@aws-amplify/core 6.0.1-api-v6-models.9351bcf.0 → 6.0.1-api-v6-models.58f2536.0

package/lib-esm/clients/handlers/fetch.js

@@ -1,104 +1,47 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { withMemoization } from '../utils/memoization';
-var shouldSendBody = function (method) {
-    return !['HEAD', 'GET', 'DELETE'].includes(method.toUpperCase());
-};
+const shouldSendBody = (method) => !['HEAD', 'GET', 'DELETE'].includes(method.toUpperCase());
 // TODO[AllanZhengYP]: we need to provide isCanceledError utility
-export var fetchTransferHandler = function (_a, _b) {
-    var url = _a.url, method = _a.method, headers = _a.headers, body = _a.body;
-    var abortSignal = _b.abortSignal, cache = _b.cache, withCrossDomainCredentials = _b.withCrossDomainCredentials;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var resp, e_1, responseHeaders, httpResponse, bodyWithMixin;
-        var _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    _e.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, fetch(url, {
-                            method: method,
-                            headers: headers,
-                            body: shouldSendBody(method) ? body : undefined,
-                            signal: abortSignal,
-                            cache: cache,
-                            credentials: withCrossDomainCredentials ? 'include' : 'same-origin',
-                        })];
-                case 1:
-                    resp = _e.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    e_1 = _e.sent();
-                    // TODO: needs to revise error handling in v6
-                    // For now this is a thin wrapper over original fetch error similar to cognito-identity-js package.
-                    // Ref: https://github.com/aws-amplify/amplify-js/blob/4fbc8c0a2be7526aab723579b4c95b552195a80b/packages/amazon-cognito-identity-js/src/Client.js#L103-L108
-                    if (e_1 instanceof TypeError) {
-                        throw new Error('Network error');
-                    }
-                    throw e_1;
-                case 3:
-                    responseHeaders = {};
-                    (_c = resp.headers) === null || _c === void 0 ? void 0 : _c.forEach(function (value, key) {
-                        responseHeaders[key.toLowerCase()] = value;
-                    });
-                    httpResponse = {
-                        statusCode: resp.status,
-                        headers: responseHeaders,
-                        body: null,
-                    };
-                    bodyWithMixin = Object.assign((_d = resp.body) !== null && _d !== void 0 ? _d : {}, {
-                        text: withMemoization(function () { return resp.text(); }),
-                        blob: withMemoization(function () { return resp.blob(); }),
-                        json: withMemoization(function () { return resp.json(); }),
-                    });
-                    return [2 /*return*/, __assign(__assign({}, httpResponse), { body: bodyWithMixin })];
-            }
+export const fetchTransferHandler = async ({ url, method, headers, body }, { abortSignal, cache, withCrossDomainCredentials }) => {
+    let resp;
+    try {
+        resp = await fetch(url, {
+            method,
+            headers,
+            body: shouldSendBody(method) ? body : undefined,
+            signal: abortSignal,
+            cache,
+            credentials: withCrossDomainCredentials ? 'include' : 'same-origin',
         });
+    }
+    catch (e) {
+        // TODO: needs to revise error handling in v6
+        // For now this is a thin wrapper over original fetch error similar to cognito-identity-js package.
+        // Ref: https://github.com/aws-amplify/amplify-js/blob/4fbc8c0a2be7526aab723579b4c95b552195a80b/packages/amazon-cognito-identity-js/src/Client.js#L103-L108
+        if (e instanceof TypeError) {
+            throw new Error('Network error');
+        }
+        throw e;
+    }
+    const responseHeaders = {};
+    resp.headers?.forEach((value, key) => {
+        responseHeaders[key.toLowerCase()] = value;
     });
+    const httpResponse = {
+        statusCode: resp.status,
+        headers: responseHeaders,
+        body: null,
+    };
+    // resp.body is a ReadableStream according to Fetch API spec, but React Native
+    // does not implement it.
+    const bodyWithMixin = Object.assign(resp.body ?? {}, {
+        text: withMemoization(() => resp.text()),
+        blob: withMemoization(() => resp.blob()),
+        json: withMemoization(() => resp.json()),
+    });
+    return {
+        ...httpResponse,
+        body: bodyWithMixin,
+    };
 };

