feat: cr revisions

Author: lukachad

lib/lib-storage/package.json

@@ -15,10 +15,10 @@
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "extract:docs": "api-extractor run --local",
     "test": "yarn g:vitest run",
-    "test:e2e": "yarn g:vitest run -c vitest.config.e2e.ts --mode development",
     "test:watch": "yarn g:vitest watch",
     "test:browser": "yarn g:vitest run -c vitest.config.browser.ts",
     "test:browser:watch": "yarn g:vitest watch -c vitest.config.browser.ts",
+    "test:e2e": "yarn g:vitest run -c vitest.config.e2e.ts --mode development",
     "test:e2e:watch": "yarn g:vitest watch -c vitest.config.e2e.ts"
   },
   "engines": {
@@ -48,7 +48,6 @@
     "@types/node": "^18.19.69",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "jsdom": "^26.1.0",
     "rimraf": "3.0.2",
     "typescript": "~5.8.3",
     "web-streams-polyfill": "3.2.1"

lib/lib-storage/src/s3-transfer-manager/S3TransferManager.e2e.spec.ts

@@ -1,17 +1,10 @@
-import {
-  GetObjectCommandOutput,
-  ListBucketInventoryConfigurationsOutputFilterSensitiveLog,
-  PutObjectCommand,
-  S3,
-} from "@aws-sdk/client-s3";
-import internal from "stream";
-import { getHeapSnapshot } from "v8";
+import { GetObjectCommandOutput, S3 } from "@aws-sdk/client-s3";
 import { beforeAll, describe, expect, test as it } from "vitest";
 
 import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
 import { Upload } from "../Upload";
 import { internalEventHandler, S3TransferManager } from "./S3TransferManager";
-import type { IS3TransferManager, S3TransferManagerConfig } from "./types";
+import type { S3TransferManagerConfig } from "./types";
 
 describe(S3TransferManager.name, () => {
   const chunk = "01234567";
@@ -231,10 +224,36 @@ describe(S3TransferManager.name, () => {
     }
   });
 
-  // TODO: Write abortController tests
-  describe.skip("Download must cancel on timed abortController", () => {});
+  describe("download with abortController ", () => {
+    const modes = ["PART"] as S3TransferManagerConfig["multipartDownloadType"][];
+    for (const mode of modes) {
+      it(`should cancel ${mode} download on abort()`, async () => {
+        const totalSizeMB = 10 * 1024 * 1024;
+        const Body = data(totalSizeMB);
+        const Key = `${mode}-size`;
+        await new Upload({
+          client,
+          params: { Bucket, Key, Body },
+        }).done();
+        const tm: S3TransferManager = mode === "PART" ? tmPart : tmRange;
+        const controller = new AbortController();
+        setTimeout(() => controller.abort(), 100);
+        try {
+          await tm.download(
+            { Bucket, Key },
+            {
+              abortSignal: controller.signal,
+            }
+          );
+          expect.fail("Download should have been aborted");
+        } catch (error) {
+          expect(error.name).toEqual("AbortError");
+        }
+      }, 60_000);
+    }
+  });
 
-  describe.skip("(SEP) download single object tests", () => {
+  describe("(SEP) download single object tests", () => {
     async function sepTests(
       objectType: "single" | "multipart",
       multipartType: "PART" | "RANGE",
@@ -286,13 +305,6 @@ describe(S3TransferManager.name, () => {
     it("multipart object: multipartDownloadType = RANGE, range = 0-12MB, partNumber = null", async () => {
       await sepTests("multipart", "RANGE", `bytes=0-${12 * 1024 * 1024}`, undefined);
     }, 60_000);
-    // skipped because TM no longer supports partNumber
-    it.skip("single object: multipartDownloadType = PART, range = null, partNumber = 2", async () => {
-      await sepTests("single", "PART", undefined, 2);
-    }, 60_000);
-    it.skip("single object: multipartDownloadType = RANGE, range = null, partNumber = 2", async () => {
-      await sepTests("single", "RANGE", undefined, 2);
-    }, 60_000);
     it("single object: multipartDownloadType = PART, range = null, partNumber = null", async () => {
       await sepTests("single", "PART", undefined, undefined);
     }, 60_000);

lib/lib-storage/src/s3-transfer-manager/S3TransferManager.spec.ts

@@ -1,13 +1,11 @@
 import { S3, S3Client } from "@aws-sdk/client-s3";
-import { GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3";
 import { TransferCompleteEvent, TransferEvent } from "@aws-sdk/lib-storage/dist-types/s3-transfer-manager/types";
 import { StreamingBlobPayloadOutputTypes } from "@smithy/types";
-import { mockClient } from "aws-sdk-client-mock";
 import { Readable } from "stream";
 import { beforeAll, beforeEach, describe, expect, test as it, vi } from "vitest";
 
 import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
-import { iterateStreams, joinStreams } from "./join-streams";
+import { joinStreams } from "./join-streams";
 import { S3TransferManager } from "./S3TransferManager";
 
 describe("S3TransferManager Unit Tests", () => {
@@ -29,72 +27,6 @@ describe("S3TransferManager Unit Tests", () => {
     });
   });
 
-  // TODO: This test uses mock from public library aws-sdk-mock. May remove
-  describe("ETag Unit tests", () => {
-    const s3Mock = mockClient(S3Client);
-
-    beforeEach(() => {
-      s3Mock.reset();
-    });
-
-    it("Should throw precondition error when ETag changes mid-download", async () => {
-      const bucket = "test-bucket";
-      const key = "test-key";
-      const originalData = Buffer.alloc(20 * 1024 * 1024, "a"); // 20MB
-
-      let getCallCount = 0;
-
-      s3Mock.on(GetObjectCommand).callsFake((input) => {
-        getCallCount++;
-
-        if (getCallCount === 1) {
-          // First call - return original object with PartsCount > 1 to trigger concurrent requests
-          return {
-            Body: Readable.from([originalData.slice(0, 8 * 1024 * 1024)]),
-            ETag: '"original-etag"',
-            ContentLength: 8 * 1024 * 1024,
-            ContentRange: "bytes 0-8388607/20971520", // Part 1 of 3 parts
-            PartsCount: 3,
-          };
-        } else {
-          // Subsequent calls with IfMatch should fail with 412 Precondition Failed
-          if (input.IfMatch === '"original-etag"') {
-            const error = new Error("The condition specified using HTTP conditional header(s) is not met.");
-            error.name = "PreconditionFailed";
-            (error as any).$metadata = {
-              httpStatusCode: 412,
-            };
-            throw error;
-          }
-
-          // Fallback for any other calls
-          return {
-            Body: Readable.from([originalData.slice(0, 8 * 1024 * 1024)]),
-            ETag: '"original-etag"',
-            ContentLength: 8 * 1024 * 1024,
-          };
-        }
-      });
-
-      const tm = new S3TransferManager({
-        s3ClientInstance: new S3Client({}),
-        targetPartSizeBytes: 8 * 1024 * 1024,
-        multipartDownloadType: "PART", // Use PART mode to trigger the concurrent requests
-      });
-
-      await expect(
-        tm.download({
-          Bucket: bucket,
-          Key: key,
-        })
-      ).rejects.toThrowError(
-        expect.objectContaining({
-          name: "PreconditionFailed",
-        })
-      );
-    });
-  });
-
   describe("S3TransferManager Constructor", () => {
     it("Should create an instance of S3TransferManager with defaults given no parameters", () => {
       const tm = new S3TransferManager() as any;

lib/lib-storage/src/s3-transfer-manager/S3TransferManager.ts

@@ -5,10 +5,7 @@ import type {
   PutObjectCommandInput,
 } from "@aws-sdk/client-s3";
 import { GetObjectCommand, HeadObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { CONFIG_RESPONSE_CHECKSUM_VALIDATION } from "@aws-sdk/middleware-flexible-checksums/dist-types";
-import { getChecksum } from "@aws-sdk/middleware-flexible-checksums/dist-types/getChecksum";
-import { copySnapshotPresignedUrlMiddlewareOptions } from "@aws-sdk/middleware-sdk-ec2/dist-types";
-import { type StreamingBlobPayloadOutputTypes, Checksum, ChecksumConstructor } from "@smithy/types";
+import { type StreamingBlobPayloadOutputTypes } from "@smithy/types";
 
 import type { AddEventListenerOptions, EventListener, RemoveEventListenerOptions } from "./event-listener-types";
 import { joinStreams } from "./join-streams";

lib/lib-storage/vitest.config.browser.ts

@@ -3,6 +3,6 @@ import { defineConfig } from "vitest/config";
 export default defineConfig({
   test: {
     include: ["**/*.browser.spec.ts"],
-    environment: "jsdom",
+    environment: "happy-dom",
   },
 });

package.json

@@ -79,7 +79,6 @@
     "@typescript-eslint/eslint-plugin": "5.55.0",
     "@typescript-eslint/parser": "5.55.0",
     "async": "3.2.4",
-    "aws-sdk-client-mock": "^4.1.0",
     "concurrently": "7.0.0",
     "decomment": "0.9.5",
     "downlevel-dts": "0.10.1",
@@ -96,7 +95,7 @@
     "fs-extra": "^9.0.0",
     "generate-changelog": "^1.7.1",
     "glob": "7.1.6",
-    "happy-dom": "16.3.0",
+    "happy-dom": "^18.0.1",
     "husky": "^4.2.3",
     "jest": "29.7.0",
     "jmespath": "^0.15.0",