@rsbuild/plugin-assets-retry 1.0.3 → 1.0.4

package/dist/index.cjs

@@ -1,8 +1,8 @@
 var __webpack_modules__ = {
-    "../../node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js": function(module, __unused_webpack_exports, __webpack_require__) {
-        module.exports = __webpack_require__("crypto")/* .randomBytes */ .randomBytes;
+    "../../node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js": function(module1, __unused_webpack_exports, __webpack_require__) {
+        module1.exports = __webpack_require__("crypto")/* .randomBytes */ .randomBytes;
     },
-    "../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js": function(module, __unused_webpack_exports, __webpack_require__) {
+    "../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js": function(module1, __unused_webpack_exports, __webpack_require__) {
         "use strict";
         /*
 Copyright (c) 2014, Yahoo! Inc. All rights reserved.
@@ -44,7 +44,7 @@ See the accompanying LICENSE file for terms.
             for(var key in obj)if ("function" == typeof obj[key]) functionKeys.push(key);
             for(var i = 0; i < functionKeys.length; i++)delete obj[functionKeys[i]];
         }
-        module.exports = function serialize(obj, options) {
+        module1.exports = function serialize(obj, options) {
             options || (options = {});
             // Backwards-compatibility for `space` as the second argument.
             if ('number' == typeof options || 'string' == typeof options) options = {
@@ -149,9 +149,9 @@ See the accompanying LICENSE file for terms.
             });
         };
     },
-    crypto: function(module) {
+    crypto: function(module1) {
         "use strict";
-        module.exports = require("crypto");
+        module1.exports = require("crypto");
     }
 };
 /************************************************************************/ // The module cache
@@ -162,22 +162,22 @@ function __webpack_require__(moduleId) {
     var cachedModule = __webpack_module_cache__[moduleId];
     if (void 0 !== cachedModule) return cachedModule.exports;
     // Create a new module (and put it into the cache)
-    var module = __webpack_module_cache__[moduleId] = {
+    var module1 = __webpack_module_cache__[moduleId] = {
         exports: {}
     };
     // Execute the module function
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    __webpack_modules__[moduleId](module1, module1.exports, __webpack_require__);
     // Return the exports of the module
-    return module.exports;
+    return module1.exports;
 }
 /************************************************************************/ // webpack/runtime/compat_get_default_export
 (()=>{
-    // getDefaultExport function for compatibility with non-harmony modules
-    __webpack_require__.n = function(module) {
-        var getter = module && module.__esModule ? function() {
-            return module['default'];
+    // getDefaultExport function for compatibility with non-ESM modules
+    __webpack_require__.n = function(module1) {
+        var getter = module1 && module1.__esModule ? function() {
+            return module1['default'];
         } : function() {
-            return module;
+            return module1;
         };
         __webpack_require__.d(getter, {
             a: getter
@@ -227,6 +227,7 @@ function __webpack_require__(moduleId) {
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
     const external_node_path_namespaceObject = require("node:path");
     var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+    const external_node_url_namespaceObject = require("node:url");
     const core_namespaceObject = require("@rsbuild/core");
     // EXTERNAL MODULE: ../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js
     var serialize_javascript = __webpack_require__("../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js");
@@ -241,20 +242,23 @@ function __webpack_require__(moduleId) {
         else obj[key] = value;
         return obj;
     }
+    const AsyncChunkRetryPlugin_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(/*#__PURE__*/ function() {
+        return 'undefined' == typeof document ? new (module.require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
+    }()));
     // https://github.com/web-infra-dev/rspack/pull/5370
-    function appendWebpackScript(module, appendSource) {
+    function appendWebpackScript(module1, appendSource) {
         try {
-            const originSource = module.getGeneratedCode();
-            module.getGeneratedCode = ()=>`${originSource}\n${appendSource}`;
+            const originSource = module1.getGeneratedCode();
+            module1.getGeneratedCode = ()=>`${originSource}\n${appendSource}`;
         } catch (err) {
             console.error('Failed to modify Webpack RuntimeModule');
             throw err;
         }
     }
-    function appendRspackScript(module, appendSource) {
+    function appendRspackScript(module1, appendSource) {
         try {
-            const source = module.source.source.toString();
-            module.source.source = Buffer.from(`${source}\n${appendSource}`, 'utf-8');
+            const source = module1.source.source.toString();
+            module1.source.source = Buffer.from(`${source}\n${appendSource}`, 'utf-8');
         } catch (err) {
             console.error('Failed to modify Rspack RuntimeModule');
             throw err;
@@ -270,23 +274,23 @@ function __webpack_require__(moduleId) {
         getRawRuntimeRetryCode() {
             const { RuntimeGlobals } = core_namespaceObject.rspack;
             const filename = 'asyncChunkRetry';
-            const runtimeFilePath = external_node_path_default().join(__dirname, 'runtime', this.options.minify ? `${filename}.min.js` : `${filename}.js`);
+            const runtimeFilePath = external_node_path_default().join(AsyncChunkRetryPlugin_dirname, 'runtime', this.options.minify ? `${filename}.min.js` : `${filename}.js`);
             const rawText = external_node_fs_default().readFileSync(runtimeFilePath, 'utf-8');
             return rawText.replaceAll('__RUNTIME_GLOBALS_REQUIRE__', RuntimeGlobals.require).replaceAll('__RUNTIME_GLOBALS_ENSURE_CHUNK__', RuntimeGlobals.ensureChunk).replaceAll('__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__', RuntimeGlobals.getChunkScriptFilename).replaceAll('__RUNTIME_GLOBALS_GET_CSS_FILENAME__', RuntimeGlobals.getChunkCssFilename).replaceAll('__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__', '__webpack_require__.miniCssF').replaceAll('__RUNTIME_GLOBALS_PUBLIC_PATH__', RuntimeGlobals.publicPath).replaceAll('__RUNTIME_GLOBALS_LOAD_SCRIPT__', RuntimeGlobals.loadScript).replaceAll('__RETRY_OPTIONS__', serialize_javascript_default()(this.runtimeOptions));
         }
         apply(compiler) {
             compiler.hooks.thisCompilation.tap(this.name, (compilation)=>{
-                compilation.hooks.runtimeModule.tap(this.name, (module)=>{
+                compilation.hooks.runtimeModule.tap(this.name, (module1)=>{
                     var _module_constructor;
                     const { isRspack } = this.options;
-                    const constructorName = isRspack ? module.constructorName : null === (_module_constructor = module.constructor) || void 0 === _module_constructor ? void 0 : _module_constructor.name;
-                    const isPublicPathModule = 'publicPath' === module.name || 'PublicPathRuntimeModule' === constructorName || 'AutoPublicPathRuntimeModule' === constructorName;
+                    const constructorName = isRspack ? module1.constructorName : null === (_module_constructor = module1.constructor) || void 0 === _module_constructor ? void 0 : _module_constructor.name;
+                    const isPublicPathModule = 'publicPath' === module1.name || 'PublicPathRuntimeModule' === constructorName || 'AutoPublicPathRuntimeModule' === constructorName;
                     if (!isPublicPathModule) return;
                     const runtimeCode = this.getRawRuntimeRetryCode();
                     // Rspack currently does not have module.addRuntimeModule on the js side,
                     // so we insert our runtime code after PublicPathRuntimeModule or AutoPublicPathRuntimeModule.
-                    if (isRspack) appendRspackScript(module, runtimeCode);
-                    else appendWebpackScript(module, runtimeCode);
+                    if (isRspack) appendRspackScript(module1, runtimeCode);
+                    else appendWebpackScript(module1, runtimeCode);
                 });
             });
         }
@@ -306,23 +310,24 @@ function __webpack_require__(moduleId) {
             ]);
         }
     }
+    const src_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(/*#__PURE__*/ function() {
+        return 'undefined' == typeof document ? new (module.require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
+    }()));
     const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
     async function getRetryCode(options) {
         const filename = 'initialChunkRetry';
         const { minify, inlineScript: _, ...restOptions } = options;
-        const runtimeFilePath = external_node_path_default().join(__dirname, 'runtime', minify ? `${filename}.min.js` : `${filename}.js`);
+        const runtimeFilePath = external_node_path_default().join(src_dirname, 'runtime', minify ? `${filename}.min.js` : `${filename}.js`);
         const runtimeCode = await external_node_fs_default().promises.readFile(runtimeFilePath, 'utf-8');
         return `(function(){${runtimeCode};init(${serialize_javascript_default()(restOptions)});})()`;
     }
-    const pluginAssetsRetry = function() {
-        let userOptions = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-        return {
+    const pluginAssetsRetry = (userOptions = {})=>({
             name: PLUGIN_ASSETS_RETRY_NAME,
             setup (api) {
                 const { inlineScript = true } = userOptions;
                 const getScriptPath = (environment)=>{
                     const distDir = environment.config.output.distPath.js;
-                    return external_node_path_default().posix.join(distDir, "assets-retry.1-0-3.js");
+                    return external_node_path_default().posix.join(distDir, "assets-retry.1-0-4.js");
                 };
                 const formatOptions = (config)=>{
                     const options = {
@@ -337,8 +342,7 @@ function __webpack_require__(moduleId) {
                     }
                     return options;
                 };
-                if (inlineScript) api.modifyHTMLTags(async (param, param1)=>{
-                    let { headTags, bodyTags } = param, { environment } = param1;
+                if (inlineScript) api.modifyHTMLTags(async ({ headTags, bodyTags }, { environment })=>{
                     const code = await getRetryCode(formatOptions(environment.config));
                     headTags.unshift({
                         tag: 'script',
@@ -351,8 +355,7 @@ function __webpack_require__(moduleId) {
                     };
                 });
                 else {
-                    api.modifyHTMLTags(async (param, param1)=>{
-                        let { headTags, bodyTags } = param, { assetPrefix, environment } = param1;
+                    api.modifyHTMLTags(async ({ headTags, bodyTags }, { assetPrefix, environment })=>{
                         const scriptPath = getScriptPath(environment);
                         const url = (0, core_namespaceObject.ensureAssetPrefix)(scriptPath, assetPrefix);
                         headTags.unshift({
@@ -368,15 +371,13 @@ function __webpack_require__(moduleId) {
                     });
                     api.processAssets({
                         stage: 'additional'
-                    }, async (param)=>{
-                        let { sources, compilation, environment } = param;
+                    }, async ({ sources, compilation, environment })=>{
                         const scriptPath = getScriptPath(environment);
                         const code = await getRetryCode(formatOptions(environment.config));
                         compilation.emitAsset(scriptPath, new sources.RawSource(code));
                     });
                 }
-                api.modifyBundlerChain(async (chain, param)=>{
-                    let { environment } = param;
+                api.modifyBundlerChain(async (chain, { environment })=>{
                     const { config, htmlPaths } = environment;
                     if (!userOptions || 0 === Object.keys(htmlPaths).length) return;
                     const options = formatOptions(config);
@@ -389,8 +390,7 @@ function __webpack_require__(moduleId) {
                     ]);
                 });
             }
-        };
-    };
+        });
 })();
 var __webpack_export_target__ = exports;
 for(var i in __webpack_exports__)__webpack_export_target__[i] = __webpack_exports__[i];

package/dist/index.js

@@ -1,8 +1,7 @@
-import { fileURLToPath as __webpack_fileURLToPath__ } from "url";
-import { dirname as __webpack_dirname__ } from "path";
 import * as __WEBPACK_EXTERNAL_MODULE_crypto__ from "crypto";
 import * as __WEBPACK_EXTERNAL_MODULE_node_fs__ from "node:fs";
 import * as __WEBPACK_EXTERNAL_MODULE_node_path__ from "node:path";
+import * as __WEBPACK_EXTERNAL_MODULE_node_url__ from "node:url";
 import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core__ from "@rsbuild/core";
 var __webpack_modules__ = {
     "../../node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js": function(module, __unused_webpack_exports, __webpack_require__) {
@@ -176,7 +175,7 @@ function __webpack_require__(moduleId) {
 }
 /************************************************************************/ // webpack/runtime/compat_get_default_export
 (()=>{
-    // getDefaultExport function for compatibility with non-harmony modules
+    // getDefaultExport function for compatibility with non-ESM modules
     __webpack_require__.n = function(module) {
         var getter = module && module.__esModule ? function() {
             return module['default'];
@@ -207,7 +206,6 @@ function __webpack_require__(moduleId) {
 // EXTERNAL MODULE: ../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js
 var serialize_javascript = __webpack_require__("../../node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js");
 var serialize_javascript_default = /*#__PURE__*/ __webpack_require__.n(serialize_javascript);
-var AsyncChunkRetryPlugin_dirname = __webpack_dirname__(__webpack_fileURLToPath__(import.meta.url));
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -218,6 +216,7 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+const AsyncChunkRetryPlugin_dirname = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].dirname((0, __WEBPACK_EXTERNAL_MODULE_node_url__.fileURLToPath)(import.meta.url));
 // https://github.com/web-infra-dev/rspack/pull/5370
 function appendWebpackScript(module, appendSource) {
     try {
@@ -283,7 +282,7 @@ class AsyncChunkRetryPlugin {
         ]);
     }
 }
-var src_dirname = __webpack_dirname__(__webpack_fileURLToPath__(import.meta.url));
+const src_dirname = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].dirname((0, __WEBPACK_EXTERNAL_MODULE_node_url__.fileURLToPath)(import.meta.url));
 const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
 async function getRetryCode(options) {
     const filename = 'initialChunkRetry';
@@ -292,15 +291,13 @@ async function getRetryCode(options) {
     const runtimeCode = await __WEBPACK_EXTERNAL_MODULE_node_fs__["default"].promises.readFile(runtimeFilePath, 'utf-8');
     return `(function(){${runtimeCode};init(${serialize_javascript_default()(restOptions)});})()`;
 }
-const pluginAssetsRetry = function() {
-    let userOptions = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-    return {
+const pluginAssetsRetry = (userOptions = {})=>({
         name: PLUGIN_ASSETS_RETRY_NAME,
         setup (api) {
             const { inlineScript = true } = userOptions;
             const getScriptPath = (environment)=>{
                 const distDir = environment.config.output.distPath.js;
-                return __WEBPACK_EXTERNAL_MODULE_node_path__["default"].posix.join(distDir, "assets-retry.1-0-3.js");
+                return __WEBPACK_EXTERNAL_MODULE_node_path__["default"].posix.join(distDir, "assets-retry.1-0-4.js");
             };
             const formatOptions = (config)=>{
                 const options = {
@@ -315,8 +312,7 @@ const pluginAssetsRetry = function() {
                 }
                 return options;
             };
-            if (inlineScript) api.modifyHTMLTags(async (param, param1)=>{
-                let { headTags, bodyTags } = param, { environment } = param1;
+            if (inlineScript) api.modifyHTMLTags(async ({ headTags, bodyTags }, { environment })=>{
                 const code = await getRetryCode(formatOptions(environment.config));
                 headTags.unshift({
                     tag: 'script',
@@ -329,8 +325,7 @@ const pluginAssetsRetry = function() {
                 };
             });
             else {
-                api.modifyHTMLTags(async (param, param1)=>{
-                    let { headTags, bodyTags } = param, { assetPrefix, environment } = param1;
+                api.modifyHTMLTags(async ({ headTags, bodyTags }, { assetPrefix, environment })=>{
                     const scriptPath = getScriptPath(environment);
                     const url = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.ensureAssetPrefix)(scriptPath, assetPrefix);
                     headTags.unshift({
@@ -346,15 +341,13 @@ const pluginAssetsRetry = function() {
                 });
                 api.processAssets({
                     stage: 'additional'
-                }, async (param)=>{
-                    let { sources, compilation, environment } = param;
+                }, async ({ sources, compilation, environment })=>{
                     const scriptPath = getScriptPath(environment);
                     const code = await getRetryCode(formatOptions(environment.config));
                     compilation.emitAsset(scriptPath, new sources.RawSource(code));
                 });
             }
-            api.modifyBundlerChain(async (chain, param)=>{
-                let { environment } = param;
+            api.modifyBundlerChain(async (chain, { environment })=>{
                 const { config, htmlPaths } = environment;
                 if (!userOptions || 0 === Object.keys(htmlPaths).length) return;
                 const options = formatOptions(config);
@@ -367,6 +360,5 @@ const pluginAssetsRetry = function() {
                 ]);
             });
         }
-    };
-};
+    });
 export { PLUGIN_ASSETS_RETRY_NAME, pluginAssetsRetry };

package/dist/runtime/asyncChunkRetry.js

@@ -73,8 +73,12 @@ function getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl) {
   var absolutePath = getAbsolutePathFromUrl(originalSrcUrl);
   return nextDomain + absolutePath + getUrlRetryQuery(existRetryTimes, getQueryFromUrl(originalSrcUrl));
 }
-function getCurrentRetry(chunkId) {
-  return retryCollector[chunkId];
+
+// shared between ensureChunk and loadScript
+var globalCurrRetrying = {};
+function getCurrentRetry(chunkId, existRetryTimes) {
+  var _retryCollector$chunk;
+  return (_retryCollector$chunk = retryCollector[chunkId]) === null || _retryCollector$chunk === void 0 ? void 0 : _retryCollector$chunk[existRetryTimes];
 }
 function initRetry(chunkId) {
   var _config$domain$, _config$domain3;
@@ -83,32 +87,32 @@ function initRetry(chunkId) {
   var existRetryTimes = 1;
   var nextDomain = (_config$domain$ = (_config$domain3 = config.domain) === null || _config$domain3 === void 0 ? void 0 : _config$domain3[0]) !== null && _config$domain$ !== void 0 ? _config$domain$ : window.origin;
   return {
-    existRetryTimes: existRetryTimes,
     nextDomain: nextDomain,
     nextRetryUrl: getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl),
     originalScriptFilename: originalScriptFilename,
     originalSrcUrl: originalSrcUrl
   };
 }
-function nextRetry(chunkId) {
-  var currRetry = getCurrentRetry(chunkId);
+function nextRetry(chunkId, existRetryTimes) {
+  var currRetry = getCurrentRetry(chunkId, existRetryTimes);
   var nextRetry;
-  if (!currRetry) {
+  var nextExistRetryTimes = existRetryTimes + 1;
+  if (existRetryTimes === 0 || currRetry === undefined) {
     nextRetry = initRetry(chunkId);
+    retryCollector[chunkId] = [];
   } else {
     var originalScriptFilename = currRetry.originalScriptFilename,
       originalSrcUrl = currRetry.originalSrcUrl;
-    var existRetryTimes = currRetry.existRetryTimes + 1;
     var nextDomain = findNextDomain(currRetry.nextDomain);
     nextRetry = {
-      existRetryTimes: existRetryTimes,
       nextDomain: nextDomain,
-      nextRetryUrl: getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl),
+      nextRetryUrl: getNextRetryUrl(nextExistRetryTimes, nextDomain, originalSrcUrl),
       originalScriptFilename: originalScriptFilename,
       originalSrcUrl: originalSrcUrl
     };
   }
-  retryCollector[chunkId] = nextRetry;
+  retryCollector[chunkId][nextExistRetryTimes] = nextRetry;
+  globalCurrRetrying[chunkId] = nextRetry;
   return nextRetry;
 }
 
@@ -122,6 +126,9 @@ var originalLoadScript = __RUNTIME_GLOBALS_LOAD_SCRIPT__;
 
 // if users want to support es5, add Promise polyfill first https://github.com/webpack/webpack/issues/12877
 function ensureChunk(chunkId) {
+  var callingCounter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    count: 0
+  };
   var result = originalEnsureChunk(chunkId);
   var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
   var originalCssFilename = originalGetCssFilename(chunkId);
@@ -135,17 +142,20 @@ function ensureChunk(chunkId) {
       window.__RB_ASYNC_CHUNKS__[originalCssFilename] = true;
     }
   }
+  callingCounter.count += 1;
   return result.catch(function (error) {
     var _error$message;
-    var _nextRetry = nextRetry(chunkId),
-      existRetryTimes = _nextRetry.existRetryTimes,
+    // the first calling is not retry
+    // if the failed request is 4 in network panel, callingCounter.count === 4, the first one is the normal request, and existRetryTimes is 3, retried 3 times
+    var existRetryTimes = callingCounter.count - 1;
+    var _nextRetry = nextRetry(chunkId, existRetryTimes),
       originalSrcUrl = _nextRetry.originalSrcUrl,
       nextRetryUrl = _nextRetry.nextRetryUrl,
       nextDomain = _nextRetry.nextDomain;
 
-    // At present, we don't consider the switching domain and addQuery of async css chunk
-    // 1. Async js chunk will be requested first. It is rare for async css chunk to fail alone.
-    // 2. the code of loading css in webpack runtime is complex and it may be modified by cssExtractPlugin, increase the complexity of this plugin.
+    // At present, we don't consider the switching domain and addQuery of async CSS chunk
+    // 1. Async js chunk will be requested first. It is rare for async CSS chunk to fail alone.
+    // 2. the code of loading CSS in webpack runtime is complex and it may be modified by cssExtractPlugin, increase the complexity of this plugin.
     var isCssAsyncChunkLoadFailed = Boolean(error === null || error === void 0 || (_error$message = error.message) === null || _error$message === void 0 ? void 0 : _error$message.includes('CSS chunk'));
     var createContext = function createContext(times) {
       return {
@@ -156,9 +166,10 @@ function ensureChunk(chunkId) {
         isAsyncChunk: true
       };
     };
-    var context = createContext(existRetryTimes - 1);
-    if (existRetryTimes > maxRetries) {
-      error.message = "Loading chunk ".concat(chunkId, " from ").concat(originalSrcUrl, " failed after ").concat(maxRetries, " retries: \"").concat(error.message, "\"");
+    var context = createContext(existRetryTimes);
+    if (existRetryTimes >= maxRetries) {
+      var _error$message2;
+      error.message = (_error$message2 = error.message) !== null && _error$message2 !== void 0 && _error$message2.includes('retries:') ? error.message : "Loading chunk ".concat(chunkId, " from ").concat(originalSrcUrl, " failed after ").concat(maxRetries, " retries: \"").concat(error.message, "\"");
       if (typeof config.onFail === 'function') {
         config.onFail(context);
       }
@@ -186,22 +197,22 @@ function ensureChunk(chunkId) {
     if (typeof config.onRetry === 'function') {
       config.onRetry(context);
     }
-    return ensureChunk(chunkId).then(function (result) {
-      if (typeof config.onSuccess === 'function') {
-        var _getCurrentRetry;
-        var _context = createContext(existRetryTimes);
-        var _ref2 = (_getCurrentRetry = getCurrentRetry(chunkId)) !== null && _getCurrentRetry !== void 0 ? _getCurrentRetry : {},
-          currRetryTimes = _ref2.existRetryTimes;
-        if (currRetryTimes === existRetryTimes) {
-          config.onSuccess(_context);
-        }
+    var nextPromise = ensureChunk(chunkId, callingCounter);
+    return nextPromise.then(function (result) {
+      // when after retrying the third time
+      // ensureChunk(chunkId, { count: 3 }), at that time, existRetryTimes === 2
+      // after all, callingCounter.count is 4
+      var isLastSuccessRetry = callingCounter.count === existRetryTimes + 2;
+      if (typeof config.onSuccess === 'function' && isLastSuccessRetry) {
+        var _context = createContext(existRetryTimes + 1);
+        config.onSuccess(_context);
       }
       return result;
     });
   });
 }
 function loadScript(originalUrl, done, key, chunkId) {
-  var retry = getCurrentRetry(chunkId);
+  var retry = globalCurrRetrying[chunkId];
   return originalLoadScript(retry ? retry.nextRetryUrl : originalUrl, done, key, chunkId);
 }
 function registerAsyncChunkRetry() {

package/dist/runtime/asyncChunkRetry.min.js

@@ -1 +1 @@
-"use strict";var _ref,_RUNTIME_GLOBALS_GET,config=__RETRY_OPTIONS__,maxRetries=config.max||3,retryCollector={};function findCurrentDomain(n){for(var r,e=null!==(r=config.domain)&&void 0!==r?r:[],i="",t=0;t<e.length;t++)if(-1!==n.indexOf(e[t])){i=e[t];break}return i||window.origin}function findNextDomain(n){var r,e=null!==(r=config.domain)&&void 0!==r?r:[],i=findCurrentDomain(n),t=e.indexOf(i);return e[(t+1)%e.length]||n}var postfixRE=/[?#].*$/;function cleanUrl(n){return n.replace(postfixRE,"")}function getQueryFromUrl(n){var r=n.split("?")[1];return r?"?".concat(r.split("#")[0]):""}function getUrlRetryQuery(n,r){return!0===config.addQuery?""!==r?"".concat(r,"&retry=").concat(n):"?retry=".concat(n):"function"==typeof config.addQuery?config.addQuery({times:n,originalQuery:r}):""}function removeDomainFromUrl(n){var r=n.indexOf("//");if(-1===r&&n.startsWith("/"))return n;var e=r+2,i=n.indexOf("/",e);return n.slice(i)}function getAbsolutePathFromUrl(n){return cleanUrl(removeDomainFromUrl(n))}function getNextRetryUrl(n,r,e){return r+getAbsolutePathFromUrl(e)+getUrlRetryQuery(n,getQueryFromUrl(e))}function getCurrentRetry(n){return retryCollector[n]}function initRetry(n){var r,e,i=originalGetChunkScriptFilename(n),t=__RUNTIME_GLOBALS_PUBLIC_PATH__+i,o=null!==(r=null===(e=config.domain)||void 0===e?void 0:e[0])&&void 0!==r?r:window.origin;return{existRetryTimes:1,nextDomain:o,nextRetryUrl:getNextRetryUrl(1,o,t),originalScriptFilename:i,originalSrcUrl:t}}function nextRetry(n){var r,e=getCurrentRetry(n);if(e){var i=e.originalScriptFilename,t=e.originalSrcUrl,o=e.existRetryTimes+1,_=findNextDomain(e.nextDomain);r={existRetryTimes:o,nextDomain:_,nextRetryUrl:getNextRetryUrl(o,_,t),originalScriptFilename:i,originalSrcUrl:t}}else r=initRetry(n);return retryCollector[n]=r,r}var originalEnsureChunk=__RUNTIME_GLOBALS_ENSURE_CHUNK__,originalGetChunkScriptFilename=__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__,originalGetCssFilename=null!==(_ref=null!==(_RUNTIME_GLOBALS_GET=__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__)&&void 0!==_RUNTIME_GLOBALS_GET?_RUNTIME_GLOBALS_GET:__RUNTIME_GLOBALS_GET_CSS_FILENAME__)&&void 0!==_ref?_ref:function(){return null},originalLoadScript=__RUNTIME_GLOBALS_LOAD_SCRIPT__;function ensureChunk(n){var r=originalEnsureChunk(n),e=originalGetChunkScriptFilename(n),i=originalGetCssFilename(n);return"undefined"!=typeof window&&(e&&(window.__RB_ASYNC_CHUNKS__[e]=!0),i&&(window.__RB_ASYNC_CHUNKS__[i]=!0)),r.catch((function(r){var e,i=nextRetry(n),t=i.existRetryTimes,o=i.originalSrcUrl,_=i.nextRetryUrl,a=i.nextDomain,u=Boolean(null==r||null===(e=r.message)||void 0===e?void 0:e.includes("CSS chunk")),c=function(n){return{times:n,domain:a,url:_,tagName:u?"link":"script",isAsyncChunk:!0}},l=c(t-1);if(t>maxRetries)throw r.message="Loading chunk ".concat(n," from ").concat(o," failed after ").concat(maxRetries,' retries: "').concat(r.message,'"'),"function"==typeof config.onFail&&config.onFail(l),r;var f=config.test;if(f){if("string"==typeof f){var s=new RegExp(f);f=function(n){return s.test(n)}}if("function"!=typeof f||!f(_))throw r}if(config.domain&&config.domain.length>0&&-1===config.domain.indexOf(a))throw r;return"function"==typeof config.onRetry&&config.onRetry(l),ensureChunk(n).then((function(r){if("function"==typeof config.onSuccess){var e,i=c(t);(null!==(e=getCurrentRetry(n))&&void 0!==e?e:{}).existRetryTimes===t&&config.onSuccess(i)}return r}))}))}function loadScript(n,r,e,i){var t=getCurrentRetry(i);return originalLoadScript(t?t.nextRetryUrl:n,r,e,i)}function registerAsyncChunkRetry(){if("undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={}),"undefined"!=typeof __RUNTIME_GLOBALS_REQUIRE__)try{__RUNTIME_GLOBALS_ENSURE_CHUNK__=ensureChunk,__RUNTIME_GLOBALS_LOAD_SCRIPT__=loadScript}catch(n){console.error("[@rsbuild/plugin-assets-retry] Register async chunk retry runtime failed",n)}}registerAsyncChunkRetry();
+"use strict";var _ref,_RUNTIME_GLOBALS_GET,config=__RETRY_OPTIONS__,maxRetries=config.max||3,retryCollector={};function findCurrentDomain(n){for(var r,e=null!==(r=config.domain)&&void 0!==r?r:[],i="",t=0;t<e.length;t++)if(-1!==n.indexOf(e[t])){i=e[t];break}return i||window.origin}function findNextDomain(n){var r,e=null!==(r=config.domain)&&void 0!==r?r:[],i=findCurrentDomain(n),t=e.indexOf(i);return e[(t+1)%e.length]||n}var postfixRE=/[?#].*$/;function cleanUrl(n){return n.replace(postfixRE,"")}function getQueryFromUrl(n){var r=n.split("?")[1];return r?"?".concat(r.split("#")[0]):""}function getUrlRetryQuery(n,r){return!0===config.addQuery?""!==r?"".concat(r,"&retry=").concat(n):"?retry=".concat(n):"function"==typeof config.addQuery?config.addQuery({times:n,originalQuery:r}):""}function removeDomainFromUrl(n){var r=n.indexOf("//");if(-1===r&&n.startsWith("/"))return n;var e=r+2,i=n.indexOf("/",e);return n.slice(i)}function getAbsolutePathFromUrl(n){return cleanUrl(removeDomainFromUrl(n))}function getNextRetryUrl(n,r,e){return r+getAbsolutePathFromUrl(e)+getUrlRetryQuery(n,getQueryFromUrl(e))}var globalCurrRetrying={};function getCurrentRetry(n,r){var e;return null===(e=retryCollector[n])||void 0===e?void 0:e[r]}function initRetry(n){var r,e,i=originalGetChunkScriptFilename(n),t=__RUNTIME_GLOBALS_PUBLIC_PATH__+i,o=null!==(r=null===(e=config.domain)||void 0===e?void 0:e[0])&&void 0!==r?r:window.origin;return{nextDomain:o,nextRetryUrl:getNextRetryUrl(1,o,t),originalScriptFilename:i,originalSrcUrl:t}}function nextRetry(n,r){var e,i=getCurrentRetry(n,r),t=r+1;if(0===r||void 0===i)e=initRetry(n),retryCollector[n]=[];else{var o=i.originalScriptFilename,_=i.originalSrcUrl,a=findNextDomain(i.nextDomain);e={nextDomain:a,nextRetryUrl:getNextRetryUrl(t,a,_),originalScriptFilename:o,originalSrcUrl:_}}return retryCollector[n][t]=e,globalCurrRetrying[n]=e,e}var originalEnsureChunk=__RUNTIME_GLOBALS_ENSURE_CHUNK__,originalGetChunkScriptFilename=__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__,originalGetCssFilename=null!==(_ref=null!==(_RUNTIME_GLOBALS_GET=__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__)&&void 0!==_RUNTIME_GLOBALS_GET?_RUNTIME_GLOBALS_GET:__RUNTIME_GLOBALS_GET_CSS_FILENAME__)&&void 0!==_ref?_ref:function(){return null},originalLoadScript=__RUNTIME_GLOBALS_LOAD_SCRIPT__;function ensureChunk(n){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{count:0},e=originalEnsureChunk(n),i=originalGetChunkScriptFilename(n),t=originalGetCssFilename(n);return"undefined"!=typeof window&&(i&&(window.__RB_ASYNC_CHUNKS__[i]=!0),t&&(window.__RB_ASYNC_CHUNKS__[t]=!0)),r.count+=1,e.catch((function(e){var i,t,o=r.count-1,_=nextRetry(n,o),a=_.originalSrcUrl,l=_.nextRetryUrl,u=_.nextDomain,c=Boolean(null==e||null===(i=e.message)||void 0===i?void 0:i.includes("CSS chunk")),f=function(n){return{times:n,domain:u,url:l,tagName:c?"link":"script",isAsyncChunk:!0}},g=f(o);if(o>=maxRetries)throw e.message=null!==(t=e.message)&&void 0!==t&&t.includes("retries:")?e.message:"Loading chunk ".concat(n," from ").concat(a," failed after ").concat(maxRetries,' retries: "').concat(e.message,'"'),"function"==typeof config.onFail&&config.onFail(g),e;var s=config.test;if(s){if("string"==typeof s){var d=new RegExp(s);s=function(n){return d.test(n)}}if("function"!=typeof s||!s(l))throw e}if(config.domain&&config.domain.length>0&&-1===config.domain.indexOf(u))throw e;return"function"==typeof config.onRetry&&config.onRetry(g),ensureChunk(n,r).then((function(n){var e=r.count===o+2;if("function"==typeof config.onSuccess&&e){var i=f(o+1);config.onSuccess(i)}return n}))}))}function loadScript(n,r,e,i){var t=globalCurrRetrying[i];return originalLoadScript(t?t.nextRetryUrl:n,r,e,i)}function registerAsyncChunkRetry(){if("undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={}),"undefined"!=typeof __RUNTIME_GLOBALS_REQUIRE__)try{__RUNTIME_GLOBALS_ENSURE_CHUNK__=ensureChunk,__RUNTIME_GLOBALS_LOAD_SCRIPT__=loadScript}catch(n){console.error("[@rsbuild/plugin-assets-retry] Register async chunk retry runtime failed",n)}}registerAsyncChunkRetry();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Assets retry plugin for Rsbuild",
   "homepage": "https://rsbuild.dev",
   "repository": {
@@ -23,17 +23,17 @@
     "dist"
   ],
   "devDependencies": {
-    "@babel/core": "^7.25.8",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-typescript": "^7.25.7",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
     "@types/serialize-javascript": "^5.0.4",
     "serialize-javascript": "^6.0.2",
-    "terser": "5.35.0",
+    "terser": "5.36.0",
     "typescript": "^5.6.3",
-    "@rsbuild/core": "1.0.15"
+    "@rsbuild/core": "1.0.19"
   },
   "peerDependencies": {
-    "@rsbuild/core": "1.x || ^1.0.1-rc.0"
+    "@rsbuild/core": "1.x"
   },
   "publishConfig": {
     "access": "public",