@bytescale/sdk 3.60.0 → 3.62.0

package/dist/worker/cjs/main.js

@@ -193,6 +193,177 @@ var FairMutex = /*#__PURE__*/function () {
   }]);
 }();
 ;// ./src/private/AuthSessionState.ts
+function AuthSessionState_empty() {}
+function AuthSessionState_awaitIgnored(value, direct) {
+  if (!direct) {
+    return value && value.then ? value.then(AuthSessionState_empty) : Promise.resolve();
+  }
+}
+function AuthSessionState_invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(result);
+}
+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 AuthSessionState_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 AuthSessionState_typeof(o) { "@babel/helpers - typeof"; return AuthSessionState_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, AuthSessionState_typeof(o); }
 function AuthSessionState_classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function AuthSessionState_defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, AuthSessionState_toPropertyKey(o.key), o); } }
@@ -299,6 +470,54 @@ var AuthSessionState = /*#__PURE__*/function () {
         jwt: undefined
       };
     }
+    /** Waits for request-time auth to be current before resolving it. */
+  }, {
+    key: "resolveAuthConfigAsync",
+    value: function resolveAuthConfigAsync(authConfigId, requireReadyDefault) {
+      try {
+        var _exit = false;
+        var _a, _b;
+        if (authConfigId === false) {
+          return AuthSessionState_await(undefined);
+        }
+        return AuthSessionState_await(_for(function () {
+          return !_exit;
+        }, void 0, function () {
+          var session = AuthSessionState.getSession();
+          if (session === undefined || !session.isActive || !Array.isArray(session.authConfigs)) {
+            var _AuthSessionState$res = AuthSessionState.resolveAuthConfig(authConfigId, requireReadyDefault);
+            _exit = true;
+            return _AuthSessionState$res;
+          }
+          var state = session.authConfigs.find(function (config) {
+            return config.config.authConfigId === authConfigId;
+          });
+          if (state === undefined) {
+            var _AuthSessionState$res2 = AuthSessionState.resolveAuthConfig(authConfigId, requireReadyDefault);
+            _exit = true;
+            return _AuthSessionState$res2;
+          }
+          var authenticationPromise = (_a = state.authenticationPromise) !== null && _a !== void 0 ? _a : state.refreshPromise;
+          return AuthSessionState_invoke(function () {
+            if (authenticationPromise !== undefined) {
+              return AuthSessionState_awaitIgnored(authenticationPromise);
+            }
+          }, function () {
+            if (AuthSessionState.getSession() !== session || !session.isActive) {
+              return;
+            }
+            var currentAuthenticationPromise = (_b = state.authenticationPromise) !== null && _b !== void 0 ? _b : state.refreshPromise;
+            if (currentAuthenticationPromise === undefined || currentAuthenticationPromise === authenticationPromise) {
+              var _AuthSessionState$res3 = AuthSessionState.resolveAuthConfig(authConfigId, true);
+              _exit = true;
+              return _AuthSessionState$res3;
+            }
+          });
+        }));
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
   }]);
 }();
 AuthSessionState.stateKey = "BytescaleSessionState";
