diff --git a/package.json b/package.json index 25748e04ba..fe0a4b95fb 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "@react-aria/focus": "3.19.1", "@react-aria/utils": "3.25.3", "@react-spring/web": "9.7.5", - "@signalapp/libsignal-client": "0.67.4", + "@signalapp/libsignal-client": "0.68.0", "@signalapp/quill-cjs": "2.1.2", "@signalapp/ringrtc": "2.50.3", "@signalapp/sqlcipher": "1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2cfce04b07..ca14ff5ca7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,8 +128,8 @@ importers: specifier: 9.7.5 version: 9.7.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2) '@signalapp/libsignal-client': - specifier: 0.67.4 - version: 0.67.4 + specifier: 0.68.0 + version: 0.68.0 '@signalapp/quill-cjs': specifier: 2.1.2 version: 2.1.2 @@ -2534,8 +2534,8 @@ packages: '@signalapp/libsignal-client@0.60.2': resolution: {integrity: sha512-tU4kNP/yCwkFntb2ahXOSQJtzdy+YifAB2yv5hw0qyKSidRHLn6bYiz4Zo2tjxLDRoBLAUxCRsQramStiqNZdA==} - '@signalapp/libsignal-client@0.67.4': - resolution: {integrity: sha512-nenGxomG2zH0uCoFSwBzofqSAHnJRdbIbLr8libGy9y3rCL2z62nHL79Kh1o46ZnzxgAA7Ay3/qMhwPcXq7Iig==} + '@signalapp/libsignal-client@0.68.0': + resolution: {integrity: sha512-k7kUqN36wYMnx1ARVVpNmWJfVlD0AIrNEq0Mpb7X8yMc6E8QY5ankwtPX3ZlO/Yl7en2NT7ZrP4dM5xpQlGsNA==} '@signalapp/mock-server@11.2.0': resolution: {integrity: sha512-y8bueRcXVulyXRRVm2M/qT7YmxGpUbiwQsRSi7a+DDI4aUeZIDW9z7KgjElv1CN1/n9O6M1bYO+TLy4ys+7U6w==} @@ -12242,7 +12242,7 @@ snapshots: type-fest: 4.26.1 uuid: 8.3.2 - '@signalapp/libsignal-client@0.67.4': + '@signalapp/libsignal-client@0.68.0': dependencies: node-gyp-build: 4.8.4 type-fest: 4.26.1 diff --git a/ts/services/backups/util/FileStream.ts b/ts/services/backups/util/FileStream.ts index 5f7f111f3e..fbad9fd10c 100644 --- a/ts/services/backups/util/FileStream.ts +++ b/ts/services/backups/util/FileStream.ts @@ -15,7 +15,7 @@ export class FileStream extends InputStream { super(); } - public async close(): Promise { + public override async close(): Promise { await this.#initPromise; await this.#file?.close(); } diff --git a/ts/services/backups/validator.ts b/ts/services/backups/validator.ts index 92fde2698f..514eaf1002 100644 --- a/ts/services/backups/validator.ts +++ b/ts/services/backups/validator.ts @@ -21,23 +21,12 @@ export async function validateBackup( aci, }); - const streams = new Array(); - - let outcome: libsignal.ValidationOutcome; - try { - outcome = await libsignal.validate( - backupKey, - libsignal.Purpose.RemoteBackup, - () => { - const stream = new FileStream(filePath); - streams.push(stream); - return stream; - }, - BigInt(fileSize) - ); - } finally { - await Promise.all(streams.map(stream => stream.close())); - } + const outcome = await libsignal.validate( + backupKey, + libsignal.Purpose.RemoteBackup, + () => new FileStream(filePath), + BigInt(fileSize) + ); if (isTestOrMockEnvironment()) { strictAssert(