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

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

@@ -1,78 +1,27 @@
 "use strict";
 // 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRetryDecider = void 0;
-var isClockSkewError_1 = require("./isClockSkewError");
+const isClockSkewError_1 = require("./isClockSkewError");
 /**
  * Get retry decider function
  * @param errorParser Function to load JavaScript error from HTTP response
  */
-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) ||
-                            (0, isClockSkewError_1.isClockSkewError)(errorCode) ||
-                            isServerSideError(statusCode, errorCode))];
-            }
-        });
-    }); };
+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) ||
+        (0, isClockSkewError_1.isClockSkewError)(errorCode) ||
+        isServerSideError(statusCode, errorCode));
 };
 exports.getRetryDecider = getRetryDecider;
 // 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',
@@ -87,19 +36,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/clients/middleware/retry/isClockSkewError.js

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isClockSkewError = void 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',
@@ -21,7 +21,5 @@ var CLOCK_SKEW_ERROR_CODES = [
  *
  * @internal
  */
-var isClockSkewError = function (errorCode) {
-    return !!errorCode && CLOCK_SKEW_ERROR_CODES.includes(errorCode);
-};
+const isClockSkewError = (errorCode) => !!errorCode && CLOCK_SKEW_ERROR_CODES.includes(errorCode);
 exports.isClockSkewError = isClockSkewError;

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

@@ -4,11 +4,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jitteredBackoff = void 0;
 // TODO: [v6] The separate retry utility is used by Data packages now and will replaced by retry middleware.
-var utils_1 = require("../../../utils");
-var DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
-var jitteredBackoff = function (attempt) {
-    var delayFunction = (0, utils_1.jitteredBackoff)(DEFAULT_MAX_DELAY_MS);
-    var delay = delayFunction(attempt);
+const utils_1 = require("../../../utils");
+const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
+const jitteredBackoff = attempt => {
+    const delayFunction = (0, utils_1.jitteredBackoff)(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/clients/middleware/retry/middleware.js

@@ -1,154 +1,90 @@
 "use strict";
 // 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retryMiddleware = void 0;
-var DEFAULT_RETRY_ATTEMPTS = 3;
+const DEFAULT_RETRY_ATTEMPTS = 3;
 /**
  * Retry middleware
  */
-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;
+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();
+        }
     };
 };
 exports.retryMiddleware = retryMiddleware;
-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,
+    };
 };

package/lib/clients/middleware/signing/middleware.js

@@ -1,99 +1,37 @@
 "use strict";
 // 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signingMiddleware = void 0;
-var signatureV4_1 = require("./signer/signatureV4");
-var getSkewCorrectedDate_1 = require("./utils/getSkewCorrectedDate");
-var getUpdatedSystemClockOffset_1 = require("./utils/getUpdatedSystemClockOffset");
+const signatureV4_1 = require("./signer/signatureV4");
+const getSkewCorrectedDate_1 = require("./utils/getSkewCorrectedDate");
+const getUpdatedSystemClockOffset_1 = require("./utils/getUpdatedSystemClockOffset");
 /**
  * Middleware that SigV4 signs request with AWS credentials, and correct system clock offset.
  * This middleware is expected to be placed after retry middleware.
  */
