@aws-sdk/lib-storage 3.896.0 → 3.900.0

package/dist-cjs/index.js

@@ -32,11 +32,13 @@ var import_middleware_endpoint = require("@smithy/middleware-endpoint");
 var import_smithy_client = require("@smithy/smithy-client");
 var import_events = require("events");
 
-// src/bytelength.ts
+// src/byteLength.ts
 var import_buffer = require("buffer");
 var import_runtimeConfig = require("././runtimeConfig");
 var byteLength = /* @__PURE__ */ __name((input) => {
-  if (input === null || input === void 0) return 0;
+  if (input == null) {
+    return 0;
+  }
   if (typeof input === "string") {
     return import_buffer.Buffer.byteLength(input);
   }
@@ -46,9 +48,11 @@ var byteLength = /* @__PURE__ */ __name((input) => {
     return input.length;
   } else if (typeof input.size === "number") {
     return input.size;
+  } else if (typeof input.start === "number" && typeof input.end === "number") {
+    return input.end + 1 - input.start;
   } else if (typeof input.path === "string") {
     try {
-      return import_runtimeConfig.ClientDefaultValues.lstatSync(input.path).size;
+      return import_runtimeConfig.runtimeConfig.lstatSync(input.path).size;
     } catch (error) {
       return void 0;
     }
@@ -56,6 +60,37 @@ var byteLength = /* @__PURE__ */ __name((input) => {
   return void 0;
 }, "byteLength");
 
+// src/byteLengthSource.ts
+var import_runtimeConfig2 = require("././runtimeConfig");
+var byteLengthSource = /* @__PURE__ */ __name((input, override) => {
+  if (override != null) {
+    return "the ContentLength property of the params set by the caller" /* CONTENT_LENGTH */;
+  }
+  if (input == null) {
+    return "a null or undefined Body" /* EMPTY_INPUT */;
+  }
+  if (typeof input === "string") {
+    return "the encoded byte length of the Body string" /* STRING_LENGTH */;
+  }
+  if (typeof input.byteLength === "number") {
+    return "the byteLength of a typed byte array such as Uint8Array" /* TYPED_ARRAY */;
+  } else if (typeof input.length === "number") {
+    return "the value of Body.length" /* LENGTH */;
+  } else if (typeof input.size === "number") {
+    return "the value of Body.size" /* SIZE */;
+  } else if (typeof input.start === "number" && typeof input.end === "number") {
+    return "the numeric difference between Body.start and Body.end" /* START_END_DIFF */;
+  } else if (typeof input.path === "string") {
+    try {
+      import_runtimeConfig2.runtimeConfig.lstatSync(input.path).size;
+      return "the size of the file given by Body.path on disk as reported by lstatSync" /* LSTAT */;
+    } catch (error) {
+      return void 0;
+    }
+  }
+  return void 0;
+}, "byteLengthSource");
+
 // src/chunker.ts
 
 var import_stream = require("stream");
@@ -191,6 +226,7 @@ var Upload = class _Upload extends import_events.EventEmitter {
   params;
   // used for reporting progress.
   totalBytes;
+  totalBytesSource;
   bytesUploadedSoFar;
   // used in the upload.
   abortController;
@@ -215,11 +251,17 @@ var Upload = class _Upload extends import_events.EventEmitter {
     this.tags = options.tags || this.tags;
     this.client = options.client;
     this.params = options.params;
-    this.totalBytes = byteLength(this.params.Body);
+    if (!this.params) {
+      throw new Error(`InputError: Upload requires params to be passed to upload.`);
+    }
+    this.totalBytes = this.params.ContentLength ?? byteLength(this.params.Body);
+    this.totalBytesSource = byteLengthSource(this.params.Body, this.params.ContentLength);
     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.partSize = options.partSize || Math.max(_Upload.MIN_PART_SIZE, Math.floor((this.totalBytes || 0) / this.MAX_PARTS));
+    if (this.totalBytes !== void 0) {
+      this.expectedPartsCount = Math.ceil(this.totalBytes / this.partSize);
+    }
     this.__validateInput();
   }
   async abort() {
@@ -429,9 +471,14 @@ 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).`);
+      const { expectedPartsCount, uploadedParts, totalBytes, totalBytesSource } = this;
+      if (totalBytes !== void 0 && expectedPartsCount !== void 0 && uploadedParts.length !== expectedPartsCount) {
+        throw new Error(`Expected ${expectedPartsCount} part(s) but uploaded ${uploadedParts.length} part(s).
+The expected part count is based on the byte-count of the input.params.Body,
+which was read from ${totalBytesSource} and is ${totalBytes}.
+If this is not correct, provide an override value by setting a number
+to input.params.ContentLength in bytes.
+`);
       }
       this.uploadedParts.sort((a, b) => a.PartNumber - b.PartNumber);
       const uploadCompleteParams = {
@@ -504,15 +551,12 @@ var Upload = class _Upload extends import_events.EventEmitter {
     }
   }
   __validateInput() {
-    if (!this.params) {
-      throw new Error(`InputError: Upload requires params to be passed to upload.`);
-    }
     if (!this.client) {
       throw new Error(`InputError: Upload requires a AWS client to do uploads with.`);
     }
     if (this.partSize < _Upload.MIN_PART_SIZE) {
       throw new Error(
-        `EntityTooSmall: Your proposed upload partsize [${this.partSize}] is smaller than the minimum allowed size [${_Upload.MIN_PART_SIZE}] (5MB)`
+        `EntityTooSmall: Your proposed upload part size [${this.partSize}] is smaller than the minimum allowed size [${_Upload.MIN_PART_SIZE}] (5MB)`
       );
     }
     if (this.queueSize < 1) {

package/dist-cjs/runtimeConfig.browser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientDefaultValues = void 0;
+exports.runtimeConfig = void 0;
 const runtimeConfig_shared_1 = require("./runtimeConfig.shared");
-exports.ClientDefaultValues = {
-    ...runtimeConfig_shared_1.ClientSharedValues,
+exports.runtimeConfig = {
+    ...runtimeConfig_shared_1.runtimeConfigShared,
     runtime: "browser",
 };

package/dist-cjs/runtimeConfig.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientDefaultValues = void 0;
+exports.runtimeConfig = void 0;
 const fs_1 = require("fs");
 const runtimeConfig_shared_1 = require("./runtimeConfig.shared");
-exports.ClientDefaultValues = {
-    ...runtimeConfig_shared_1.ClientSharedValues,
+exports.runtimeConfig = {
+    ...runtimeConfig_shared_1.runtimeConfigShared,
     runtime: "node",
     lstatSync: fs_1.lstatSync,
 };

package/dist-cjs/runtimeConfig.native.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientDefaultValues = void 0;
+exports.runtimeConfig = void 0;
 const runtimeConfig_browser_1 = require("./runtimeConfig.browser");
-exports.ClientDefaultValues = {
-    ...runtimeConfig_browser_1.ClientDefaultValues,
+exports.runtimeConfig = {
+    ...runtimeConfig_browser_1.runtimeConfig,
     runtime: "react-native",
 };

package/dist-cjs/runtimeConfig.shared.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientSharedValues = void 0;
-exports.ClientSharedValues = {
+exports.runtimeConfigShared = void 0;
+exports.runtimeConfigShared = {
     lstatSync: () => { },
 };

package/dist-es/Upload.js

@@ -3,7 +3,8 @@ import { AbortController } from "@smithy/abort-controller";
 import { getEndpointFromInstructions, toEndpointV1, } from "@smithy/middleware-endpoint";
 import { extendedEncodeURIComponent } from "@smithy/smithy-client";
 import { EventEmitter } from "events";
-import { byteLength } from "./bytelength";
+import { byteLength } from "./byteLength";
+import { byteLengthSource } from "./byteLengthSource";
 import { getChunk } from "./chunker";
 export class Upload extends EventEmitter {
     static MIN_PART_SIZE = 1024 * 1024 * 5;
@@ -15,6 +16,7 @@ export class Upload extends EventEmitter {
     client;
     params;
     totalBytes;
+    totalBytesSource;
     bytesUploadedSoFar;
     abortController;
     concurrentUploaders = [];
@@ -35,11 +37,18 @@ export class Upload extends EventEmitter {
         this.tags = options.tags || this.tags;
         this.client = options.client;
         this.params = options.params;
-        this.totalBytes = byteLength(this.params.Body);
+        if (!this.params) {
+            throw new Error(`InputError: Upload requires params to be passed to upload.`);
+        }
+        this.totalBytes = this.params.ContentLength ?? byteLength(this.params.Body);
+        this.totalBytesSource = byteLengthSource(this.params.Body, this.params.ContentLength);
         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.partSize =
+            options.partSize || Math.max(Upload.MIN_PART_SIZE, Math.floor((this.totalBytes || 0) / this.MAX_PARTS));
+        if (this.totalBytes !== undefined) {
+            this.expectedPartsCount = Math.ceil(this.totalBytes / this.partSize);
+        }
         this.__validateInput();
     }
     async abort() {
@@ -242,9 +251,14 @@ 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).`);
+            const { expectedPartsCount, uploadedParts, totalBytes, totalBytesSource } = this;
+            if (totalBytes !== undefined && expectedPartsCount !== undefined && uploadedParts.length !== expectedPartsCount) {
+                throw new Error(`Expected ${expectedPartsCount} part(s) but uploaded ${uploadedParts.length} part(s).
+The expected part count is based on the byte-count of the input.params.Body,
+which was read from ${totalBytesSource} and is ${totalBytes}.
+If this is not correct, provide an override value by setting a number
+to input.params.ContentLength in bytes.
+`);
             }
             this.uploadedParts.sort((a, b) => a.PartNumber - b.PartNumber);
             const uploadCompleteParams = {
@@ -307,14 +321,11 @@ export class Upload extends EventEmitter {
         }
     }
     __validateInput() {
-        if (!this.params) {
-            throw new Error(`InputError: Upload requires params to be passed to upload.`);
-        }
         if (!this.client) {
             throw new Error(`InputError: Upload requires a AWS client to do uploads with.`);
         }
         if (this.partSize < Upload.MIN_PART_SIZE) {
-            throw new Error(`EntityTooSmall: Your proposed upload partsize [${this.partSize}] is smaller than the minimum allowed size [${Upload.MIN_PART_SIZE}] (5MB)`);
+            throw new Error(`EntityTooSmall: Your proposed upload part size [${this.partSize}] is smaller than the minimum allowed size [${Upload.MIN_PART_SIZE}] (5MB)`);
         }
         if (this.queueSize < 1) {
             throw new Error(`Queue size: Must have at least one uploading queue.`);

package/dist-es/{bytelength.js → byteLength.js}

@@ -1,8 +1,9 @@
 import { Buffer } from "buffer";
-import { ClientDefaultValues } from "./runtimeConfig";
+import { runtimeConfig } from "./runtimeConfig";
 export const byteLength = (input) => {
-    if (input === null || input === undefined)
+    if (input == null) {
         return 0;
+    }
     if (typeof input === "string") {
         return Buffer.byteLength(input);
     }
@@ -15,9 +16,12 @@ export const byteLength = (input) => {
     else if (typeof input.size === "number") {
         return input.size;
     }
+    else if (typeof input.start === "number" && typeof input.end === "number") {
+        return input.end + 1 - input.start;
+    }
     else if (typeof input.path === "string") {
         try {
-            return ClientDefaultValues.lstatSync(input.path).size;
+            return runtimeConfig.lstatSync(input.path).size;
         }
         catch (error) {
             return undefined;

package/dist-es/byteLengthSource.js

@@ -0,0 +1,45 @@
+import { runtimeConfig } from "./runtimeConfig";
+export var BYTE_LENGTH_SOURCE;
+(function (BYTE_LENGTH_SOURCE) {
+    BYTE_LENGTH_SOURCE["EMPTY_INPUT"] = "a null or undefined Body";
+    BYTE_LENGTH_SOURCE["CONTENT_LENGTH"] = "the ContentLength property of the params set by the caller";
+    BYTE_LENGTH_SOURCE["STRING_LENGTH"] = "the encoded byte length of the Body string";
+    BYTE_LENGTH_SOURCE["TYPED_ARRAY"] = "the byteLength of a typed byte array such as Uint8Array";
+    BYTE_LENGTH_SOURCE["LENGTH"] = "the value of Body.length";
+    BYTE_LENGTH_SOURCE["SIZE"] = "the value of Body.size";
+    BYTE_LENGTH_SOURCE["START_END_DIFF"] = "the numeric difference between Body.start and Body.end";
+    BYTE_LENGTH_SOURCE["LSTAT"] = "the size of the file given by Body.path on disk as reported by lstatSync";
+})(BYTE_LENGTH_SOURCE || (BYTE_LENGTH_SOURCE = {}));
+export const byteLengthSource = (input, override) => {
+    if (override != null) {
+        return BYTE_LENGTH_SOURCE.CONTENT_LENGTH;
+    }
+    if (input == null) {
+        return BYTE_LENGTH_SOURCE.EMPTY_INPUT;
+    }
+    if (typeof input === "string") {
+        return BYTE_LENGTH_SOURCE.STRING_LENGTH;
+    }
+    if (typeof input.byteLength === "number") {
+        return BYTE_LENGTH_SOURCE.TYPED_ARRAY;
+    }
+    else if (typeof input.length === "number") {
+        return BYTE_LENGTH_SOURCE.LENGTH;
+    }
+    else if (typeof input.size === "number") {
+        return BYTE_LENGTH_SOURCE.SIZE;
+    }
+    else if (typeof input.start === "number" && typeof input.end === "number") {
+        return BYTE_LENGTH_SOURCE.START_END_DIFF;
+    }
+    else if (typeof input.path === "string") {
+        try {
+            runtimeConfig.lstatSync(input.path).size;
+            return BYTE_LENGTH_SOURCE.LSTAT;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    return undefined;
+};

package/dist-es/runtimeConfig.browser.js

@@ -1,5 +1,5 @@
-import { ClientSharedValues } from "./runtimeConfig.shared";
-export const ClientDefaultValues = {
-    ...ClientSharedValues,
+import { runtimeConfigShared as shared } from "./runtimeConfig.shared";
+export const runtimeConfig = {
+    ...shared,
     runtime: "browser",
 };

package/dist-es/runtimeConfig.js

@@ -1,7 +1,7 @@
 import { lstatSync } from "fs";
-import { ClientSharedValues } from "./runtimeConfig.shared";
-export const ClientDefaultValues = {
-    ...ClientSharedValues,
+import { runtimeConfigShared as shared } from "./runtimeConfig.shared";
+export const runtimeConfig = {
+    ...shared,
     runtime: "node",
     lstatSync,
 };

package/dist-es/runtimeConfig.native.js

@@ -1,5 +1,5 @@
-import { ClientDefaultValues as BrowserDefaults } from "./runtimeConfig.browser";
-export const ClientDefaultValues = {
-    ...BrowserDefaults,
+import { runtimeConfig as browserConfig } from "./runtimeConfig.browser";
+export const runtimeConfig = {
+    ...browserConfig,
     runtime: "react-native",
 };

package/dist-es/runtimeConfig.shared.js

@@ -1,3 +1,3 @@
-export const ClientSharedValues = {
+export const runtimeConfigShared = {
     lstatSync: () => { },
 };

package/dist-types/Upload.d.ts

@@ -23,6 +23,7 @@ export declare class Upload extends EventEmitter {
     private readonly client;
     private readonly params;
     private totalBytes?;
+    private readonly totalBytesSource?;
     private bytesUploadedSoFar;
     private abortController;
     private concurrentUploaders;

package/dist-types/byteLength.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Clients use util-body-length-[node|browser] instead.
+ * @internal
+ * @param input - to examine.
+ * @returns byte count of input or undefined if indeterminable.
+ */
+export declare const byteLength: (input: any) => number | undefined;

package/dist-types/byteLengthSource.d.ts

@@ -0,0 +1,21 @@
+/**
+ * @internal
+ */
+export declare enum BYTE_LENGTH_SOURCE {
+    EMPTY_INPUT = "a null or undefined Body",
+    CONTENT_LENGTH = "the ContentLength property of the params set by the caller",
+    STRING_LENGTH = "the encoded byte length of the Body string",
+    TYPED_ARRAY = "the byteLength of a typed byte array such as Uint8Array",
+    LENGTH = "the value of Body.length",
+    SIZE = "the value of Body.size",
+    START_END_DIFF = "the numeric difference between Body.start and Body.end",
+    LSTAT = "the size of the file given by Body.path on disk as reported by lstatSync"
+}
+/**
+ * The returned value should complete the sentence, "The byte count of the data was determined by ...".
+ * @internal
+ * @param input - to examine.
+ * @param override - manually specified value.
+ * @returns source of byte count information.
+ */
+export declare const byteLengthSource: (input: any, override?: number) => BYTE_LENGTH_SOURCE | undefined;

package/dist-types/runtimeConfig.browser.d.ts

@@ -1,7 +1,7 @@
 /**
  * @internal
  */
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
     runtime: string;
     lstatSync: () => void;
 };

package/dist-types/runtimeConfig.d.ts

@@ -1,7 +1,7 @@
 /**
  * @internal
  */
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
     runtime: string;
     lstatSync: import("fs").StatSyncFn;
 };

package/dist-types/runtimeConfig.native.d.ts

@@ -1,7 +1,7 @@
 /**
  * @internal
  */
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
     runtime: string;
     lstatSync: () => void;
 };

package/dist-types/runtimeConfig.shared.d.ts

@@ -1,6 +1,6 @@
 /**
  * @internal
  */
-export declare const ClientSharedValues: {
+export declare const runtimeConfigShared: {
     lstatSync: () => void;
 };

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

@@ -16,6 +16,7 @@ export declare class Upload extends EventEmitter {
   private readonly client;
   private readonly params;
   private totalBytes?;
+  private readonly totalBytesSource?;
   private bytesUploadedSoFar;
   private abortController;
   private concurrentUploaders;

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

@@ -0,0 +1 @@
+export declare const byteLength: (input: any) => number | undefined;

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

@@ -0,0 +1,14 @@
+export declare enum BYTE_LENGTH_SOURCE {
+  EMPTY_INPUT = "a null or undefined Body",
+  CONTENT_LENGTH = "the ContentLength property of the params set by the caller",
+  STRING_LENGTH = "the encoded byte length of the Body string",
+  TYPED_ARRAY = "the byteLength of a typed byte array such as Uint8Array",
+  LENGTH = "the value of Body.length",
+  SIZE = "the value of Body.size",
+  START_END_DIFF = "the numeric difference between Body.start and Body.end",
+  LSTAT = "the size of the file given by Body.path on disk as reported by lstatSync",
+}
+export declare const byteLengthSource: (
+  input: any,
+  override?: number
+) => BYTE_LENGTH_SOURCE | undefined;

package/dist-types/ts3.4/runtimeConfig.browser.d.ts

@@ -1,4 +1,4 @@
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
   runtime: string;
   lstatSync: () => void;
 };

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

@@ -1,4 +1,4 @@
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
   runtime: string;
   lstatSync: import("fs").StatSyncFn;
 };

package/dist-types/ts3.4/runtimeConfig.native.d.ts

@@ -1,4 +1,4 @@
-export declare const ClientDefaultValues: {
+export declare const runtimeConfig: {
   runtime: string;
   lstatSync: () => void;
 };

package/dist-types/ts3.4/runtimeConfig.shared.d.ts

@@ -1,3 +1,3 @@
-export declare const ClientSharedValues: {
+export declare const runtimeConfigShared: {
   lstatSync: () => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/lib-storage",
-  "version": "3.896.0",
+  "version": "3.900.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.4",
-    "@smithy/smithy-client": "^4.6.4",
+    "@smithy/middleware-endpoint": "^4.2.5",
+    "@smithy/smithy-client": "^4.6.5",
     "buffer": "5.6.0",
     "events": "3.3.0",
     "stream-browserify": "3.0.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.896.0"
+    "@aws-sdk/client-s3": "^3.899.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.896.0",
+    "@aws-sdk/client-s3": "3.899.0",
     "@smithy/types": "^4.5.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^18.19.69",

package/dist-types/bytelength.d.ts

@@ -1 +0,0 @@
-export declare const byteLength: (input: any) => any;

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

@@ -1 +0,0 @@
-export declare const byteLength: (input: any) => any;