From 322439117e4c829214e5b47693cfc3c06fd640a2 Mon Sep 17 00:00:00 2001 From: Dave Mihalcik <38867245+dmihalcik-virtru@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:53:53 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20explicit=20content-leng?= =?UTF-8?q?th=20(#255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is unused and inaccurate --- .../src/client/DecoratedReadableStream.ts | 2 -- lib/tdf3/src/client/builders.ts | 24 ++----------------- remote-store/package-lock.json | 2 +- remote-store/src/index.ts | 14 ----------- web-app/package-lock.json | 16 ++++++------- 5 files changed, 11 insertions(+), 47 deletions(-) diff --git a/lib/tdf3/src/client/DecoratedReadableStream.ts b/lib/tdf3/src/client/DecoratedReadableStream.ts index 42ac6800..e48ed3dd 100644 --- a/lib/tdf3/src/client/DecoratedReadableStream.ts +++ b/lib/tdf3/src/client/DecoratedReadableStream.ts @@ -27,7 +27,6 @@ export class DecoratedReadableStream { on: EventEmitter['on']; emit: EventEmitter['emit']; metadata?: Metadata; - contentLength?: number; manifest: Manifest; upsertResponse?: UpsertResponse; fileStreamServiceWorker?: string; @@ -110,7 +109,6 @@ export class DecoratedReadableStream { } const fileStream = streamSaver.createWriteStream(filepath, { - ...(this.contentLength && { size: this.contentLength }), writableStrategy: { highWaterMark: 1 }, readableStrategy: { highWaterMark: 1 }, }); diff --git a/lib/tdf3/src/client/builders.ts b/lib/tdf3/src/client/builders.ts index 47d0d1bb..99ee102a 100644 --- a/lib/tdf3/src/client/builders.ts +++ b/lib/tdf3/src/client/builders.ts @@ -32,7 +32,6 @@ export type EncryptParams = { scope?: Scope; metadata?: Metadata; keypair?: CryptoKeyPair; - contentLength?: number; offline?: boolean; windowSize?: number; asHtml?: boolean; @@ -74,15 +73,6 @@ class EncryptParamsBuilder { this._params = { ...params }; } - setContentLength(contentLength: number) { - this._params.contentLength = contentLength; - } - - withContentLength(contentLength: number) { - this.setContentLength(contentLength); - return this; - } - getStreamSource(): EncryptParams['source'] | undefined { return this._params.source; } @@ -485,12 +475,11 @@ export type DecryptSource = | { type: 'file-browser'; location: Blob }; export type DecryptParams = { - source: DecryptSource; - opts?: { keypair: PemKeyPair }; eo?: EntityObject; + source: DecryptSource; keyMiddleware?: DecryptKeyMiddleware; streamMiddleware?: DecryptStreamMiddleware; -} & Pick; +}; /** * A builder capable of constructing the necessary parameters object for a @@ -518,15 +507,6 @@ class DecryptParamsBuilder { }; } - setContentLength(contentLength: number) { - this._params.contentLength = contentLength; - } - - withContentLength(contentLength: number) { - this.setContentLength(contentLength); - return this; - } - getStreamSource(): DecryptSource | undefined { return this._params.source; } diff --git a/remote-store/package-lock.json b/remote-store/package-lock.json index f1cbf1bf..46f0fcb5 100644 --- a/remote-store/package-lock.json +++ b/remote-store/package-lock.json @@ -1649,7 +1649,7 @@ "node_modules/@opentdf/client": { "version": "2.0.0", "resolved": "file:../lib/opentdf-client-2.0.0.tgz", - "integrity": "sha512-hs9WzKYyLmiizrad01mRByHOVbr2OpFEXS2oYeQcjygGeMdkRGfTiyt+Y7voBMJJuCeOcyzM9Rll7OQpPQra8w==", + "integrity": "sha512-p8Og3vK9QI16/OcbCZL7oe4dtUBDc7htZzVNndJSUh9AMXyR7bu7UeaHr+m4k7U+0iJuFVYfAdqsTdkWtav3oA==", "license": "BSD-3-Clause-Clear", "dependencies": { "ajv": "^8.12.0", diff --git a/remote-store/src/index.ts b/remote-store/src/index.ts index 7fa62779..22d45441 100644 --- a/remote-store/src/index.ts +++ b/remote-store/src/index.ts @@ -1,7 +1,6 @@ import { S3Client, GetObjectCommand, - HeadObjectCommand, S3ClientConfig, AbortMultipartUploadCommandOutput, CompleteMultipartUploadCommandOutput, @@ -93,19 +92,6 @@ export const setRemoteStoreAsStream = async ( const s3 = new S3Client(storageParams); - const s3Metadata = await s3.send( - new HeadObjectCommand({ - Key: FILE_NAME, - Bucket: BUCKET_NAME, - }) - ); - - if (typeof s3Metadata.ContentLength === 'number') { - if ((builder as DecryptParamsBuilder).setContentLength) { - (builder as DecryptParamsBuilder).setContentLength(s3Metadata.ContentLength); - } - } - const s3download = await s3.send( new GetObjectCommand({ Key: FILE_NAME, diff --git a/web-app/package-lock.json b/web-app/package-lock.json index fc315129..72847930 100644 --- a/web-app/package-lock.json +++ b/web-app/package-lock.json @@ -602,7 +602,7 @@ "node_modules/@opentdf/client": { "version": "2.0.0", "resolved": "file:../lib/opentdf-client-2.0.0.tgz", - "integrity": "sha512-hs9WzKYyLmiizrad01mRByHOVbr2OpFEXS2oYeQcjygGeMdkRGfTiyt+Y7voBMJJuCeOcyzM9Rll7OQpPQra8w==", + "integrity": "sha512-p8Og3vK9QI16/OcbCZL7oe4dtUBDc7htZzVNndJSUh9AMXyR7bu7UeaHr+m4k7U+0iJuFVYfAdqsTdkWtav3oA==", "license": "BSD-3-Clause-Clear", "dependencies": { "ajv": "^8.12.0", @@ -1204,9 +1204,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", - "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -4099,7 +4099,7 @@ }, "@opentdf/client": { "version": "file:../lib/opentdf-client-2.0.0.tgz", - "integrity": "sha512-hs9WzKYyLmiizrad01mRByHOVbr2OpFEXS2oYeQcjygGeMdkRGfTiyt+Y7voBMJJuCeOcyzM9Rll7OQpPQra8w==", + "integrity": "sha512-p8Og3vK9QI16/OcbCZL7oe4dtUBDc7htZzVNndJSUh9AMXyR7bu7UeaHr+m4k7U+0iJuFVYfAdqsTdkWtav3oA==", "requires": { "ajv": "^8.12.0", "axios": "^1.6.1", @@ -4464,9 +4464,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz", - "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0",