@rsbuild/plugin-assets-retry 0.6.6 → 0.6.8

package/dist/index.d.ts

@@ -24,10 +24,6 @@ type PluginAssetsRetryOptions = {
      * Set the `crossorigin` attribute for tags.
      */
     crossOrigin?: boolean | CrossOrigin;
-    /**
-     * Whether to inline the runtime JavaScript code of Assets Retry plugin into the HTML file.
-     */
-    inlineScript?: boolean;
     /**
      * The callback function when the asset is failed to be retried.
      */
@@ -40,6 +36,10 @@ type PluginAssetsRetryOptions = {
      * The callback function when the asset is successfully retried.
      */
     onSuccess?: (options: AssetsRetryHookContext) => void;
+    /**
+     * Whether to inline the runtime JavaScript code of Assets Retry plugin into the HTML file.
+     */
+    inlineScript?: boolean;
     /**
      * Whether to minify the runtime JavaScript code of Assets Retry plugin.
      */

package/dist/index.js

@@ -58,12 +58,12 @@ var AssetsRetryPlugin_exports = {};
 __export(AssetsRetryPlugin_exports, {
   AssetsRetryPlugin: () => AssetsRetryPlugin
 });
-var import_node_path, import_shared, _retryOptions, AssetsRetryPlugin;
+var import_node_path2, import_shared2, _retryOptions, AssetsRetryPlugin;
 var init_AssetsRetryPlugin = __esm({
   "src/AssetsRetryPlugin.ts"() {
     "use strict";
-    import_node_path = __toESM(require("path"));
-    import_shared = require("@rsbuild/shared");
+    import_node_path2 = __toESM(require("path"));
+    import_shared2 = require("@rsbuild/shared");
     AssetsRetryPlugin = class {
       constructor(options) {
         __publicField(this, "name");
@@ -77,7 +77,7 @@ var init_AssetsRetryPlugin = __esm({
           distDir,
           HtmlPlugin,
           inlineScript = true,
-          minify = process.env.NODE_ENV === "production",
+          minify,
           ...retryOptions
         } = options;
         this.name = "AssetsRetryPlugin";
@@ -89,21 +89,23 @@ var init_AssetsRetryPlugin = __esm({
         this.minify = minify;
       }
       async getRetryCode() {
-        const { default: serialize } = await import("serialize-javascript");
-        const runtimeFilePath = import_node_path.default.join(
+        const { default: serialize2 } = await import("serialize-javascript");
+        const filename = "initialChunkRetry";
+        const runtimeFilePath = import_node_path2.default.join(
           __dirname,
-          this.minify ? "runtime.min.js" : "runtime.js"
+          "runtime",
+          this.minify ? `${filename}.min.js` : `${filename}.js`
         );
-        const runtimeCode = await import_shared.fse.readFile(runtimeFilePath, "utf-8");
-        return `(function(){${runtimeCode};init(${serialize(
+        const runtimeCode = await import_shared2.fse.readFile(runtimeFilePath, "utf-8");
+        return `(function(){${runtimeCode};init(${serialize2(
           __privateGet(this, _retryOptions)
         )});})()`;
       }
       async getScriptPath() {
         if (!this.scriptPath) {
-          this.scriptPath = import_node_path.default.posix.join(
+          this.scriptPath = import_node_path2.default.posix.join(
             this.distDir,
-            `assets-retry.${"0.6.6"}.js`
+            `assets-retry.${"0.6.8"}.js`
           );
         }
         return this.scriptPath;
@@ -134,15 +136,15 @@ var init_AssetsRetryPlugin = __esm({
           this.HtmlPlugin.getHooks(compilation).alterAssetTagGroups.tapPromise(
             this.name,
             async (data) => {
-              const scriptTag = (0, import_shared.generateScriptTag)();
+              const scriptTag = (0, import_shared2.generateScriptTag)();
               if (this.inlineScript) {
                 data.headTags.unshift({
                   ...scriptTag,
                   innerHTML: await this.getRetryCode()
                 });
               } else {
-                const publicPath = (0, import_shared.getPublicPathFromCompiler)(compiler);
-                const url = (0, import_shared.withPublicPath)(await this.getScriptPath(), publicPath);
+                const publicPath = (0, import_shared2.getPublicPathFromCompiler)(compiler);
+                const url = (0, import_shared2.withPublicPath)(await this.getScriptPath(), publicPath);
                 data.headTags.unshift({
                   ...scriptTag,
                   attributes: {
@@ -167,32 +169,115 @@ __export(src_exports, {
   pluginAssetsRetry: () => pluginAssetsRetry
 });
 module.exports = __toCommonJS(src_exports);
-var import_shared2 = require("@rsbuild/shared");
+var import_shared3 = require("@rsbuild/shared");
+
+// src/AsyncChunkRetryPlugin.ts
+var import_node_path = __toESM(require("path"));
+var import_core = require("@rsbuild/core");
+var import_shared = require("@rsbuild/shared");
+var import_serialize_javascript = __toESM(require("serialize-javascript"));
+function appendWebpackScript(module2, appendSource) {
+  try {
+    const originSource = module2.getGeneratedCode();
+    module2.getGeneratedCode = () => `${originSource}
+${appendSource}`;
+  } catch (err) {
+    console.error("Failed to modify Webpack RuntimeModule");
+    throw err;
+  }
+}
+function appendRspackScript(module2, appendSource) {
+  try {
+    const source = module2.source.source.toString();
+    module2.source.source = Buffer.from(`${source}
+${appendSource}`, "utf-8");
+  } catch (err) {
+    console.error("Failed to modify Rspack RuntimeModule");
+    throw err;
+  }
+}
+var AsyncChunkRetryPlugin = class {
+  constructor(options) {
+    __publicField(this, "name", "ASYNC_CHUNK_RETRY_PLUGIN");
+    __publicField(this, "options");
+    __publicField(this, "runtimeOptions");
+    this.options = options;
+    this.runtimeOptions = (0, import_shared.pick)(options, [
+      "domain",
+      "max",
+      "onRetry",
+      "onSuccess",
+      "onFail",
+      "test"
+    ]);
+  }
+  getRawRuntimeRetryCode() {
+    const { RuntimeGlobals } = import_core.rspack;
+    const filename = "asyncChunkRetry";
+    const runtimeFilePath = import_node_path.default.join(
+      __dirname,
+      "runtime",
+      this.options.minify ? `${filename}.min.js` : `${filename}.js`
+    );
+    const rawText = import_shared.fse.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_PUBLIC_PATH__", RuntimeGlobals.publicPath).replaceAll("__RUNTIME_GLOBALS_LOAD_SCRIPT__", RuntimeGlobals.loadScript).replaceAll("__RETRY_OPTIONS__", (0, import_serialize_javascript.default)(this.runtimeOptions));
+  }
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap(this.name, (compilation) => {
+      compilation.hooks.runtimeModule.tap(this.name, (module2) => {
+        const { isRspack } = this.options;
+        const constructorName = isRspack ? module2.constructorName : module2.constructor?.name;
+        const isPublicPathModule = module2.name === "publicPath" || constructorName === "PublicPathRuntimeModule";
+        if (!isPublicPathModule) {
+          return;
+        }
+        const runtimeCode = this.getRawRuntimeRetryCode();
+        if (isRspack) {
+          appendRspackScript(module2, runtimeCode);
+        } else {
+          appendWebpackScript(module2, runtimeCode);
+        }
+      });
+    });
+  }
+};
+
+// src/index.ts
 var pluginAssetsRetry = (options = {}) => ({
   name: "rsbuild:assets-retry",
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin }) => {
-      const config = api.getNormalizedConfig();
-      if (!options || (0, import_shared2.isHtmlDisabled)(config, target)) {
-        return;
-      }
-      const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
-      const distDir = (0, import_shared2.getDistPath)(config, "js");
-      if (options.crossOrigin === void 0) {
-        options.crossOrigin = config.html.crossorigin;
-      }
-      if (options.minify === void 0) {
-        const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js ?? true;
-        options.minify = minify;
-      }
-      chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
-        {
-          ...options,
-          distDir,
-          HtmlPlugin
+    api.modifyBundlerChain(
+      async (chain, { CHAIN_ID, target, HtmlPlugin, isProd }) => {
+        const config = api.getNormalizedConfig();
+        if (!options || (0, import_shared3.isHtmlDisabled)(config, target)) {
+          return;
         }
-      ]);
-    });
+        const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
+        const distDir = (0, import_shared3.getDistPath)(config, "js");
+        if (options.crossOrigin === void 0) {
+          options.crossOrigin = config.html.crossorigin;
+        }
+        if (options.minify === void 0) {
+          const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js;
+          options.minify = minify && isProd;
+        }
+        chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
+          {
+            ...options,
+            distDir,
+            HtmlPlugin
+          }
+        ]);
+        const isRspack = api.context.bundlerType === "rspack";
+        chain.plugin(CHAIN_ID.PLUGIN.ASYNC_CHUNK_RETRY).use(AsyncChunkRetryPlugin, [{ ...options, isRspack }]);
+      }
+    );
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -34,12 +34,12 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.49.0_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.49.2_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename, getDirname, __dirname;
 var init_esm = __esm({
-  "../../node_modules/.pnpm/@modern-js+module-tools@2.49.0_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../node_modules/.pnpm/@modern-js+module-tools@2.49.2_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
@@ -52,9 +52,9 @@ var AssetsRetryPlugin_exports = {};
 __export(AssetsRetryPlugin_exports, {
   AssetsRetryPlugin: () => AssetsRetryPlugin
 });
-import path2 from "path";
+import path3 from "path";
 import {
-  fse,
+  fse as fse2,
   generateScriptTag,
   getPublicPathFromCompiler,
   withPublicPath
@@ -77,7 +77,7 @@ var init_AssetsRetryPlugin = __esm({
           distDir,
           HtmlPlugin,
           inlineScript = true,
-          minify = process.env.NODE_ENV === "production",
+          minify,
           ...retryOptions
         } = options;
         this.name = "AssetsRetryPlugin";
@@ -89,21 +89,23 @@ var init_AssetsRetryPlugin = __esm({
         this.minify = minify;
       }
       async getRetryCode() {
-        const { default: serialize } = await import("serialize-javascript");
-        const runtimeFilePath = path2.join(
+        const { default: serialize2 } = await import("serialize-javascript");
+        const filename = "initialChunkRetry";
+        const runtimeFilePath = path3.join(
           __dirname,
-          this.minify ? "runtime.min.js" : "runtime.js"
+          "runtime",
+          this.minify ? `${filename}.min.js` : `${filename}.js`
         );
-        const runtimeCode = await fse.readFile(runtimeFilePath, "utf-8");
-        return `(function(){${runtimeCode};init(${serialize(
+        const runtimeCode = await fse2.readFile(runtimeFilePath, "utf-8");
+        return `(function(){${runtimeCode};init(${serialize2(
           __privateGet(this, _retryOptions)
         )});})()`;
       }
       async getScriptPath() {
         if (!this.scriptPath) {
-          this.scriptPath = path2.posix.join(
+          this.scriptPath = path3.posix.join(
             this.distDir,
-            `assets-retry.${"0.6.6"}.js`
+            `assets-retry.${"0.6.8"}.js`
           );
         }
         return this.scriptPath;
@@ -164,31 +166,115 @@ var init_AssetsRetryPlugin = __esm({
 // src/index.ts
 init_esm();
 import { getDistPath, isHtmlDisabled } from "@rsbuild/shared";
+
+// src/AsyncChunkRetryPlugin.ts
+init_esm();
+import path2 from "path";
+import { rspack } from "@rsbuild/core";
+import { fse, pick } from "@rsbuild/shared";
+import serialize from "serialize-javascript";
+function appendWebpackScript(module, appendSource) {
+  try {
+    const originSource = module.getGeneratedCode();
+    module.getGeneratedCode = () => `${originSource}
+${appendSource}`;
+  } catch (err) {
+    console.error("Failed to modify Webpack RuntimeModule");
+    throw err;
+  }
+}
+function appendRspackScript(module, appendSource) {
+  try {
+    const source = module.source.source.toString();
+    module.source.source = Buffer.from(`${source}
+${appendSource}`, "utf-8");
+  } catch (err) {
+    console.error("Failed to modify Rspack RuntimeModule");
+    throw err;
+  }
+}
+var AsyncChunkRetryPlugin = class {
+  constructor(options) {
+    __publicField(this, "name", "ASYNC_CHUNK_RETRY_PLUGIN");
+    __publicField(this, "options");
+    __publicField(this, "runtimeOptions");
+    this.options = options;
+    this.runtimeOptions = pick(options, [
+      "domain",
+      "max",
+      "onRetry",
+      "onSuccess",
+      "onFail",
+      "test"
+    ]);
+  }
+  getRawRuntimeRetryCode() {
+    const { RuntimeGlobals } = rspack;
+    const filename = "asyncChunkRetry";
+    const runtimeFilePath = path2.join(
+      __dirname,
+      "runtime",
+      this.options.minify ? `${filename}.min.js` : `${filename}.js`
+    );
+    const rawText = fse.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_PUBLIC_PATH__", RuntimeGlobals.publicPath).replaceAll("__RUNTIME_GLOBALS_LOAD_SCRIPT__", RuntimeGlobals.loadScript).replaceAll("__RETRY_OPTIONS__", serialize(this.runtimeOptions));
+  }
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap(this.name, (compilation) => {
+      compilation.hooks.runtimeModule.tap(this.name, (module) => {
+        const { isRspack } = this.options;
+        const constructorName = isRspack ? module.constructorName : module.constructor?.name;
+        const isPublicPathModule = module.name === "publicPath" || constructorName === "PublicPathRuntimeModule";
+        if (!isPublicPathModule) {
+          return;
+        }
+        const runtimeCode = this.getRawRuntimeRetryCode();
+        if (isRspack) {
+          appendRspackScript(module, runtimeCode);
+        } else {
+          appendWebpackScript(module, runtimeCode);
+        }
+      });
+    });
+  }
+};
+
+// src/index.ts
 var pluginAssetsRetry = (options = {}) => ({
   name: "rsbuild:assets-retry",
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin }) => {
-      const config = api.getNormalizedConfig();
-      if (!options || isHtmlDisabled(config, target)) {
-        return;
-      }
-      const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
-      const distDir = getDistPath(config, "js");
-      if (options.crossOrigin === void 0) {
-        options.crossOrigin = config.html.crossorigin;
-      }
-      if (options.minify === void 0) {
-        const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js ?? true;
-        options.minify = minify;
-      }
-      chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
-        {
-          ...options,
-          distDir,
-          HtmlPlugin
+    api.modifyBundlerChain(
+      async (chain, { CHAIN_ID, target, HtmlPlugin, isProd }) => {
+        const config = api.getNormalizedConfig();
+        if (!options || isHtmlDisabled(config, target)) {
+          return;
         }
-      ]);
-    });
+        const { AssetsRetryPlugin: AssetsRetryPlugin2 } = await Promise.resolve().then(() => (init_AssetsRetryPlugin(), AssetsRetryPlugin_exports));
+        const distDir = getDistPath(config, "js");
+        if (options.crossOrigin === void 0) {
+          options.crossOrigin = config.html.crossorigin;
+        }
+        if (options.minify === void 0) {
+          const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js;
+          options.minify = minify && isProd;
+        }
+        chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
+          {
+            ...options,
+            distDir,
+            HtmlPlugin
+          }
+        ]);
+        const isRspack = api.context.bundlerType === "rspack";
+        chain.plugin(CHAIN_ID.PLUGIN.ASYNC_CHUNK_RETRY).use(AsyncChunkRetryPlugin, [{ ...options, isRspack }]);
+      }
+    );
   }
 });
 export {

package/dist/runtime/asyncChunkRetry.js

@@ -0,0 +1,171 @@
+"use strict";
+
+// rsbuild/runtime/async-chunk-retry
+
+// e.g: src_AsyncCompTest_tsx
+// e.g: static/js/async/src_AsyncCompTest_tsx.js
+// publicPath + ChunkFilename e.g: http://localhost:3000/static/js/async/src_AsyncCompTest_tsx.js
+
+// init retryCollector and nextRetry function
+var config = __RETRY_OPTIONS__;
+var maxRetries = config.max || 3;
+var retryCollector = {};
+function findCurrentDomain(url) {
+  var _config$domain;
+  var domainList = (_config$domain = config.domain) !== null && _config$domain !== void 0 ? _config$domain : [];
+  var domain = '';
+  for (var i = 0; i < domainList.length; i++) {
+    if (url.indexOf(domainList[i]) !== -1) {
+      domain = domainList[i];
+      break;
+    }
+  }
+  return domain || url;
+}
+function findNextDomain(url) {
+  var _config$domain2;
+  var domainList = (_config$domain2 = config.domain) !== null && _config$domain2 !== void 0 ? _config$domain2 : [];
+  var currentDomain = findCurrentDomain(url);
+  var index = domainList.indexOf(currentDomain);
+  return domainList[(index + 1) % domainList.length] || url;
+}
+
+// TODO: add option query to onRetry with initial chunk together
+// function getUrlRetryQuery(existRetryTimes: number): string {
+//   return `?retry-attempt=${existRetryTimes}`;
+// }
+
+function getCurrentRetry(chunkId) {
+  return retryCollector[chunkId];
+}
+function initRetry(chunkId) {
+  var _config$domain$, _config$domain3;
+  var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
+  var originalSrcUrl = __RUNTIME_GLOBALS_PUBLIC_PATH__ + originalScriptFilename;
+  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$ : __RUNTIME_GLOBALS_PUBLIC_PATH__;
+  var existRetryTimes = 1;
+  return {
+    existRetryTimes: existRetryTimes,
+    nextDomain: nextDomain,
+    nextRetryUrl: nextDomain + (nextDomain[nextDomain.length - 1] === '/' ? '' : '/') + originalScriptFilename,
+    // + getUrlRetryQuery(existRetryTimes),
+
+    originalScriptFilename: originalScriptFilename,
+    originalSrcUrl: originalSrcUrl
+  };
+}
+function nextRetry(chunkId) {
+  var currRetry = getCurrentRetry(chunkId);
+  var nextRetry;
+  if (!currRetry) {
+    nextRetry = initRetry(chunkId);
+  } else {
+    var existRetryTimes = currRetry.existRetryTimes + 1;
+    var nextDomain = findNextDomain(currRetry.nextDomain);
+    nextRetry = {
+      existRetryTimes: existRetryTimes,
+      nextDomain: nextDomain,
+      nextRetryUrl: nextDomain + (nextDomain[nextDomain.length - 1] === '/' ? '' : '/') + currRetry.originalScriptFilename,
+      // + getUrlRetryQuery(existRetryTimes),
+
+      originalScriptFilename: currRetry.originalScriptFilename,
+      originalSrcUrl: currRetry.originalSrcUrl
+    };
+  }
+  retryCollector[chunkId] = nextRetry;
+  return nextRetry;
+}
+
+// rewrite webpack runtime with nextRetry()
+var originalEnsureChunk = __RUNTIME_GLOBALS_ENSURE_CHUNK__;
+var originalGetChunkScriptFilename = __RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__;
+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 result = originalEnsureChunk(chunkId);
+  var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
+
+  // mark the async chunk name in the global variables and share it with initial chunk retry
+  if (typeof window !== 'undefined' && !window.__RB_ASYNC_CHUNKS__[originalScriptFilename]) {
+    window.__RB_ASYNC_CHUNKS__[originalScriptFilename] = true;
+  }
+  return result.catch(function (error) {
+    var _nextRetry = nextRetry(chunkId),
+      existRetryTimes = _nextRetry.existRetryTimes,
+      originalSrcUrl = _nextRetry.originalSrcUrl,
+      nextRetryUrl = _nextRetry.nextRetryUrl,
+      nextDomain = _nextRetry.nextDomain;
+    var createContext = function createContext(times) {
+      return {
+        times: times,
+        domain: nextDomain,
+        url: nextRetryUrl,
+        tagName: 'script'
+      };
+    };
+    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, "\"");
+      if (typeof config.onFail === 'function') {
+        config.onFail(context);
+      }
+      throw error;
+    }
+
+    // Filter by config.test and config.domain
+    var tester = config.test;
+    if (tester) {
+      if (typeof tester === 'string') {
+        var regexp = new RegExp(tester);
+        tester = function tester(str) {
+          return regexp.test(str);
+        };
+      }
+      if (typeof tester !== 'function' || !tester(nextRetryUrl)) {
+        throw error;
+      }
+    }
+    if (config.domain && config.domain.length > 0 && config.domain.indexOf(nextDomain) === -1) {
+      throw error;
+    }
+
+    // Start retry
+    if (typeof config.onRetry === 'function') {
+      config.onRetry(context);
+    }
+
+    // biome-ignore lint/complexity/useArrowFunction: use function instead of () => {}
+    return ensureChunk(chunkId).then(function (result) {
+      if (typeof config.onSuccess === 'function') {
+        var _getCurrentRetry;
+        var _context = createContext(existRetryTimes);
+        var _ref = (_getCurrentRetry = getCurrentRetry(chunkId)) !== null && _getCurrentRetry !== void 0 ? _getCurrentRetry : {},
+          currRetryTimes = _ref.existRetryTimes;
+        if (currRetryTimes === existRetryTimes) {
+          config.onSuccess(_context);
+        }
+      }
+      return result;
+    });
+  });
+}
+function loadScript(originalUrl, done, key, chunkId) {
+  var retry = getCurrentRetry(chunkId);
+  return originalLoadScript(retry ? retry.nextRetryUrl : originalUrl, done, key, chunkId);
+}
+function registerAsyncChunkRetry() {
+  // init global variables shared with async chunk
+  if (typeof window !== 'undefined' && !window.__RB_ASYNC_CHUNKS__) {
+    window.__RB_ASYNC_CHUNKS__ = {};
+  }
+  if (typeof __RUNTIME_GLOBALS_REQUIRE__ !== 'undefined') {
+    try {
+      __RUNTIME_GLOBALS_ENSURE_CHUNK__ = ensureChunk;
+      __RUNTIME_GLOBALS_LOAD_SCRIPT__ = loadScript;
+    } catch (e) {
+      console.error('[@rsbuild/plugin-assets-retry] Register async chunk retry runtime failed', e);
+    }
+  }
+}
+registerAsyncChunkRetry();

package/dist/runtime/asyncChunkRetry.min.js

@@ -0,0 +1 @@
+"use strict";var config=__RETRY_OPTIONS__,maxRetries=config.max||3,retryCollector={};function findCurrentDomain(n){for(var i,e=null!==(i=config.domain)&&void 0!==i?i:[],r="",t=0;t<e.length;t++)if(-1!==n.indexOf(e[t])){r=e[t];break}return r||n}function findNextDomain(n){var i,e=null!==(i=config.domain)&&void 0!==i?i:[],r=findCurrentDomain(n),t=e.indexOf(r);return e[(t+1)%e.length]||n}function getCurrentRetry(n){return retryCollector[n]}function initRetry(n){var i,e,r=originalGetChunkScriptFilename(n),t=__RUNTIME_GLOBALS_PUBLIC_PATH__+r,o=null!==(i=null===(e=config.domain)||void 0===e?void 0:e[0])&&void 0!==i?i:__RUNTIME_GLOBALS_PUBLIC_PATH__;return{existRetryTimes:1,nextDomain:o,nextRetryUrl:o+("/"===o[o.length-1]?"":"/")+r,originalScriptFilename:r,originalSrcUrl:t}}function nextRetry(n){var i,e=getCurrentRetry(n);if(e){var r=e.existRetryTimes+1,t=findNextDomain(e.nextDomain);i={existRetryTimes:r,nextDomain:t,nextRetryUrl:t+("/"===t[t.length-1]?"":"/")+e.originalScriptFilename,originalScriptFilename:e.originalScriptFilename,originalSrcUrl:e.originalSrcUrl}}else i=initRetry(n);return retryCollector[n]=i,i}var originalEnsureChunk=__RUNTIME_GLOBALS_ENSURE_CHUNK__,originalGetChunkScriptFilename=__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__,originalLoadScript=__RUNTIME_GLOBALS_LOAD_SCRIPT__;function ensureChunk(n){var i=originalEnsureChunk(n),e=originalGetChunkScriptFilename(n);return"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__[e]||(window.__RB_ASYNC_CHUNKS__[e]=!0),i.catch((function(i){var e=nextRetry(n),r=e.existRetryTimes,t=e.originalSrcUrl,o=e.nextRetryUrl,_=e.nextDomain,a=function(n){return{times:n,domain:_,url:o,tagName:"script"}},c=a(r-1);if(r>maxRetries)throw i.message="Loading chunk ".concat(n," from ").concat(t," failed after ").concat(maxRetries,' retries: "').concat(i.message,'"'),"function"==typeof config.onFail&&config.onFail(c),i;var u=config.test;if(u){if("string"==typeof u){var f=new RegExp(u);u=function(n){return f.test(n)}}if("function"!=typeof u||!u(o))throw i}if(config.domain&&config.domain.length>0&&-1===config.domain.indexOf(_))throw i;return"function"==typeof config.onRetry&&config.onRetry(c),ensureChunk(n).then((function(i){if("function"==typeof config.onSuccess){var e,t=a(r);(null!==(e=getCurrentRetry(n))&&void 0!==e?e:{}).existRetryTimes===r&&config.onSuccess(t)}return i}))}))}function loadScript(n,i,e,r){var t=getCurrentRetry(r);return originalLoadScript(t?t.nextRetryUrl:n,i,e,r)}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/dist/{runtime.js → runtime/initialChunkRetry.js}

@@ -1,6 +1,6 @@
 "use strict";
 
-// rsbuild/initial-chunk/retry
+// rsbuild/runtime/initial-chunk-retry
 
 var TAG_TYPE = {
   link: HTMLLinkElement,
@@ -120,6 +120,14 @@ function retry(config, e) {
   var target = targetInfo.target,
     tagName = targetInfo.tagName,
     url = targetInfo.url;
+
+  // If the requested failed chunk is async chunk，skip it, because async chunk will be retried by asyncChunkRetry runtime
+  if (typeof window !== 'undefined' && Object.keys(window.__RB_ASYNC_CHUNKS__ || {}).some(function (chunkName) {
+    return url.indexOf(chunkName) !== -1;
+  })) {
+    return;
+  }
+
   // Filter by config.test and config.domain
   var tester = config.test;
   if (tester) {
@@ -235,6 +243,10 @@ function init(options) {
     config.domain = config.domain.filter(Boolean);
   }
 
+  // init global variables shared with async chunk
+  if (typeof window !== 'undefined' && !window.__RB_ASYNC_CHUNKS__) {
+    window.__RB_ASYNC_CHUNKS__ = {};
+  }
   // Bind event in window
   try {
     resourceMonitor(function (e) {

package/dist/runtime/initialChunkRetry.min.js

@@ -0,0 +1 @@
+"use strict";var TAG_TYPE={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement},TYPES=Object.keys(TAG_TYPE);function findCurrentDomain(e,n){for(var t="",r=0;r<n.length;r++)if(-1!==e.indexOf(n[r])){t=n[r];break}return t||e}function findNextDomain(e,n){var t=findCurrentDomain(e,n),r=n.indexOf(t);return n[(r+1)%n.length]||e}function getRequestUrl(e){return e instanceof HTMLScriptElement||e instanceof HTMLImageElement?e.src:e instanceof HTMLLinkElement?e.href:null}var defaultConfig={max:3,type:TYPES,domain:[],crossOrigin:!1};function validateTargetInfo(e,n){var t,r=n.target,i=null===(t=r.tagName)||void 0===t?void 0:t.toLocaleLowerCase(),a=e.type,o=getRequestUrl(r);return!!(i&&-1!==a.indexOf(i)&&TAG_TYPE[i]&&r instanceof TAG_TYPE[i]&&o)&&{target:r,tagName:i,url:o}}function createElement(e,n){var t=!0===n.crossOrigin?"anonymous":n.crossOrigin,r=t?'crossorigin="'.concat(t,'"'):"",i=n.times?'data-rsbuild-retry-times="'.concat(n.times,'"'):"",a=n.isAsync?"data-rsbuild-async":"";if(e instanceof HTMLScriptElement){var o=document.createElement("script");return o.src=n.url,t&&(o.crossOrigin=t),n.times&&(o.dataset.rsbuildRetryTimes=String(n.times)),n.isAsync&&(o.dataset.rsbuildAsync=""),{element:o,str:'<script src="'.concat(n.url,'" ').concat(r," ").concat(i," ").concat(a,">")+"<\/script>"}}if(e instanceof HTMLLinkElement){var s=document.createElement("link");return s.rel=e.rel||"stylesheet",e.as&&(s.as=e.as),s.href=n.url,t&&(s.crossOrigin=t),n.times&&(s.dataset.rsbuildRetryTimes=String(n.times)),{element:s,str:'<link rel="'.concat(s.rel,'" href="').concat(n.url,'" ').concat(r," ").concat(i," ").concat(s.as?'as="'.concat(s.as,'"'):"","></link>")}}}function reloadElementResource(e,n,t){e instanceof HTMLScriptElement&&(t.isAsync?document.body.appendChild(n.element):document.write(n.str)),e instanceof HTMLLinkElement&&document.getElementsByTagName("head")[0].appendChild(n.element),e instanceof HTMLImageElement&&(e.src=t.url,e.dataset.rsbuildRetryTimes=String(t.times))}function retry(e,n){var t=validateTargetInfo(e,n);if(!1!==t){var r=t.target,i=t.tagName,a=t.url;if("undefined"==typeof window||!Object.keys(window.__RB_ASYNC_CHUNKS__||{}).some((function(e){return-1!==a.indexOf(e)}))){var o=e.test;if(o){if("string"==typeof o){var s=new RegExp(o);o=function(e){return s.test(e)}}if("function"!=typeof o||!o(a))return}var c=findCurrentDomain(a,e.domain);if(!(e.domain&&e.domain.length>0&&-1===e.domain.indexOf(c))){var d=Number(r.dataset.rsbuildRetryTimes)||0;if(d!==e.max){var l=findNextDomain(c,e.domain),m=Boolean(r.dataset.rsbuildAsync)||r.async||r.defer,f={url:a.replace(c,l),times:d+1,crossOrigin:e.crossOrigin,isAsync:m},u=createElement(r,f);if(e.onRetry&&"function"==typeof e.onRetry){var y={times:d,domain:c,url:a,tagName:i};e.onRetry(y)}reloadElementResource(r,u,f)}else if("function"==typeof e.onFail){var g={times:d,domain:c,url:a,tagName:i};e.onFail(g)}}}}}function load(e,n){var t=validateTargetInfo(e,n);if(!1!==t){var r=t.target,i=t.tagName,a=t.url,o=findCurrentDomain(a,e.domain),s=Number(r.dataset.rsbuildRetryTimes)||0;if(0!==s&&"function"==typeof e.onSuccess){var c={times:s,domain:o,url:a,tagName:i};e.onSuccess(c)}}}function resourceMonitor(e,n){"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",(function(n){n&&n.target instanceof Element&&e(n)}),!0),document.addEventListener("load",(function(e){e&&e.target instanceof Element&&n(e)}),!0))}function init(e){var n={};for(var t in defaultConfig)n[t]=defaultConfig[t];for(var r in e)n[r]=e[r];Array.isArray(n.type)&&0!==n.type.length||(n.type=defaultConfig.type),Array.isArray(n.domain)&&0!==n.domain.length||(n.domain=defaultConfig.domain),Array.isArray(n.domain)&&(n.domain=n.domain.filter(Boolean)),"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={});try{resourceMonitor((function(e){try{retry(n,e)}catch(e){console.error("retry error captured",e)}}),(function(e){try{load(n,e)}catch(e){console.error("load error captured",e)}}))}catch(e){console.error("monitor error captured",e)}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Assets retry plugin for Rsbuild",
   "homepage": "https://rsbuild.dev",
   "repository": {
@@ -24,21 +24,21 @@
   ],
   "dependencies": {
     "serialize-javascript": "^6.0.2",
-    "@rsbuild/shared": "0.6.6"
+    "@rsbuild/shared": "0.6.8"
   },
   "devDependencies": {
     "@babel/core": "^7.24.4",
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-typescript": "^7.24.1",
     "@types/serialize-javascript": "^5.0.4",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2",
-    "terser": "5.30.3",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.7.0",
+    "terser": "5.30.4",
     "typescript": "^5.4.2",
-    "@rsbuild/core": "0.6.6",
-    "@scripts/test-helper": "0.6.6"
+    "@rsbuild/core": "0.6.8",
+    "@scripts/test-helper": "0.6.8"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.6.6"
+    "@rsbuild/core": "^0.6.8"
   },
   "publishConfig": {
     "access": "public",

package/dist/runtime.min.js

@@ -1 +0,0 @@
-"use strict";var TAG_TYPE={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement},TYPES=Object.keys(TAG_TYPE);function findCurrentDomain(e,t){for(var n="",r=0;r<t.length;r++)if(-1!==e.indexOf(t[r])){n=t[r];break}return n||e}function findNextDomain(e,t){var n=findCurrentDomain(e,t),r=t.indexOf(n);return t[(r+1)%t.length]||e}function getRequestUrl(e){return e instanceof HTMLScriptElement||e instanceof HTMLImageElement?e.src:e instanceof HTMLLinkElement?e.href:null}var defaultConfig={max:3,type:TYPES,domain:[],crossOrigin:!1};function validateTargetInfo(e,t){var n,r=t.target,i=null===(n=r.tagName)||void 0===n?void 0:n.toLocaleLowerCase(),a=e.type,o=getRequestUrl(r);return!!(i&&-1!==a.indexOf(i)&&TAG_TYPE[i]&&r instanceof TAG_TYPE[i]&&o)&&{target:r,tagName:i,url:o}}function createElement(e,t){var n=!0===t.crossOrigin?"anonymous":t.crossOrigin,r=n?'crossorigin="'.concat(n,'"'):"",i=t.times?'data-rsbuild-retry-times="'.concat(t.times,'"'):"",a=t.isAsync?"data-rsbuild-async":"";if(e instanceof HTMLScriptElement){var o=document.createElement("script");return o.src=t.url,n&&(o.crossOrigin=n),t.times&&(o.dataset.rsbuildRetryTimes=String(t.times)),t.isAsync&&(o.dataset.rsbuildAsync=""),{element:o,str:'<script src="'.concat(t.url,'" ').concat(r," ").concat(i," ").concat(a,">")+"<\/script>"}}if(e instanceof HTMLLinkElement){var s=document.createElement("link");return s.rel=e.rel||"stylesheet",e.as&&(s.as=e.as),s.href=t.url,n&&(s.crossOrigin=n),t.times&&(s.dataset.rsbuildRetryTimes=String(t.times)),{element:s,str:'<link rel="'.concat(s.rel,'" href="').concat(t.url,'" ').concat(r," ").concat(i," ").concat(s.as?'as="'.concat(s.as,'"'):"","></link>")}}}function reloadElementResource(e,t,n){e instanceof HTMLScriptElement&&(n.isAsync?document.body.appendChild(t.element):document.write(t.str)),e instanceof HTMLLinkElement&&document.getElementsByTagName("head")[0].appendChild(t.element),e instanceof HTMLImageElement&&(e.src=n.url,e.dataset.rsbuildRetryTimes=String(n.times))}function retry(e,t){var n=validateTargetInfo(e,t);if(!1!==n){var r=n.target,i=n.tagName,a=n.url,o=e.test;if(o){if("string"==typeof o){var s=new RegExp(o);o=function(e){return s.test(e)}}if("function"!=typeof o||!o(a))return}var c=findCurrentDomain(a,e.domain);if(!(e.domain&&e.domain.length>0&&-1===e.domain.indexOf(c))){var l=Number(r.dataset.rsbuildRetryTimes)||0;if(l!==e.max){var m=findNextDomain(c,e.domain),d=Boolean(r.dataset.rsbuildAsync)||r.async||r.defer,u={url:a.replace(c,m),times:l+1,crossOrigin:e.crossOrigin,isAsync:d},f=createElement(r,u);if(e.onRetry&&"function"==typeof e.onRetry){var g={times:l,domain:c,url:a,tagName:i};e.onRetry(g)}reloadElementResource(r,f,u)}else if("function"==typeof e.onFail){var y={times:l,domain:c,url:a,tagName:i};e.onFail(y)}}}}function load(e,t){var n=validateTargetInfo(e,t);if(!1!==n){var r=n.target,i=n.tagName,a=n.url,o=findCurrentDomain(a,e.domain),s=Number(r.dataset.rsbuildRetryTimes)||0;if(0!==s&&"function"==typeof e.onSuccess){var c={times:s,domain:o,url:a,tagName:i};e.onSuccess(c)}}}function resourceMonitor(e,t){"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",(function(t){t&&t.target instanceof Element&&e(t)}),!0),document.addEventListener("load",(function(e){e&&e.target instanceof Element&&t(e)}),!0))}function init(e){var t={};for(var n in defaultConfig)t[n]=defaultConfig[n];for(var r in e)t[r]=e[r];Array.isArray(t.type)&&0!==t.type.length||(t.type=defaultConfig.type),Array.isArray(t.domain)&&0!==t.domain.length||(t.domain=defaultConfig.domain),Array.isArray(t.domain)&&(t.domain=t.domain.filter(Boolean));try{resourceMonitor((function(e){try{retry(t,e)}catch(e){console.error("retry error captured",e)}}),(function(e){try{load(t,e)}catch(e){console.error("load error captured",e)}}))}catch(e){console.error("monitor error captured",e)}}