@@ -444,12 +663,43 @@ var BytescaleApiClientConfigUtils = /*#__PURE__*/function () {
     value: function getAccountId(config) {
       return BytescaleApiClientConfigUtils.resolveAuthentication(config).accountId;
     }
+  }, {
+    key: "getAccountIdAsync",
+    value: function getAccountIdAsync(config) {
+      try {
+        return runtime_await(BytescaleApiClientConfigUtils.resolveAuthenticationAsync(config), function (_BytescaleApiClientCo) {
+          return _BytescaleApiClientCo.accountId;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
   }, {
     key: "resolveAuthentication",
     value: function resolveAuthentication(config) {
-      var _a, _b;
+      var _a;
       var apiKey = (_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined;
       var authConfig = AuthSessionState.resolveAuthConfig(config.authConfigId, apiKey === undefined);
+      return BytescaleApiClientConfigUtils.resolveAuthenticationWithAuthConfig(config, authConfig);
+    }
+  }, {
+    key: "resolveAuthenticationAsync",
+    value: function resolveAuthenticationAsync(config) {
+      try {
+        var _a;
+        var apiKey = (_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined;
+        return runtime_await(AuthSessionState.resolveAuthConfigAsync(config.authConfigId, apiKey === undefined), function (authConfig) {
+          return BytescaleApiClientConfigUtils.resolveAuthenticationWithAuthConfig(config, authConfig);
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, {
+    key: "resolveAuthenticationWithAuthConfig",
+    value: function resolveAuthenticationWithAuthConfig(config, authConfig) {
+      var _a, _b;
+      var apiKey = (_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined;
       var apiKeyAccountId = apiKey === undefined ? undefined : BytescaleApiClientConfigUtils.getApiKeyAccountId(apiKey);
       if (apiKeyAccountId !== undefined && authConfig !== undefined && apiKeyAccountId !== authConfig.accountId) {
         throw new Error("The API key belongs to account '".concat(apiKeyAccountId, "', but AuthManager configuration '").concat((_b = config.authConfigId) !== null && _b !== void 0 ? _b : "default", "' belongs to account '").concat(authConfig.accountId, "'."));
@@ -536,7 +786,6 @@ var BaseAPI = /*#__PURE__*/function () {
       try {
         var _this = this;
         var _a;
-        Object.assign(context.headers, BytescaleApiClientConfigUtils.resolveAuthentication(_this.config).headers);
         // Key: any possible value for 'baseUrlOverride'
         // Value: user-overridden value for that base URL from the config.
         var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigUtils.defaultCdnUrl, BytescaleApiClientConfigUtils.getCdnUrl(_this.config));
@@ -577,44 +826,48 @@ var BaseAPI = /*#__PURE__*/function () {
         }
         var configHeaders = _this2.config.headers;
         return runtime_await(runtime_await(configHeaders === undefined ? {} : typeof configHeaders === "function" ? configHeaders() : configHeaders, function (resolvedConfigHeaders) {
-          for (var _i = 0, _Object$keys = Object.keys(resolvedConfigHeaders); _i < _Object$keys.length; _i++) {
-            var key = _Object$keys[_i];
-            if (key.toLowerCase() === "authorization" || key.toLowerCase() === "authorization-token") {
-              for (var _i2 = 0, _Object$keys2 = Object.keys(context.headers); _i2 < _Object$keys2.length; _i2++) {
-                var generatedKey = _Object$keys2[_i2];
-                if (generatedKey.toLowerCase() === key.toLowerCase()) {
-                  // Custom auth headers have documented precedence; remove the generated spelling to make that deterministic.
-                  // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-                  delete context.headers[generatedKey];
+          var _context$headers = context.headers;
+          return runtime_await(BytescaleApiClientConfigUtils.resolveAuthenticationAsync(_this2.config), function (_BytescaleApiClientCo2) {
+            Object.assign(_context$headers, _BytescaleApiClientCo2.headers);
+            for (var _i = 0, _Object$keys = Object.keys(resolvedConfigHeaders); _i < _Object$keys.length; _i++) {
+              var key = _Object$keys[_i];
+              if (key.toLowerCase() === "authorization" || key.toLowerCase() === "authorization-token") {
+                for (var _i2 = 0, _Object$keys2 = Object.keys(context.headers); _i2 < _Object$keys2.length; _i2++) {
+                  var generatedKey = _Object$keys2[_i2];
+                  if (generatedKey.toLowerCase() === key.toLowerCase()) {
+                    // Custom auth headers have documented precedence; remove the generated spelling to make that deterministic.
+                    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+                    delete context.headers[generatedKey];
+                  }
                 }
               }
             }
-          }
-          var headers = Object.assign(Object.assign({}, context.headers), resolvedConfigHeaders);
-          Object.keys(headers).forEach(function (key) {
-            return headers[key] === undefined ? delete headers[key] : {};
-          });
-          var initOverrideFn = typeof initOverrides === "function" ? initOverrides : function () {
-            return runtime_await(initOverrides);
-          };
-          var initParams = {
-            method: context.method,
-            headers: headers,
-            body: context.body
-          };
-          var _Object$assign = Object.assign({}, initParams);
-          return runtime_await(initOverrideFn({
-            init: initParams,
-            context: context
-          }), function (_initOverrideFn) {
-            var overriddenInit = Object.assign(_Object$assign, _initOverrideFn);
-            var init = Object.assign(Object.assign({}, overriddenInit), {
-              body: JSON.stringify(overriddenInit.body)
+            var headers = Object.assign(Object.assign({}, context.headers), resolvedConfigHeaders);
+            Object.keys(headers).forEach(function (key) {
+              return headers[key] === undefined ? delete headers[key] : {};
             });
-            return {
-              url: url,
-              init: init
+            var initOverrideFn = typeof initOverrides === "function" ? initOverrides : function () {
+              return runtime_await(initOverrides);
             };
+            var initParams = {
+              method: context.method,
+              headers: headers,
+              body: context.body
+            };
+            var _Object$assign = Object.assign({}, initParams);
+            return runtime_await(initOverrideFn({
+              init: initParams,
+              context: context
+            }), function (_initOverrideFn) {
+              var overriddenInit = Object.assign(_Object$assign, _initOverrideFn);
+              var init = Object.assign(Object.assign({}, overriddenInit), {
+                body: JSON.stringify(overriddenInit.body)
+              });
+              return {
+                url: url,
+                init: init
+              };
+            });
           });
         }, configHeaders === undefined || !(typeof configHeaders === "function")));
       } catch (e) {
@@ -642,8 +895,8 @@ var BaseAPI = /*#__PURE__*/function () {
             // unless the following is set.
             // https://github.com/nodejs/node/issues/46221#issuecomment-1383246036
             duplex: "half"
-          })), function (_BytescaleApiClientCo) {
-            response = _BytescaleApiClientCo;
+          })), function (_BytescaleApiClientCo3) {
+            response = _BytescaleApiClientCo3;
           });
         }, function (e) {
           // Network-level errors, CORS errors, or HTTP-level errors from intermediary services (e.g. AWS or the user's own infrastructure/proxies).
@@ -2054,21 +2307,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;
@@ -2079,7 +2332,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();
@@ -2088,9 +2341,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 {
@@ -2101,28 +2354,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) {
@@ -2134,7 +2387,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;
@@ -2143,14 +2396,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) {
@@ -2158,14 +2411,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) {
@@ -2173,7 +2426,7 @@ function _for(test, update, body) {
         return;
       }
       result = body();
-      if (_isSettledPact(result)) {
+      if (UploadManagerBase_isSettledPact(result)) {
         result = result.v;
       }
     } while (!result || !result.then);
@@ -2188,7 +2441,7 @@ function _for(test, update, body) {
         _resumeAfterBody(result);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
   function _resumeAfterUpdate() {
@@ -2199,7 +2452,7 @@ function _for(test, update, body) {
         _resumeAfterTest(shouldContinue);
       }
     } else {
-      _settle(pact, 1, result);
+      UploadManagerBase_settle(pact, 1, result);
     }
   }
 }
@@ -2239,40 +2492,41 @@ var UploadManagerBase = /*#__PURE__*/function () {
       try {
         var _this = this;
         _this.assertNotCancelled(request);
-        var accountId = BytescaleApiClientConfigUtils.getAccountId(_this.config);
-        var source = _this.processUploadSource(request.data);
-        var preUploadInfo = _this.getPreUploadInfo(request, source);
-        var bytesTotal = preUploadInfo.size;
-        var makeOnProgressForPart = _this.makeOnProgressForPartFactory(request, bytesTotal);
-        var init = _this.preUpload(source);
-        // Raise initial progress event SYNCHRONOUSLY.
-        if (request.onProgress !== undefined) {
-          request.onProgress(_this.makeProgressEvent(0, bytesTotal));
-        }
-        return UploadManagerBase_await(_this.beginUpload(request, preUploadInfo, accountId), function (uploadInfo) {
-          var partCount = uploadInfo.uploadParts.count;
-          var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
-          var _this$makeCancellatio = _this.makeCancellationMethods(),
-            cancel = _this$makeCancellatio.cancel,
-            addCancellationHandler = _this$makeCancellatio.addCancellationHandler;
-          var intervalHandle = setInterval(_this.onIntervalTick(request, cancel), _this.intervalMs);
-          var uploadedParts;
-          return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
-            return UploadManagerBase_await(_this.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
-              return _this.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler, accountId);
-            })), function (_this$mapAsync) {
-              uploadedParts = _this$mapAsync;
-              return UploadManagerBase_awaitIgnored(_this.postUpload(init));
-            });
-          }, function (_wasThrown, _result) {
-            clearInterval(intervalHandle);
-            return UploadManagerBase_rethrow(_wasThrown, _result);
-          }), function () {
-            var etag = uploadedParts.flatMap(function (x) {
-              return x.status === "Completed" ? [x.etag] : [];
-            })[0];
-            return Object.assign(Object.assign({}, uploadInfo.file), {
-              etag: etag // The 'etag' in the original 'uploadInfo.file' will be null, so we set it to the final etag value here.
+        return UploadManagerBase_await(BytescaleApiClientConfigUtils.getAccountIdAsync(_this.config), function (accountId) {
+          var source = _this.processUploadSource(request.data);
+          var preUploadInfo = _this.getPreUploadInfo(request, source);
+          var bytesTotal = preUploadInfo.size;
+          var makeOnProgressForPart = _this.makeOnProgressForPartFactory(request, bytesTotal);
+          var init = _this.preUpload(source);
+          // Raise initial progress event SYNCHRONOUSLY.
+          if (request.onProgress !== undefined) {
+            request.onProgress(_this.makeProgressEvent(0, bytesTotal));
+          }
+          return UploadManagerBase_await(_this.beginUpload(request, preUploadInfo, accountId), function (uploadInfo) {
+            var partCount = uploadInfo.uploadParts.count;
+            var parts = UploadManagerBase_toConsumableArray(Array(partCount).keys());
+            var _this$makeCancellatio = _this.makeCancellationMethods(),
+              cancel = _this$makeCancellatio.cancel,
+              addCancellationHandler = _this$makeCancellatio.addCancellationHandler;
+            var intervalHandle = setInterval(_this.onIntervalTick(request, cancel), _this.intervalMs);
+            var uploadedParts;
+            return UploadManagerBase_continue(UploadManagerBase_finallyRethrows(function () {
+              return UploadManagerBase_await(_this.mapAsync(parts, preUploadInfo.maxConcurrentUploadParts, _async(function (part) {
+                return _this.uploadPart(request, source, part, uploadInfo, makeOnProgressForPart(), addCancellationHandler, accountId);
+              })), function (_this$mapAsync) {
+                uploadedParts = _this$mapAsync;
+                return UploadManagerBase_awaitIgnored(_this.postUpload(init));
+              });
+            }, function (_wasThrown, _result) {
+              clearInterval(intervalHandle);
+              return UploadManagerBase_rethrow(_wasThrown, _result);
+            }), function () {
+              var etag = uploadedParts.flatMap(function (x) {
+                return x.status === "Completed" ? [x.etag] : [];
+              })[0];
+              return Object.assign(Object.assign({}, uploadInfo.file), {
+                etag: etag // The 'etag' in the original 'uploadInfo.file' will be null, so we set it to the final etag value here.
+              });
             });
           });
         });
@@ -2479,7 +2733,7 @@ var UploadManagerBase = /*#__PURE__*/function () {
         var result = [];
         var workQueue = UploadManagerBase_toConsumableArray(items);
         return UploadManagerBase_await(Promise.all(UploadManagerBase_toConsumableArray(Array(concurrency).keys()).map(_async(function () {
-          return _continueIgnored(_for(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'.