@bytescale/sdk 3.0.0-alpha.13 → 3.0.0-alpha.15

package/README.md

@@ -83,7 +83,7 @@ import * as Bytescale from "@bytescale/sdk";
 import nodeFetch from "node-fetch";
 
 const uploadManager = new Bytescale.UploadManager({
-  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js // Errors can occur with other implementations // Try 'nodeFetch as any' for TypeScript
+  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js. TypeScript: 'nodeFetch as any' may be necessary.
   apiKey: "free" // Get API keys from: www.bytescale.com
 });
 
@@ -242,7 +242,7 @@ import * as Bytescale from "@bytescale/sdk";
 import nodeFetch from "node-fetch"; // Only required for Node.js
 
 const fileApi = new Bytescale.FileApi({
-  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js // Errors can occur with other implementations // Try 'nodeFetch as any' for TypeScript
+  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js. TypeScript: 'nodeFetch as any' may be necessary.
   apiKey: "YOUR_API_KEY" // e.g. "secret_xxxxx"
 });
 
@@ -268,7 +268,7 @@ import fetch from "node-fetch"; // Only required for Node.js
 import fs from "fs";
 
 const fileApi = new Bytescale.FileApi({
-  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js // Errors can occur with other implementations // Try 'nodeFetch as any' for TypeScript
+  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js. TypeScript: 'nodeFetch as any' may be necessary.
   apiKey: "YOUR_API_KEY" // e.g. "secret_xxxxx"
 });
 
@@ -309,7 +309,7 @@ import * as Bytescale from "@bytescale/sdk";
 import fetch from "node-fetch"; // Only required for Node.js
 
 const fileApi = new Bytescale.FileApi({
-  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js // Errors can occur with other implementations // Try 'nodeFetch as any' for TypeScript
+  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js. TypeScript: 'nodeFetch as any' may be necessary.
   apiKey: "YOUR_API_KEY" // e.g. "secret_xxxxx"
 });
 
@@ -331,7 +331,7 @@ import * as Bytescale from "@bytescale/sdk";
 import fetch from "node-fetch"; // Only required for Node.js
 
 const folderApi = new Bytescale.FolderApi({
-  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js // Errors can occur with other implementations // Try 'nodeFetch as any' for TypeScript
+  fetchApi: nodeFetch, // import nodeFetch from "node-fetch"; // Only required for Node.js. TypeScript: 'nodeFetch as any' may be necessary.
   apiKey: "YOUR_API_KEY" // e.g. "secret_xxxxx"
 });
 

package/dist/browser/cjs/main.js

