Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-02 08:13:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify json export mode

Browse Source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal
2026-03-09 17:36:32 -05:00
committed by GitHub
parent 04f96b1177
commit 613c5968f7
1 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ts/services/backups/export.preload.ts
View File

@@ -393,13 +393,17 @@ export class BackupExportStream extends Readable {
currentAppVersion: `Desktop ${window.getVersion()}`,
};
this.push(
this.#getJsonIfNeeded(
this.options.type === 'plaintext-export'
? Backups.BackupInfo.encode(backupInfo).finish()
: Backups.BackupInfo.encodeDelimited(backupInfo).finish()
)
);
if (this.options.type === 'plaintext-export') {
const { exporter, chunk: initialChunk } = BackupJsonExporter.start(
Backups.BackupInfo.encode(backupInfo).finish(),
{ validate: false }
);
this.#jsonExporter = exporter;
this.push(`${initialChunk}\n`);
} else {
this.push(Backups.BackupInfo.encodeDelimited(backupInfo).finish());
}
this.#pushFrame({
account: await this.#toAccountData(),
@@ -881,18 +885,14 @@ export class BackupExportStream extends Readable {
this.#buffers.push(buffer);
}
#frameToJson(encodedFrame: Uint8Array): string {
let lines = '';
if (!this.#jsonExporter) {
const { exporter, chunk: initialChunk } = BackupJsonExporter.start(
encodedFrame,
{ validate: false }
#pushFrame(frame: Backups.IFrame): void {
const encodedFrame = Backups.Frame.encodeDelimited(frame).finish();
if (this.options.type === 'plaintext-export') {
strictAssert(
this.#jsonExporter != null,
'jsonExported must be initialized'
);
lines = `${initialChunk}\n`;
this.#jsonExporter = exporter;
} else {
const results = this.#jsonExporter.exportFrames(encodedFrame);
for (const result of results) {
if (result.errorMessage) {
@@ -904,27 +904,12 @@ export class BackupExportStream extends Readable {
if (!result.line) {
log.error('frameToJson: frame was filtered out by libsignal');
} else {
lines += `${result.line}\n`;
this.#pushBuffer(Buffer.from(`${result.line}\n`));
}
}
} else {
this.#pushBuffer(encodedFrame);
}
return lines;
}
#getJsonIfNeeded(encoded: Uint8Array): Uint8Array {
if (this.options.type === 'plaintext-export') {
const json = this.#frameToJson(encoded);
return Buffer.from(json, 'utf-8');
}
return encoded;
}
#pushFrame(frame: Backups.IFrame): void {
const encodedFrame = Backups.Frame.encodeDelimited(frame).finish();
const toPush = this.#getJsonIfNeeded(encodedFrame);
this.#pushBuffer(toPush);
}
async #flush(): Promise<void> {