package/lib-esm/clients/handlers/unauthenticated.js

@@ -4,4 +4,4 @@ import { retryMiddleware } from '../middleware/retry';
 import { userAgentMiddleware } from '../middleware/userAgent';
 import { composeTransferHandler } from '../internal/composeTransferHandler';
 import { fetchTransferHandler } from './fetch';
-export var unauthenticatedHandler = composeTransferHandler(fetchTransferHandler, [userAgentMiddleware, retryMiddleware]);
+export const unauthenticatedHandler = composeTransferHandler(fetchTransferHandler, [userAgentMiddleware, retryMiddleware]);

package/lib-esm/clients/internal/composeServiceApi.js

@@ -1,71 +1,21 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-export var composeServiceApi = function (transferHandler, serializer, deserializer, defaultConfig) {
-    return function (config, input) { return __awaiter(void 0, void 0, void 0, function () {
-        var resolvedConfig, endpoint, request, response;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    resolvedConfig = __assign(__assign({}, defaultConfig), config);
-                    return [4 /*yield*/, resolvedConfig.endpointResolver(resolvedConfig, input)];
-                case 1:
-                    endpoint = _a.sent();
-                    return [4 /*yield*/, serializer(input, endpoint)];
-                case 2:
-                    request = _a.sent();
-                    return [4 /*yield*/, transferHandler(request, __assign({}, resolvedConfig))];
-                case 3:
-                    response = _a.sent();
-                    return [4 /*yield*/, deserializer(response)];
-                case 4: return [2 /*return*/, _a.sent()];
-            }
+export const composeServiceApi = (transferHandler, serializer, deserializer, defaultConfig) => {
+    return async (config, input) => {
+        const resolvedConfig = {
+            ...defaultConfig,
+            ...config,
+        };
+        // We may want to allow different endpoints from given config(other than region) and input.
+        // Currently S3 supports additional `useAccelerateEndpoint` option to use accelerate endpoint.
+        const endpoint = await resolvedConfig.endpointResolver(resolvedConfig, input);
+        // Unlike AWS SDK clients, a serializer should NOT populate the `host` or `content-length` headers.
+        // Both of these headers are prohibited per Spec(https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_header_name).
+        // They will be populated automatically by browser, or node-fetch polyfill.
+        const request = await serializer(input, endpoint);
+        const response = await transferHandler(request, {
+            ...resolvedConfig,
         });
-    }); };
+        return await deserializer(response);
+    };
 };

package/lib-esm/clients/internal/composeTransferHandler.js

@@ -8,15 +8,13 @@
  * 	transfer handler's option type and the middleware's option type.
  * @internal
  */
