@module-federation/retry-plugin 0.19.1 → 0.20.0

package/dist/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @module-federation/retry-plugin
 
+## 0.20.0
+
+### Patch Changes
+
+- Updated dependencies [37346d4]
+- Updated dependencies [639a83b]
+  - @module-federation/sdk@0.20.0
+
 ## 0.19.1
 
 ### Patch Changes

package/dist/esm/index.js

@@ -6,6 +6,7 @@ var defaultRetries = 3;
 var defaultRetryDelay = 1e3;
 var PLUGIN_IDENTIFIER = "[ Module Federation RetryPlugin ]";
 var ERROR_ABANDONED = "The request failed and has now been abandoned";
+var RUNTIME_008 = "RUNTIME-008";
 
 // packages/retry-plugin/src/logger.ts
 import { createLogger } from "@module-federation/sdk";
@@ -194,7 +195,7 @@ async function fetchRetry(params, lastRequestUrl, originalTotal) {
         });
         logger_default.log(`${PLUGIN_IDENTIFIER}: retry failed, no retries left for url: ${requestUrl}`);
       }
-      throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED}`);
+      throw new Error(`${RUNTIME_008}: ${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED} | url: ${requestUrl}`);
     } else {
       const nextIndex = total - retryTimes + 1;
       const predictedBaseUrl = combineUrlDomainWithPathQuery(requestUrl, url);
@@ -230,10 +231,11 @@ function scriptRetry({ retryOptions, retryFn, beforeExecuteRetry = /* @__PURE__
     let originalUrl;
     const { retryTimes = defaultRetries, retryDelay = defaultRetryDelay, domains, addQuery, onRetry, onSuccess, onError } = retryOptions || {};
     let attempts = 0;
-    while (attempts < retryTimes) {
+    const maxAttempts = retryTimes;
+    while (attempts < maxAttempts) {
       try {
         beforeExecuteRetry();
-        if (retryDelay > 0) {
+        if (retryDelay > 0 && attempts > 0) {
           await new Promise((resolve) => setTimeout(resolve, retryDelay));
         }
         const retryIndex = attempts + 1;
@@ -272,13 +274,13 @@ function scriptRetry({ retryOptions, retryFn, beforeExecuteRetry = /* @__PURE__
       } catch (error) {
         lastError = error;
         attempts++;
-        if (attempts >= retryTimes) {
+        if (attempts >= maxAttempts) {
           onError && lastRequestUrl && onError({
             domains,
             url: lastRequestUrl,
             tagName: "script"
           });
-          throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED}`);
+          throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED} | url: ${lastRequestUrl || "unknown"}`);
         }
       }
     }
@@ -290,7 +292,7 @@ __name(scriptRetry, "scriptRetry");
 // packages/retry-plugin/src/index.ts
 var RetryPlugin = /* @__PURE__ */ __name((params) => {
   if (params?.fetch || params?.script) {
-    logger_default.warn(`${PLUGIN_IDENTIFIER}: fetch or script config is deprecated, please use the new config style. See docs: https://module-federation.io/plugin/plugins/retry-plugin.html`);
+    logger_default.warn(`${PLUGIN_IDENTIFIER}: params is ${params}, fetch or script config is deprecated, please use the new config style. See docs: https://module-federation.io/plugin/plugins/retry-plugin.html`);
   }
   const { fetchOptions = {}, retryTimes = defaultRetries, successTimes = 0, retryDelay = defaultRetryDelay, domains = [], manifestDomains = [], addQuery, onRetry, onSuccess, onError } = params || {};
   return {

package/dist/index.js

@@ -34,6 +34,7 @@ var defaultRetries = 3;
 var defaultRetryDelay = 1e3;
 var PLUGIN_IDENTIFIER = "[ Module Federation RetryPlugin ]";
 var ERROR_ABANDONED = "The request failed and has now been abandoned";
+var RUNTIME_008 = "RUNTIME-008";
 
 // packages/retry-plugin/src/logger.ts
 var import_sdk = require("@module-federation/sdk");
@@ -222,7 +223,7 @@ async function fetchRetry(params, lastRequestUrl, originalTotal) {
         });
         logger_default.log(`${PLUGIN_IDENTIFIER}: retry failed, no retries left for url: ${requestUrl}`);
       }
-      throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED}`);
+      throw new Error(`${RUNTIME_008}: ${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED} | url: ${requestUrl}`);
     } else {
       const nextIndex = total - retryTimes + 1;
       const predictedBaseUrl = combineUrlDomainWithPathQuery(requestUrl, url);
@@ -258,10 +259,11 @@ function scriptRetry({ retryOptions, retryFn, beforeExecuteRetry = /* @__PURE__
     let originalUrl;
     const { retryTimes = defaultRetries, retryDelay = defaultRetryDelay, domains, addQuery, onRetry, onSuccess, onError } = retryOptions || {};
     let attempts = 0;
-    while (attempts < retryTimes) {
+    const maxAttempts = retryTimes;
+    while (attempts < maxAttempts) {
       try {
         beforeExecuteRetry();
-        if (retryDelay > 0) {
+        if (retryDelay > 0 && attempts > 0) {
           await new Promise((resolve) => setTimeout(resolve, retryDelay));
         }
         const retryIndex = attempts + 1;
@@ -300,13 +302,13 @@ function scriptRetry({ retryOptions, retryFn, beforeExecuteRetry = /* @__PURE__
       } catch (error) {
         lastError = error;
         attempts++;
-        if (attempts >= retryTimes) {
+        if (attempts >= maxAttempts) {
           onError && lastRequestUrl && onError({
             domains,
             url: lastRequestUrl,
             tagName: "script"
           });
-          throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED}`);
+          throw new Error(`${PLUGIN_IDENTIFIER}: ${ERROR_ABANDONED} | url: ${lastRequestUrl || "unknown"}`);
         }
       }
     }
@@ -318,7 +320,7 @@ __name(scriptRetry, "scriptRetry");
 // packages/retry-plugin/src/index.ts
 var RetryPlugin = /* @__PURE__ */ __name((params) => {
   if (params?.fetch || params?.script) {
-    logger_default.warn(`${PLUGIN_IDENTIFIER}: fetch or script config is deprecated, please use the new config style. See docs: https://module-federation.io/plugin/plugins/retry-plugin.html`);
+    logger_default.warn(`${PLUGIN_IDENTIFIER}: params is ${params}, fetch or script config is deprecated, please use the new config style. See docs: https://module-federation.io/plugin/plugins/retry-plugin.html`);
   }
   const { fetchOptions = {}, retryTimes = defaultRetries, successTimes = 0, retryDelay = defaultRetryDelay, domains = [], manifestDomains = [], addQuery, onRetry, onSuccess, onError } = params || {};
   return {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/retry-plugin",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "author": "danpeen <dapeen.feng@gmail.com>",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/retry-plugin",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "author": "danpeen <dapeen.feng@gmail.com>",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",
@@ -33,9 +33,9 @@
     }
   },
   "devDependencies": {
-    "@module-federation/runtime": "0.19.1"
+    "@module-federation/runtime": "0.20.0"
   },
   "dependencies": {
-    "@module-federation/sdk": "0.19.1"
+    "@module-federation/sdk": "0.20.0"
   }
 }