-var signingMiddleware = function (_a) {
-    var credentials = _a.credentials, region = _a.region, service = _a.service, _b = _a.uriEscapePath, uriEscapePath = _b === void 0 ? true : _b;
-    var currentSystemClockOffset;
-    return function (next) {
-        return function signingMiddleware(request) {
-            return __awaiter(this, void 0, void 0, function () {
-                var signRequestOptions, _a, signedRequest, response, dateString;
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            currentSystemClockOffset = currentSystemClockOffset !== null && currentSystemClockOffset !== void 0 ? currentSystemClockOffset : 0;
-                            _b = {};
-                            if (!(typeof credentials === 'function')) return [3 /*break*/, 2];
-                            return [4 /*yield*/, credentials()];
-                        case 1:
-                            _a = _c.sent();
-                            return [3 /*break*/, 3];
-                        case 2:
-                            _a = credentials;
-                            _c.label = 3;
-                        case 3:
-                            signRequestOptions = (_b.credentials = _a,
-                                _b.signingDate = (0, getSkewCorrectedDate_1.getSkewCorrectedDate)(currentSystemClockOffset),
-                                _b.signingRegion = region,
-                                _b.signingService = service,
-                                _b.uriEscapePath = uriEscapePath,
-                                _b);
-                            return [4 /*yield*/, (0, signatureV4_1.signRequest)(request, signRequestOptions)];
-                        case 4:
-                            signedRequest = _c.sent();
-                            return [4 /*yield*/, next(signedRequest)];
-                        case 5:
-                            response = _c.sent();
-                            dateString = getDateHeader(response);
-                            if (dateString) {
-                                currentSystemClockOffset = (0, getUpdatedSystemClockOffset_1.getUpdatedSystemClockOffset)(Date.parse(dateString), currentSystemClockOffset);
-                            }
-                            return [2 /*return*/, response];
-                    }
-                });
-            });
+const signingMiddleware = ({ credentials, region, service, uriEscapePath = true, }) => {
+    let currentSystemClockOffset;
+    return (next) => async function signingMiddleware(request) {
+        currentSystemClockOffset = currentSystemClockOffset ?? 0;
+        const signRequestOptions = {
+            credentials: typeof credentials === 'function' ? await credentials() : credentials,
+            signingDate: (0, getSkewCorrectedDate_1.getSkewCorrectedDate)(currentSystemClockOffset),
+            signingRegion: region,
+            signingService: service,
+            uriEscapePath,
         };
+        const signedRequest = await (0, signatureV4_1.signRequest)(request, signRequestOptions);
+        const response = await next(signedRequest);
+        // Update system clock offset if response contains date header, regardless of the status code.
+        // non-2xx response will still be returned from next handler instead of thrown, because it's
+        // only thrown by the retry middleware.
+        const dateString = getDateHeader(response);
+        if (dateString) {
+            currentSystemClockOffset = (0, getUpdatedSystemClockOffset_1.getUpdatedSystemClockOffset)(Date.parse(dateString), currentSystemClockOffset);
+        }
+        return response;
     };
 };
 exports.signingMiddleware = signingMiddleware;
-var getDateHeader = function (_a) {
-    var _b, _c;
-    var _d = _a === void 0 ? {} : _a, headers = _d.headers;
-    return (_c = (_b = headers === null || headers === void 0 ? void 0 : headers.date) !== null && _b !== void 0 ? _b : headers === null || headers === void 0 ? void 0 : headers.Date) !== null && _c !== void 0 ? _c : headers === null || headers === void 0 ? void 0 : headers['x-amz-date'];
-};
+const getDateHeader = ({ headers } = {}) => headers?.date ?? headers?.Date ?? headers?.['x-amz-date'];

package/lib/clients/middleware/signing/signer/signatureV4/index.js

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHashedPayload = exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
-// TODO: V6 replace Signer
 var signRequest_1 = require("./signRequest");
 Object.defineProperty(exports, "signRequest", { enumerable: true, get: function () { return signRequest_1.signRequest; } });
 var presignUrl_1 = require("./presignUrl");

package/lib/clients/middleware/signing/signer/signatureV4/presignUrl.js

@@ -1,50 +1,12 @@
 "use strict";
 // 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 __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.presignUrl = void 0;