-export var composeTransferHandler = function (coreHandler, middleware) {
-    return function (request, options) {
-        var context = {};
-        var composedHandler = function (request) { return coreHandler(request, options); };
-        for (var i = middleware.length - 1; i >= 0; i--) {
-            var m = middleware[i];
-            var resolvedMiddleware = m(options);
-            composedHandler = resolvedMiddleware(composedHandler, context);
-        }
-        return composedHandler(request);
-    };
+export const composeTransferHandler = (coreHandler, middleware) => (request, options) => {
+    const context = {};
+    let composedHandler = (request) => coreHandler(request, options);
+    for (let i = middleware.length - 1; i >= 0; i--) {
+        const m = middleware[i];
+        const resolvedMiddleware = m(options);
+        composedHandler = resolvedMiddleware(composedHandler, context);
+    }
+    return composedHandler(request);
 };

package/lib-esm/clients/middleware/retry/defaultRetryDecider.js

@@ -1,74 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { isClockSkewError } from './isClockSkewError';
 /**
  * Get retry decider function
  * @param errorParser Function to load JavaScript error from HTTP response
  */
-export var getRetryDecider = function (errorParser) {
-    return function (response, error) { return __awaiter(void 0, void 0, void 0, function () {
-        var parsedError, _a, errorCode, statusCode;
-        var _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    if (!((_b = error) !== null && _b !== void 0)) return [3 /*break*/, 1];
-                    _a = _b;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, errorParser(response)];
-                case 2:
-                    _a = (_d.sent());
-                    _d.label = 3;
-                case 3:
-                    parsedError = (_c = _a) !== null && _c !== void 0 ? _c : undefined;
-                    errorCode = parsedError === null || parsedError === void 0 ? void 0 : parsedError['code'];
-                    statusCode = response === null || response === void 0 ? void 0 : response.statusCode;
-                    return [2 /*return*/, (isConnectionError(error) ||
-                            isThrottlingError(statusCode, errorCode) ||
-                            isClockSkewError(errorCode) ||
-                            isServerSideError(statusCode, errorCode))];
-            }
-        });
-    }); };
+export const getRetryDecider = (errorParser) => async (response, error) => {
+    const parsedError = error ??
+        (await errorParser(response)) ??
+        undefined;
+    const errorCode = parsedError?.['code'];
+    const statusCode = response?.statusCode;
+    return (isConnectionError(error) ||
+        isThrottlingError(statusCode, errorCode) ||
+        isClockSkewError(errorCode) ||
+        isServerSideError(statusCode, errorCode));
 };
 // reference: https://github.com/aws/aws-sdk-js-v3/blob/ab0e7be36e7e7f8a0c04834357aaad643c7912c3/packages/service-error-classification/src/constants.ts#L22-L37