@@ -259,7 +259,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -543,7 +543,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2044,10 +2053,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2057,7 +2069,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2113,21 +2125,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2150,9 +2178,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2171,14 +2199,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2198,9 +2226,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2209,6 +2237,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2219,13 +2249,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2413,7 +2443,7 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBrowser) {
   }
   UploadManagerBrowser_createClass(UploadManager, [{
     key: "doPutUploadPart",
-    value: function doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler) {
+    value: function doPutUploadPart(part, _contentLength, source, onProgress, addCancellationHandler) {
       try {
         var _this2 = this;
         var xhr = new XMLHttpRequest();
@@ -2423,23 +2453,15 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBrowser) {
             xhr.abort();
           }
         });
-        var lastBytesSent = 0;
-        var setBytesSent = function setBytesSent(newBytesSent) {
-          var delta = newBytesSent - lastBytesSent;
-          lastBytesSent = newBytesSent;
-          onProgress(delta);
-        };
         return UploadManagerBrowser_finallyRethrows(function () {
           return UploadManagerBrowser_await(new Promise(function (resolve, reject) {
             xhr.upload.addEventListener("progress", function (evt) {
               if (evt.lengthComputable) {
-                setBytesSent(evt.loaded);
+                onProgress(evt.loaded);
               }
             }, false);
             xhr.addEventListener("load", function () {
               var _a;
-              // Ensure we always report the progress of a finished upload as 100%.
-              setBytesSent(contentLength);
               var etag = (_a = xhr.getResponseHeader("etag")) !== null && _a !== void 0 ? _a : undefined;
               resolve({
                 etag: etag,

package/dist/browser/esm/main.mjs

@@ -244,7 +244,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -528,7 +528,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2029,10 +2038,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2042,7 +2054,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2098,21 +2110,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2135,9 +2163,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2156,14 +2184,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2183,9 +2211,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2194,6 +2222,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2204,13 +2234,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2398,7 +2428,7 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBrowser) {
   }
   UploadManagerBrowser_createClass(UploadManager, [{
     key: "doPutUploadPart",
-    value: function doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler) {
+    value: function doPutUploadPart(part, _contentLength, source, onProgress, addCancellationHandler) {
       try {
         var _this2 = this;
         var xhr = new XMLHttpRequest();
@@ -2408,23 +2438,15 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBrowser) {
             xhr.abort();
           }
         });
-        var lastBytesSent = 0;
-        var setBytesSent = function setBytesSent(newBytesSent) {
-          var delta = newBytesSent - lastBytesSent;
-          lastBytesSent = newBytesSent;
-          onProgress(delta);
-        };
         return UploadManagerBrowser_finallyRethrows(function () {
           return UploadManagerBrowser_await(new Promise(function (resolve, reject) {
             xhr.upload.addEventListener("progress", function (evt) {
               if (evt.lengthComputable) {
-                setBytesSent(evt.loaded);
+                onProgress(evt.loaded);
               }
             }, false);
             xhr.addEventListener("load", function () {
               var _a;
-              // Ensure we always report the progress of a finished upload as 100%.
-              setBytesSent(contentLength);
               var etag = (_a = xhr.getResponseHeader("etag")) !== null && _a !== void 0 ? _a : undefined;
               resolve({
                 etag: etag,

package/dist/node/cjs/main.js

@@ -259,7 +259,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -543,7 +543,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2044,10 +2053,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2057,7 +2069,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2113,21 +2125,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2150,9 +2178,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2171,14 +2199,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2198,9 +2226,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2209,6 +2237,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2219,13 +2249,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2550,7 +2580,8 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
           method: "PUT",
           headers: headers,
           body: content,
-          signal: signal
+          signal: signal,
+          cache: "no-store" // Required for Next.js's Fetch implementation, which caches POST/PUT requests by default.
         }), function (response) {
           return {
             etag: (_a = response.headers.get("etag")) !== null && _a !== void 0 ? _a : undefined,
@@ -2872,10 +2903,12 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
         var _this2 = this;
         // Report progress:
         var hasWarned = false;
+        var bytesSent = 0;
         return UploadManagerNode_await(_this2.sliceDataForRequest(source, part), function (stream) {
           var streamWithProgress = stream.on("data", function (data) {
-            if (data.length !== undefined) {
-              onProgress(data.length);
+            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.");

package/dist/node/esm/main.mjs

@@ -246,7 +246,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -530,7 +530,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2031,10 +2040,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2044,7 +2056,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2100,21 +2112,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2137,9 +2165,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2158,14 +2186,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2185,9 +2213,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2196,6 +2224,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2206,13 +2236,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2541,7 +2571,8 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
           method: "PUT",
           headers: headers,
           body: content,
-          signal: signal
+          signal: signal,
+          cache: "no-store" // Required for Next.js's Fetch implementation, which caches POST/PUT requests by default.
         }), function (response) {
           return {
             etag: (_a = response.headers.get("etag")) !== null && _a !== void 0 ? _a : undefined,
@@ -2863,10 +2894,12 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
         var _this2 = this;
         // Report progress:
         var hasWarned = false;
+        var bytesSent = 0;
         return UploadManagerNode_await(_this2.sliceDataForRequest(source, part), function (stream) {
           var streamWithProgress = stream.on("data", function (data) {
-            if (data.length !== undefined) {
-              onProgress(data.length);
+            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.");

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

@@ -1,5 +1,5 @@
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.

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

@@ -29,7 +29,11 @@ export declare abstract class UploadManagerBase<TSource, TInit> implements Uploa
     protected abstract doPutUploadPart(part: UploadPart, contentLength: number, source: TSource, onProgress: (bytesSentDelta: number) => void, addCancellationHandler: AddCancellationHandler): Promise<PutUploadPartResult>;
     private onIntervalTick;
     private makeCancellationMethods;
-    private makeProgressCallback;
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
+    private makeOnProgressForPartFactory;
+    private makeProgressEvent;
     private assertNotCancelled;
     private isCancelled;
     private beginUpload;

package/dist/types/private/model/OnPartProgress.d.ts

@@ -1 +1 @@
-export declare type OnPartProgress = (bytesSentDelta: number) => void;
+export declare type OnPartProgress = (bytesSentTotalForPart: number) => void;

package/dist/types/public/browser/UploadManagerBrowser.d.ts

@@ -4,5 +4,5 @@ import { PutUploadPartResult } from "../../private/model/PutUploadPartResult";
 import { AddCancellationHandler } from "../../private/model/AddCancellationHandler";
 import { UploadManagerBrowserWorkerBase } from "../../private/UploadManagerBrowserWorkerBase";
 export declare class UploadManager extends UploadManagerBrowserWorkerBase {
-    protected doPutUploadPart(part: UploadPart, contentLength: number, source: UploadSourceProcessedBrowser, onProgress: (bytesSentDelta: number) => void, addCancellationHandler: AddCancellationHandler): Promise<PutUploadPartResult>;
+    protected doPutUploadPart(part: UploadPart, _contentLength: number, source: UploadSourceProcessedBrowser, onProgress: (bytesSentDelta: number) => void, addCancellationHandler: AddCancellationHandler): Promise<PutUploadPartResult>;
 }

package/dist/worker/cjs/main.js

@@ -259,7 +259,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -543,7 +543,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2044,10 +2053,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2057,7 +2069,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2113,21 +2125,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2150,9 +2178,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2171,14 +2199,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2198,9 +2226,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2209,6 +2237,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2219,13 +2249,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2405,7 +2435,8 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
           method: "PUT",
           headers: headers,
           body: content,
-          signal: signal
+          signal: signal,
+          cache: "no-store" // Required for Next.js's Fetch implementation, which caches POST/PUT requests by default.
         }), function (response) {
           return {
             etag: (_a = response.headers.get("etag")) !== null && _a !== void 0 ? _a : undefined,

package/dist/worker/esm/main.mjs

@@ -244,7 +244,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * A lightweight mutex. (Other libraries contain too many features and we want to keep the size upload-js down).
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
  *
  * Characteristics:
  * - Non-reentrant.
@@ -528,7 +528,16 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return runtime_continue(_catch(function () {
-          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, Object.assign(Object.assign({}, init), {
+            // This is specifically added to cater for Next.js's Fetch implementation, which caches POST requests...
+            //
+            // "fetch requests that use the POST method are also automatically cached."
+            // - https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#caching-data
+            //
+            // However, this is probably a good idea, even for all GET requests, as if the user is refreshing a JWT
+            // or downloading a file via 'FileApi.downloadFile', then they'll likely want the latest.
+            cache: "no-store"
+          })), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -2029,10 +2038,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
         _this2.assertNotCancelled(request);
         var source = _this2.processUploadSource(request.data);
         var preUploadInfo = _this2.getPreUploadInfo(request, source);
-        var onProgress = _this2.makeProgressCallback(request, preUploadInfo.size);
+        var bytesTotal = preUploadInfo.size;
+        var makeOnProgressForPart = _this2.makeOnProgressForPartFactory(request, bytesTotal);
         var init = _this2.preUpload(source);
         // Raise initial progress event SYNCHRONOUSLY.
-        onProgress(0);
+        if (request.onProgress !== undefined) {
+          request.onProgress(_this2.makeProgressEvent(0, bytesTotal));
+        }
         return UploadManagerBase_await(_this2.beginUpload(request, preUploadInfo), function (uploadInfo) {
           var partCount = uploadInfo.uploadParts.count;
           var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
@@ -2042,7 +2054,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
           return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
             return UploadManagerBase_await(_this2.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this2.uploadPart(request, source, part, uploadInfo, onProgress, addCancellationHandler);
+              return _this2.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler);
             })), function () {
               return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
@@ -2098,21 +2110,37 @@ var UploadManagerBase = /*#__PURE__*/function () {
         addCancellationHandler: addCancellationHandler
       };
     }
+    /**
+     * Returns a callback, which when called, returns a callback that can be used by ONE specific part to report its progress.
+     */
   }, {
-    key: "makeProgressCallback",
-    value: function makeProgressCallback(request, bytesTotal) {
+    key: "makeOnProgressForPartFactory",
+    value: function makeOnProgressForPartFactory(request, bytesTotal) {
+      var _this4 = this;
       var onProgress = request.onProgress;
       if (onProgress === undefined) {
-        return function () {};
+        return function () {
+          return function () {};
+        };
       }
       var bytesSent = 0;
-      return function (bytesSentDelta) {
-        bytesSent += bytesSentDelta;
-        onProgress({
-          bytesTotal: bytesTotal,
-          bytesSent: bytesSent,
-          progress: Math.round(bytesSent / bytesTotal * 100)
-        });
+      return function () {
+        var bytesSentForPart = 0;
+        return function (bytesSentTotalForPart) {
+          var delta = bytesSentTotalForPart - bytesSentForPart;
+          bytesSentForPart += delta;
+          bytesSent += delta;
+          onProgress(_this4.makeProgressEvent(bytesSent, bytesTotal));
+        };
+      };
+    }
+  }, {
+    key: "makeProgressEvent",
+    value: function makeProgressEvent(bytesSent, bytesTotal) {
+      return {
+        bytesTotal: bytesTotal,
+        bytesSent: bytesSent,
+        progress: Math.round(bytesSent / bytesTotal * 100)
       };
     }
   }, {
@@ -2135,9 +2163,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: _this5.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -2156,14 +2184,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "uploadPart",
     value: function uploadPart(request, source, partIndex, uploadInfo, onProgress, addCancellationHandler) {
       try {
-        var _this7 = this;
-        _this7.assertNotCancelled(request);
-        return UploadManagerBase_await(_this7.getUploadPart(partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: _this7.accountId,
+        var _this8 = this;
+        _this8.assertNotCancelled(request);
+        return UploadManagerBase_await(_this8.getUploadPart(partIndex, uploadInfo), function (part) {
+          _this8.assertNotCancelled(request);
+          return UploadManagerBase_await(_this8.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
+            _this8.assertNotCancelled(request);
+            return UploadManagerBase_awaitIgnored(_this8.uploadApi.completeUploadPart({
+              accountId: _this8.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
               completeUploadPartRequest: {
@@ -2183,9 +2211,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "putUploadPart",
     value: function putUploadPart(part, source, onProgress, addCancellationHandler) {
       try {
-        var _this9 = this;
+        var _this10 = this;
         var contentLength = part.range.inclusiveEnd + 1 - part.range.inclusiveStart;
-        return UploadManagerBase_await(_this9.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
+        return UploadManagerBase_await(_this10.doPutUploadPart(part, contentLength, source, onProgress, addCancellationHandler), function (_ref3) {
           var status = _ref3.status,
             etag = _ref3.etag;
           if (Math.floor(status / 100) !== 2) {
@@ -2194,6 +2222,8 @@ var UploadManagerBase = /*#__PURE__*/function () {
           if (etag === undefined) {
             throw new Error("No 'etag' response header found in upload part response.");
           }
+          // Always send 100% for part, as some UploadManager implementations either don't report progress, or may not report the last chunk uploaded.
+          onProgress(contentLength);
           return etag;
         });
       } catch (e) {
@@ -2204,13 +2234,13 @@ var UploadManagerBase = /*#__PURE__*/function () {
     key: "getUploadPart",
     value: function getUploadPart(partIndex, uploadInfo) {
       try {
-        var _this11 = this;
+        var _this12 = this;
         if (partIndex === 0) {
           return uploadInfo.uploadParts.first;
         }
-        return UploadManagerBase_await(_this11.uploadApi.getUploadPart({
+        return UploadManagerBase_await(_this12.uploadApi.getUploadPart({
           uploadId: uploadInfo.uploadId,
-          accountId: _this11.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -2390,7 +2420,8 @@ var UploadManagerFetchUtils = /*#__PURE__*/function () {
           method: "PUT",
           headers: headers,
           body: content,
-          signal: signal
+          signal: signal,
+          cache: "no-store" // Required for Next.js's Fetch implementation, which caches POST/PUT requests by default.
         }), function (response) {
           return {
             etag: (_a = response.headers.get("etag")) !== null && _a !== void 0 ? _a : undefined,

package/package.json

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