@bytescale/sdk 3.46.0 → 3.47.0

package/dist/node/cjs/main.js

@@ -2394,34 +2394,32 @@ var StreamUtils = /*#__PURE__*/function () {
   return StreamUtils_createClass(StreamUtils, null, [{
     key: "create",
     value: function create() {
-      var readable = new external_stream_namespaceObject.Readable();
-      readable._read = function () {}; // _read is required but you can noop it
-      return readable;
+      return new external_stream_namespaceObject.Readable({
+        read: function read(_size) {
+          // No implementation needed here.
+          // The stream will wait for data to be pushed externally.
+        }
+      });
     }
   }, {
-    key: "empty",
-    value: function empty() {
-      var readable = StreamUtils.create();
-      StreamUtils.endStream(readable);
-      return readable;
+    key: "endStream",
+    value: function endStream(readable) {
+      readable.push(null);
     }
   }, {
-    key: "fromArrayBuffer",
-    value: function fromArrayBuffer(buffer) {
-      return StreamUtils.fromBuffer(Buffer.from(buffer));
+    key: "empty",
+    value: function empty() {
+      return external_stream_namespaceObject.Readable.from([]);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      var readable = StreamUtils.create();
-      readable.push(buffer);
-      StreamUtils.endStream(readable);
-      return readable;
+      return external_stream_namespaceObject.Readable.from(buffer);
     }
   }, {
-    key: "endStream",
-    value: function endStream(readable) {
-      readable.push(null);
+    key: "fromArrayBuffer",
+    value: function fromArrayBuffer(buffer) {
+      return StreamUtils.fromBuffer(Buffer.from(buffer));
     }
   }]);
 }();
@@ -2670,6 +2668,45 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
     }
   }]);
 }();