-var THROTTLING_ERROR_CODES = [
+const THROTTLING_ERROR_CODES = [
     'BandwidthLimitExceeded',
     'EC2ThrottledException',
     'LimitExceededException',
@@ -83,19 +32,13 @@ var THROTTLING_ERROR_CODES = [
     'ThrottlingException',
     'TooManyRequestsException',
 ];
-var TIMEOUT_ERROR_CODES = [
+const TIMEOUT_ERROR_CODES = [
     'TimeoutError',
     'RequestTimeout',
     'RequestTimeoutException',
 ];
-var isThrottlingError = function (statusCode, errorCode) {
-    return statusCode === 429 ||
-        (!!errorCode && THROTTLING_ERROR_CODES.includes(errorCode));
-};
-var isConnectionError = function (error) {
-    return (error === null || error === void 0 ? void 0 : error['name']) === 'Network error';
-};
-var isServerSideError = function (statusCode, errorCode) {
-    return (!!statusCode && [500, 502, 503, 504].includes(statusCode)) ||
-        (!!errorCode && TIMEOUT_ERROR_CODES.includes(errorCode));
-};
+const isThrottlingError = (statusCode, errorCode) => statusCode === 429 ||
+    (!!errorCode && THROTTLING_ERROR_CODES.includes(errorCode));
+const isConnectionError = (error) => error?.['name'] === 'Network error';
+const isServerSideError = (statusCode, errorCode) => (!!statusCode && [500, 502, 503, 504].includes(statusCode)) ||
+    (!!errorCode && TIMEOUT_ERROR_CODES.includes(errorCode));

package/lib-esm/clients/middleware/retry/isClockSkewError.js

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 // via https://github.com/aws/aws-sdk-js-v3/blob/ab0e7be36e7e7f8a0c04834357aaad643c7912c3/packages/service-error-classification/src/constants.ts#L8
-var CLOCK_SKEW_ERROR_CODES = [
+const CLOCK_SKEW_ERROR_CODES = [
     'AuthFailure',
     'InvalidSignatureException',
     'RequestExpired',
@@ -18,6 +18,4 @@ var CLOCK_SKEW_ERROR_CODES = [
  *
  * @internal
  */
-export var isClockSkewError = function (errorCode) {
-    return !!errorCode && CLOCK_SKEW_ERROR_CODES.includes(errorCode);
-};
+export const isClockSkewError = (errorCode) => !!errorCode && CLOCK_SKEW_ERROR_CODES.includes(errorCode);

package/lib-esm/clients/middleware/retry/jitteredBackoff.js

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // TODO: [v6] The separate retry utility is used by Data packages now and will replaced by retry middleware.
 import { jitteredBackoff as jitteredBackoffUtil } from '../../../utils';
-var DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
-export var jitteredBackoff = function (attempt) {
-    var delayFunction = jitteredBackoffUtil(DEFAULT_MAX_DELAY_MS);
-    var delay = delayFunction(attempt);
+const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
+export const jitteredBackoff = attempt => {
+    const delayFunction = jitteredBackoffUtil(DEFAULT_MAX_DELAY_MS);
+    const delay = delayFunction(attempt);
     // The delayFunction returns false when the delay is greater than the max delay(5 mins).
     // In this case, the retry middleware will delay 5 mins instead, as a ceiling of the delay.
     return delay === false ? DEFAULT_MAX_DELAY_MS : delay;

package/lib-esm/clients/middleware/retry/middleware.js

@@ -1,150 +1,86 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var DEFAULT_RETRY_ATTEMPTS = 3;
+const DEFAULT_RETRY_ATTEMPTS = 3;
 /**
  * Retry middleware
  */
-export var retryMiddleware = function (_a) {
-    var _b = _a.maxAttempts, maxAttempts = _b === void 0 ? DEFAULT_RETRY_ATTEMPTS : _b, retryDecider = _a.retryDecider, computeDelay = _a.computeDelay, abortSignal = _a.abortSignal;
+export const retryMiddleware = ({ maxAttempts = DEFAULT_RETRY_ATTEMPTS, retryDecider, computeDelay, abortSignal, }) => {
     if (maxAttempts < 1) {
         throw new Error('maxAttempts must be greater than 0');
     }
-    return function (next, context) {
-        return function retryMiddleware(request) {
-            var _a, _b, _c;
-            return __awaiter(this, void 0, void 0, function () {
-                var error, attemptsCount, response, handleTerminalErrorOrResponse, e_1, delay;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            attemptsCount = (_a = context.attemptsCount) !== null && _a !== void 0 ? _a : 0;
-                            handleTerminalErrorOrResponse = function () {
-                                if (response) {
-                                    addOrIncrementMetadataAttempts(response, attemptsCount);
-                                    return response;
-                                }
-                                else {
-                                    addOrIncrementMetadataAttempts(error, attemptsCount);
-                                    throw error;
-                                }
-                            };
-                            _d.label = 1;
-                        case 1:
-                            if (!(!(abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) && attemptsCount < maxAttempts)) return [3 /*break*/, 11];
-                            _d.label = 2;
-                        case 2:
-                            _d.trys.push([2, 4, , 5]);
-                            return [4 /*yield*/, next(request)];
-                        case 3:
-                            response = _d.sent();
-                            error = undefined;
-                            return [3 /*break*/, 5];
-                        case 4:
-                            e_1 = _d.sent();
-                            error = e_1;
-                            response = undefined;
-                            return [3 /*break*/, 5];
-                        case 5:
-                            // context.attemptsCount may be updated after calling next handler which may retry the request by itself.
-                            attemptsCount =
-                                ((_b = context.attemptsCount) !== null && _b !== void 0 ? _b : 0) > attemptsCount
-                                    ? (_c = context.attemptsCount) !== null && _c !== void 0 ? _c : 0
-                                    : attemptsCount + 1;
-                            context.attemptsCount = attemptsCount;
-                            return [4 /*yield*/, retryDecider(response, error)];
-                        case 6:
-                            if (!_d.sent()) return [3 /*break*/, 9];
-                            if (!(!(abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) && attemptsCount < maxAttempts)) return [3 /*break*/, 8];
-                            delay = computeDelay(attemptsCount);
-                            return [4 /*yield*/, cancellableSleep(delay, abortSignal)];
-                        case 7:
-                            _d.sent();
-                            _d.label = 8;
-                        case 8: return [3 /*break*/, 1];
-                        case 9: return [2 /*return*/, handleTerminalErrorOrResponse()];
-                        case 10: return [3 /*break*/, 1];
-                        case 11:
-                            if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
-                                throw new Error('Request aborted.');
-                            }
-                            else {
-                                return [2 /*return*/, handleTerminalErrorOrResponse()];
-                            }
-                            return [2 /*return*/];
-                    }
-                });
-            });
+    return (next, context) => async function retryMiddleware(request) {
+        let error;
+        let attemptsCount = context.attemptsCount ?? 0;
+        let response;
+        // When retry is not needed or max attempts is reached, either error or response will be set. This function handles either cases.
+        const handleTerminalErrorOrResponse = () => {
+            if (response) {
+                addOrIncrementMetadataAttempts(response, attemptsCount);
+                return response;
+            }
+            else {
+                addOrIncrementMetadataAttempts(error, attemptsCount);
+                throw error;
+            }
         };
+        while (!abortSignal?.aborted && attemptsCount < maxAttempts) {
+            try {
+                response = await next(request);
+                error = undefined;
+            }
+            catch (e) {
+                error = e;
+                response = undefined;
+            }
+            // context.attemptsCount may be updated after calling next handler which may retry the request by itself.
+            attemptsCount =
+                (context.attemptsCount ?? 0) > attemptsCount
+                    ? context.attemptsCount ?? 0
+                    : attemptsCount + 1;
+            context.attemptsCount = attemptsCount;
+            if (await retryDecider(response, error)) {
+                if (!abortSignal?.aborted && attemptsCount < maxAttempts) {
+                    // prevent sleep for last attempt or cancelled request;
+                    const delay = computeDelay(attemptsCount);
+                    await cancellableSleep(delay, abortSignal);
+                }
+                continue;
+            }
+            else {
+                return handleTerminalErrorOrResponse();
+            }
+        }
+        if (abortSignal?.aborted) {
+            throw new Error('Request aborted.');
+        }
+        else {
+            return handleTerminalErrorOrResponse();
+        }
     };
 };
-var cancellableSleep = function (timeoutMs, abortSignal) {
-    if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+const cancellableSleep = (timeoutMs, abortSignal) => {
+    if (abortSignal?.aborted) {
         return Promise.resolve();
     }
-    var timeoutId;
-    var sleepPromiseResolveFn;
-    var sleepPromise = new Promise(function (resolve) {
+    let timeoutId;
+    let sleepPromiseResolveFn;
+    const sleepPromise = new Promise(resolve => {
         sleepPromiseResolveFn = resolve;
         timeoutId = setTimeout(resolve, timeoutMs);
     });
-    abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', function cancelSleep(event) {
+    abortSignal?.addEventListener('abort', function cancelSleep(event) {
         clearTimeout(timeoutId);
-        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', cancelSleep);
+        abortSignal?.removeEventListener('abort', cancelSleep);
         sleepPromiseResolveFn();
     });
     return sleepPromise;
 };
-var addOrIncrementMetadataAttempts = function (nextHandlerOutput, attempts) {
-    var _a;
+const addOrIncrementMetadataAttempts = (nextHandlerOutput, attempts) => {
     if (Object.prototype.toString.call(nextHandlerOutput) !== '[object Object]') {
         return;
     }
-    nextHandlerOutput['$metadata'] = __assign(__assign({}, ((_a = nextHandlerOutput['$metadata']) !== null && _a !== void 0 ? _a : {})), { attempts: attempts });
+    nextHandlerOutput['$metadata'] = {
+        ...(nextHandlerOutput['$metadata'] ?? {}),
+        attempts,
+    };
 };