@bytescale/sdk 3.0.0-alpha.9 → 3.2.0

package/dist/browser/cjs/main.js

@@ -58,16 +58,332 @@ __lib_require__.d(__lib_exports__, {
   "querystring": function() { return /* reexport */ querystring; }
 });
 
-;// CONCATENATED MODULE: ./src/private/AuthSessionState.ts
+;// CONCATENATED MODULE: ./src/private/Mutex.ts
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _call(body, then, direct) {
+  if (direct) {
+    return then ? then(body()) : body();
+  }
+  try {
+    var result = Promise.resolve(body());
+    return then ? result.then(then) : result;
+  } catch (e) {
+    return Promise.reject(e);
+  }
+}
+function _rethrow(thrown, value) {
+  if (thrown) throw value;
+  return value;
+}
+function _finallyRethrows(body, finalizer) {
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
+}
+function _await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+}
+function _empty() {}
+function _awaitIgnored(value, direct) {
+  if (!direct) {
+    return value && value.then ? value.then(_empty) : Promise.resolve();
+  }
+}
+function _settle(pact, state, value) {
+  if (!pact.s) {
+    if (value instanceof _Pact) {
+      if (value.s) {
+        if (state & 1) {
+          state = value.s;
+        }
+        value = value.v;
+      } else {
+        value.o = _settle.bind(null, pact, state);
+        return;
+      }
+    }
+    if (value && value.then) {
+      value.then(_settle.bind(null, pact, state), _settle.bind(null, pact, 2));
+      return;
+    }
+    pact.s = state;
+    pact.v = value;
+    var observer = pact.o;
+    if (observer) {
+      observer(pact);
+    }
+  }
+}
+var _Pact = /*#__PURE__*/function () {
+  function _Pact() {}
+  _Pact.prototype.then = function (onFulfilled, onRejected) {
+    var result = new _Pact();
+    var state = this.s;
+    if (state) {
+      var callback = state & 1 ? onFulfilled : onRejected;
+      if (callback) {
+        try {
+          _settle(result, 1, callback(this.v));
+        } catch (e) {
+          _settle(result, 2, e);
+        }
+        return result;
+      } else {
+        return this;
+      }
+    }
+    this.o = function (_this) {
+      try {
+        var value = _this.v;
+        if (_this.s & 1) {
+          _settle(result, 1, onFulfilled ? onFulfilled(value) : value);
+        } else if (onRejected) {
+          _settle(result, 1, onRejected(value));
+        } else {
+          _settle(result, 2, value);
+        }
+      } catch (e) {
+        _settle(result, 2, e);
+      }
+    };
+    return result;
+  };
+  return _Pact;
+}();
+function _isSettledPact(thenable) {
+  return thenable instanceof _Pact && thenable.s & 1;
+}
+function _for(test, update, body) {
+  var stage;
+  for (;;) {
+    var shouldContinue = test();
+    if (_isSettledPact(shouldContinue)) {
+      shouldContinue = shouldContinue.v;
+    }
+    if (!shouldContinue) {
+      return result;
+    }
+    if (shouldContinue.then) {
+      stage = 0;
+      break;
+    }
+    var result = body();
+    if (result && result.then) {
+      if (_isSettledPact(result)) {
+        result = result.s;
+      } else {
+        stage = 1;
+        break;
+      }
+    }
+    if (update) {
+      var updateValue = update();
+      if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
+        stage = 2;
+        break;
+      }
+    }
+  }
+  var pact = new _Pact();
+  var reject = _settle.bind(null, pact, 2);
+  (stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);
+  return pact;
+  function _resumeAfterBody(value) {
+    result = value;
+    do {
+      if (update) {
+        updateValue = update();
+        if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
+          updateValue.then(_resumeAfterUpdate).then(void 0, reject);
+          return;
+        }
+      }
+      shouldContinue = test();
+      if (!shouldContinue || _isSettledPact(shouldContinue) && !shouldContinue.v) {
+        _settle(pact, 1, result);
+        return;
+      }
+      if (shouldContinue.then) {
+        shouldContinue.then(_resumeAfterTest).then(void 0, reject);
+        return;
+      }
+      result = body();
+      if (_isSettledPact(result)) {
+        result = result.v;
+      }
+    } while (!result || !result.then);
+    result.then(_resumeAfterBody).then(void 0, reject);
+  }
+  function _resumeAfterTest(shouldContinue) {
+    if (shouldContinue) {
+      result = body();
+      if (result && result.then) {
+        result.then(_resumeAfterBody).then(void 0, reject);
+      } else {
+        _resumeAfterBody(result);
+      }
+    } else {
+      _settle(pact, 1, result);
+    }
+  }
+  function _resumeAfterUpdate() {
+    if (shouldContinue = test()) {
+      if (shouldContinue.then) {
+        shouldContinue.then(_resumeAfterTest).then(void 0, reject);
+      } else {
+        _resumeAfterTest(shouldContinue);
+      }
+    } else {
+      _settle(pact, 1, result);
+    }
+  }
+}
+function _continue(value, then) {
+  return value && value.then ? value.then(then) : then(value);
+}
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 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); }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var AuthSessionState = /*#__PURE__*/_createClass(function AuthSessionState() {
-  _classCallCheck(this, AuthSessionState);
-});
+/**
+ * A lightweight mutex. (Other libraries contain too many features and we want to keep size down).
+ *
+ * Characteristics:
+ * - Non-reentrant.
+ * - Unfair. (Multiple callers awaiting 'acquire' will be granted the mutex in no order.)
+ *   - When calling `safe` consecutively with no 'awaits' in-between, the current context will synchronously acquire
+ *     the mutex every time.
+ */
+var Mutex = /*#__PURE__*/function () {
+  function Mutex() {
+    _classCallCheck(this, Mutex);
+    this.mutex = undefined;
+    this.resolver = undefined;
+  }
+  _createClass(Mutex, [{
+    key: "safe",
+    value: function safe(callback) {
+      try {
+        var _this2 = this;
+        return _await(_this2.acquire(), function () {
+          return _finallyRethrows(callback, function (_wasThrown, _result) {
+            _this2.release();
+            return _rethrow(_wasThrown, _result);
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "acquire",
+    value: function acquire() {
+      try {
+        var _this4 = this;
+        // Loop necessary for when multiple calls are made to 'acquire' before a 'release' is called, else the call to
+        // 'release' will resume every caller currently waiting on 'acquire'.
+        return _continue(_for(function () {
+          return _this4.mutex !== undefined;
+        }, void 0, function () {
+          return _awaitIgnored(_this4.mutex);
+        }), function () {
+          _this4.mutex = new Promise(function (resolve) {
+            _this4.resolver = resolve;
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      if (this.resolver === undefined) {
+        throw new Error("Unable to release mutex: already released.");
+      }
+      this.resolver();
+      this.resolver = undefined;
+      this.mutex = undefined;
+    }
+  }]);
+  return Mutex;
+}();
+;// CONCATENATED MODULE: ./src/private/AuthSessionState.ts
+function AuthSessionState_typeof(obj) { "@babel/helpers - typeof"; return AuthSessionState_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, AuthSessionState_typeof(obj); }
+function AuthSessionState_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function AuthSessionState_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, AuthSessionState_toPropertyKey(descriptor.key), descriptor); } }
+function AuthSessionState_createClass(Constructor, protoProps, staticProps) { if (protoProps) AuthSessionState_defineProperties(Constructor.prototype, protoProps); if (staticProps) AuthSessionState_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function AuthSessionState_toPropertyKey(arg) { var key = AuthSessionState_toPrimitive(arg, "string"); return AuthSessionState_typeof(key) === "symbol" ? key : String(key); }
+function AuthSessionState_toPrimitive(input, hint) { if (AuthSessionState_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (AuthSessionState_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
+/**
+ * Maintains a global session state, even across package versions.
+ *
+ * This is to allow users to start auth sessions via the Bytescale JavaScript SDK, where due to versioning or other
+ * bundling issues, the Bytescale Upload Widget has been bundled with a different Bytescale JavaScript SDK. In this
+ * scenario, the user wouldn't be able to start an auth session with the Bytescale Upload Widget. Therefore, we use
+ * global state (i.e. on the window) to ensure the session state can be shared between the user's instance of the
+ * Bytescale JavaScript SDK and the Upload Widget's version of the Bytescale JavaScript SDK.
+ *
+ * Users also frequently have problems caused by them not keeping track of *Api and *Manager instances correctly, so
+ * making this global prevents a lot of common mistakes.
+ */
+var AuthSessionState = /*#__PURE__*/function () {
+  function AuthSessionState() {
+    AuthSessionState_classCallCheck(this, AuthSessionState);
+  }
+  AuthSessionState_createClass(AuthSessionState, null, [{
+    key: "getMutex",
+    value:
+    /**
+     * Called in the browser only.
+     */
+    function getMutex() {
+      var key = AuthSessionState.mutexKey;
+      var mutex = window[key];
+      if (mutex === undefined) {
+        mutex = new Mutex();
+        window[key] = mutex;
+      }
+      return mutex;
+    }
+    /**
+     * Called in the browser only.
+     */
+  }, {
+    key: "setSession",
+    value: function setSession(session) {
+      window[AuthSessionState.stateKey] = session;
+    }
+    /**
+     * Called in the browser and in Node.js (so we check the env before calling env-specific code).
+     */
+  }, {
+    key: "getSession",
+    value: function getSession() {
+      if (typeof window === "undefined") {
+        return undefined;
+      }
+      return window[AuthSessionState.stateKey];
+    }
+  }]);
+  return AuthSessionState;
+}();
+AuthSessionState.stateKey = "BytescaleSessionState";
+AuthSessionState.mutexKey = "BytescaleSessionStateMutex";
 ;// CONCATENATED MODULE: ./src/public/shared/generated/runtime.ts
 function runtime_typeof(obj) { "@babel/helpers - typeof"; return runtime_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, runtime_typeof(obj); }
 function _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) _setPrototypeOf(subClass, superClass); }
@@ -91,8 +407,8 @@ function _catch(body, recover) {
   }
   return result;
 }
-function _empty() {}
-function _continue(value, then) {
+function runtime_empty() {}
+function runtime_continue(value, then) {
   return value && value.then ? value.then(then) : then(value);
 }
 function _invoke(body, then) {
@@ -103,7 +419,7 @@ function _invoke(body, then) {
   return then(result);
 }
 function _defineProperty(obj, key, value) { key = runtime_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _await(value, then, direct) {
+function runtime_await(value, then, direct) {
   if (direct) {
     return then ? then(value) : value;
   }
@@ -191,72 +507,30 @@ var BaseAPI = /*#__PURE__*/function () {
     this.config = config;
     BytescaleApiClientConfigUtils.validate(config);
   }
+  /**
+   * Returns a successful response (2**) else throws an error.
+   */
   runtime_createClass(BaseAPI, [{
     key: "request",
     value: function request(context, initOverrides, baseUrlOverride) {
       try {
         var _this2 = this;
-        var _a, _b;
+        var _a;
         var apiKey = _this2.config.apiKey;
         context.headers["Authorization"] = "Bearer ".concat(apiKey); // authorization-header authentication
-        if (((_a = AuthSessionState.session) === null || _a === void 0 ? void 0 : _a.accessToken) !== undefined) {
-          context.headers["Authorization-Token"] = AuthSessionState.session.accessToken;
+        var session = AuthSessionState.getSession();
+        if ((session === null || session === void 0 ? void 0 : session.accessToken) !== undefined) {
+          context.headers["Authorization-Token"] = session.accessToken;
         }
         // Key: any possible value for 'baseUrlOverride'
         // Value: user-overridden value for that base URL from the config.
         var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigUtils.defaultCdnUrl, BytescaleApiClientConfigUtils.getCdnUrl(_this2.config));
-        return _await(_this2.createFetchParams(context, initOverrides, baseUrlOverride === undefined ? undefined : (_b = nonDefaultBasePaths[baseUrlOverride]) !== null && _b !== void 0 ? _b : baseUrlOverride), function (_ref) {
+        return runtime_await(_this2.createFetchParams(context, initOverrides, baseUrlOverride === undefined ? undefined : (_a = nonDefaultBasePaths[baseUrlOverride]) !== null && _a !== void 0 ? _a : baseUrlOverride), function (_ref) {
           var url = _ref.url,
             init = _ref.init;
-          return _this2.doFetch(url, init, true);
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
-    /**
-     * Returns a successful response (2**) else throws an error.
-     */
-  }, {
-    key: "doFetch",
-    value: function doFetch(url, init, isBytescaleApi) {
-      try {
-        var _exit3 = false;
-        var _this4 = this;
-        var _a, _b;
-        var response;
-        return _continue(_catch(function () {
-          return _await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
-            response = _BytescaleApiClientCo;
-          });
-        }, function (e) {
-          // Network-level errors, CORS errors, or HTTP-level errors from intermediary services (e.g. AWS or the user's own infrastructure/proxies).
-          // HTTP-level errors from external services (e.g. AWS or the user's own proxy) will appear as CORS errors as their response headers won't include the appropriate CORS values.
-          throw new Error(isBytescaleApi ? "Unable to resolve the Bytescale API: ".concat(e.message, " If the problem persists, and your network connection is OK, then please contact support@bytescale.com and provide: (a) time of failed request in UTC (b) screenshot of failed network response header + body (c) screenshot of failed network request header + body (d) browser and OS version.") : "Unable to resolve URL (".concat(url, "): ").concat(e.message));
-        }), function (_result) {
-          var _exit2 = false;
-          if (_exit3) return _result;
-          return response.status >= 200 && response.status < 300 ? response : _invoke(function () {
-            if (isBytescaleApi) {
-              var jsonError = undefined;
-              return _continue(_catch(function () {
-                return _await(response.json(), function (_response$json) {
-                  jsonError = _response$json;
-                });
-              }, _empty), function () {
-                if (typeof ((_a = jsonError === null || jsonError === void 0 ? void 0 : jsonError.error) === null || _a === void 0 ? void 0 : _a.code) === "string") {
-                  throw new BytescaleApiError(jsonError);
-                }
-                // HTTP-level errors from intermediary services (e.g. AWS or the user's own infrastructure/proxies). On the browser,
-                // this error is unlikely to be triggered since these errors will masqurade as CORS errors (see above) but in Node.js
-                // this error will appear from any intermediary service failure.
-                throw new Error("Unable to connect to the Bytescale API (".concat(response.status, "): please try again."));
-              });
-            }
-          }, function (_result2) {
-            if (_exit2) return _result2;
-            throw new Error("Failure status code (".concat(response.status, ") received for request: ").concat((_b = init.method) !== null && _b !== void 0 ? _b : "GET", " ").concat(url));
-          });
+          return BaseAPI.fetch(url, init, Object.assign(Object.assign({}, _this2.config), {
+            isBytescaleApi: true
+          }));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -279,23 +553,23 @@ var BaseAPI = /*#__PURE__*/function () {
     key: "createFetchParams",
     value: function createFetchParams(context, initOverrides, baseUrlOverride) {
       try {
-        var _this6 = this;
-        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigUtils.getApiUrl(_this6.config)) + context.path;
+        var _this4 = this;
+        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigUtils.getApiUrl(_this4.config)) + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
           // only add the querystring to the URL if there are query parameters.
           // this is done to avoid urls ending with a "?" character which buggy webservers
           // do not handle correctly sometimes.
           url += "?" + querystring(context.query);
         }
-        var configHeaders = _this6.config.headers;
+        var configHeaders = _this4.config.headers;
         var _Object$assign3 = Object.assign({}, context.headers);
-        return _await(configHeaders === undefined ? {} : configHeaders(), function (_configHeaders) {
+        return runtime_await(configHeaders === undefined ? {} : configHeaders(), function (_configHeaders) {
           var headers = Object.assign(_Object$assign3, _configHeaders);
           Object.keys(headers).forEach(function (key) {
             return headers[key] === undefined ? delete headers[key] : {};
           });
           var initOverrideFn = typeof initOverrides === "function" ? initOverrides : function () {
-            return _await(initOverrides);
+            return runtime_await(initOverrides);
           };
           var initParams = {
             method: context.method,
@@ -303,7 +577,7 @@ var BaseAPI = /*#__PURE__*/function () {
             body: context.body
           };
           var _Object$assign2 = Object.assign({}, initParams);
-          return _await(initOverrideFn({
+          return runtime_await(initOverrideFn({
             init: initParams,
             context: context
           }), function (_initOverrideFn) {
@@ -321,6 +595,59 @@ var BaseAPI = /*#__PURE__*/function () {
         return Promise.reject(e);
       }
     }
+  }], [{
+    key: "fetch",
+    value: function fetch(url, init, config) {
+      try {
+        var _exit3 = false;
+        var _a, _b;
+        var response;
+        return runtime_continue(_catch(function () {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(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) {
+          // Network-level errors, CORS errors, or HTTP-level errors from intermediary services (e.g. AWS or the user's own infrastructure/proxies).
+          // HTTP-level errors from external services (e.g. AWS or the user's own proxy) will appear as CORS errors as their response headers won't include the appropriate CORS values.
+          throw new Error(config.isBytescaleApi ? "Unable to resolve the Bytescale API: ".concat(e.message, " If the problem persists, and your network connection is OK, then please contact support@bytescale.com and provide: (a) time of failed request in UTC (b) screenshot of failed network response header + body (c) screenshot of failed network request header + body (d) browser and OS version.") : "Unable to resolve URL (".concat(url, "): ").concat(e.message));
+        }), function (_result) {
+          var _exit2 = false;
+          if (_exit3) return _result;
+          return response.status >= 200 && response.status < 300 ? response : _invoke(function () {
+            if (config.isBytescaleApi) {
+              var jsonError = undefined;
+              return runtime_continue(_catch(function () {
+                return runtime_await(response.json(), function (_response$json) {
+                  jsonError = _response$json;
+                });
+              }, runtime_empty), function () {
+                if (typeof ((_a = jsonError === null || jsonError === void 0 ? void 0 : jsonError.error) === null || _a === void 0 ? void 0 : _a.code) === "string") {
+                  throw new BytescaleApiError(jsonError);
+                }
+                // HTTP-level errors from intermediary services (e.g. AWS or the user's own infrastructure/proxies). On the browser,
+                // this error is unlikely to be triggered since these errors will masqurade as CORS errors (see above) but in Node.js
+                // this error will appear from any intermediary service failure.
+                throw new Error("Unable to connect to the Bytescale API (".concat(response.status, "): please try again."));
+              });
+            }
+          }, function (_result2) {
+            if (_exit2) return _result2;
+            throw new Error("Failure status code (".concat(response.status, ") received for request: ").concat((_b = init.method) !== null && _b !== void 0 ? _b : "GET", " ").concat(url));
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
   }]);
   return BaseAPI;
 }();
@@ -328,11 +655,11 @@ var CancelledError = /*#__PURE__*/function (_Error) {
   _inherits(CancelledError, _Error);
   var _super = _createSuper(CancelledError);
   function CancelledError() {
-    var _this7;
+    var _this5;
     runtime_classCallCheck(this, CancelledError);
-    _this7 = _super.call(this, "Operation cancelled by caller.");
-    _this7.name = "CancelledError";
-    return _this7;
+    _this5 = _super.call(this, "Operation cancelled by caller.");
+    _this5.name = "CancelledError";
+    return _this5;
   }
   return runtime_createClass(CancelledError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
@@ -340,13 +667,13 @@ var BytescaleApiError = /*#__PURE__*/function (_Error2) {
   _inherits(BytescaleApiError, _Error2);
   var _super2 = _createSuper(BytescaleApiError);
   function BytescaleApiError(response) {
-    var _this8;
+    var _this6;
     runtime_classCallCheck(this, BytescaleApiError);
-    _this8 = _super2.call(this, response.error.message);
-    _this8.name = "BytescaleApiError";
-    _this8.errorCode = response.error.code;
-    _this8.details = response.error.details;
-    return _this8;
+    _this6 = _super2.call(this, response.error.message);
+    _this6.name = "BytescaleApiError";
+    _this6.errorCode = response.error.code;
+    _this6.details = response.error.details;
+    return _this6;
   }
   return runtime_createClass(BytescaleApiError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
@@ -372,8 +699,8 @@ var JSONApiResponse = /*#__PURE__*/function () {
     key: "value",
     value: function value() {
       try {
-        var _this10 = this;
-        return _await(_this10.raw.json());
+        var _this8 = this;
+        return runtime_await(_this8.raw.json());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -389,7 +716,7 @@ var VoidApiResponse = /*#__PURE__*/function () {
   runtime_createClass(VoidApiResponse, [{
     key: "value",
     value: function value() {
-      return _await(undefined);
+      return runtime_await(undefined);
     }
   }]);
   return VoidApiResponse;
@@ -414,8 +741,8 @@ var BinaryResult = /*#__PURE__*/function () {
     key: "text",
     value: function text() {
       try {
-        var _this12 = this;
-        return _await(_this12.raw.text());
+        var _this10 = this;
+        return runtime_await(_this10.raw.text());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -424,8 +751,8 @@ var BinaryResult = /*#__PURE__*/function () {
     key: "blob",
     value: function blob() {
       try {
-        var _this14 = this;
-        return _await(_this14.raw.blob());
+        var _this12 = this;
+        return runtime_await(_this12.raw.blob());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -434,8 +761,8 @@ var BinaryResult = /*#__PURE__*/function () {
     key: "json",
     value: function json() {
       try {
-        var _this16 = this;
-        return _await(_this16.raw.json());
+        var _this14 = this;
+        return runtime_await(_this14.raw.json());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -1360,33 +1687,32 @@ function UrlBuilder_toPrimitive(input, hint) { if (UrlBuilder_typeof(input) !==
 
 
 var UrlBuilder = /*#__PURE__*/function () {
-  function UrlBuilder(config) {
+  function UrlBuilder() {
     UrlBuilder_classCallCheck(this, UrlBuilder);
-    var _a;
-    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
   }
-  /**
-   * Builds a URL to either a raw file or a transformed file.
-   *
-   * Example 1) Getting a publicly-accessible raw file URL:
-   *
-   *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg" })
-   *
-   * Example 2) Getting a publicly-accessible image URL, resized to 500x500:
-   *
-   *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "image", params: { w: 500, h: 500, fit: "crop" } } } })
-   *
-   * Example 3) Getting a privately-accessible image URL, resized to 500x500 (requires 'AuthManager.beginAuthSession' to be called before accessing the URL):
-   *
-   *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "image", params: { w: 500, h: 500, fit: "crop" } }, auth: true } })
-   *
-   * Example 4) Getting a publicly-accessible image URL, resized using a transformation preset called "thumbnail" that was created manually in the Bytescale Dashboard:
-   *
-   *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "preset", preset: "thumbnail" } } })
-   */
-  UrlBuilder_createClass(UrlBuilder, [{
+  UrlBuilder_createClass(UrlBuilder, null, [{
     key: "url",
-    value: function url(params) {
+    value:
+    /**
+     * Builds a URL to either a raw file or a transformed file.
+     *
+     * Example 1) Getting a publicly-accessible raw file URL:
+     *
+     *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg" })
+     *
+     * Example 2) Getting a publicly-accessible image URL, resized to 500x500:
+     *
+     *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "image", params: { w: 500, h: 500, fit: "crop" } } } })
+     *
+     * Example 3) Getting a privately-accessible image URL, resized to 500x500 (requires 'AuthManager.beginAuthSession' to be called before accessing the URL):
+     *
+     *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "image", params: { w: 500, h: 500, fit: "crop" } }, auth: true } })
+     *
+     * Example 4) Getting a publicly-accessible image URL, resized using a transformation preset called "thumbnail" that was created manually in the Bytescale Dashboard:
+     *
+     *   new UrlBuilder().url({ accountId: "1234abc", filePath: "/example.jpg", options: { transformation: { type: "preset", preset: "thumbnail" } } })
+     */
+    function url(params) {
       var _a;
       return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options);
     }
@@ -1412,7 +1738,8 @@ var UrlBuilder = /*#__PURE__*/function () {
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl(params, prefix) {
-      return "".concat(this.cdnUrl, "/").concat(params.accountId, "/").concat(prefix).concat(params.filePath);
+      var cdnUrl = BytescaleApiClientConfigUtils.defaultCdnUrl;
+      return "".concat(cdnUrl, "/").concat(params.accountId, "/").concat(prefix).concat(params.filePath);
     }
   }, {
     key: "getCommonTransformationQueryParams",
@@ -1507,21 +1834,21 @@ function _invokeIgnored(body) {
     return result.then(UploadManagerBase_empty);
   }
 }
-function _settle(pact, state, value) {
+function UploadManagerBase_settle(pact, state, value) {
   if (!pact.s) {
-    if (value instanceof _Pact) {
+    if (value instanceof UploadManagerBase_Pact) {
       if (value.s) {
         if (state & 1) {
           state = value.s;
         }
         value = value.v;
       } else {
-        value.o = _settle.bind(null, pact, state);
+        value.o = UploadManagerBase_settle.bind(null, pact, state);
         return;
       }
     }
     if (value && value.then) {
-      value.then(_settle.bind(null, pact, state), _settle.bind(null, pact, 2));
+      value.then(UploadManagerBase_settle.bind(null, pact, state), UploadManagerBase_settle.bind(null, pact, 2));
       return;
     }
     pact.s = state;
@@ -1532,7 +1859,7 @@ function _settle(pact, state, value) {
     }
   }
 }
-var _Pact = /*#__PURE__*/function () {
+var UploadManagerBase_Pact = /*#__PURE__*/function () {
   function _Pact() {}
   _Pact.prototype.then = function (onFulfilled, onRejected) {
     var result = new _Pact();
@@ -1541,9 +1868,9 @@ var _Pact = /*#__PURE__*/function () {
       var callback = state & 1 ? onFulfilled : onRejected;
       if (callback) {
         try {
-          _settle(result, 1, callback(this.v));
+          UploadManagerBase_settle(result, 1, callback(this.v));
         } catch (e) {
-          _settle(result, 2, e);
+          UploadManagerBase_settle(result, 2, e);
         }
         return result;
       } else {
@@ -1554,28 +1881,28 @@ var _Pact = /*#__PURE__*/function () {
       try {
         var value = _this.v;
         if (_this.s & 1) {
-          _settle(result, 1, onFulfilled ? onFulfilled(value) : value);
+          UploadManagerBase_settle(result, 1, onFulfilled ? onFulfilled(value) : value);
         } else if (onRejected) {
-          _settle(result, 1, onRejected(value));
+          UploadManagerBase_settle(result, 1, onRejected(value));
         } else {
-          _settle(result, 2, value);
+          UploadManagerBase_settle(result, 2, value);
         }
       } catch (e) {
-        _settle(result, 2, e);
+        UploadManagerBase_settle(result, 2, e);
       }
     };
     return result;
   };
   return _Pact;
 }();
-function _isSettledPact(thenable) {
-  return thenable instanceof _Pact && thenable.s & 1;
+function UploadManagerBase_isSettledPact(thenable) {
+  return thenable instanceof UploadManagerBase_Pact && thenable.s & 1;
 }
-function _for(test, update, body) {
+function UploadManagerBase_for(test, update, body) {
   var stage;
   for (;;) {
     var shouldContinue = test();
-    if (_isSettledPact(shouldContinue)) {
+    if (UploadManagerBase_isSettledPact(shouldContinue)) {
       shouldContinue = shouldContinue.v;
     }
     if (!shouldContinue) {
@@ -1587,7 +1914,7 @@ function _for(test, update, body) {
     }
     var result = body();
     if (result && result.then) {
-      if (_isSettledPact(result)) {
+      if (UploadManagerBase_isSettledPact(result)) {
         result = result.s;
       } else {
         stage = 1;
@@ -1596,14 +1923,14 @@ function _for(test, update, body) {
     }
     if (update) {
       var updateValue = update();
-      if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
+      if (updateValue && updateValue.then && !UploadManagerBase_isSettledPact(updateValue)) {
         stage = 2;
         break;
       }
     }
   }
-  var pact = new _Pact();
-  var reject = _settle.bind(null, pact, 2);
+  var pact = new UploadManagerBase_Pact();
+  var reject = UploadManagerBase_settle.bind(null, pact, 2);
   (stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);
   return pact;
   function _resumeAfterBody(value) {
@@ -1611,14 +1938,14 @@ function _for(test, update, body) {
     do {
       if (update) {
         updateValue = update();
-        if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
+        if (updateValue && updateValue.then && !UploadManagerBase_isSettledPact(updateValue)) {
           updateValue.then(_resumeAfterUpdate).then(void 0, reject);
           return;
         }
       }
       shouldContinue = test();
-      if (!shouldContinue || _isSettledPact(shouldContinue) && !shouldContinue.v) {
-        _settle(pact, 1, result);
+      if (!shouldContinue || UploadManagerBase_isSettledPact(shouldContinue) && !shouldContinue.v) {
+        UploadManagerBase_settle(pact, 1, result);
         return;
       }
       if (shouldContinue.then) {
@@ -1626,7 +1953,7 @@ function _for(test, update, body) {
         return;
       }
       result = body();
-      if (_isSettledPact(result)) {
+      if (UploadManagerBase_isSettledPact(result)) {
         result = result.v;
       }
     } while (!result || !result.then);
@@ -1641,7 +1968,7 @@ function _for(test, update, body) {
         _resumeAfterBody(result);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
   function _resumeAfterUpdate() {
@@ -1652,7 +1979,7 @@ function _for(test, update, body) {
         _resumeAfterTest(shouldContinue);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
 }
@@ -1668,7 +1995,7 @@ function UploadManagerBase_iterableToArray(iter) { if (typeof Symbol !== "undefi
 function UploadManagerBase_arrayWithoutHoles(arr) { if (Array.isArray(arr)) return UploadManagerBase_arrayLikeToArray(arr); }
 function UploadManagerBase_arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function UploadManagerBase_empty() {}
-function _awaitIgnored(value, direct) {
+function UploadManagerBase_awaitIgnored(value, direct) {
   if (!direct) {
     return value && value.then ? value.then(UploadManagerBase_empty) : Promise.resolve();
   }
@@ -1682,11 +2009,11 @@ function UploadManagerBase_await(value, then, direct) {
   }
   return then ? value.then(then) : value;
 }
-function _rethrow(thrown, value) {
+function UploadManagerBase_rethrow(thrown, value) {
   if (thrown) throw value;
   return value;
 }
-function _finallyRethrows(body, finalizer) {
+function UploadManagerBase_finallyRethrows(body, finalizer) {
   try {
     var result = body();
   } catch (e) {
@@ -1717,6 +2044,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
     this.defaultMaxConcurrentUploadParts = 4;
     this.intervalMs = 500;
     this.uploadApi = new UploadApi(config);
+    this.accountId = BytescaleApiClientConfigUtils.getAccountId(config);
   }
   UploadManagerBase_createClass(UploadManagerBase, [{
     key: "upload",
@@ -1726,10 +2054,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());
@@ -1737,15 +2068,15 @@ var UploadManagerBase = /*#__PURE__*/function () {
             cancel = _this2$makeCancellati.cancel,
             addCancellationHandler = _this2$makeCancellati.addCancellationHandler;
           var intervalHandle = setInterval(_this2.onIntervalTick(request, cancel), _this2.intervalMs);
-          return UploadManagerBase_continue(_finallyRethrows(function () {
+          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 _awaitIgnored(_this2.postUpload(init));
+              return UploadManagerBase_awaitIgnored(_this2.postUpload(init));
             });
           }, function (_wasThrown, _result) {
             clearInterval(intervalHandle);
-            return _rethrow(_wasThrown, _result);
+            return UploadManagerBase_rethrow(_wasThrown, _result);
           }), function () {
             return uploadInfo.file;
           });
@@ -1795,21 +2126,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)
       };
     }
   }, {
@@ -1832,9 +2179,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
         mime = _ref2.mime,
         originalFileName = _ref2.originalFileName;
       try {
-        var _this5 = this;
-        return UploadManagerBase_await(_this5.uploadApi.beginMultipartUpload({
-          accountId: request.accountId,
+        var _this6 = this;
+        return UploadManagerBase_await(_this6.uploadApi.beginMultipartUpload({
+          accountId: _this6.accountId,
           beginMultipartUploadRequest: {
             metadata: request.metadata,
             mime: mime,
@@ -1853,14 +2200,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(request, partIndex, uploadInfo), function (part) {
-          _this7.assertNotCancelled(request);
-          return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
-            _this7.assertNotCancelled(request);
-            return _awaitIgnored(_this7.uploadApi.completeUploadPart({
-              accountId: request.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: {
@@ -1880,9 +2227,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) {
@@ -1891,6 +2238,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) {
@@ -1899,15 +2248,15 @@ var UploadManagerBase = /*#__PURE__*/function () {
     }
   }, {
     key: "getUploadPart",
-    value: function getUploadPart(request, partIndex, uploadInfo) {
+    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: request.accountId,
+          accountId: _this12.accountId,
           uploadPartIndex: partIndex
         }));
       } catch (e) {
@@ -1931,14 +2280,14 @@ var UploadManagerBase = /*#__PURE__*/function () {
     value: function mapAsync(items, concurrency, callback) {
       try {
         var workQueue = UploadManagerBase_toConsumableArray(items);
-        return _awaitIgnored(Promise.all(UploadManagerBase_toConsumableArray(Array(concurrency).keys()).map(_async(function () {
-          return _continueIgnored(_for(function () {
+        return UploadManagerBase_awaitIgnored(Promise.all(UploadManagerBase_toConsumableArray(Array(concurrency).keys()).map(_async(function () {
+          return _continueIgnored(UploadManagerBase_for(function () {
             return workQueue.length > 0;
           }, void 0, function () {
             var work = workQueue.shift(); // IMPORTANT: use 'shift' instead of 'pop' to ensure 'items' are processed in order when 'concurrency = 1'.
             return _invokeIgnored(function () {
               if (work !== undefined) {
-                return _awaitIgnored(callback(work));
+                return UploadManagerBase_awaitIgnored(callback(work));
               }
             });
           }));
@@ -1950,9 +2299,9 @@ var UploadManagerBase = /*#__PURE__*/function () {
   }]);
   return UploadManagerBase;
 }();
-;// CONCATENATED MODULE: ./src/public/browser/UploadManagerBrowser.ts
-function UploadManagerBrowser_typeof(obj) { "@babel/helpers - typeof"; return UploadManagerBrowser_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, UploadManagerBrowser_typeof(obj); }
-function UploadManagerBrowser_await(value, then, direct) {
+;// CONCATENATED MODULE: ./src/private/UploadManagerBrowserWorkerBase.ts
+function UploadManagerBrowserWorkerBase_typeof(obj) { "@babel/helpers - typeof"; return UploadManagerBrowserWorkerBase_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, UploadManagerBrowserWorkerBase_typeof(obj); }
+function UploadManagerBrowserWorkerBase_await(value, then, direct) {
   if (direct) {
     return then ? then(value) : value;
   }
@@ -1961,44 +2310,31 @@ function UploadManagerBrowser_await(value, then, direct) {
   }
   return then ? value.then(then) : value;
 }
-function UploadManagerBrowser_rethrow(thrown, value) {
-  if (thrown) throw value;
-  return value;
-}
-function UploadManagerBrowser_finallyRethrows(body, finalizer) {
-  try {
-    var result = body();
-  } catch (e) {
-    return finalizer(true, e);
-  }
-  if (result && result.then) {
-    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-  }
-  return finalizer(false, result);
-}
-function UploadManagerBrowser_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function UploadManagerBrowser_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, UploadManagerBrowser_toPropertyKey(descriptor.key), descriptor); } }
-function UploadManagerBrowser_createClass(Constructor, protoProps, staticProps) { if (protoProps) UploadManagerBrowser_defineProperties(Constructor.prototype, protoProps); if (staticProps) UploadManagerBrowser_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function UploadManagerBrowser_toPropertyKey(arg) { var key = UploadManagerBrowser_toPrimitive(arg, "string"); return UploadManagerBrowser_typeof(key) === "symbol" ? key : String(key); }
-function UploadManagerBrowser_toPrimitive(input, hint) { if (UploadManagerBrowser_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (UploadManagerBrowser_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function UploadManagerBrowser_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) UploadManagerBrowser_setPrototypeOf(subClass, superClass); }
-function UploadManagerBrowser_setPrototypeOf(o, p) { UploadManagerBrowser_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return UploadManagerBrowser_setPrototypeOf(o, p); }
-function UploadManagerBrowser_createSuper(Derived) { var hasNativeReflectConstruct = UploadManagerBrowser_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = UploadManagerBrowser_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = UploadManagerBrowser_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return UploadManagerBrowser_possibleConstructorReturn(this, result); }; }
-function UploadManagerBrowser_possibleConstructorReturn(self, call) { if (call && (UploadManagerBrowser_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 UploadManagerBrowser_assertThisInitialized(self); }
-function UploadManagerBrowser_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function UploadManagerBrowser_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function UploadManagerBrowser_getPrototypeOf(o) { UploadManagerBrowser_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return UploadManagerBrowser_getPrototypeOf(o); }
-
+function UploadManagerBrowserWorkerBase_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function UploadManagerBrowserWorkerBase_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, UploadManagerBrowserWorkerBase_toPropertyKey(descriptor.key), descriptor); } }
+function UploadManagerBrowserWorkerBase_createClass(Constructor, protoProps, staticProps) { if (protoProps) UploadManagerBrowserWorkerBase_defineProperties(Constructor.prototype, protoProps); if (staticProps) UploadManagerBrowserWorkerBase_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function UploadManagerBrowserWorkerBase_toPropertyKey(arg) { var key = UploadManagerBrowserWorkerBase_toPrimitive(arg, "string"); return UploadManagerBrowserWorkerBase_typeof(key) === "symbol" ? key : String(key); }
+function UploadManagerBrowserWorkerBase_toPrimitive(input, hint) { if (UploadManagerBrowserWorkerBase_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (UploadManagerBrowserWorkerBase_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function UploadManagerBrowserWorkerBase_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) UploadManagerBrowserWorkerBase_setPrototypeOf(subClass, superClass); }
+function UploadManagerBrowserWorkerBase_setPrototypeOf(o, p) { UploadManagerBrowserWorkerBase_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return UploadManagerBrowserWorkerBase_setPrototypeOf(o, p); }
+function UploadManagerBrowserWorkerBase_createSuper(Derived) { var hasNativeReflectConstruct = UploadManagerBrowserWorkerBase_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = UploadManagerBrowserWorkerBase_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = UploadManagerBrowserWorkerBase_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return UploadManagerBrowserWorkerBase_possibleConstructorReturn(this, result); }; }
+function UploadManagerBrowserWorkerBase_possibleConstructorReturn(self, call) { if (call && (UploadManagerBrowserWorkerBase_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 UploadManagerBrowserWorkerBase_assertThisInitialized(self); }
+function UploadManagerBrowserWorkerBase_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function UploadManagerBrowserWorkerBase_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function UploadManagerBrowserWorkerBase_getPrototypeOf(o) { UploadManagerBrowserWorkerBase_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return UploadManagerBrowserWorkerBase_getPrototypeOf(o); }
 
 
-var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
-  UploadManagerBrowser_inherits(UploadManager, _UploadManagerBase);
-  var _super = UploadManagerBrowser_createSuper(UploadManager);
-  function UploadManager() {
-    UploadManagerBrowser_classCallCheck(this, UploadManager);
+/**
+ * The "browser" and "worker" runtimes support the same input types, but the former uses XHR and the latter uses Fetch.
+ */
+var UploadManagerBrowserWorkerBase = /*#__PURE__*/function (_UploadManagerBase) {
+  UploadManagerBrowserWorkerBase_inherits(UploadManagerBrowserWorkerBase, _UploadManagerBase);
+  var _super = UploadManagerBrowserWorkerBase_createSuper(UploadManagerBrowserWorkerBase);
+  function UploadManagerBrowserWorkerBase() {
+    UploadManagerBrowserWorkerBase_classCallCheck(this, UploadManagerBrowserWorkerBase);
     return _super.apply(this, arguments);
   }
-  UploadManagerBrowser_createClass(UploadManager, [{
+  UploadManagerBrowserWorkerBase_createClass(UploadManagerBrowserWorkerBase, [{
     key: "processUploadSource",
     value: function processUploadSource(data) {
       if (typeof data === "string") {
@@ -2010,13 +2346,19 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
           })
         };
       }
+      if (data.byteLength !== undefined) {
+        return {
+          type: "ArrayBuffer",
+          value: data
+        };
+      }
       if (data.size !== undefined) {
         return {
           type: "Blob",
           value: data
         };
       }
-      throw new Error("Unsupported type for 'data' parameter. Please provide a String, Blob, or File object (from a file input element).");
+      throw new Error("Unsupported type for 'data' parameter. Please provide a String, Blob, ArrayBuffer, or File object (from a file input element).");
     }
   }, {
     key: "getPreUploadInfoPartial",
@@ -2024,8 +2366,15 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
       switch (data.type) {
         case "Blob":
           return this.getBlobInfo(data);
+        case "ArrayBuffer":
+          return {
+            mime: undefined,
+            size: data.value.byteLength,
+            originalFileName: undefined,
+            maxConcurrentUploadParts: undefined
+          };
         default:
-          assertUnreachable(data.type);
+          assertUnreachable(data);
       }
     }
   }, {
@@ -2036,11 +2385,66 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
   }, {
     key: "postUpload",
     value: function postUpload(_init) {
-      return UploadManagerBrowser_await();
+      return UploadManagerBrowserWorkerBase_await();
     } // NO-OP.
   }, {
+    key: "getRequestBody",
+    value: function getRequestBody(part, blob) {
+      return part.range.inclusiveEnd === -1 ? new Blob() : blob.value.slice(part.range.inclusiveStart, part.range.inclusiveEnd + 1);
+    }
+  }]);
+  return UploadManagerBrowserWorkerBase;
+}(UploadManagerBase);
+;// CONCATENATED MODULE: ./src/public/browser/UploadManagerBrowser.ts
+function UploadManagerBrowser_typeof(obj) { "@babel/helpers - typeof"; return UploadManagerBrowser_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, UploadManagerBrowser_typeof(obj); }
+function UploadManagerBrowser_await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+}
+function UploadManagerBrowser_rethrow(thrown, value) {
+  if (thrown) throw value;
+  return value;
+}
+function UploadManagerBrowser_finallyRethrows(body, finalizer) {
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
+}
+function UploadManagerBrowser_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function UploadManagerBrowser_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, UploadManagerBrowser_toPropertyKey(descriptor.key), descriptor); } }
+function UploadManagerBrowser_createClass(Constructor, protoProps, staticProps) { if (protoProps) UploadManagerBrowser_defineProperties(Constructor.prototype, protoProps); if (staticProps) UploadManagerBrowser_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function UploadManagerBrowser_toPropertyKey(arg) { var key = UploadManagerBrowser_toPrimitive(arg, "string"); return UploadManagerBrowser_typeof(key) === "symbol" ? key : String(key); }
+function UploadManagerBrowser_toPrimitive(input, hint) { if (UploadManagerBrowser_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (UploadManagerBrowser_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function UploadManagerBrowser_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) UploadManagerBrowser_setPrototypeOf(subClass, superClass); }
+function UploadManagerBrowser_setPrototypeOf(o, p) { UploadManagerBrowser_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return UploadManagerBrowser_setPrototypeOf(o, p); }
+function UploadManagerBrowser_createSuper(Derived) { var hasNativeReflectConstruct = UploadManagerBrowser_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = UploadManagerBrowser_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = UploadManagerBrowser_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return UploadManagerBrowser_possibleConstructorReturn(this, result); }; }
+function UploadManagerBrowser_possibleConstructorReturn(self, call) { if (call && (UploadManagerBrowser_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 UploadManagerBrowser_assertThisInitialized(self); }
+function UploadManagerBrowser_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function UploadManagerBrowser_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function UploadManagerBrowser_getPrototypeOf(o) { UploadManagerBrowser_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return UploadManagerBrowser_getPrototypeOf(o); }
+
+
+var UploadManager = /*#__PURE__*/function (_UploadManagerBrowser) {
+  UploadManagerBrowser_inherits(UploadManager, _UploadManagerBrowser);
+  var _super = UploadManagerBrowser_createSuper(UploadManager);
+  function UploadManager() {
+    UploadManagerBrowser_classCallCheck(this, UploadManager);
+    return _super.apply(this, arguments);
+  }
+  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();
@@ -2050,23 +2454,15 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
             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,
@@ -2093,14 +2489,9 @@ var UploadManager = /*#__PURE__*/function (_UploadManagerBase) {
         return Promise.reject(e);
       }
     }
-  }, {
-    key: "getRequestBody",
-    value: function getRequestBody(part, blob) {
-      return part.range.inclusiveEnd === -1 ? new Blob() : blob.value.slice(part.range.inclusiveStart, part.range.inclusiveEnd + 1);
-    }
   }]);
   return UploadManager;
-}(UploadManagerBase);
+}(UploadManagerBrowserWorkerBase);
 ;// CONCATENATED MODULE: ./src/private/ConsoleUtils.ts
 function ConsoleUtils_typeof(obj) { "@babel/helpers - typeof"; return ConsoleUtils_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, ConsoleUtils_typeof(obj); }
 function ConsoleUtils_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -2130,269 +2521,6 @@ var ConsoleUtils = /*#__PURE__*/function () {
   }]);
   return ConsoleUtils;
 }();
-;// CONCATENATED MODULE: ./src/private/Mutex.ts
-function Mutex_typeof(obj) { "@babel/helpers - typeof"; return Mutex_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, Mutex_typeof(obj); }
-function _call(body, then, direct) {
-  if (direct) {
-    return then ? then(body()) : body();
-  }
-  try {
-    var result = Promise.resolve(body());
-    return then ? result.then(then) : result;
-  } catch (e) {
-    return Promise.reject(e);
-  }
-}
-function Mutex_rethrow(thrown, value) {
-  if (thrown) throw value;
-  return value;
-}
-function Mutex_finallyRethrows(body, finalizer) {
-  try {
-    var result = body();
-  } catch (e) {
-    return finalizer(true, e);
-  }
-  if (result && result.then) {
-    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-  }
-  return finalizer(false, result);
-}
-function Mutex_await(value, then, direct) {
-  if (direct) {
-    return then ? then(value) : value;
-  }
-  if (!value || !value.then) {
-    value = Promise.resolve(value);
-  }
-  return then ? value.then(then) : value;
-}
-function Mutex_empty() {}
-function Mutex_awaitIgnored(value, direct) {
-  if (!direct) {
-    return value && value.then ? value.then(Mutex_empty) : Promise.resolve();
-  }
-}
-function Mutex_settle(pact, state, value) {
-  if (!pact.s) {
-    if (value instanceof Mutex_Pact) {
-      if (value.s) {
-        if (state & 1) {
-          state = value.s;
-        }
-        value = value.v;
-      } else {
-        value.o = Mutex_settle.bind(null, pact, state);
-        return;
-      }
-    }
-    if (value && value.then) {
-      value.then(Mutex_settle.bind(null, pact, state), Mutex_settle.bind(null, pact, 2));
-      return;
-    }
-    pact.s = state;
-    pact.v = value;
-    var observer = pact.o;
-    if (observer) {
-      observer(pact);
-    }
-  }
-}
-var Mutex_Pact = /*#__PURE__*/function () {
-  function _Pact() {}
-  _Pact.prototype.then = function (onFulfilled, onRejected) {
-    var result = new _Pact();
-    var state = this.s;
-    if (state) {
-      var callback = state & 1 ? onFulfilled : onRejected;
-      if (callback) {
-        try {
-          Mutex_settle(result, 1, callback(this.v));
-        } catch (e) {
-          Mutex_settle(result, 2, e);
-        }
-        return result;
-      } else {
-        return this;
-      }
-    }
-    this.o = function (_this) {
-      try {
-        var value = _this.v;
-        if (_this.s & 1) {
-          Mutex_settle(result, 1, onFulfilled ? onFulfilled(value) : value);
-        } else if (onRejected) {
-          Mutex_settle(result, 1, onRejected(value));
-        } else {
-          Mutex_settle(result, 2, value);
-        }
-      } catch (e) {
-        Mutex_settle(result, 2, e);
-      }
-    };
-    return result;
-  };
-  return _Pact;
-}();
-function Mutex_isSettledPact(thenable) {
-  return thenable instanceof Mutex_Pact && thenable.s & 1;
-}
-function Mutex_for(test, update, body) {
-  var stage;
-  for (;;) {
-    var shouldContinue = test();
-    if (Mutex_isSettledPact(shouldContinue)) {
-      shouldContinue = shouldContinue.v;
-    }
-    if (!shouldContinue) {
-      return result;
-    }
-    if (shouldContinue.then) {
-      stage = 0;
-      break;
-    }
-    var result = body();
-    if (result && result.then) {
-      if (Mutex_isSettledPact(result)) {
-        result = result.s;
-      } else {
-        stage = 1;
-        break;
-      }
-    }
-    if (update) {
-      var updateValue = update();
-      if (updateValue && updateValue.then && !Mutex_isSettledPact(updateValue)) {
-        stage = 2;
-        break;
-      }
-    }
-  }
-  var pact = new Mutex_Pact();
-  var reject = Mutex_settle.bind(null, pact, 2);
-  (stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);
-  return pact;
-  function _resumeAfterBody(value) {
-    result = value;
-    do {
-      if (update) {
-        updateValue = update();
-        if (updateValue && updateValue.then && !Mutex_isSettledPact(updateValue)) {
-          updateValue.then(_resumeAfterUpdate).then(void 0, reject);
-          return;
-        }
-      }
-      shouldContinue = test();
-      if (!shouldContinue || Mutex_isSettledPact(shouldContinue) && !shouldContinue.v) {
-        Mutex_settle(pact, 1, result);
-        return;
-      }
-      if (shouldContinue.then) {
-        shouldContinue.then(_resumeAfterTest).then(void 0, reject);
-        return;
-      }
-      result = body();
-      if (Mutex_isSettledPact(result)) {
-        result = result.v;
-      }
-    } while (!result || !result.then);
-    result.then(_resumeAfterBody).then(void 0, reject);
-  }
-  function _resumeAfterTest(shouldContinue) {
-    if (shouldContinue) {
-      result = body();
-      if (result && result.then) {
-        result.then(_resumeAfterBody).then(void 0, reject);
-      } else {
-        _resumeAfterBody(result);
-      }
-    } else {
-      Mutex_settle(pact, 1, result);
-    }
-  }
-  function _resumeAfterUpdate() {
-    if (shouldContinue = test()) {
-      if (shouldContinue.then) {
-        shouldContinue.then(_resumeAfterTest).then(void 0, reject);
-      } else {
-        _resumeAfterTest(shouldContinue);
-      }
-    } else {
-      Mutex_settle(pact, 1, result);
-    }
-  }
-}
-function Mutex_continue(value, then) {
-  return value && value.then ? value.then(then) : then(value);
-}
-function Mutex_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function Mutex_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, Mutex_toPropertyKey(descriptor.key), descriptor); } }
-function Mutex_createClass(Constructor, protoProps, staticProps) { if (protoProps) Mutex_defineProperties(Constructor.prototype, protoProps); if (staticProps) Mutex_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function Mutex_toPropertyKey(arg) { var key = Mutex_toPrimitive(arg, "string"); return Mutex_typeof(key) === "symbol" ? key : String(key); }
-function Mutex_toPrimitive(input, hint) { if (Mutex_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (Mutex_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).
- *
- * Characteristics:
- * - Non-reentrant.
- * - Unfair. (Multiple callers awaiting 'acquire' will be granted the mutex in no order.)
- *   - When calling `safe` consecutively with no 'awaits' in-between, the current context will synchronously acquire
- *     the mutex every time.
- */
-var Mutex = /*#__PURE__*/function () {
-  function Mutex() {
-    Mutex_classCallCheck(this, Mutex);
-    this.mutex = undefined;
-    this.resolver = undefined;
-  }
-  Mutex_createClass(Mutex, [{
-    key: "safe",
-    value: function safe(callback) {
-      try {
-        var _this2 = this;
-        return Mutex_await(_this2.acquire(), function () {
-          return Mutex_finallyRethrows(callback, function (_wasThrown, _result) {
-            _this2.release();
-            return Mutex_rethrow(_wasThrown, _result);
-          });
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
-  }, {
-    key: "acquire",
-    value: function acquire() {
-      try {
-        var _this4 = this;
-        // Loop necessary for when multiple calls are made to 'acquire' before a 'release' is called, else the call to
-        // 'release' will resume every caller currently waiting on 'acquire'.
-        return Mutex_continue(Mutex_for(function () {
-          return _this4.mutex !== undefined;
-        }, void 0, function () {
-          return Mutex_awaitIgnored(_this4.mutex);
-        }), function () {
-          _this4.mutex = new Promise(function (resolve) {
-            _this4.resolver = resolve;
-          });
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
-  }, {
-    key: "release",
-    value: function release() {
-      if (this.resolver === undefined) {
-        throw new Error("Unable to release mutex: already released.");
-      }
-      this.resolver();
-      this.resolver = undefined;
-      this.mutex = undefined;
-    }
-  }]);
-  return Mutex;
-}();
 ;// CONCATENATED MODULE: ./src/public/browser/AuthManagerBrowser.ts
 function AuthManagerBrowser_typeof(obj) { "@babel/helpers - typeof"; return AuthManagerBrowser_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, AuthManagerBrowser_typeof(obj); }
 function AuthManagerBrowser_defineProperty(obj, key, value) { key = AuthManagerBrowser_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -2459,64 +2587,47 @@ function AuthManagerBrowser_defineProperties(target, props) { for (var i = 0; i
 function AuthManagerBrowser_createClass(Constructor, protoProps, staticProps) { if (protoProps) AuthManagerBrowser_defineProperties(Constructor.prototype, protoProps); if (staticProps) AuthManagerBrowser_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function AuthManagerBrowser_toPropertyKey(arg) { var key = AuthManagerBrowser_toPrimitive(arg, "string"); return AuthManagerBrowser_typeof(key) === "symbol" ? key : String(key); }
 function AuthManagerBrowser_toPrimitive(input, hint) { if (AuthManagerBrowser_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (AuthManagerBrowser_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function AuthManagerBrowser_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) AuthManagerBrowser_setPrototypeOf(subClass, superClass); }
-function AuthManagerBrowser_setPrototypeOf(o, p) { AuthManagerBrowser_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return AuthManagerBrowser_setPrototypeOf(o, p); }
-function AuthManagerBrowser_createSuper(Derived) { var hasNativeReflectConstruct = AuthManagerBrowser_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = AuthManagerBrowser_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = AuthManagerBrowser_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return AuthManagerBrowser_possibleConstructorReturn(this, result); }; }
-function AuthManagerBrowser_possibleConstructorReturn(self, call) { if (call && (AuthManagerBrowser_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 AuthManagerBrowser_assertThisInitialized(self); }
-function AuthManagerBrowser_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function AuthManagerBrowser_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function AuthManagerBrowser_getPrototypeOf(o) { AuthManagerBrowser_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return AuthManagerBrowser_getPrototypeOf(o); }
 
 
 
-
-var AuthManager = /*#__PURE__*/function (_BaseAPI) {
-  AuthManagerBrowser_inherits(AuthManager, _BaseAPI);
-  var _super = AuthManagerBrowser_createSuper(AuthManager);
-  function AuthManager(config) {
-    var _this;
-    AuthManagerBrowser_classCallCheck(this, AuthManager);
-    _this = _super.call(this, config);
-    _this.authSessionMutex = new Mutex();
-    _this.contentType = "content-type";
-    _this.contentTypeJson = "application/json";
-    _this.contentTypeText = "text/plain";
-    _this.minJwtTtlSeconds = 10;
-    _this.maxJwtTtlSeconds = 2147483; // Max value for window.setTimeout is 2147483647ms -- if we go over this, the timeout fires immediately.
-    _this.retryAuthAfterErrorSeconds = 5;
-    _this.refreshBeforeExpirySeconds = 20;
-    var cdnUrl = BytescaleApiClientConfigUtils.getCdnUrl(config);
-    var accountId = BytescaleApiClientConfigUtils.getAccountId(config);
-    _this.accessTokenUrl = "".concat(cdnUrl, "/api/v1/access_tokens/").concat(accountId);
-    return _this;
-  }
-  AuthManagerBrowser_createClass(AuthManager, [{
+var AuthManagerImpl = /*#__PURE__*/function () {
+  function AuthManagerImpl() {
+    AuthManagerBrowser_classCallCheck(this, AuthManagerImpl);
+    this.contentType = "content-type";
+    this.contentTypeJson = "application/json";
+    this.contentTypeText = "text/plain";
+    this.minJwtTtlSeconds = 10;
+    this.maxJwtTtlSeconds = 2147483; // Max value for window.setTimeout is 2147483647ms -- if we go over this, the timeout fires immediately.
+    this.retryAuthAfterErrorSeconds = 5;
+    this.refreshBeforeExpirySeconds = 20;
+    this.authSessionMutex = AuthSessionState.getMutex();
+  }
+  AuthManagerBrowser_createClass(AuthManagerImpl, [{
     key: "isAuthSessionActive",
     value: function isAuthSessionActive() {
-      return AuthSessionState.session !== undefined;
+      return AuthSessionState.getSession() !== undefined;
     }
   }, {
     key: "beginAuthSession",
-    value: function beginAuthSession(authUrl, authHeaders) {
+    value: function beginAuthSession(params) {
       try {
-        var _this3 = this;
+        var _this2 = this;
         var newSession = {
           accessToken: undefined,
           accessTokenRefreshHandle: undefined,
-          authUrl: authUrl,
-          authHeaders: authHeaders,
+          params: params,
           isActive: true
         };
-        return AuthManagerBrowser_await(_this3.authSessionMutex.safe(AuthManagerBrowser_async(function () {
+        return AuthManagerBrowser_await(_this2.authSessionMutex.safe(AuthManagerBrowser_async(function () {
           // We check both 'session' and 'sessionDisposing' here, as we don't want to call 'beginAuthSession' until the session is fully disposed.
-          if (_this3.isAuthSessionActive()) {
+          if (_this2.isAuthSessionActive()) {
             throw new Error("Auth session already active: see AuthManager.isAuthSessionActive(). Please call 'await endAuthSession()' and then 'await beginAuthSession(...)' if you want to start a new auth session.");
           }
-          AuthSessionState.session = newSession;
+          AuthSessionState.setSession(newSession);
           return AuthManagerBrowser_await();
         })), function () {
           // IMPORTANT: must be called outside the above, else re-entrant deadlock will occur.
-          return AuthManagerBrowser_awaitIgnored(_this3.refreshAccessToken(newSession));
+          return AuthManagerBrowser_awaitIgnored(_this2.refreshAccessToken(newSession));
         });
       } catch (e) {
         return Promise.reject(e);
@@ -2526,18 +2637,18 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
     key: "endAuthSession",
     value: function endAuthSession() {
       try {
-        var _this5 = this;
-        return AuthManagerBrowser_awaitIgnored(_this5.authSessionMutex.safe(AuthManagerBrowser_async(function () {
-          if (AuthSessionState.session === undefined) {
+        var _this4 = this;
+        return AuthManagerBrowser_awaitIgnored(_this4.authSessionMutex.safe(AuthManagerBrowser_async(function () {
+          var session = AuthSessionState.getSession();
+          if (session === undefined) {
             return;
           }
-          var session = AuthSessionState.session;
-          AuthSessionState.session = undefined;
+          AuthSessionState.setSession(undefined);
           session.isActive = false;
           if (session.accessTokenRefreshHandle !== undefined) {
             clearTimeout(session.accessTokenRefreshHandle);
           }
-          return AuthManagerBrowser_awaitIgnored(_this5.deleteAccessToken());
+          return AuthManagerBrowser_awaitIgnored(_this4.deleteAccessToken(session.params));
         })));
       } catch (e) {
         return Promise.reject(e);
@@ -2547,26 +2658,26 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
     key: "refreshAccessToken",
     value: function refreshAccessToken(session) {
       try {
-        var _this7 = this;
-        return AuthManagerBrowser_awaitIgnored(_this7.authSessionMutex.safe(AuthManagerBrowser_async(function () {
+        var _this6 = this;
+        return AuthManagerBrowser_awaitIgnored(_this6.authSessionMutex.safe(AuthManagerBrowser_async(function () {
           if (!session.isActive) {
             return;
           }
-          var timeout = _this7.retryAuthAfterErrorSeconds;
+          var timeout = _this6.retryAuthAfterErrorSeconds;
           return AuthManagerBrowser_continueIgnored(AuthManagerBrowser_finallyRethrows(function () {
             return AuthManagerBrowser_catch(function () {
-              var _getAccessToken = _this7.getAccessToken,
-                _session$authUrl = session.authUrl;
-              return AuthManagerBrowser_await(session.authHeaders(), function (_session$authHeaders) {
-                return AuthManagerBrowser_await(_getAccessToken.call(_this7, _session$authUrl, _session$authHeaders), function (jwt) {
-                  return AuthManagerBrowser_await(_this7.setAccessToken(jwt), function (setTokenResult) {
-                    var desiredTtl = setTokenResult.ttlSeconds - _this7.refreshBeforeExpirySeconds;
-                    timeout = Math.max(desiredTtl, _this7.minJwtTtlSeconds);
+              var _getAccessToken = _this6.getAccessToken,
+                _session$params = session.params;
+              return AuthManagerBrowser_await(session.params.authHeaders(), function (_session$params$authH) {
+                return AuthManagerBrowser_await(_getAccessToken.call(_this6, _session$params, _session$params$authH), function (jwt) {
+                  return AuthManagerBrowser_await(_this6.setAccessToken(session.params, jwt), function (setTokenResult) {
+                    var desiredTtl = setTokenResult.ttlSeconds - _this6.refreshBeforeExpirySeconds;
+                    timeout = Math.max(desiredTtl, _this6.minJwtTtlSeconds);
                     if (desiredTtl !== timeout) {
                       ConsoleUtils.warn("JWT expiration is too short: waiting for ".concat(timeout, " seconds before refreshing."));
                     }
                     // There's need to print a warning for this: it's OK to silently request the JWT before it expires. Also, this is 24 days in this case!
-                    timeout = Math.min(timeout, _this7.maxJwtTtlSeconds);
+                    timeout = Math.min(timeout, _this6.maxJwtTtlSeconds);
                     session.accessToken = setTokenResult.accessToken;
                   });
                 });
@@ -2577,7 +2688,7 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
             });
           }, function (_wasThrown, _result) {
             session.accessTokenRefreshHandle = window.setTimeout(function () {
-              _this7.refreshAccessToken(session).then(function () {}, function (e) {
+              _this6.refreshAccessToken(session).then(function () {}, function (e) {
                 return ConsoleUtils.error("Unexpected error when refreshing access token: ".concat(e));
               });
             }, timeout * 1000);
@@ -2588,34 +2699,49 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
         return Promise.reject(e);
       }
     }
+  }, {
+    key: "getAccessTokenUrl",
+    value: function getAccessTokenUrl(params) {
+      var _a;
+      var cdnUrl = BytescaleApiClientConfigUtils.getCdnUrl((_a = params.options) !== null && _a !== void 0 ? _a : {});
+      return "".concat(cdnUrl, "/api/v1/access_tokens/").concat(params.accountId);
+    }
   }, {
     key: "deleteAccessToken",
-    value: function deleteAccessToken() {
+    value: function deleteAccessToken(params) {
       try {
-        var _this9 = this;
-        return AuthManagerBrowser_awaitIgnored(_this9.doFetch(_this9.accessTokenUrl, {
+        var _this8 = this;
+        var _a;
+        return AuthManagerBrowser_awaitIgnored(BaseAPI.fetch(_this8.getAccessTokenUrl(params), {
           method: "DELETE",
           credentials: "include",
           headers: {}
-        }, true));
+        }, {
+          isBytescaleApi: true,
+          fetchApi: (_a = params.options) === null || _a === void 0 ? void 0 : _a.fetchApi
+        }));
       } catch (e) {
         return Promise.reject(e);
       }
     }
   }, {
     key: "setAccessToken",
-    value: function setAccessToken(jwt) {
+    value: function setAccessToken(params, jwt) {
       try {
-        var _this11 = this;
+        var _this10 = this;
+        var _a;
         var request = {
           accessToken: jwt
         };
-        return AuthManagerBrowser_await(_this11.doFetch(_this11.accessTokenUrl, {
+        return AuthManagerBrowser_await(BaseAPI.fetch(_this10.getAccessTokenUrl(params), {
           method: "PUT",
           credentials: "include",
-          headers: AuthManagerBrowser_defineProperty({}, _this11.contentType, _this11.contentTypeJson),
+          headers: AuthManagerBrowser_defineProperty({}, _this10.contentType, _this10.contentTypeJson),
           body: JSON.stringify(request)
-        }, true), function (response) {
+        }, {
+          isBytescaleApi: true,
+          fetchApi: (_a = params.options) === null || _a === void 0 ? void 0 : _a.fetchApi
+        }), function (response) {
           return AuthManagerBrowser_await(response.json());
         });
       } catch (e) {
@@ -2624,17 +2750,23 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
     }
   }, {
     key: "getAccessToken",
-    value: function getAccessToken(authUrl, headers) {
+    value: function getAccessToken(params, headers) {
       try {
-        var _this13 = this;
+        var _this12 = this;
+        var _a, _b;
         var endpointName = "Your auth API endpoint";
-        var requiredContentType = _this13.contentTypeText;
-        return AuthManagerBrowser_await(_this13.doFetch(authUrl, {
+        var requiredContentType = _this12.contentTypeText;
+        return AuthManagerBrowser_await(BaseAPI.fetch(params.authUrl, {
           method: "GET",
           headers: headers
-        }, false), function (result) {
-          if (result.headers.get(_this13.contentType) !== requiredContentType) {
-            throw new Error("".concat(endpointName, " returned an unsupported '").concat(_this13.contentType, "' response header: please return '").concat(requiredContentType, "'."));
+        }, {
+          isBytescaleApi: false,
+          fetchApi: (_a = params.options) === null || _a === void 0 ? void 0 : _a.fetchApi
+        }), function (result) {
+          var actualContentType = (_b = result.headers.get(_this12.contentType)) !== null && _b !== void 0 ? _b : "";
+          // Support content types like "text/plain; charset=utf-8" and "text/plain"
+          if (actualContentType.split(";")[0] !== requiredContentType) {
+            throw new Error("".concat(endpointName, " returned \"").concat(actualContentType, "\" for the ").concat(_this12.contentType, " response header, but the Bytescale SDK requires \"").concat(requiredContentType, "\"."));
           }
           return AuthManagerBrowser_await(result.text(), function (jwt) {
             if (jwt.length === 0) {
@@ -2652,8 +2784,12 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
       }
     }
   }]);
-  return AuthManager;
-}(BaseAPI);
+  return AuthManagerImpl;
+}();
+/**
+ * Alternative way of implementing a static class (i.e. all methods static). We do this so we can use a interface on the class (interfaces can't define static methods).
+ */
+var AuthManager = new AuthManagerImpl();
 ;// CONCATENATED MODULE: ./src/public/browser/index.ts