+;// CONCATENATED MODULE: ./src/public/node/ProgressStream.ts
+function ProgressStream_typeof(o) { "@babel/helpers - typeof"; return ProgressStream_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, ProgressStream_typeof(o); }
+function ProgressStream_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function ProgressStream_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, ProgressStream_toPropertyKey(descriptor.key), descriptor); } }
+function ProgressStream_createClass(Constructor, protoProps, staticProps) { if (protoProps) ProgressStream_defineProperties(Constructor.prototype, protoProps); if (staticProps) ProgressStream_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function ProgressStream_toPropertyKey(t) { var i = ProgressStream_toPrimitive(t, "string"); return "symbol" == ProgressStream_typeof(i) ? i : i + ""; }
+function ProgressStream_toPrimitive(t, r) { if ("object" != ProgressStream_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != ProgressStream_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function ProgressStream_callSuper(t, o, e) { return o = ProgressStream_getPrototypeOf(o), ProgressStream_possibleConstructorReturn(t, ProgressStream_isNativeReflectConstruct() ? Reflect.construct(o, e || [], ProgressStream_getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function ProgressStream_possibleConstructorReturn(self, call) { if (call && (ProgressStream_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return ProgressStream_assertThisInitialized(self); }
+function ProgressStream_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function ProgressStream_isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (ProgressStream_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function ProgressStream_getPrototypeOf(o) { ProgressStream_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return ProgressStream_getPrototypeOf(o); }
+function ProgressStream_inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) ProgressStream_setPrototypeOf(subClass, superClass); }
+function ProgressStream_setPrototypeOf(o, p) { ProgressStream_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return ProgressStream_setPrototypeOf(o, p); }
+
+var ProgressStream = /*#__PURE__*/function (_Transform) {
+  function ProgressStream(options) {
+    var _this;
+    ProgressStream_classCallCheck(this, ProgressStream);
+    _this = ProgressStream_callSuper(this, ProgressStream, [options]);
+    _this.totalBytes = 0;
+    _this.onProgress = options === null || options === void 0 ? void 0 : options.onProgress;
+    return _this;
+  }
+  ProgressStream_inherits(ProgressStream, _Transform);
+  return ProgressStream_createClass(ProgressStream, [{
+    key: "_transform",
+    value: function _transform(chunk, _encoding, callback) {
+      this.totalBytes += chunk.length;
+      // Invoke the progress callback if provided
+      if (this.onProgress !== undefined) {
+        this.onProgress(this.totalBytes);
+      }
+      // Pass the chunk along
+      this.push(chunk);
+      callback();
+    }
+  }]);
+}(external_stream_namespaceObject.Transform);
 ;// CONCATENATED MODULE: ./src/public/node/UploadManagerNode.ts
 function UploadManagerNode_typeof(o) { "@babel/helpers - typeof"; return UploadManagerNode_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, UploadManagerNode_typeof(o); }
 function UploadManagerNode_empty() {}
@@ -2870,6 +2907,7 @@ function UploadManagerNode_setPrototypeOf(o, p) { UploadManagerNode_setPrototype
 
 
 
+
 var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
   function UploadManager() {
     UploadManagerNode_classCallCheck(this, UploadManager);
@@ -2974,20 +3012,12 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
     value: function doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler) {
       try {
         var _this = this;
-        // Report progress:
-        var hasWarned = false;
-        var bytesSent = 0;
-        return UploadManagerNode_await(_this.sliceDataForRequest(source, part), function (stream) {
-          var streamWithProgress = stream.on("data", function (data) {
-            if (data.byteLength !== undefined) {
-              bytesSent += data.byteLength;
-              onProgress(bytesSent);
-            } else if (!hasWarned) {
-              hasWarned = true;
-              console.warn("Expected stream to contain buffers, but it did not, so upload progress won't be reported.");
-            }
+        return UploadManagerNode_await(_this.sliceDataForRequest(source, part), function (inputStream) {
+          var progressStream = new ProgressStream({
+            onProgress: onProgress
           });
-          return UploadManagerNode_await(UploadManagerFetchUtils.doPutUploadPart(_this.config, part, _this.coerceRequestBody(streamWithProgress), contentLength, addCancellationHandler));
+          inputStream.pipe(progressStream);
+          return UploadManagerNode_await(UploadManagerFetchUtils.doPutUploadPart(_this.config, part, _this.coerceRequestBody(progressStream), contentLength, addCancellationHandler));
         });
       } catch (e) {
         return Promise.reject(e);

package/dist/node/esm/main.mjs

@@ -2369,7 +2369,7 @@ var x = function(y) {
 	var x = {}; __lib_require__.d(x, y); return x
 } 
 var y = function(x) { return function() { return x; }; }
-var external_stream_namespaceObject = x({ ["Readable"]: function() { return __WEBPACK_EXTERNAL_MODULE_stream__.Readable; } });
+var external_stream_namespaceObject = x({ ["Readable"]: function() { return __WEBPACK_EXTERNAL_MODULE_stream__.Readable; }, ["Transform"]: function() { return __WEBPACK_EXTERNAL_MODULE_stream__.Transform; } });
 ;// CONCATENATED MODULE: ./src/private/StreamUtils.ts
 function StreamUtils_typeof(o) { "@babel/helpers - typeof"; return StreamUtils_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, StreamUtils_typeof(o); }
 function StreamUtils_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -2385,34 +2385,32 @@ var StreamUtils = /*#__PURE__*/function () {
   return StreamUtils_createClass(StreamUtils, null, [{
     key: "create",
     value: function create() {
-      var readable = new external_stream_namespaceObject.Readable();
-      readable._read = function () {}; // _read is required but you can noop it
-      return readable;
+      return new external_stream_namespaceObject.Readable({
+        read: function read(_size) {
+          // No implementation needed here.
+          // The stream will wait for data to be pushed externally.
+        }
+      });
     }
   }, {
-    key: "empty",
-    value: function empty() {
-      var readable = StreamUtils.create();
-      StreamUtils.endStream(readable);
-      return readable;
+    key: "endStream",
+    value: function endStream(readable) {
+      readable.push(null);
     }
   }, {
-    key: "fromArrayBuffer",
-    value: function fromArrayBuffer(buffer) {
-      return StreamUtils.fromBuffer(Buffer.from(buffer));
+    key: "empty",
+    value: function empty() {
+      return external_stream_namespaceObject.Readable.from([]);
     }
   }, {
     key: "fromBuffer",
     value: function fromBuffer(buffer) {
-      var readable = StreamUtils.create();
-      readable.push(buffer);
-      StreamUtils.endStream(readable);
-      return readable;
+      return external_stream_namespaceObject.Readable.from(buffer);
     }
   }, {
-    key: "endStream",
-    value: function endStream(readable) {
-      readable.push(null);
+    key: "fromArrayBuffer",
+    value: function fromArrayBuffer(buffer) {
+      return StreamUtils.fromBuffer(Buffer.from(buffer));
     }
   }]);
 }();
@@ -2665,6 +2663,45 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
     }
   }]);
 }();
+;// CONCATENATED MODULE: ./src/public/node/ProgressStream.ts
+function ProgressStream_typeof(o) { "@babel/helpers - typeof"; return ProgressStream_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, ProgressStream_typeof(o); }
+function ProgressStream_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function ProgressStream_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, ProgressStream_toPropertyKey(descriptor.key), descriptor); } }
+function ProgressStream_createClass(Constructor, protoProps, staticProps) { if (protoProps) ProgressStream_defineProperties(Constructor.prototype, protoProps); if (staticProps) ProgressStream_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function ProgressStream_toPropertyKey(t) { var i = ProgressStream_toPrimitive(t, "string"); return "symbol" == ProgressStream_typeof(i) ? i : i + ""; }
+function ProgressStream_toPrimitive(t, r) { if ("object" != ProgressStream_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != ProgressStream_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function ProgressStream_callSuper(t, o, e) { return o = ProgressStream_getPrototypeOf(o), ProgressStream_possibleConstructorReturn(t, ProgressStream_isNativeReflectConstruct() ? Reflect.construct(o, e || [], ProgressStream_getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function ProgressStream_possibleConstructorReturn(self, call) { if (call && (ProgressStream_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return ProgressStream_assertThisInitialized(self); }
+function ProgressStream_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function ProgressStream_isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (ProgressStream_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function ProgressStream_getPrototypeOf(o) { ProgressStream_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return ProgressStream_getPrototypeOf(o); }
+function ProgressStream_inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) ProgressStream_setPrototypeOf(subClass, superClass); }
+function ProgressStream_setPrototypeOf(o, p) { ProgressStream_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return ProgressStream_setPrototypeOf(o, p); }
+
+var ProgressStream = /*#__PURE__*/function (_Transform) {
+  function ProgressStream(options) {
+    var _this;
+    ProgressStream_classCallCheck(this, ProgressStream);
+    _this = ProgressStream_callSuper(this, ProgressStream, [options]);
+    _this.totalBytes = 0;
+    _this.onProgress = options === null || options === void 0 ? void 0 : options.onProgress;
+    return _this;
+  }
+  ProgressStream_inherits(ProgressStream, _Transform);
+  return ProgressStream_createClass(ProgressStream, [{
+    key: "_transform",
+    value: function _transform(chunk, _encoding, callback) {
+      this.totalBytes += chunk.length;
+      // Invoke the progress callback if provided
+      if (this.onProgress !== undefined) {
+        this.onProgress(this.totalBytes);
+      }
+      // Pass the chunk along
+      this.push(chunk);
+      callback();
+    }
+  }]);
+}(external_stream_namespaceObject.Transform);
 ;// CONCATENATED MODULE: ./src/public/node/UploadManagerNode.ts
 function UploadManagerNode_typeof(o) { "@babel/helpers - typeof"; return UploadManagerNode_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, UploadManagerNode_typeof(o); }
 function UploadManagerNode_empty() {}
@@ -2865,6 +2902,7 @@ function UploadManagerNode_setPrototypeOf(o, p) { UploadManagerNode_setPrototype
 
 
 
+
 var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
   function UploadManager() {
     UploadManagerNode_classCallCheck(this, UploadManager);
@@ -2969,20 +3007,12 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
     value: function doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler) {
       try {
         var _this = this;
-        // Report progress:
-        var hasWarned = false;
-        var bytesSent = 0;
-        return UploadManagerNode_await(_this.sliceDataForRequest(source, part), function (stream) {
-          var streamWithProgress = stream.on("data", function (data) {
-            if (data.byteLength !== undefined) {
-              bytesSent += data.byteLength;
-              onProgress(bytesSent);
-            } else if (!hasWarned) {
-              hasWarned = true;
-              console.warn("Expected stream to contain buffers, but it did not, so upload progress won't be reported.");
-            }
+        return UploadManagerNode_await(_this.sliceDataForRequest(source, part), function (inputStream) {
+          var progressStream = new ProgressStream({
+            onProgress: onProgress
           });
-          return UploadManagerNode_await(UploadManagerFetchUtils.doPutUploadPart(_this.config, part, _this.coerceRequestBody(streamWithProgress), contentLength, addCancellationHandler));
+          inputStream.pipe(progressStream);
+          return UploadManagerNode_await(UploadManagerFetchUtils.doPutUploadPart(_this.config, part, _this.coerceRequestBody(progressStream), contentLength, addCancellationHandler));
         });
       } catch (e) {
         return Promise.reject(e);

package/dist/types/private/StreamUtils.d.ts

@@ -4,8 +4,8 @@
 import type * as stream from "stream";
 export declare class StreamUtils {
     static create(): stream.Readable;
+    static endStream(readable: stream.Readable): void;
     static empty(): NodeJS.ReadableStream;
-    static fromArrayBuffer(buffer: ArrayBuffer): NodeJS.ReadableStream;
     static fromBuffer(buffer: Buffer): NodeJS.ReadableStream;
-    static endStream(readable: stream.Readable): void;
+    static fromArrayBuffer(buffer: ArrayBuffer): NodeJS.ReadableStream;
 }

package/dist/types/private/UploadManagerBase.d.ts

@@ -26,7 +26,7 @@ export declare abstract class UploadManagerBase<TSource, TInit> implements Uploa
     };
     protected abstract preUpload(source: TSource): TInit;
     protected abstract postUpload(init: TInit): Promise<void>;
-    protected abstract doPutUploadPart(part: UploadPart, contentLength: number, source: TSource, onProgress: (bytesSentDelta: number) => void, addCancellationHandler: AddCancellationHandler): Promise<PutUploadPartResult>;
+    protected abstract doPutUploadPart(part: UploadPart, contentLength: number, source: TSource, onProgress: (totalBytesTransferred: number) => void, addCancellationHandler: AddCancellationHandler): Promise<PutUploadPartResult>;
     private onIntervalTick;
     private makeCancellationMethods;
     /**

package/dist/types/public/node/ProgressStream.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Transform, TransformCallback, TransformOptions } from "stream";
+interface ProgressStreamOptions extends TransformOptions {
+    /**
+     * Optional callback to handle progress updates.
+     * @param totalBytesTransferred - The total number of bytes transferred so far.
+     */
+    onProgress?: (totalBytesTransferred: number) => void;
+}
+export declare class ProgressStream extends Transform {
+    private readonly onProgress;
+    private totalBytes;
+    constructor(options?: ProgressStreamOptions);
+    _transform(chunk: Buffer, _encoding: BufferEncoding, callback: TransformCallback): void;
+}
+export {};

package/dist/types/public/node/UploadManagerNode.d.ts

@@ -16,7 +16,7 @@ export declare class UploadManager extends UploadManagerBase<UploadSourceProcess
     };
     protected preUpload(source: UploadSourceProcessedNode): UploadManagerNodeInit;
     protected postUpload(init: UploadManagerNodeInit): Promise<void>;
-    protected doPutUploadPart(part: UploadPart, contentLength: number, source: UploadSourceProcessedNode, onProgress: (bytesSentDelta: number) => void, addCancellationHandler: AddCancellationHandler): Promise<{
+    protected doPutUploadPart(part: UploadPart, contentLength: number, source: UploadSourceProcessedNode, onProgress: (totalBytesTransferred: number) => void, addCancellationHandler: AddCancellationHandler): Promise<{
         etag: string | undefined;
         status: number;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytescale/sdk",
-  "version": "3.46.0",
+  "version": "3.47.0",
   "description": "Bytescale JavaScript SDK",
   "author": "Bytescale <hello@bytescale.com> (https://www.bytescale.com)",
   "license": "MIT",