@bytescale/sdk 1.5.0 → 3.0.0-alpha.10

package/dist/node/cjs/main.js

@@ -64,7 +64,7 @@ __lib_require__.d(__lib_exports__, {
   "AuthManager": function() { return /* reexport */ AuthManager; },
   "BaseAPI": function() { return /* reexport */ BaseAPI; },
   "BinaryResult": function() { return /* reexport */ BinaryResult; },
-  "BytescaleApiClientConfigResolver": function() { return /* reexport */ BytescaleApiClientConfigResolver; },
+  "BytescaleApiClientConfigUtils": function() { return /* reexport */ BytescaleApiClientConfigUtils; },
   "BytescaleApiError": function() { return /* reexport */ BytescaleApiError; },
   "CancelledError": function() { return /* reexport */ CancelledError; },
   "CommonTypesNoOp": function() { return /* reexport */ CommonTypesNoOp; },
@@ -80,16 +80,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 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() {
+    _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); }
@@ -113,8 +429,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) {
@@ -125,7 +441,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;
   }
@@ -140,21 +456,21 @@ function runtime_createClass(Constructor, protoProps, staticProps) { if (protoPr
 function runtime_toPropertyKey(arg) { var key = runtime_toPrimitive(arg, "string"); return runtime_typeof(key) === "symbol" ? key : String(key); }
 function runtime_toPrimitive(input, hint) { if (runtime_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (runtime_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
-var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
-  function BytescaleApiClientConfigResolver() {
-    runtime_classCallCheck(this, BytescaleApiClientConfigResolver);
+var BytescaleApiClientConfigUtils = /*#__PURE__*/function () {
+  function BytescaleApiClientConfigUtils() {
+    runtime_classCallCheck(this, BytescaleApiClientConfigUtils);
   }
-  runtime_createClass(BytescaleApiClientConfigResolver, null, [{
+  runtime_createClass(BytescaleApiClientConfigUtils, null, [{
     key: "getApiUrl",
     value: function getApiUrl(config) {
       var _a;
-      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultApiUrl;
+      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultApiUrl;
     }
   }, {
     key: "getCdnUrl",
     value: function getCdnUrl(config) {
       var _a;
-      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
     }
   }, {
     key: "getFetchApi",
@@ -162,11 +478,48 @@ var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
       var _a;
       return (_a = config.fetchApi) !== null && _a !== void 0 ? _a : fetch;
     }
+  }, {
+    key: "getAccountId",
+    value: function getAccountId(config) {
+      var _a, _b;
+      var accountId;
+      if (BytescaleApiClientConfigUtils.specialApiKeys.includes(config.apiKey)) {
+        accountId = BytescaleApiClientConfigUtils.specialApiKeyAccountId;
+      } else {
+        accountId = (_b = (_a = config.apiKey.split("_")[1]) === null || _a === void 0 ? void 0 : _a.substr(0, BytescaleApiClientConfigUtils.accountIdLength)) !== null && _b !== void 0 ? _b : "";
+        if (accountId.length !== BytescaleApiClientConfigUtils.accountIdLength) {
+          throw new Error("Invalid Bytescale API key.");
+        }
+      }
+      return accountId;
+    }
+  }, {
+    key: "validate",
+    value: function validate(config) {
+      var _a;
+      // Defensive programming, for users not using TypeScript. Mainly because this is used by UploadWidget users.
+      if ((config !== null && config !== void 0 ? config : undefined) === undefined) {
+        throw new Error("Config parameter required.");
+      }
+      if (((_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined) === undefined) {
+        throw new Error("Please provide an API key via the 'apiKey' config parameter.");
+      }
+      if (config.apiKey.trim() !== config.apiKey) {
+        // We do not support API keys with whitespace (by trimming ourselves) because otherwise we'd need to support this
+        // everywhere in perpetuity (since removing the trimming would be a breaking change).
+        throw new Error("API key needs trimming (whitespace detected).");
+      }
+      // This performs futher validation on the API key...
+      BytescaleApiClientConfigUtils.getAccountId(config);
+    }
   }]);
-  return BytescaleApiClientConfigResolver;
+  return BytescaleApiClientConfigUtils;
 }();
-BytescaleApiClientConfigResolver.defaultApiUrl = "https://api.bytescale.com";
-BytescaleApiClientConfigResolver.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.defaultApiUrl = "https://api.bytescale.com";
+BytescaleApiClientConfigUtils.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.specialApiKeys = ["free", "demo"];
+BytescaleApiClientConfigUtils.specialApiKeyAccountId = "W142hJk";
+BytescaleApiClientConfigUtils.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 /**
  * This is the base class for all generated API classes.
  */
@@ -174,22 +527,24 @@ var BaseAPI = /*#__PURE__*/function () {
   function BaseAPI(config) {
     runtime_classCallCheck(this, BaseAPI);
     this.config = config;
+    BytescaleApiClientConfigUtils.validate(config);
   }
   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({}, BytescaleApiClientConfigResolver.defaultCdnUrl, BytescaleApiClientConfigResolver.getCdnUrl(_this2.config));
-        return _await(_this2.createFetchParams(context, initOverrides, baseUrlOverride === undefined ? undefined : (_b = nonDefaultBasePaths[baseUrlOverride]) !== null && _b !== void 0 ? _b : baseUrlOverride), function (_ref) {
+        var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigUtils.defaultCdnUrl, BytescaleApiClientConfigUtils.getCdnUrl(_this2.config));
+        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);
@@ -209,8 +564,8 @@ var BaseAPI = /*#__PURE__*/function () {
         var _this4 = this;
         var _a, _b;
         var response;
-        return _continue(_catch(function () {
-          return _await(BytescaleApiClientConfigResolver.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+        return runtime_continue(_catch(function () {
+          return runtime_await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -223,11 +578,11 @@ var BaseAPI = /*#__PURE__*/function () {
           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) {
+              return runtime_continue(_catch(function () {
+                return runtime_await(response.json(), function (_response$json) {
                   jsonError = _response$json;
                 });
-              }, _empty), function () {
+              }, 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);
                 }
@@ -264,7 +619,7 @@ var BaseAPI = /*#__PURE__*/function () {
     value: function createFetchParams(context, initOverrides, baseUrlOverride) {
       try {
         var _this6 = this;
-        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigResolver.getApiUrl(_this6.config)) + context.path;
+        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigUtils.getApiUrl(_this6.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
@@ -273,13 +628,13 @@ var BaseAPI = /*#__PURE__*/function () {
         }
         var configHeaders = _this6.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,
@@ -287,7 +642,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) {
@@ -308,9 +663,6 @@ var BaseAPI = /*#__PURE__*/function () {
   }]);
   return BaseAPI;
 }();
-BaseAPI.specialApiKeys = ["free", "demo"];
-BaseAPI.specialApiKeyAccountId = "W142hJk";
-BaseAPI.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 var CancelledError = /*#__PURE__*/function (_Error) {
   _inherits(CancelledError, _Error);
   var _super = _createSuper(CancelledError);
@@ -360,7 +712,7 @@ var JSONApiResponse = /*#__PURE__*/function () {
     value: function value() {
       try {
         var _this10 = this;
-        return _await(_this10.raw.json());
+        return runtime_await(_this10.raw.json());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -376,7 +728,7 @@ var VoidApiResponse = /*#__PURE__*/function () {
   runtime_createClass(VoidApiResponse, [{
     key: "value",
     value: function value() {
-      return _await(undefined);
+      return runtime_await(undefined);
     }
   }]);
   return VoidApiResponse;
@@ -402,7 +754,7 @@ var BinaryResult = /*#__PURE__*/function () {
     value: function text() {
       try {
         var _this12 = this;
-        return _await(_this12.raw.text());
+        return runtime_await(_this12.raw.text());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -412,7 +764,7 @@ var BinaryResult = /*#__PURE__*/function () {
     value: function blob() {
       try {
         var _this14 = this;
-        return _await(_this14.raw.blob());
+        return runtime_await(_this14.raw.blob());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -422,7 +774,7 @@ var BinaryResult = /*#__PURE__*/function () {
     value: function json() {
       try {
         var _this16 = this;
-        return _await(_this16.raw.json());
+        return runtime_await(_this16.raw.json());
       } catch (e) {
         return Promise.reject(e);
       }
@@ -468,9 +820,6 @@ function FileApi_getPrototypeOf(o) { FileApi_getPrototypeOf = Object.setPrototyp
  */
 // @ts-ignore
 
-/**
- *
- */
 var FileApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FileApi_inherits(FileApi, _runtime$BaseAPI);
   var _super = FileApi_createSuper(FileApi);
@@ -769,9 +1118,6 @@ function FolderApi_getPrototypeOf(o) { FolderApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var FolderApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FolderApi_inherits(FolderApi, _runtime$BaseAPI);
   var _super = FolderApi_createSuper(FolderApi);
@@ -1029,9 +1375,6 @@ function JobApi_getPrototypeOf(o) { JobApi_getPrototypeOf = Object.setPrototypeO
  */
 // @ts-ignore
 
-/**
- *
- */
 var JobApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   JobApi_inherits(JobApi, _runtime$BaseAPI);
   var _super = JobApi_createSuper(JobApi);
@@ -1164,9 +1507,6 @@ function UploadApi_getPrototypeOf(o) { UploadApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var UploadApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   UploadApi_inherits(UploadApi, _runtime$BaseAPI);
   var _super = UploadApi_createSuper(UploadApi);
@@ -1362,7 +1702,7 @@ var UrlBuilder = /*#__PURE__*/function () {
   function UrlBuilder(config) {
     UrlBuilder_classCallCheck(this, UrlBuilder);
     var _a;
-    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+    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.
@@ -1387,7 +1727,7 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "url",
     value: 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.transformation);
+      return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options);
     }
   }, {
     key: "raw",
@@ -1401,18 +1741,25 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "transformation",
     value: function transformation(params, trans) {
       var _a;
-      var baseUrl = this.getBaseUrl(params, trans.type === "preset" ? trans.preset : trans.type);
-      var transParams = this.getTransformationParams(trans, {
-        cachePermanently: "cache_perm"
-      });
+      var baseUrl = this.getBaseUrl(params, trans.transformation === "preset" ? trans.transformationPreset : trans.transformation);
+      var transParams = trans.transformation === "preset" ? [] : this.getTransformationParams(trans);
       var commonParams = this.getCommonQueryParams((_a = params.options) !== null && _a !== void 0 ? _a : {});
-      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(commonParams), _toConsumableArray(transParams)));
+      var transCommonParams = this.getCommonTransformationQueryParams(trans);
+      // This format puts "artifact" at the end, which isn't required, but is convention.
+      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(transParams), _toConsumableArray(commonParams), _toConsumableArray(transCommonParams)));
     }
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl(params, prefix) {
       return "".concat(this.cdnUrl, "/").concat(params.accountId, "/").concat(prefix).concat(params.filePath);
     }
+  }, {
+    key: "getCommonTransformationQueryParams",
+    value: function getCommonTransformationQueryParams(trans) {
+      return this.makeQueryParams(["cachePermanently", "large", "artifact"], {
+        cachePermanently: "cache_perm"
+      })(trans);
+    }
   }, {
     key: "getCommonQueryParams",
     value: function getCommonQueryParams(params) {
@@ -1438,8 +1785,9 @@ var UrlBuilder = /*#__PURE__*/function () {
     }
   }, {
     key: "getTransformationParams",
-    value: function getTransformationParams(trans, keyRewrites) {
-      if (trans.params === undefined) {
+    value: function getTransformationParams(trans) {
+      var params = trans.transformationParams;
+      if (params === undefined) {
         return [];
       }
       var serializeObj = function serializeObj(obj) {
@@ -1447,11 +1795,10 @@ var UrlBuilder = /*#__PURE__*/function () {
           var _ref2 = _slicedToArray(_ref, 2),
             key = _ref2[0],
             value = _ref2[1];
-          var _a;
-          return [(_a = keyRewrites[key]) !== null && _a !== void 0 ? _a : key, value.toString()];
+          return [key, value.toString()];
         });
       };
-      return Array.isArray(trans.params) ? trans.params.flatMap(serializeObj) : serializeObj(trans.params);
+      return Array.isArray(params) ? params.flatMap(serializeObj) : serializeObj(params);
     }
   }, {
     key: "addQueryParams",
@@ -1499,21 +1846,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;
@@ -1524,7 +1871,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();
@@ -1533,9 +1880,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 {
@@ -1546,28 +1893,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) {
@@ -1579,7 +1926,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;
@@ -1588,14 +1935,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) {
@@ -1603,14 +1950,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) {
@@ -1618,7 +1965,7 @@ function _for(test, update, body) {
         return;
       }
       result = body();
-      if (_isSettledPact(result)) {
+      if (UploadManagerBase_isSettledPact(result)) {
         result = result.v;
       }
     } while (!result || !result.then);
@@ -1633,7 +1980,7 @@ function _for(test, update, body) {
         _resumeAfterBody(result);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
   function _resumeAfterUpdate() {
@@ -1644,7 +1991,7 @@ function _for(test, update, body) {
         _resumeAfterTest(shouldContinue);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
 }
@@ -1660,7 +2007,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();
   }
@@ -1674,11 +2021,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) {
@@ -1729,15 +2076,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);
             })), 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;
           });
@@ -1851,7 +2198,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
           _this7.assertNotCancelled(request);
           return UploadManagerBase_await(_this7.putUploadPart(part, source, onProgress, addCancellationHandler), function (etag) {
             _this7.assertNotCancelled(request);
-            return _awaitIgnored(_this7.uploadApi.completeUploadPart({
+            return UploadManagerBase_awaitIgnored(_this7.uploadApi.completeUploadPart({
               accountId: request.accountId,
               uploadId: uploadInfo.uploadId,
               uploadPartIndex: partIndex,
@@ -1923,14 +2270,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));
               }
             });
           }));