@aws-amplify/core 6.10.6 → 6.10.7-unstable.65207a6.0

package/src/clients/index.ts

@@ -4,13 +4,13 @@
 export { getDnsSuffix } from './endpoints';
 
 export { fetchTransferHandler } from './handlers/fetch';
-export { unauthenticatedHandler } from './handlers/unauthenticated';
-export { authenticatedHandler } from './handlers/authenticated';
+export { unauthenticatedHandler } from './handlers/aws/unauthenticated';
+export { authenticatedHandler } from './handlers/aws/authenticated';
 export {
 	getHashedPayload,
 	presignUrl,
-	PresignUrlOptions,
 	signRequest,
+	PresignUrlOptions,
 	SignRequestOptions,
 } from './middleware/signing/signer/signatureV4';
 export { EMPTY_HASH as EMPTY_SHA256_HASH } from './middleware/signing/signer/signatureV4/constants';
@@ -22,10 +22,13 @@ export {
 } from './middleware/signing';
 export {
 	getRetryDecider,
-	RetryDeciderOutput,
 	jitteredBackoff,
 	retryMiddlewareFactory,
+	amzSdkInvocationIdHeaderMiddlewareFactory,
+	amzSdkRequestHeaderMiddlewareFactory,
+	RetryDeciderOutput,
 	RetryOptions,
+	AmzSdkRequestHeaderMiddlewareOptions,
 } from './middleware/retry';
 export {
 	userAgentMiddlewareFactory,

package/src/clients/middleware/retry/amzSdkInvocationIdHeaderMiddleware.ts

@@ -0,0 +1,31 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { HttpRequest, HttpResponse, Middleware } from '../../types';
+import { amplifyUuid } from '../../../libraryUtils';
+
+import { AMZ_SDK_INVOCATION_ID_HEADER } from './constants';
+
+/**
+ * Middleware injects a UUID string to `amz-sdk-invocation-id` header.
+ * if the header is not set already. This header is helpful to provide
+ * observability to group the requests caused by automatic retry.
+ *
+ * This middleware is standalone because of extra UUID dependency, we will
+ * NOT use this middleware for API categories.
+ *
+ * Ref: https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/1.0.9/http-client/aws.smithy.kotlin.runtime.http.operation/-http-operation-context/-sdk-invocation-id.html
+ */
+export const amzSdkInvocationIdHeaderMiddlewareFactory: Middleware<
+	HttpRequest,
+	HttpResponse,
+	object
+> = () => next => {
+	return async function amzSdkInvocationIdHeaderMiddleware(request) {
+		if (!request.headers[AMZ_SDK_INVOCATION_ID_HEADER]) {
+			request.headers[AMZ_SDK_INVOCATION_ID_HEADER] = amplifyUuid();
+		}
+
+		return next(request);
+	};
+};

package/src/clients/middleware/retry/amzSdkRequestHeaderMiddleware.ts

@@ -0,0 +1,38 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { HttpRequest, HttpResponse, Middleware } from '../../types';
+
+import { RetryOptions } from './retryMiddleware';
+import { AMZ_SDK_REQUEST_HEADER, DEFAULT_RETRY_ATTEMPTS } from './constants';
+
+export type AmzSdkRequestHeaderMiddlewareOptions = Pick<
+	RetryOptions,
+	'maxAttempts'
+>;
+
+/**
+ * Middleware injects `amz-sdk-request` header to indicate the retry state at the time an HTTP request is made.
+ * This middleware should co-exist with retryMiddleware as it relies on the retryAttempts value in middleware context
+ * set by the retry middleware.
+ *
+ * Example header: `amz-sdk-request: attempt=1; max=3`.
+ *
+ * This middleware is standalone because of extra headers may conflict with custom endpoint settings(e.g. CORS), we will
+ * NOT use this middleware for API categories.
+ */
+export const amzSdkRequestHeaderMiddlewareFactory: Middleware<
+	HttpRequest,
+	HttpResponse,
+	AmzSdkRequestHeaderMiddlewareOptions
+> =
+	({ maxAttempts = DEFAULT_RETRY_ATTEMPTS }) =>
+	(next, context) => {
+		return async function amzSdkRequestHeaderMiddleware(request) {
+			const attemptsCount: number = context.attemptsCount ?? 0;
+			request.headers[AMZ_SDK_REQUEST_HEADER] =
+				`attempt=${attemptsCount + 1}; max=${maxAttempts}`;
+
+			return next(request);
+		};
+	};

package/src/clients/middleware/retry/constants.ts

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const DEFAULT_RETRY_ATTEMPTS = 3;
+
+export const AMZ_SDK_INVOCATION_ID_HEADER = 'amz-sdk-invocation-id';
+
+export const AMZ_SDK_REQUEST_HEADER = 'amz-sdk-request';
+
+export const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;

package/src/clients/middleware/retry/index.ts

@@ -1,7 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { RetryOptions, retryMiddlewareFactory } from './middleware';
+export { RetryOptions, retryMiddlewareFactory } from './retryMiddleware';
 export { jitteredBackoff } from './jitteredBackoff';
 export { getRetryDecider } from './defaultRetryDecider';
 export { RetryDeciderOutput } from './types';
+export { amzSdkInvocationIdHeaderMiddlewareFactory } from './amzSdkInvocationIdHeaderMiddleware';
+export {
+	amzSdkRequestHeaderMiddlewareFactory,
+	AmzSdkRequestHeaderMiddlewareOptions,
+} from './amzSdkRequestHeaderMiddleware';

package/src/clients/middleware/retry/jitteredBackoff.ts

@@ -3,11 +3,10 @@
 
 import { jitteredBackoff as jitteredBackoffUtil } from '../../../utils';
 
-import type { RetryOptions } from './middleware';
+import type { RetryOptions } from './retryMiddleware';
+import { DEFAULT_MAX_DELAY_MS } from './constants';
 // TODO: [v6] The separate retry utility is used by Data packages now and will replaced by retry middleware.
 
-const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
-
 export const jitteredBackoff: RetryOptions['computeDelay'] = attempt => {
 	const delayFunction = jitteredBackoffUtil(DEFAULT_MAX_DELAY_MS);
 	const delay = delayFunction(attempt);

package/src/clients/middleware/retry/{middleware.ts → retryMiddleware.ts}

@@ -1,21 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 import {
+	HttpRequest,
+	HttpResponse,
 	MiddlewareContext,
 	MiddlewareHandler,
-	Request,
-	Response,
-} from '../../types/core';
+} from '../../types';
 
+import { DEFAULT_RETRY_ATTEMPTS } from './constants';
 import { RetryDeciderOutput } from './types';
 
-const DEFAULT_RETRY_ATTEMPTS = 3;
-
 /**
  * Configuration of the retry middleware
  */
-export interface RetryOptions<TResponse = Response> {
+export interface RetryOptions<TResponse extends HttpResponse = HttpResponse> {
 	/**
 	 * Function to decide if the request should be retried.
 	 *
@@ -47,9 +45,12 @@ export interface RetryOptions<TResponse = Response> {
 }
 
 /**
- * Retry middleware
+ * Middleware that executes the retry logic.
  */
-export const retryMiddlewareFactory = <TInput = Request, TOutput = Response>({
+export const retryMiddlewareFactory = <
+	TInput extends HttpRequest = HttpRequest,
+	TOutput extends HttpResponse = HttpResponse,
+>({
 	maxAttempts = DEFAULT_RETRY_ATTEMPTS,
 	retryDecider,
 	computeDelay,

package/src/clients/types/aws.ts

@@ -1,15 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 import { MetadataBearer } from '@aws-sdk/types';
 
 import { Endpoint } from './core';
 import { HttpResponse } from './http';
 
-export type {
-	AwsCredentialIdentity as Credentials,
-	MetadataBearer,
-} from '@aws-sdk/types';
+export type { AwsCredentialIdentity as Credentials } from '@aws-sdk/types';
 
 export type SourceData = string | ArrayBuffer | ArrayBufferView;
 

package/src/errors/AmplifyError.ts

@@ -1,11 +1,14 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
-import { AmplifyErrorParams } from '../types/errors';
+import { AmplifyErrorParams, ResponseMetadata } from '../types/errors';
 
 export class AmplifyError extends Error {
-	underlyingError?: Error | unknown;
-	recoverySuggestion?: string;
+	readonly underlyingError?: Error | unknown;
+	readonly recoverySuggestion?: string;
+	/**
+	 * Additional metadata that can be used to provide more context to the error.
+	 */
+	readonly metadata?: ResponseMetadata;
 	/**
 	 *  Constructs an AmplifyError.
 	 *
@@ -19,12 +22,18 @@ export class AmplifyError extends Error {
 		name,
 		recoverySuggestion,
 		underlyingError,
+		metadata,
 	}: AmplifyErrorParams) {
 		super(message);
 
 		this.name = name;
 		this.underlyingError = underlyingError;
 		this.recoverySuggestion = recoverySuggestion;
+		if (metadata) {
+			// If metadata exists, explicitly only record the following properties.
+			const { extendedRequestId, httpStatusCode, requestId } = metadata;
+			this.metadata = { extendedRequestId, httpStatusCode, requestId };
+		}
 
 		// Hack for making the custom error class work when transpiled to es5
 		// TODO: Delete the following 2 lines after we change the build target to >= es2015

package/src/libraryUtils.ts

@@ -62,6 +62,7 @@ export {
 	ModelAttribute,
 	SecondaryIndexAttribute,
 	GraphQLProviderConfig,
+	RetryStrategy,
 } from './singleton/API/types';
 export { Signer } from './Signer';
 export {

package/src/singleton/API/types.ts

@@ -5,7 +5,9 @@ import { AtLeastOne } from '../types';
 
 export interface LibraryAPIOptions {
 	GraphQL?: {
-		// custom headers for given GraphQL service. Will be applied to all operations.
+		/**
+		 * custom headers for given GraphQL service. Will be applied to all operations.
+		 */
 		headers?(options?: {
 			query?: string;
 			variables?: Record<string, DocumentType>;
@@ -13,11 +15,23 @@ export interface LibraryAPIOptions {
 		withCredentials?: boolean;
 	};
 	REST?: {
-		// custom headers for given REST service. Will be applied to all operations.
+		/**
+		 * custom headers for given REST service. Will be applied to all operations.
+		 */
 		headers?(options: { apiName: string }): Promise<Headers>;
+		/**
+		 * Retry strategy for the REST API calls.
+		 *
+		 * @default ` { strategy: 'jittered-exponential-backoff' } `
+		 */
+		retryStrategy?: RetryStrategy;
 	};
 }
 
+export interface RetryStrategy {
+	strategy: 'jittered-exponential-backoff' | 'no-retry';
+}
+
 export interface APIGraphQLConfig {
 	/**
 	 * Required GraphQL endpoint, must be a valid URL string.

package/src/singleton/Auth/types.ts

@@ -61,11 +61,7 @@ export interface CredentialsAndIdentityIdProvider {
 }
 
 export interface TokenProvider {
-	getTokens({
-		forceRefresh,
-	}?: {
-		forceRefresh?: boolean;
-	}): Promise<AuthTokens | null>;
+	getTokens(options?: { forceRefresh?: boolean }): Promise<AuthTokens | null>;
 }
 
 export interface FetchAuthSessionOptions {

package/src/types/errors.ts

@@ -1,5 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { ResponseMetadata as SdkResponseMetadata } from '@aws-sdk/types';
+
+export type ResponseMetadata = Pick<
+	SdkResponseMetadata,
+	'extendedRequestId' | 'httpStatusCode' | 'requestId'
+>;
 
 export enum AmplifyErrorCode {
 	NoEndpointId = 'NoEndpointId',
@@ -13,6 +19,7 @@ export interface AmplifyErrorParams<ErrorCode extends string = string> {
 	name: ErrorCode;
 	recoverySuggestion?: string;
 	underlyingError?: Error | unknown;
+	metadata?: ResponseMetadata;
 }
 
 export type AmplifyErrorMap<ErrorCode extends string = string> = Record<

package/dist/cjs/clients/handlers/authenticated.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authenticated.js","sources":["../../../../src/clients/handlers/authenticated.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.authenticatedHandler = void 0;\nconst retry_1 = require(\"../middleware/retry\");\nconst signing_1 = require(\"../middleware/signing\");\nconst userAgent_1 = require(\"../middleware/userAgent\");\nconst composeTransferHandler_1 = require(\"../internal/composeTransferHandler\");\nconst fetch_1 = require(\"./fetch\");\nexports.authenticatedHandler = (0, composeTransferHandler_1.composeTransferHandler)(fetch_1.fetchTransferHandler, [\n    userAgent_1.userAgentMiddlewareFactory,\n    retry_1.retryMiddlewareFactory,\n    signing_1.signingMiddlewareFactory,\n]);\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC7D,OAAO,CAAC,oBAAoB,GAAG,MAAM;AACrC,MAAM,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,uBAAuB,CAAC;AAClD,MAAM,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC;AACtD,MAAM,wBAAwB,GAAG,OAAO,CAAC,oCAAoC,CAAC;AAC9E,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;AAClC,OAAO,CAAC,oBAAoB,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,OAAO,CAAC,oBAAoB,EAAE;AAClH,IAAI,WAAW,CAAC,0BAA0B;AAC1C,IAAI,OAAO,CAAC,sBAAsB;AAClC,IAAI,SAAS,CAAC,wBAAwB;AACtC,CAAC,CAAC;;"}

package/dist/cjs/clients/handlers/unauthenticated.js

@@ -1,12 +0,0 @@
-'use strict';
-
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.unauthenticatedHandler = void 0;
-const retry_1 = require("../middleware/retry");
-const userAgent_1 = require("../middleware/userAgent");
-const composeTransferHandler_1 = require("../internal/composeTransferHandler");
-const fetch_1 = require("./fetch");
-exports.unauthenticatedHandler = (0, composeTransferHandler_1.composeTransferHandler)(fetch_1.fetchTransferHandler, [userAgent_1.userAgentMiddlewareFactory, retry_1.retryMiddlewareFactory]);
-//# sourceMappingURL=unauthenticated.js.map

package/dist/cjs/clients/handlers/unauthenticated.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"unauthenticated.js","sources":["../../../../src/clients/handlers/unauthenticated.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.unauthenticatedHandler = void 0;\nconst retry_1 = require(\"../middleware/retry\");\nconst userAgent_1 = require(\"../middleware/userAgent\");\nconst composeTransferHandler_1 = require(\"../internal/composeTransferHandler\");\nconst fetch_1 = require(\"./fetch\");\nexports.unauthenticatedHandler = (0, composeTransferHandler_1.composeTransferHandler)(fetch_1.fetchTransferHandler, [userAgent_1.userAgentMiddlewareFactory, retry_1.retryMiddlewareFactory]);\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC7D,OAAO,CAAC,sBAAsB,GAAG,MAAM;AACvC,MAAM,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC;AACtD,MAAM,wBAAwB,GAAG,OAAO,CAAC,oCAAoC,CAAC;AAC9E,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;AAClC,OAAO,CAAC,sBAAsB,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,OAAO,CAAC,oBAAoB,EAAE,CAAC,WAAW,CAAC,0BAA0B,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;;"}

package/dist/cjs/clients/middleware/retry/middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"middleware.js","sources":["../../../../../src/clients/middleware/retry/middleware.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.retryMiddlewareFactory = void 0;\nconst DEFAULT_RETRY_ATTEMPTS = 3;\n/**\n * Retry middleware\n */\nconst retryMiddlewareFactory = ({ maxAttempts = DEFAULT_RETRY_ATTEMPTS, retryDecider, computeDelay, abortSignal, }) => {\n    if (maxAttempts < 1) {\n        throw new Error('maxAttempts must be greater than 0');\n    }\n    return (next, context) => async function retryMiddleware(request) {\n        let error;\n        let attemptsCount = context.attemptsCount ?? 0;\n        let response;\n        // When retry is not needed or max attempts is reached, either error or response will be set. This function handles either cases.\n        const handleTerminalErrorOrResponse = () => {\n            if (response) {\n                addOrIncrementMetadataAttempts(response, attemptsCount);\n                return response;\n            }\n            else {\n                addOrIncrementMetadataAttempts(error, attemptsCount);\n                throw error;\n            }\n        };\n        while (!abortSignal?.aborted && attemptsCount < maxAttempts) {\n            try {\n                response = await next(request);\n                error = undefined;\n            }\n            catch (e) {\n                error = e;\n                response = undefined;\n            }\n            // context.attemptsCount may be updated after calling next handler which may retry the request by itself.\n            attemptsCount =\n                (context.attemptsCount ?? 0) > attemptsCount\n                    ? (context.attemptsCount ?? 0)\n                    : attemptsCount + 1;\n            context.attemptsCount = attemptsCount;\n            const { isCredentialsExpiredError, retryable } = await retryDecider(response, error, context);\n            if (retryable) {\n                // Setting isCredentialsInvalid flag to notify signing middleware to forceRefresh credentials provider.\n                context.isCredentialsExpired = !!isCredentialsExpiredError;\n                if (!abortSignal?.aborted && attemptsCount < maxAttempts) {\n                    // prevent sleep for last attempt or cancelled request;\n                    const delay = computeDelay(attemptsCount);\n                    await cancellableSleep(delay, abortSignal);\n                }\n                continue;\n            }\n            else {\n                return handleTerminalErrorOrResponse();\n            }\n        }\n        if (abortSignal?.aborted) {\n            throw new Error('Request aborted.');\n        }\n        else {\n            return handleTerminalErrorOrResponse();\n        }\n    };\n};\nexports.retryMiddlewareFactory = retryMiddlewareFactory;\nconst cancellableSleep = (timeoutMs, abortSignal) => {\n    if (abortSignal?.aborted) {\n        return Promise.resolve();\n    }\n    let timeoutId;\n    let sleepPromiseResolveFn;\n    const sleepPromise = new Promise(resolve => {\n        sleepPromiseResolveFn = resolve;\n        timeoutId = setTimeout(resolve, timeoutMs);\n    });\n    abortSignal?.addEventListener('abort', function cancelSleep(_) {\n        clearTimeout(timeoutId);\n        abortSignal?.removeEventListener('abort', cancelSleep);\n        sleepPromiseResolveFn();\n    });\n    return sleepPromise;\n};\nconst addOrIncrementMetadataAttempts = (nextHandlerOutput, attempts) => {\n    if (Object.prototype.toString.call(nextHandlerOutput) !== '[object Object]') {\n        return;\n    }\n    nextHandlerOutput.$metadata = {\n        ...(nextHandlerOutput.$metadata ?? {}),\n        attempts,\n    };\n};\n"],"names":[],"mappings":"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"}

package/dist/esm/clients/handlers/authenticated.d.ts

@@ -1,5 +0,0 @@
-import { RetryOptions } from '../middleware/retry';
-import { SigningOptions } from '../middleware/signing';
-import { UserAgentOptions } from '../middleware/userAgent';
-import { HttpRequest, HttpResponse } from '../types';
-export declare const authenticatedHandler: (request: HttpRequest, options: UserAgentOptions & RetryOptions<HttpResponse> & SigningOptions & import("../types").HttpTransferOptions) => Promise<HttpResponse>;

package/dist/esm/clients/handlers/authenticated.mjs

@@ -1,20 +0,0 @@
-import { retryMiddlewareFactory } from '../middleware/retry/middleware.mjs';
-import '../../types/errors.mjs';
-import '../../errors/errorHelpers.mjs';
-import '../../utils/getClientInfo/getClientInfo.mjs';
-import '../../utils/retry/retry.mjs';
-import { signingMiddlewareFactory } from '../middleware/signing/middleware.mjs';
-import { userAgentMiddlewareFactory } from '../middleware/userAgent/middleware.mjs';
-import { composeTransferHandler } from '../internal/composeTransferHandler.mjs';
-import { fetchTransferHandler } from './fetch.mjs';
-
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-const authenticatedHandler = composeTransferHandler(fetchTransferHandler, [
-    userAgentMiddlewareFactory,
-    retryMiddlewareFactory,
-    signingMiddlewareFactory,
-]);
-
-export { authenticatedHandler };
-//# sourceMappingURL=authenticated.mjs.map

package/dist/esm/clients/handlers/authenticated.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"authenticated.mjs","sources":["../../../../src/clients/handlers/authenticated.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { retryMiddlewareFactory } from '../middleware/retry';\nimport { signingMiddlewareFactory, } from '../middleware/signing';\nimport { userAgentMiddlewareFactory, } from '../middleware/userAgent';\nimport { composeTransferHandler } from '../internal/composeTransferHandler';\nimport { fetchTransferHandler } from './fetch';\nexport const authenticatedHandler = composeTransferHandler(fetchTransferHandler, [\n    userAgentMiddlewareFactory,\n    retryMiddlewareFactory,\n    signingMiddlewareFactory,\n]);\n"],"names":[],"mappings":";;;;;;;;;;AAAA;AACA;AAMY,MAAC,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,EAAE;AACjF,IAAI,0BAA0B;AAC9B,IAAI,sBAAsB;AAC1B,IAAI,wBAAwB;AAC5B,CAAC;;;;"}

package/dist/esm/clients/handlers/unauthenticated.d.ts

@@ -1,4 +0,0 @@
-import { RetryOptions } from '../middleware/retry';
-import { UserAgentOptions } from '../middleware/userAgent';
-import { HttpRequest, HttpResponse } from '../types';
-export declare const unauthenticatedHandler: (request: HttpRequest, options: UserAgentOptions & RetryOptions<HttpResponse> & import("../types").HttpTransferOptions) => Promise<HttpResponse>;

package/dist/esm/clients/handlers/unauthenticated.mjs

@@ -1,15 +0,0 @@
-import { retryMiddlewareFactory } from '../middleware/retry/middleware.mjs';
-import '../../types/errors.mjs';
-import '../../errors/errorHelpers.mjs';
-import '../../utils/getClientInfo/getClientInfo.mjs';
-import '../../utils/retry/retry.mjs';
-import { userAgentMiddlewareFactory } from '../middleware/userAgent/middleware.mjs';
-import { composeTransferHandler } from '../internal/composeTransferHandler.mjs';
-import { fetchTransferHandler } from './fetch.mjs';
-
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-const unauthenticatedHandler = composeTransferHandler(fetchTransferHandler, [userAgentMiddlewareFactory, retryMiddlewareFactory]);
-
-export { unauthenticatedHandler };
-//# sourceMappingURL=unauthenticated.mjs.map

package/dist/esm/clients/handlers/unauthenticated.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"unauthenticated.mjs","sources":["../../../../src/clients/handlers/unauthenticated.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { retryMiddlewareFactory } from '../middleware/retry';\nimport { userAgentMiddlewareFactory, } from '../middleware/userAgent';\nimport { composeTransferHandler } from '../internal/composeTransferHandler';\nimport { fetchTransferHandler } from './fetch';\nexport const unauthenticatedHandler = composeTransferHandler(fetchTransferHandler, [userAgentMiddlewareFactory, retryMiddlewareFactory]);\n"],"names":[],"mappings":";;;;;;;;;AAAA;AACA;AAKY,MAAC,sBAAsB,GAAG,sBAAsB,CAAC,oBAAoB,EAAE,CAAC,0BAA0B,EAAE,sBAAsB,CAAC;;;;"}

package/dist/esm/clients/middleware/retry/middleware.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"middleware.mjs","sources":["../../../../../src/clients/middleware/retry/middleware.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nconst DEFAULT_RETRY_ATTEMPTS = 3;\n/**\n * Retry middleware\n */\nexport const retryMiddlewareFactory = ({ maxAttempts = DEFAULT_RETRY_ATTEMPTS, retryDecider, computeDelay, abortSignal, }) => {\n    if (maxAttempts < 1) {\n        throw new Error('maxAttempts must be greater than 0');\n    }\n    return (next, context) => async function retryMiddleware(request) {\n        let error;\n        let attemptsCount = context.attemptsCount ?? 0;\n        let response;\n        // When retry is not needed or max attempts is reached, either error or response will be set. This function handles either cases.\n        const handleTerminalErrorOrResponse = () => {\n            if (response) {\n                addOrIncrementMetadataAttempts(response, attemptsCount);\n                return response;\n            }\n            else {\n                addOrIncrementMetadataAttempts(error, attemptsCount);\n                throw error;\n            }\n        };\n        while (!abortSignal?.aborted && attemptsCount < maxAttempts) {\n            try {\n                response = await next(request);\n                error = undefined;\n            }\n            catch (e) {\n                error = e;\n                response = undefined;\n            }\n            // context.attemptsCount may be updated after calling next handler which may retry the request by itself.\n            attemptsCount =\n                (context.attemptsCount ?? 0) > attemptsCount\n                    ? (context.attemptsCount ?? 0)\n                    : attemptsCount + 1;\n            context.attemptsCount = attemptsCount;\n            const { isCredentialsExpiredError, retryable } = await retryDecider(response, error, context);\n            if (retryable) {\n                // Setting isCredentialsInvalid flag to notify signing middleware to forceRefresh credentials provider.\n                context.isCredentialsExpired = !!isCredentialsExpiredError;\n                if (!abortSignal?.aborted && attemptsCount < maxAttempts) {\n                    // prevent sleep for last attempt or cancelled request;\n                    const delay = computeDelay(attemptsCount);\n                    await cancellableSleep(delay, abortSignal);\n                }\n                continue;\n            }\n            else {\n                return handleTerminalErrorOrResponse();\n            }\n        }\n        if (abortSignal?.aborted) {\n            throw new Error('Request aborted.');\n        }\n        else {\n            return handleTerminalErrorOrResponse();\n        }\n    };\n};\nconst cancellableSleep = (timeoutMs, abortSignal) => {\n    if (abortSignal?.aborted) {\n        return Promise.resolve();\n    }\n    let timeoutId;\n    let sleepPromiseResolveFn;\n    const sleepPromise = new Promise(resolve => {\n        sleepPromiseResolveFn = resolve;\n        timeoutId = setTimeout(resolve, timeoutMs);\n    });\n    abortSignal?.addEventListener('abort', function cancelSleep(_) {\n        clearTimeout(timeoutId);\n        abortSignal?.removeEventListener('abort', cancelSleep);\n        sleepPromiseResolveFn();\n    });\n    return sleepPromise;\n};\nconst addOrIncrementMetadataAttempts = (nextHandlerOutput, attempts) => {\n    if (Object.prototype.toString.call(nextHandlerOutput) !== '[object Object]') {\n        return;\n    }\n    nextHandlerOutput.$metadata = {\n        ...(nextHandlerOutput.$metadata ?? {}),\n        attempts,\n    };\n};\n"],"names":[],"mappings":"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"}

package/src/clients/handlers/authenticated.ts

@@ -1,27 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { RetryOptions, retryMiddlewareFactory } from '../middleware/retry';
-import {
-	SigningOptions,
-	signingMiddlewareFactory,
-} from '../middleware/signing';
-import {
-	UserAgentOptions,
-	userAgentMiddlewareFactory,
-} from '../middleware/userAgent';
-import { composeTransferHandler } from '../internal/composeTransferHandler';
-import { HttpRequest, HttpResponse } from '../types';
-
-import { fetchTransferHandler } from './fetch';
-
-export const authenticatedHandler = composeTransferHandler<
-	[UserAgentOptions, RetryOptions<HttpResponse>, SigningOptions],
-	HttpRequest,
-	HttpResponse,
-	typeof fetchTransferHandler
->(fetchTransferHandler, [
-	userAgentMiddlewareFactory,
-	retryMiddlewareFactory,
-	signingMiddlewareFactory,
-]);

package/src/clients/handlers/unauthenticated.ts

@@ -1,19 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { RetryOptions, retryMiddlewareFactory } from '../middleware/retry';
-import {
-	UserAgentOptions,
-	userAgentMiddlewareFactory,
-} from '../middleware/userAgent';
-import { composeTransferHandler } from '../internal/composeTransferHandler';
-import { HttpRequest, HttpResponse } from '../types';
-
-import { fetchTransferHandler } from './fetch';
-
-export const unauthenticatedHandler = composeTransferHandler<
-	[UserAgentOptions, RetryOptions<HttpResponse>],
-	HttpRequest,
-	HttpResponse,
-	typeof fetchTransferHandler
->(fetchTransferHandler, [userAgentMiddlewareFactory, retryMiddlewareFactory]);