@smithy/middleware-retry 4.4.40 → 4.4.42

package/dist-cjs/index.js

@@ -187,20 +187,17 @@ const NODE_MAX_ATTEMPT_CONFIG_OPTIONS = {
     default: utilRetry.DEFAULT_MAX_ATTEMPTS,
 };
 const resolveRetryConfig = (input) => {
-    const { retryStrategy, retryMode: _retryMode, maxAttempts: _maxAttempts } = input;
-    const maxAttempts = utilMiddleware.normalizeProvider(_maxAttempts ?? utilRetry.DEFAULT_MAX_ATTEMPTS);
+    const { retryStrategy, retryMode } = input;
+    const maxAttempts = utilMiddleware.normalizeProvider(input.maxAttempts ?? utilRetry.DEFAULT_MAX_ATTEMPTS);
+    let controller = retryStrategy
+        ? Promise.resolve(retryStrategy)
+        : undefined;
+    const getDefault = async () => (await utilMiddleware.normalizeProvider(retryMode)()) === utilRetry.RETRY_MODES.ADAPTIVE
+        ? new utilRetry.AdaptiveRetryStrategy(maxAttempts)
+        : new utilRetry.StandardRetryStrategy(maxAttempts);
     return Object.assign(input, {
         maxAttempts,
-        retryStrategy: async () => {
-            if (retryStrategy) {
-                return retryStrategy;
-            }
-            const retryMode = await utilMiddleware.normalizeProvider(_retryMode)();
-            if (retryMode === utilRetry.RETRY_MODES.ADAPTIVE) {
-                return new utilRetry.AdaptiveRetryStrategy(maxAttempts);
-            }
-            return new utilRetry.StandardRetryStrategy(maxAttempts);
-        },
+        retryStrategy: () => (controller ??= getDefault()),
     });
 };
 const ENV_RETRY_MODE = "AWS_RETRY_MODE";

package/dist-es/configurations.js

@@ -26,20 +26,17 @@ export const NODE_MAX_ATTEMPT_CONFIG_OPTIONS = {
     default: DEFAULT_MAX_ATTEMPTS,
 };
 export const resolveRetryConfig = (input) => {
-    const { retryStrategy, retryMode: _retryMode, maxAttempts: _maxAttempts } = input;
-    const maxAttempts = normalizeProvider(_maxAttempts ?? DEFAULT_MAX_ATTEMPTS);
+    const { retryStrategy, retryMode } = input;
+    const maxAttempts = normalizeProvider(input.maxAttempts ?? DEFAULT_MAX_ATTEMPTS);
+    let controller = retryStrategy
+        ? Promise.resolve(retryStrategy)
+        : undefined;
+    const getDefault = async () => (await normalizeProvider(retryMode)()) === RETRY_MODES.ADAPTIVE
+        ? new AdaptiveRetryStrategy(maxAttempts)
+        : new StandardRetryStrategy(maxAttempts);
     return Object.assign(input, {
         maxAttempts,
-        retryStrategy: async () => {
-            if (retryStrategy) {
-                return retryStrategy;
-            }
-            const retryMode = await normalizeProvider(_retryMode)();
-            if (retryMode === RETRY_MODES.ADAPTIVE) {
-                return new AdaptiveRetryStrategy(maxAttempts);
-            }
-            return new StandardRetryStrategy(maxAttempts);
-        },
+        retryStrategy: () => (controller ??= getDefault()),
     });
 };
 export const ENV_RETRY_MODE = "AWS_RETRY_MODE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/middleware-retry",
-  "version": "4.4.40",
+  "version": "4.4.42",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "node ../../scripts/inline middleware-retry",
@@ -34,13 +34,13 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/node-config-provider": "^4.3.11",
-    "@smithy/protocol-http": "^5.3.11",
-    "@smithy/service-error-classification": "^4.2.11",
-    "@smithy/smithy-client": "^4.12.3",
-    "@smithy/types": "^4.13.0",
-    "@smithy/util-middleware": "^4.2.11",
-    "@smithy/util-retry": "^4.2.11",
+    "@smithy/node-config-provider": "^4.3.12",
+    "@smithy/protocol-http": "^5.3.12",
+    "@smithy/service-error-classification": "^4.2.12",
+    "@smithy/smithy-client": "^4.12.5",
+    "@smithy/types": "^4.13.1",
+    "@smithy/util-middleware": "^4.2.12",
+    "@smithy/util-retry": "^4.2.12",
     "@smithy/uuid": "^1.1.2",
     "tslib": "^2.6.2"
   },