-var constants_1 = require("./constants");
-var getSigningValues_1 = require("./utils/getSigningValues");
-var getSignature_1 = require("./utils/getSignature");
-var amplifyUrl_1 = require("../../../../../utils/amplifyUrl");
+const constants_1 = require("./constants");
+const getSigningValues_1 = require("./utils/getSigningValues");
+const getSignature_1 = require("./utils/getSignature");
+const amplifyUrl_1 = require("../../../../../utils/amplifyUrl");
 /**
  * Given a `Presignable` object, returns a Signature Version 4 presigned `URL` object.
  *
@@ -52,27 +14,30 @@ var amplifyUrl_1 = require("../../../../../utils/amplifyUrl");
  * @param presignUrlOptions `PresignUrlOptions` object containing values used to construct the signature.
  * @returns A `URL` with authentication query params which can grant temporary access to AWS resources.
  */
-var presignUrl = function (_a, _b) {
-    var _c, _d, _e, _f;
-    var body = _a.body, _g = _a.method, method = _g === void 0 ? 'GET' : _g, url = _a.url;
-    var expiration = _b.expiration, options = __rest(_b, ["expiration"]);
-    var signingValues = (0, getSigningValues_1.getSigningValues)(options);
-    var accessKeyId = signingValues.accessKeyId, credentialScope = signingValues.credentialScope, longDate = signingValues.longDate, sessionToken = signingValues.sessionToken;
+const presignUrl = ({ body, method = 'GET', url }, { expiration, ...options }) => {
+    const signingValues = (0, getSigningValues_1.getSigningValues)(options);
+    const { accessKeyId, credentialScope, longDate, sessionToken } = signingValues;
     // create the request to sign
     // @ts-ignore URL constructor accepts a URL object
-    var presignedUrl = new amplifyUrl_1.AmplifyUrl(url);
-    Object.entries(__assign(__assign((_c = {}, _c[constants_1.ALGORITHM_QUERY_PARAM] = constants_1.SHA256_ALGORITHM_IDENTIFIER, _c[constants_1.CREDENTIAL_QUERY_PARAM] = "".concat(accessKeyId, "/").concat(credentialScope), _c[constants_1.AMZ_DATE_QUERY_PARAM] = longDate, _c[constants_1.SIGNED_HEADERS_QUERY_PARAM] = constants_1.HOST_HEADER, _c), (expiration && (_d = {}, _d[constants_1.EXPIRES_QUERY_PARAM] = expiration.toString(), _d))), (sessionToken && (_e = {}, _e[constants_1.TOKEN_QUERY_PARAM] = sessionToken, _e)))).forEach(function (_a) {
-        var _b = __read(_a, 2), key = _b[0], value = _b[1];
+    const presignedUrl = new amplifyUrl_1.AmplifyUrl(url);
+    Object.entries({
+        [constants_1.ALGORITHM_QUERY_PARAM]: constants_1.SHA256_ALGORITHM_IDENTIFIER,
+        [constants_1.CREDENTIAL_QUERY_PARAM]: `${accessKeyId}/${credentialScope}`,
+        [constants_1.AMZ_DATE_QUERY_PARAM]: longDate,
+        [constants_1.SIGNED_HEADERS_QUERY_PARAM]: constants_1.HOST_HEADER,
+        ...(expiration && { [constants_1.EXPIRES_QUERY_PARAM]: expiration.toString() }),
+        ...(sessionToken && { [constants_1.TOKEN_QUERY_PARAM]: sessionToken }),
+    }).forEach(([key, value]) => {
         presignedUrl.searchParams.append(key, value);
     });
-    var requestToSign = {
-        body: body,
-        headers: (_f = {}, _f[constants_1.HOST_HEADER] = url.host, _f),
-        method: method,
+    const requestToSign = {
+        body,
+        headers: { [constants_1.HOST_HEADER]: url.host },
+        method,
         url: presignedUrl,
     };
     // calculate and add the signature to the url
-    var signature = (0, getSignature_1.getSignature)(requestToSign, signingValues);
+    const signature = (0, getSignature_1.getSignature)(requestToSign, signingValues);
     presignedUrl.searchParams.append(constants_1.SIGNATURE_QUERY_PARAM, signature);
     return presignedUrl;
 };