@aws-sdk/lib-storage 3.894.0 → 3.896.0

package/dist-cjs/index.js

@@ -184,7 +184,7 @@ var Upload = class _Upload extends import_events.EventEmitter {
   MAX_PARTS = 1e4;
   // Defaults.
   queueSize = 4;
-  partSize = _Upload.MIN_PART_SIZE;
+  partSize;
   leavePartsOnError = false;
   tags = [];
   client;
@@ -199,6 +199,7 @@ var Upload = class _Upload extends import_events.EventEmitter {
   abortMultipartUploadCommand = null;
   uploadedParts = [];
   uploadEnqueuedPartsCount = 0;
+  expectedPartsCount;
   /**
    * Last UploadId if the upload was done with MultipartUpload and not PutObject.
    */
@@ -210,15 +211,16 @@ var Upload = class _Upload extends import_events.EventEmitter {
   constructor(options) {
     super();
     this.queueSize = options.queueSize || this.queueSize;
-    this.partSize = options.partSize || this.partSize;
     this.leavePartsOnError = options.leavePartsOnError || this.leavePartsOnError;
     this.tags = options.tags || this.tags;
     this.client = options.client;
     this.params = options.params;
-    this.__validateInput();
     this.totalBytes = byteLength(this.params.Body);
     this.bytesUploadedSoFar = 0;
     this.abortController = options.abortController ?? new import_abort_controller.AbortController();
+    this.partSize = Math.max(_Upload.MIN_PART_SIZE, Math.floor((this.totalBytes || 0) / this.MAX_PARTS));
+    this.expectedPartsCount = this.totalBytes !== void 0 ? Math.ceil(this.totalBytes / this.partSize) : void 0;
+    this.__validateInput();
   }
   async abort() {
     this.abortController.abort();
@@ -364,6 +366,7 @@ var Upload = class _Upload extends import_events.EventEmitter {
         eventEmitter.on("xhr.upload.progress", uploadEventListener);
       }
       this.uploadEnqueuedPartsCount += 1;
+      this.__validateUploadPart(dataPart);
       const partResult = await this.client.send(
         new import_client_s3.UploadPartCommand({
           ...this.params,
@@ -426,6 +429,10 @@ var Upload = class _Upload extends import_events.EventEmitter {
     }
     let result;
     if (this.isMultiPart) {
+      const { expectedPartsCount, uploadedParts } = this;
+      if (expectedPartsCount !== void 0 && uploadedParts.length !== expectedPartsCount) {
+        throw new Error(`Expected ${expectedPartsCount} part(s) but uploaded ${uploadedParts.length} part(s).`);
+      }
       this.uploadedParts.sort((a, b) => a.PartNumber - b.PartNumber);
       const uploadCompleteParams = {
         ...this.params,
@@ -480,6 +487,22 @@ var Upload = class _Upload extends import_events.EventEmitter {
       };
     });
   }
+  __validateUploadPart(dataPart) {
+    const actualPartSize = byteLength(dataPart.data);
+    if (actualPartSize === void 0) {
+      throw new Error(
+        `A dataPart was generated without a measurable data chunk size for part number ${dataPart.partNumber}`
+      );
+    }
+    if (dataPart.partNumber === 1 && dataPart.lastPart) {
+      return;
+    }
+    if (!dataPart.lastPart && actualPartSize !== this.partSize) {
+      throw new Error(
+        `The byte size for part number ${dataPart.partNumber}, size ${actualPartSize} does not match expected size ${this.partSize}`
+      );
+    }
+  }
   __validateInput() {
     if (!this.params) {
       throw new Error(`InputError: Upload requires params to be passed to upload.`);

package/dist-es/Upload.js

@@ -9,7 +9,7 @@ export class Upload extends EventEmitter {
     static MIN_PART_SIZE = 1024 * 1024 * 5;
     MAX_PARTS = 10_000;
     queueSize = 4;
-    partSize = Upload.MIN_PART_SIZE;
+    partSize;
     leavePartsOnError = false;
     tags = [];
     client;
@@ -22,6 +22,7 @@ export class Upload extends EventEmitter {
     abortMultipartUploadCommand = null;
     uploadedParts = [];
     uploadEnqueuedPartsCount = 0;
+    expectedPartsCount;
     uploadId;
     uploadEvent;
     isMultiPart = true;
@@ -30,15 +31,16 @@ export class Upload extends EventEmitter {
     constructor(options) {
         super();
         this.queueSize = options.queueSize || this.queueSize;
-        this.partSize = options.partSize || this.partSize;
         this.leavePartsOnError = options.leavePartsOnError || this.leavePartsOnError;
         this.tags = options.tags || this.tags;
         this.client = options.client;
         this.params = options.params;
-        this.__validateInput();
         this.totalBytes = byteLength(this.params.Body);
         this.bytesUploadedSoFar = 0;
         this.abortController = options.abortController ?? new AbortController();
+        this.partSize = Math.max(Upload.MIN_PART_SIZE, Math.floor((this.totalBytes || 0) / this.MAX_PARTS));
+        this.expectedPartsCount = this.totalBytes !== undefined ? Math.ceil(this.totalBytes / this.partSize) : undefined;
+        this.__validateInput();
     }
     async abort() {
         this.abortController.abort();
@@ -183,6 +185,7 @@ export class Upload extends EventEmitter {
                 eventEmitter.on("xhr.upload.progress", uploadEventListener);
             }
             this.uploadEnqueuedPartsCount += 1;
+            this.__validateUploadPart(dataPart);
             const partResult = await this.client.send(new UploadPartCommand({
                 ...this.params,
                 ContentLength: undefined,
@@ -239,6 +242,10 @@ export class Upload extends EventEmitter {
         }
         let result;
         if (this.isMultiPart) {
+            const { expectedPartsCount, uploadedParts } = this;
+            if (expectedPartsCount !== undefined && uploadedParts.length !== expectedPartsCount) {
+                throw new Error(`Expected ${expectedPartsCount} part(s) but uploaded ${uploadedParts.length} part(s).`);
+            }
             this.uploadedParts.sort((a, b) => a.PartNumber - b.PartNumber);
             const uploadCompleteParams = {
                 ...this.params,
@@ -287,6 +294,18 @@ export class Upload extends EventEmitter {
             };
         });
     }
+    __validateUploadPart(dataPart) {
+        const actualPartSize = byteLength(dataPart.data);
+        if (actualPartSize === undefined) {
+            throw new Error(`A dataPart was generated without a measurable data chunk size for part number ${dataPart.partNumber}`);
+        }
+        if (dataPart.partNumber === 1 && dataPart.lastPart) {
+            return;
+        }
+        if (!dataPart.lastPart && actualPartSize !== this.partSize) {
+            throw new Error(`The byte size for part number ${dataPart.partNumber}, size ${actualPartSize} does not match expected size ${this.partSize}`);
+        }
+    }
     __validateInput() {
         if (!this.params) {
             throw new Error(`InputError: Upload requires params to be passed to upload.`);

package/dist-types/Upload.d.ts

@@ -30,6 +30,7 @@ export declare class Upload extends EventEmitter {
     private abortMultipartUploadCommand;
     private uploadedParts;
     private uploadEnqueuedPartsCount;
+    private expectedPartsCount?;
     /**
      * Last UploadId if the upload was done with MultipartUpload and not PutObject.
      */
@@ -54,5 +55,6 @@ export declare class Upload extends EventEmitter {
     private markUploadAsAborted;
     private __notifyProgress;
     private __abortTimeout;
+    private __validateUploadPart;
     private __validateInput;
 }

package/dist-types/ts3.4/Upload.d.ts

@@ -23,6 +23,7 @@ export declare class Upload extends EventEmitter {
   private abortMultipartUploadCommand;
   private uploadedParts;
   private uploadEnqueuedPartsCount;
+  private expectedPartsCount?;
   uploadId?: string;
   uploadEvent?: string;
   private isMultiPart;
@@ -39,5 +40,6 @@ export declare class Upload extends EventEmitter {
   private markUploadAsAborted;
   private __notifyProgress;
   private __abortTimeout;
+  private __validateUploadPart;
   private __validateInput;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/lib-storage",
-  "version": "3.894.0",
+  "version": "3.896.0",
   "description": "Storage higher order operation",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -29,18 +29,18 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@smithy/abort-controller": "^4.1.1",
-    "@smithy/middleware-endpoint": "^4.2.3",
-    "@smithy/smithy-client": "^4.6.3",
+    "@smithy/middleware-endpoint": "^4.2.4",
+    "@smithy/smithy-client": "^4.6.4",
     "buffer": "5.6.0",
     "events": "3.3.0",
     "stream-browserify": "3.0.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.894.0"
+    "@aws-sdk/client-s3": "^3.896.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.894.0",
+    "@aws-sdk/client-s3": "3.896.0",
     "@smithy/types": "^4.5.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^18.19.69",