@rsbuild/plugin-assets-retry 1.3.0 → 1.4.0

package/README.md

@@ -59,33 +59,43 @@ type AssetsRetryHookContext = {
   isAsyncChunk: boolean;
 };
 
-type AssetsRetryOptions = {
+type RuntimeRetryOptions = {
   type?: string[];
   domain?: string[];
   max?: number;
-  test?: string | ((url: string) => boolean);
+  test?: string | RegExp | ((url: string) => boolean);
   crossOrigin?: boolean | 'anonymous' | 'use-credentials';
-  inlineScript?: boolean;
   delay?: number | ((context: AssetsRetryHookContext) => number);
   onRetry?: (context: AssetsRetryHookContext) => void;
   onSuccess?: (context: AssetsRetryHookContext) => void;
   onFail?: (context: AssetsRetryHookContext) => void;
 };
+
+type AssetsRetryOptions =
+  | ({
+      inlineScript?: boolean;
+      minify?: boolean;
+    } & RuntimeRetryOptions)
+  | {
+      inlineScript?: boolean;
+      minify?: boolean;
+      rules: RuntimeRetryOptions[];
+    };
 ```
 
 - **Default:**
 
 ```ts
 const defaultAssetsRetryOptions = {
+  max: 3,
   type: ['script', 'link', 'img'],
   domain: [],
-  max: 3,
-  test: '',
   crossOrigin: false,
+  test: '',
   delay: 0,
-  onRetry: () => {},
-  onSuccess: () => {},
-  onFail: () => {},
+  addQuery: false,
+  inlineScript: true,
+  minify: rsbuildConfig.mode === 'production',
 };
 ```
 
@@ -242,7 +252,7 @@ When set to `true`, `retry=${times}` will be added to the query when requesting,
 
 When you want to customize query, you can pass a function, for example:
 
-- **Example:** All assets requested do not contain query:
+- **Example 1:** All assets requested do not contain query:
 
 ```js
 pluginAssetsRetry({
@@ -254,7 +264,7 @@ pluginAssetsRetry({
 });
 ```
 
-- **Example:** If there is a query in some of the requested assets, you can read it with `originalQuery`:
+- **Example 2:** If there is a query in some of the requested assets, you can read it with `originalQuery`:
 
 ```js
 pluginAssetsRetry({
@@ -325,6 +335,80 @@ pluginAssetsRetry({
 });
 ```
 
+### rules
+
+- **Type:** `RuntimeRetryOptions[]`
+- **Default:** `undefined`
+
+Configure multiple retry rules with different options. Each rule will be evaluated in order, and the first matching rule will be used for retry logic. This is useful when you have different retry requirements for different types of assets or domains.
+
+When using `rules`, the plugin will:
+
+1. Check each rule in order by `test` `domain` `type`
+
+2. If the rule is matched, the rule's configuration will be used to retry
+
+3. If no rule is matched, the resource will not be retried
+
+Each rule supports all the same options as the top-level configuration, including `type`, `domain`, `max`, `test`, `crossOrigin`, `delay`, `onRetry`, `onSuccess`, and `onFail`.
+
+- **Example 1:** Different retry strategies for different CDNs:
+
+```js
+pluginAssetsRetry({
+  rules: [
+    {
+      // Rule for primary CDN
+      test: /cdn1\.example\.com/,
+      domain: ['cdn1.example.com', 'cdn1-backup.example.com'],
+      max: 3,
+      delay: 1000,
+    },
+    {
+      // Rule for secondary CDN with more retries
+      test: /cdn2\.example\.com/,
+      domain: ['cdn2.example.com', 'cdn2-backup.example.com'],
+      max: 5,
+      delay: 500,
+    },
+    {
+      // Default rule for other assets
+      domain: ['default.example.com', 'default-backup.example.com'],
+      max: 2,
+    },
+  ],
+});
+```
+
+- **Example 2:** Different retry strategies for different asset types:
+
+```js
+pluginAssetsRetry({
+  rules: [
+    {
+      // Critical JavaScript files get more retries
+      type: ['script'],
+      // Or test: /\.js$/,
+      max: 5,
+      delay: 1000,
+      onFail: ({ url }) => console.error(`Critical JS failed: ${url}`),
+    },
+    {
+      // CSS files get fewer retries
+      test: /\.css$/,
+      max: 2,
+      delay: 500,
+    },
+    {
+      // Images get minimal retries
+      test: /\.(png|jpg|gif|svg)$/,
+      max: 1,
+      delay: 0,
+    },
+  ],
+});
+```
+
 ## Notes
 
 When you use Assets Retry plugin, the Rsbuild injects some runtime code into the HTML and [Rspack Runtime](https://rspack.dev/misc/glossary#runtime), then serializes the Assets Retry plugin config, inserting it into the runtime code. Therefore, you need to be aware of the following:
@@ -389,6 +473,32 @@ If you want Assets Retry plugin to work on resources in custom templates, you ca
 </html>
 ```
 
+#### Identifying retry scripts in HTML templates
+
+The Assets Retry plugin adds a unique `data-rsbuild-assets-retry` attribute to retry scripts, allowing you to easily identify them in custom HTML templates.
+
+You can import the attribute constant:
+
+```js
+import { ASSETS_RETRY_DATA_ATTRIBUTE } from '@rsbuild/plugin-assets-retry';
+```
+
+The attribute values are:
+- `"inline"` for inline scripts (when `inlineScript: true`)
+- `"external"` for external scripts (when `inlineScript: false`)
+
+Example usage in HTML templates:
+
+```html
+<!-- Filter retry scripts -->
+<%= htmlWebpackPlugin.tags.headTags.filter(tag => tag.attributes['data-rsbuild-assets-retry'] === 'inline') %>
+
+<!-- Filter non-retry scripts -->
+<%= htmlWebpackPlugin.tags.headTags.filter(tag => !tag.attributes['data-rsbuild-assets-retry']) %>
+```
+
+This allows you to place retry scripts at the top of your HTML head for optimal loading order.
+
 ## License
 
 [MIT](./LICENSE).

package/README.zh-CN.md

@@ -57,33 +57,43 @@ type AssetsRetryHookContext = {
   isAsyncChunk: boolean;
 };
 
-type AssetsRetryOptions = {
+type RuntimeRetryOptions = {
   type?: string[];
   domain?: string[];
   max?: number;
   test?: string | ((url: string) => boolean);
   crossOrigin?: boolean | 'anonymous' | 'use-credentials';
-  inlineScript?: boolean;
   delay?: number | ((context: AssetsRetryHookContext) => number);
   onRetry?: (context: AssetsRetryHookContext) => void;
   onSuccess?: (context: AssetsRetryHookContext) => void;
   onFail?: (context: AssetsRetryHookContext) => void;
 };
+
+type AssetsRetryOptions =
+  | ({
+      inlineScript?: boolean;
+      minify?: boolean;
+    } & RuntimeRetryOptions)
+  | {
+      inlineScript?: boolean;
+      minify?: boolean;
+      rules: RuntimeRetryOptions[];
+    };
 ```
 
 - **默认值：**
 
 ```ts
-const defaultOptions = {
+const defaultAssetsRetryOptions = {
+  max: 3,
   type: ['script', 'link', 'img'],
   domain: [],
-  max: 3,
-  test: '',
   crossOrigin: false,
+  test: '',
   delay: 0,
-  onRetry: () => {},
-  onSuccess: () => {},
-  onFail: () => {},
+  addQuery: false,
+  inlineScript: true,
+  minify: rsbuildConfig.mode === 'production',
 };
 ```
 
@@ -240,7 +250,7 @@ type AddQuery =
 
 当你想要自定义 query 时，可以传入一个函数，比如：
 
-- **示例：** 请求的所有资源都不含 query：
+- **示例 1：** 请求的所有资源都不含 query：
 
 ```js
 pluginAssetsRetry({
@@ -252,7 +262,7 @@ pluginAssetsRetry({
 });
 ```
 
-- **示例：** 当请求的某些资源中含有 query 时，可以使用 `originalQuery` 读取：
+- **示例 2：** 当请求的某些资源中含有 query 时，可以使用 `originalQuery` 读取：
 
 ```js
 pluginAssetsRetry({
@@ -323,6 +333,80 @@ pluginAssetsRetry({
 });
 ```
 
+### rules
+
+- **类型：** `RuntimeRetryOptions[]`
+- **默认值：** `undefined`
+
+配置多个重试规则，每个规则可以有不同的选项。规则会按顺序进行评估，第一个匹配的规则将用于重试逻辑。这在你对不同类型的资源或域名有不同的重试需求时非常有用。
+
+使用 `rules` 时，插件会：
+
+1. 按顺序通过 `test` `domain` `type` 检查每个规则
+
+2. 如果匹配到规则，会使用规则的配置进行重试
+
+3. 如果没有匹配到规则，则不会重试该资源
+
+每个规则支持与顶层配置相同的所有选项，包括 `type`、`domain`、`test`、`max`、`crossOrigin`、`delay`、`onRetry`、`onSuccess` 和 `onFail`。
+
+- **示例 1：** 不同 CDN 的不同重试策略：
+
+```js
+pluginAssetsRetry({
+  rules: [
+    {
+      // 主 CDN 的规则
+      test: /cdn1\.example\.com/,
+      domain: ['cdn1.example.com', 'cdn1-backup.example.com'],
+      max: 3,
+      delay: 1000,
+    },
+    {
+      // 次要 CDN 的规则，更多重试次数
+      test: /cdn2\.example\.com/,
+      domain: ['cdn2.example.com', 'cdn2-backup.example.com'],
+      max: 5,
+      delay: 500,
+    },
+    {
+      // 其他资源的默认规则
+      domain: ['default.example.com', 'default-backup.example.com'],
+      max: 2,
+    },
+  ],
+});
+```
+
+- **示例 2：** 不同资源类型的不同重试策略：
+
+```js
+pluginAssetsRetry({
+  rules: [
+    {
+      // 关键 JavaScript 文件获得更多重试次数
+      test: /\.js$/,
+      // 或者 type: ['script'],
+      max: 5,
+      delay: 1000,
+      onFail: ({ url }) => console.error(`关键 JS 失败: ${url}`),
+    },
+    {
+      // CSS 文件获得较少的重试次数
+      test: /\.css$/,
+      max: 2,
+      delay: 500,
+    },
+    {
+      // 图片获得最少的重试次数
+      test: /\.(png|jpg|gif|svg)$/,
+      max: 1,
+      delay: 0,
+    },
+  ],
+});
+```
+
 ## 注意事项
 
 当你使用 Assets Retry 插件时，Rsbuild 会分别向 HTML 和 [Rspack Runtime](https://rspack.dev/zh/misc/glossary#runtime) 中注入运行时代码，并将 Assets Retry 插件配置的内容序列化后插入到这些代码中，因此你需要注意：
@@ -387,6 +471,32 @@ Assets Retry 插件通过监听页面 error 事件来获悉当前资源是否加
 </html>
 ```
 
+#### 在 HTML 模板中识别重试脚本
+
+Assets Retry 插件为重试脚本添加了唯一的 `data-rsbuild-assets-retry` 属性，使您可以在自定义 HTML 模板中轻松识别它们。
+
+您可以导入属性常量：
+
+```js
+import { ASSETS_RETRY_DATA_ATTRIBUTE } from '@rsbuild/plugin-assets-retry';
+```
+
+属性值包括：
+- `"inline"` 用于内联脚本（当 `inlineScript: true` 时）
+- `"external"` 用于外部脚本（当 `inlineScript: false` 时）
+
+在 HTML 模板中的使用示例：
+
+```html
+<!-- 筛选重试脚本 -->
+<%= htmlWebpackPlugin.tags.headTags.filter(tag => tag.attributes['data-rsbuild-assets-retry'] === 'inline') %>
+
+<!-- 筛选非重试脚本 -->
+<%= htmlWebpackPlugin.tags.headTags.filter(tag => !tag.attributes['data-rsbuild-assets-retry']) %>
+```
+
+这允许您将重试脚本放置在 HTML 头部的顶部以获得最佳的加载顺序。
+
 ## License
 
 [MIT](./LICENSE).

package/dist/index.cjs

@@ -170,6 +170,7 @@ var __webpack_exports__ = {};
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
         pluginAssetsRetry: ()=>pluginAssetsRetry,
+        ASSETS_RETRY_DATA_ATTRIBUTE: ()=>ASSETS_RETRY_DATA_ATTRIBUTE,
         PLUGIN_ASSETS_RETRY_NAME: ()=>PLUGIN_ASSETS_RETRY_NAME
     });
     const external_node_fs_namespaceObject = require("node:fs");
@@ -249,8 +250,9 @@ var __webpack_exports__ = {};
     }
     const src_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_import_meta_url__));
     const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
-    function getRuntimeOptions(userOptions) {
-        const { inlineScript, minify, ...restOptions } = userOptions;
+    const ASSETS_RETRY_DATA_ATTRIBUTE = 'data-rsbuild-assets-retry';
+    function getRuntimeOptions(userOptions, defaultCrossOrigin) {
+        const { inlineScript, minify, ...runtimeOptions } = userOptions;
         const defaultOptions = {
             max: 3,
             type: [
@@ -259,18 +261,27 @@ var __webpack_exports__ = {};
                 'img'
             ],
             domain: [],
-            crossOrigin: false,
+            crossOrigin: defaultCrossOrigin,
             delay: 0,
             addQuery: false
         };
-        const result = {
-            ...defaultOptions,
-            ...restOptions
-        };
-        if (!Array.isArray(result.type) || 0 === result.type.length) result.type = defaultOptions.type;
-        if (!Array.isArray(result.domain) || 0 === result.domain.length) result.domain = defaultOptions.domain;
-        if (Array.isArray(result.domain)) result.domain = result.domain.filter(Boolean);
-        return result;
+        function normalizeOption(options) {
+            const result = {
+                ...defaultOptions,
+                ...options
+            };
+            if (!Array.isArray(result.type) || 0 === result.type.length) result.type = defaultOptions.type;
+            if (!Array.isArray(result.domain) || 0 === result.domain.length) result.domain = defaultOptions.domain;
+            if (Array.isArray(result.domain)) result.domain = result.domain.filter(Boolean);
+            return result;
+        }
+        if ('rules' in runtimeOptions) {
+            const result = runtimeOptions.rules.map((i)=>normalizeOption(i));
+            return result;
+        }
+        return [
+            normalizeOption(runtimeOptions)
+        ];
     }
     async function getRetryCode(runtimeOptions, minify) {
         const filename = 'initialChunkRetry';
@@ -284,27 +295,25 @@ var __webpack_exports__ = {};
                 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-3-0.js");
+                    return external_node_path_default().posix.join(distDir, "assets-retry.1-4-0.js");
                 };
-                const normalizeOptions = (config)=>{
-                    const options = {
-                        ...userOptions
+                const getDefaultValueFromRsbuildConfig = (config)=>{
+                    var _config_output_minify;
+                    const minify = 'boolean' == typeof config.output.minify ? config.output.minify : null == (_config_output_minify = config.output.minify) ? void 0 : _config_output_minify.js;
+                    return {
+                        crossorigin: config.html.crossorigin,
+                        minify: Boolean(minify) && 'production' === config.mode
                     };
-                    if (void 0 === options.crossOrigin) options.crossOrigin = config.html.crossorigin;
-                    if (void 0 === options.minify) {
-                        var _config_output_minify;
-                        const minify = 'boolean' == typeof config.output.minify ? config.output.minify : null == (_config_output_minify = config.output.minify) ? void 0 : _config_output_minify.js;
-                        options.minify = minify && 'production' === config.mode;
-                    }
-                    return options;
                 };
                 if (inlineScript) api.modifyHTMLTags(async ({ headTags, bodyTags }, { environment })=>{
-                    const options = normalizeOptions(environment.config);
-                    const runtimeOptions = getRuntimeOptions(options);
-                    const code = await getRetryCode(runtimeOptions, options.minify);
+                    const { minify, crossorigin } = getDefaultValueFromRsbuildConfig(environment.config);
+                    const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
+                    const code = await getRetryCode(runtimeOptions, minify);
                     headTags.unshift({
                         tag: "script",
-                        attrs: {},
+                        attrs: {
+                            [ASSETS_RETRY_DATA_ATTRIBUTE]: 'inline'
+                        },
                         children: code
                     });
                     return {
@@ -319,7 +328,8 @@ var __webpack_exports__ = {};
                         headTags.unshift({
                             tag: "script",
                             attrs: {
-                                src: url
+                                src: url,
+                                [ASSETS_RETRY_DATA_ATTRIBUTE]: 'external'
                             }
                         });
                         return {
@@ -331,30 +341,32 @@ var __webpack_exports__ = {};
                         stage: 'additional'
                     }, async ({ sources, compilation, environment })=>{
                         const scriptPath = getScriptPath(environment);
-                        const options = normalizeOptions(environment.config);
-                        const runtimeOptions = getRuntimeOptions(options);
-                        const code = await getRetryCode(runtimeOptions, options.minify);
+                        const { crossorigin, minify } = getDefaultValueFromRsbuildConfig(environment.config);
+                        const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
+                        const code = await getRetryCode(runtimeOptions, minify);
                         compilation.emitAsset(scriptPath, new sources.RawSource(code));
                     });
                 }
                 api.modifyBundlerChain(async (chain, { environment })=>{
                     const { config, htmlPaths } = environment;
                     if (!userOptions || 0 === Object.keys(htmlPaths).length) return;
-                    const options = normalizeOptions(config);
-                    const runtimeOptions = getRuntimeOptions(options);
+                    const { crossorigin, minify } = getDefaultValueFromRsbuildConfig(config);
+                    const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
                     const isRspack = 'rspack' === api.context.bundlerType;
                     chain.plugin('async-chunk-retry').use(AsyncChunkRetryPlugin, [
                         runtimeOptions,
                         isRspack,
-                        options.minify
+                        minify
                     ]);
                 });
             }
         });
 })();
+exports.ASSETS_RETRY_DATA_ATTRIBUTE = __webpack_exports__.ASSETS_RETRY_DATA_ATTRIBUTE;
 exports.PLUGIN_ASSETS_RETRY_NAME = __webpack_exports__.PLUGIN_ASSETS_RETRY_NAME;
 exports.pluginAssetsRetry = __webpack_exports__.pluginAssetsRetry;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "ASSETS_RETRY_DATA_ATTRIBUTE",
     "PLUGIN_ASSETS_RETRY_NAME",
     "pluginAssetsRetry"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import type { CrossOrigin as CrossOrigin_2 } from '@rsbuild/core';
 import type { RsbuildPlugin } from '@rsbuild/core';
 
+export declare const ASSETS_RETRY_DATA_ATTRIBUTE = "data-rsbuild-assets-retry";
+
 declare type AssetsRetryHookContext_2 = {
     url: string;
     times: number;
@@ -26,7 +28,9 @@ export declare const PLUGIN_ASSETS_RETRY_NAME = "rsbuild:assets-retry";
 
 export declare const pluginAssetsRetry: (userOptions?: PluginAssetsRetryOptions) => RsbuildPlugin;
 
-export declare type PluginAssetsRetryOptions = RuntimeRetryOptions & CompileTimeRetryOptions;
+export declare type PluginAssetsRetryOptions = (RuntimeRetryOptions & CompileTimeRetryOptions) | ({
+    rules: RuntimeRetryOptions[];
+} & CompileTimeRetryOptions);
 
 declare type RuntimeRetryOptions = RuntimeRetryOptionsWithDefaultValue & RuntimeRetryOptionsWithoutDefaultValue;
 
@@ -78,7 +82,7 @@ declare type RuntimeRetryOptionsWithoutDefaultValue = {
     /**
      * The test function of the asset to be retried.
      */
-    test?: string | ((url: string) => boolean);
+    test?: string | RegExp | ((url: string) => boolean);
     /**
      * The callback function when the asset is failed to be retried.
      */

package/dist/index.js

@@ -225,8 +225,9 @@ class AsyncChunkRetryPlugin {
 }
 const src_dirname = node_path.dirname(fileURLToPath(import.meta.url));
 const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
-function getRuntimeOptions(userOptions) {
-    const { inlineScript, minify, ...restOptions } = userOptions;
+const ASSETS_RETRY_DATA_ATTRIBUTE = 'data-rsbuild-assets-retry';
+function getRuntimeOptions(userOptions, defaultCrossOrigin) {
+    const { inlineScript, minify, ...runtimeOptions } = userOptions;
     const defaultOptions = {
         max: 3,
         type: [
@@ -235,18 +236,27 @@ function getRuntimeOptions(userOptions) {
             'img'
         ],
         domain: [],
-        crossOrigin: false,
+        crossOrigin: defaultCrossOrigin,
         delay: 0,
         addQuery: false
     };
-    const result = {
-        ...defaultOptions,
-        ...restOptions
-    };
-    if (!Array.isArray(result.type) || 0 === result.type.length) result.type = defaultOptions.type;
-    if (!Array.isArray(result.domain) || 0 === result.domain.length) result.domain = defaultOptions.domain;
-    if (Array.isArray(result.domain)) result.domain = result.domain.filter(Boolean);
-    return result;
+    function normalizeOption(options) {
+        const result = {
+            ...defaultOptions,
+            ...options
+        };
+        if (!Array.isArray(result.type) || 0 === result.type.length) result.type = defaultOptions.type;
+        if (!Array.isArray(result.domain) || 0 === result.domain.length) result.domain = defaultOptions.domain;
+        if (Array.isArray(result.domain)) result.domain = result.domain.filter(Boolean);
+        return result;
+    }
+    if ('rules' in runtimeOptions) {
+        const result = runtimeOptions.rules.map((i)=>normalizeOption(i));
+        return result;
+    }
+    return [
+        normalizeOption(runtimeOptions)
+    ];
 }
 async function getRetryCode(runtimeOptions, minify) {
     const filename = 'initialChunkRetry';
@@ -260,27 +270,25 @@ const pluginAssetsRetry = (userOptions = {})=>({
             const { inlineScript = true } = userOptions;
             const getScriptPath = (environment)=>{
                 const distDir = environment.config.output.distPath.js;
-                return node_path.posix.join(distDir, "assets-retry.1-3-0.js");
+                return node_path.posix.join(distDir, "assets-retry.1-4-0.js");
             };
-            const normalizeOptions = (config)=>{
-                const options = {
-                    ...userOptions
+            const getDefaultValueFromRsbuildConfig = (config)=>{
+                var _config_output_minify;
+                const minify = 'boolean' == typeof config.output.minify ? config.output.minify : null == (_config_output_minify = config.output.minify) ? void 0 : _config_output_minify.js;
+                return {
+                    crossorigin: config.html.crossorigin,
+                    minify: Boolean(minify) && 'production' === config.mode
                 };
-                if (void 0 === options.crossOrigin) options.crossOrigin = config.html.crossorigin;
-                if (void 0 === options.minify) {
-                    var _config_output_minify;
-                    const minify = 'boolean' == typeof config.output.minify ? config.output.minify : null == (_config_output_minify = config.output.minify) ? void 0 : _config_output_minify.js;
-                    options.minify = minify && 'production' === config.mode;
-                }
-                return options;
             };
             if (inlineScript) api.modifyHTMLTags(async ({ headTags, bodyTags }, { environment })=>{
-                const options = normalizeOptions(environment.config);
-                const runtimeOptions = getRuntimeOptions(options);
-                const code = await getRetryCode(runtimeOptions, options.minify);
+                const { minify, crossorigin } = getDefaultValueFromRsbuildConfig(environment.config);
+                const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
+                const code = await getRetryCode(runtimeOptions, minify);
                 headTags.unshift({
                     tag: "script",
-                    attrs: {},
+                    attrs: {
+                        [ASSETS_RETRY_DATA_ATTRIBUTE]: 'inline'
+                    },
                     children: code
                 });
                 return {
@@ -295,7 +303,8 @@ const pluginAssetsRetry = (userOptions = {})=>({
                     headTags.unshift({
                         tag: "script",
                         attrs: {
-                            src: url
+                            src: url,
+                            [ASSETS_RETRY_DATA_ATTRIBUTE]: 'external'
                         }
                     });
                     return {
@@ -307,24 +316,24 @@ const pluginAssetsRetry = (userOptions = {})=>({
                     stage: 'additional'
                 }, async ({ sources, compilation, environment })=>{
                     const scriptPath = getScriptPath(environment);
-                    const options = normalizeOptions(environment.config);
-                    const runtimeOptions = getRuntimeOptions(options);
-                    const code = await getRetryCode(runtimeOptions, options.minify);
+                    const { crossorigin, minify } = getDefaultValueFromRsbuildConfig(environment.config);
+                    const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
+                    const code = await getRetryCode(runtimeOptions, minify);
                     compilation.emitAsset(scriptPath, new sources.RawSource(code));
                 });
             }
             api.modifyBundlerChain(async (chain, { environment })=>{
                 const { config, htmlPaths } = environment;
                 if (!userOptions || 0 === Object.keys(htmlPaths).length) return;
-                const options = normalizeOptions(config);
-                const runtimeOptions = getRuntimeOptions(options);
+                const { crossorigin, minify } = getDefaultValueFromRsbuildConfig(config);
+                const runtimeOptions = getRuntimeOptions(userOptions, crossorigin);
                 const isRspack = 'rspack' === api.context.bundlerType;
                 chain.plugin('async-chunk-retry').use(AsyncChunkRetryPlugin, [
                     runtimeOptions,
                     isRspack,
-                    options.minify
+                    minify
                 ]);
             });
         }
     });
-export { PLUGIN_ASSETS_RETRY_NAME, pluginAssetsRetry };
+export { ASSETS_RETRY_DATA_ATTRIBUTE, PLUGIN_ASSETS_RETRY_NAME, pluginAssetsRetry };

package/dist/runtime/asyncChunkRetry.js

@@ -3,18 +3,17 @@
     var ERROR_PREFIX = '[@rsbuild/plugin-assets-retry] ';
     function findCurrentDomain(url, config) {
         var domains = config.domain;
-        var domain = '';
-        for(var i = 0; i < domains.length; i++)if (-1 !== url.indexOf(domains[i])) {
-            domain = domains[i];
-            break;
+        for(var i = 0; i < domains.length; i++){
+            var domain = domains[i];
+            if (-1 !== url.indexOf(domain)) return domain;
         }
-        return domain || window.origin;
+        return window.origin;
     }
     function findNextDomain(url, config) {
         var domains = config.domain;
         var currentDomain = findCurrentDomain(url, config);
         var index = domains.indexOf(currentDomain);
-        return domains[(index + 1) % domains.length] || url;
+        return -1 === index ? currentDomain : domains[(index + 1) % domains.length];
     }
     var postfixRE = /[?#].*$/;
     function cleanUrl(url) {
@@ -35,8 +34,32 @@
     function getNextRetryUrl(currRetryUrl, domain, nextDomain, existRetryTimes, originalQuery, config) {
         return cleanUrl(currRetryUrl.replace(domain, nextDomain)) + getUrlRetryQuery(existRetryTimes + 1, originalQuery, config);
     }
-    var asyncChunkRetry_config = __RETRY_OPTIONS__;
-    var maxRetries = asyncChunkRetry_config.max;
+    function _instanceof(left, right) {
+        if (null != right && "undefined" != typeof Symbol && right[Symbol.hasInstance]) return !!right[Symbol.hasInstance](left);
+        return left instanceof right;
+    }
+    function findMatchingRule(url, type, rules) {
+        for(var i = 0; i < rules.length; i++){
+            var rule = rules[i];
+            var tester = rule.test;
+            var shouldMatch = true;
+            if (_instanceof(tester, RegExp)) shouldMatch = tester.test(url);
+            else if ('string' == typeof tester) {
+                var regexp = new RegExp(tester);
+                shouldMatch = regexp.test(url);
+            } else if ('function' == typeof tester) shouldMatch = tester(url);
+            if (rule.domain && rule.domain.length > 0) {
+                var domain = findCurrentDomain(url, rule);
+                if (!rule.domain.includes(domain)) shouldMatch = false;
+            }
+            if (rule.type && rule.type.length > 0) {
+                if (!rule.type.includes(type)) shouldMatch = false;
+            }
+            if (shouldMatch) return rule;
+        }
+        return null;
+    }
+    var asyncChunkRetry_rules = __RETRY_OPTIONS__;
     var retryCollector = {};
     var retryCssCollector = {};
     var globalCurrRetrying = {};
@@ -52,13 +75,17 @@
         var originalSrcUrl = '/' === originalPublicPath[0] && '/' !== originalPublicPath[1] ? window.origin + originalPublicPath + originalScriptFilename : originalPublicPath + originalScriptFilename;
         var originalQuery = getQueryFromUrl(originalSrcUrl);
         var existRetryTimes = 0;
-        var nextDomain = findCurrentDomain(originalSrcUrl, asyncChunkRetry_config);
+        var tagName = isCssAsyncChunk ? 'link' : "script";
+        var rule = findMatchingRule(originalSrcUrl, tagName, asyncChunkRetry_rules);
+        if (!rule) return null;
+        var nextDomain = findCurrentDomain(originalSrcUrl, rule);
         return {
             nextDomain: nextDomain,
-            nextRetryUrl: getNextRetryUrl(originalSrcUrl, nextDomain, nextDomain, existRetryTimes, originalQuery, asyncChunkRetry_config),
+            nextRetryUrl: getNextRetryUrl(originalSrcUrl, nextDomain, nextDomain, existRetryTimes, originalQuery, rule),
             originalScriptFilename: originalScriptFilename,
             originalSrcUrl: originalSrcUrl,
-            originalQuery: originalQuery
+            originalQuery: originalQuery,
+            rule: rule
         };
     }
     function asyncChunkRetry_nextRetry(chunkId, existRetryTimes, isCssAsyncChunk) {
@@ -67,17 +94,19 @@
         var nextExistRetryTimes = existRetryTimes + 1;
         if (0 === existRetryTimes || void 0 === currRetry) {
             nextRetry = initRetry(chunkId, isCssAsyncChunk);
+            if (!nextRetry) return null;
             if (isCssAsyncChunk) retryCssCollector[chunkId] = [];
             else retryCollector[chunkId] = [];
         } else {
-            var originalScriptFilename = currRetry.originalScriptFilename, originalSrcUrl = currRetry.originalSrcUrl, originalQuery = currRetry.originalQuery;
-            var nextDomain = findNextDomain(currRetry.nextDomain, asyncChunkRetry_config);
+            var originalScriptFilename = currRetry.originalScriptFilename, originalSrcUrl = currRetry.originalSrcUrl, originalQuery = currRetry.originalQuery, rule = currRetry.rule;
+            var nextDomain = findNextDomain(currRetry.nextDomain, rule);
             nextRetry = {
                 nextDomain: nextDomain,
-                nextRetryUrl: getNextRetryUrl(currRetry.nextRetryUrl, currRetry.nextDomain, nextDomain, existRetryTimes, originalQuery, asyncChunkRetry_config),
+                nextRetryUrl: getNextRetryUrl(currRetry.nextRetryUrl, currRetry.nextDomain, nextDomain, existRetryTimes, originalQuery, rule),
                 originalScriptFilename: originalScriptFilename,
                 originalSrcUrl: originalSrcUrl,
-                originalQuery: originalQuery
+                originalQuery: originalQuery,
+                rule: rule
             };
         }
         if (isCssAsyncChunk) {
@@ -123,16 +152,19 @@
             var originalScriptFilename;
             var nextRetryUrl;
             var nextDomain;
+            var rule;
             var isCssAsyncChunkLoadFailed = Boolean(null == error ? void 0 : null == (_error_message = error.message) ? void 0 : _error_message.includes('CSS chunk'));
             if (isCssAsyncChunkLoadFailed) callingCounter.cssFailedCount += 1;
             var existRetryTimes = isCssAsyncChunkLoadFailed ? cssExistRetryTimes : jsExistRetryTimes;
             try {
                 var retryResult = asyncChunkRetry_nextRetry(chunkId, existRetryTimes, isCssAsyncChunkLoadFailed);
+                if (!retryResult) throw error;
                 originalScriptFilename = retryResult.originalScriptFilename;
                 nextRetryUrl = retryResult.nextRetryUrl;
                 nextDomain = retryResult.nextDomain;
+                rule = retryResult.rule;
             } catch (e) {
-                console.error(ERROR_PREFIX, 'failed to get nextRetryUrl', e);
+                if (e !== error) console.error(ERROR_PREFIX, 'failed to get nextRetryUrl', e);
                 throw error;
             }
             var createContext = function(times) {
@@ -145,25 +177,14 @@
                 };
             };
             var context = createContext(existRetryTimes);
-            if (existRetryTimes >= maxRetries) {
+            if (existRetryTimes >= rule.max) {
                 var _error_message1;
-                error.message = (null == (_error_message1 = error.message) ? void 0 : _error_message1.includes('retries:')) ? error.message : "Loading chunk ".concat(chunkId, ' from "').concat(originalScriptFilename, '" failed after ').concat(maxRetries, ' retries: "').concat(error.message, '"');
-                if ('function' == typeof asyncChunkRetry_config.onFail) asyncChunkRetry_config.onFail(context);
+                error.message = (null == (_error_message1 = error.message) ? void 0 : _error_message1.includes('retries:')) ? error.message : "Loading chunk ".concat(chunkId, ' from "').concat(originalScriptFilename, '" failed after ').concat(rule.max, ' retries: "').concat(error.message, '"');
+                if ('function' == typeof rule.onFail) rule.onFail(context);
                 throw error;
             }
-            var tester = asyncChunkRetry_config.test;
-            if (tester) {
-                if ('string' == typeof tester) {
-                    var regexp = new RegExp(tester);
-                    tester = function(str) {
-                        return regexp.test(str);
-                    };
-                }
-                if ('function' != typeof tester || !tester(nextRetryUrl)) throw error;
-            }
-            if (asyncChunkRetry_config.domain && asyncChunkRetry_config.domain.length > 0 && -1 === asyncChunkRetry_config.domain.indexOf(nextDomain)) throw error;
-            if ('function' == typeof asyncChunkRetry_config.onRetry) asyncChunkRetry_config.onRetry(context);
-            var delayTime = 'function' == typeof asyncChunkRetry_config.delay ? asyncChunkRetry_config.delay(context) : asyncChunkRetry_config.delay;
+            if ('function' == typeof rule.onRetry) rule.onRetry(context);
+            var delayTime = 'function' == typeof rule.delay ? rule.delay(context) : rule.delay;
             var delayPromise = delayTime > 0 ? new Promise(function(resolve) {
                 return setTimeout(resolve, delayTime);
             }) : Promise.resolve();
@@ -171,9 +192,9 @@
                 return ensureChunk.apply(ensureChunk, args);
             }).then(function(result) {
                 var isLastSuccessRetry = (null == callingCounter ? void 0 : callingCounter.count) === existRetryTimesAll + 2;
-                if ('function' == typeof asyncChunkRetry_config.onSuccess && isLastSuccessRetry) {
+                if ('function' == typeof rule.onSuccess && isLastSuccessRetry) {
                     var context = createContext(existRetryTimes + 1);
-                    asyncChunkRetry_config.onSuccess(context);
+                    rule.onSuccess(context);
                 }
                 return result;
             });

package/dist/runtime/asyncChunkRetry.min.js

@@ -1 +1 @@
-!function(){"use strict";var n="[@rsbuild/plugin-assets-retry] ";function r(n,r){for(var e=r.domain,t="",i=0;i<e.length;i++)if(-1!==n.indexOf(e[i])){t=e[i];break}return t||window.origin}var e=/[?#].*$/;function t(n,r,t,i,o,_){var a;return n.replace(r,t).replace(e,"")+(a=i+1,!0===_.addQuery?""!==o?"".concat(o,"&retry=").concat(a):"?retry=".concat(a):"function"==typeof _.addQuery?_.addQuery({times:a,originalQuery:o}):"")}var i=__RETRY_OPTIONS__,o=i.max,_={},a={},c={},l={},u=__RUNTIME_GLOBALS_ENSURE_CHUNK__,s=__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__,f=__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__||__RUNTIME_GLOBALS_GET_CSS_FILENAME__||function(){return null},d=__RUNTIME_GLOBALS_LOAD_SCRIPT__;function y(e){var d=Array.prototype.slice.call(arguments);d[10]||(d[10]={count:0,cssFailedCount:0});var S=d[10],R=u.apply(null,d);try{var p=s(e),E=f(e);"undefined"!=typeof window&&(p&&(window.__RB_ASYNC_CHUNKS__[p]=!0),E&&(window.__RB_ASYNC_CHUNKS__[E]=!0))}catch(r){console.error(n,"get original script or CSS filename error",r)}return S&&"number"==typeof S.count&&"number"==typeof S.cssFailedCount?(S.count+=1,R.catch(function(u){var R,p,E,U,L,m=S.count-1,g=S.cssFailedCount,v=!!(null==u||null==(R=u.message)?void 0:R.includes("CSS chunk"));v&&(S.cssFailedCount+=1);var N=v?g:m-g;try{var A=function(n,e,o){var u,d,y,S=o?null==(u=a[n])?void 0:u[e]:null==(d=_[n])?void 0:d[e],R=e+1;if(0===e||void 0===S)y=function(n,e){var o,_=e?f(n):s(n);if(!_)throw Error("only support cssExtract");var a=__RUNTIME_GLOBALS_PUBLIC_PATH__,c="/"===a[0]&&"/"!==a[1]?window.origin+a+_:a+_,l=(o=c.split("?")[1])?"?".concat(o.split("#")[0]):"",u=r(c,i);return{nextDomain:u,nextRetryUrl:t(c,u,u,0,l,i),originalScriptFilename:_,originalSrcUrl:c,originalQuery:l}}(n,o),o?a[n]=[]:_[n]=[];else{var p,E,U,L,m=S.originalScriptFilename,g=S.originalSrcUrl,v=S.originalQuery,N=(p=S.nextDomain,E=i.domain,U=r(p,i),L=E.indexOf(U),E[(L+1)%E.length]||p);y={nextDomain:N,nextRetryUrl:t(S.nextRetryUrl,S.nextDomain,N,e,v,i),originalScriptFilename:m,originalSrcUrl:g,originalQuery:v}}return o?(a[n][R]=y,l[n]=y):(_[n][R]=y,c[n]=y),y}(e,N,v);p=A.originalScriptFilename,E=A.nextRetryUrl,U=A.nextDomain}catch(r){throw console.error(n,"failed to get nextRetryUrl",r),u}var C=function(n){return{times:n,domain:U,url:E,tagName:v?"link":"script",isAsyncChunk:!0}},T=C(N);if(N>=o)throw u.message=(null==(L=u.message)?void 0:L.includes("retries:"))?u.message:"Loading chunk ".concat(e,' from "').concat(p,'" failed after ').concat(o,' retries: "').concat(u.message,'"'),"function"==typeof i.onFail&&i.onFail(T),u;var I=i.test;if(I){if("string"==typeof I){var w=new RegExp(I);I=function(n){return w.test(n)}}if("function"!=typeof I||!I(E))throw u}if(i.domain&&i.domain.length>0&&-1===i.domain.indexOf(U))throw u;"function"==typeof i.onRetry&&i.onRetry(T);var O="function"==typeof i.delay?i.delay(T):i.delay;return(O>0?new Promise(function(n){return setTimeout(n,O)}):Promise.resolve()).then(function(){return y.apply(y,d)}).then(function(n){var r=(null==S?void 0:S.count)===m+2;if("function"==typeof i.onSuccess&&r){var e=C(N+1);i.onSuccess(e)}return n})})):R}if("undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={}),"undefined"!=typeof __RUNTIME_GLOBALS_REQUIRE__)try{__RUNTIME_GLOBALS_ENSURE_CHUNK__=y,__RUNTIME_GLOBALS_LOAD_SCRIPT__=function(){var n=Array.prototype.slice.call(arguments),r=c[n[3]];return r&&(n[0]=r.nextRetryUrl),d.apply(null,n)},__RUNTIME_GLOBALS_RSBUILD_LOAD_STYLESHEET__=function(n,r){var e=l[r];return e&&e.nextRetryUrl||__RUNTIME_GLOBALS_PUBLIC_PATH__+n}}catch(r){console.error(n,"Register async chunk retry runtime failed",r)}}();
+!function(){"use strict";var n="[@rsbuild/plugin-assets-retry] ";function r(n,r){for(var e=r.domain,t=0;t<e.length;t++){var i=e[t];if(-1!==n.indexOf(i))return i}return window.origin}var e=/[?#].*$/;function t(n,r,t,i,o,_){var a;return n.replace(r,t).replace(e,"")+(a=i+1,!0===_.addQuery?""!==o?"".concat(o,"&retry=").concat(a):"?retry=".concat(a):"function"==typeof _.addQuery?_.addQuery({times:a,originalQuery:o}):"")}var i=__RETRY_OPTIONS__,o={},_={},a={},l={},u=__RUNTIME_GLOBALS_ENSURE_CHUNK__,c=__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__,s=__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__||__RUNTIME_GLOBALS_GET_CSS_FILENAME__||function(){return null},f=__RUNTIME_GLOBALS_LOAD_SCRIPT__;function y(e){var f=Array.prototype.slice.call(arguments);f[10]||(f[10]={count:0,cssFailedCount:0});var d=f[10],S=u.apply(null,f);try{var p=c(e),R=s(e);"undefined"!=typeof window&&(p&&(window.__RB_ASYNC_CHUNKS__[p]=!0),R&&(window.__RB_ASYNC_CHUNKS__[R]=!0))}catch(r){console.error(n,"get original script or CSS filename error",r)}return d&&"number"==typeof d.count&&"number"==typeof d.cssFailedCount?(d.count+=1,S.catch(function(u){var S,p,R,m,E,U,g=d.count-1,v=d.cssFailedCount,L=!!(null==u||null==(S=u.message)?void 0:S.includes("CSS chunk"));L&&(d.cssFailedCount+=1);var N=L?v:g-v;try{var A=function(n,e,u){var f,y,d,S=u?null==(f=_[n])?void 0:f[e]:null==(y=o[n])?void 0:y[e],p=e+1;if(0===e||void 0===S){if(!(d=function(n,e){var o,_=e?s(n):c(n);if(!_)throw Error("only support cssExtract");var a=__RUNTIME_GLOBALS_PUBLIC_PATH__,l="/"===a[0]&&"/"!==a[1]?window.origin+a+_:a+_,u=(o=l.split("?")[1])?"?".concat(o.split("#")[0]):"",f=function(n,e,t){for(var i=0;i<t.length;i++){var o,_=t[i],a=_.test,l=!0;if((null!=(o=RegExp)&&"undefined"!=typeof Symbol&&o[Symbol.hasInstance]?!!o[Symbol.hasInstance](a):a instanceof o)?l=a.test(n):"string"==typeof a?l=new RegExp(a).test(n):"function"==typeof a&&(l=a(n)),_.domain&&_.domain.length>0){var u=r(n,_);_.domain.includes(u)||(l=!1)}if(_.type&&_.type.length>0&&!_.type.includes(e)&&(l=!1),l)return _}return null}(l,e?"link":"script",i);if(!f)return null;var y=r(l,f);return{nextDomain:y,nextRetryUrl:t(l,y,y,0,u,f),originalScriptFilename:_,originalSrcUrl:l,originalQuery:u,rule:f}}(n,u)))return null;u?_[n]=[]:o[n]=[]}else{var R,m,E,U,g=S.originalScriptFilename,v=S.originalSrcUrl,L=S.originalQuery,N=S.rule,A=(R=S.nextDomain,m=N.domain,E=r(R,N),-1===(U=m.indexOf(E))?E:m[(U+1)%m.length]);d={nextDomain:A,nextRetryUrl:t(S.nextRetryUrl,S.nextDomain,A,e,L,N),originalScriptFilename:g,originalSrcUrl:v,originalQuery:L,rule:N}}return u?(_[n][p]=d,l[n]=d):(o[n][p]=d,a[n]=d),d}(e,N,L);if(!A)throw u;p=A.originalScriptFilename,R=A.nextRetryUrl,m=A.nextDomain,E=A.rule}catch(r){throw r!==u&&console.error(n,"failed to get nextRetryUrl",r),u}var C=function(n){return{times:n,domain:m,url:R,tagName:L?"link":"script",isAsyncChunk:!0}},I=C(N);if(N>=E.max)throw u.message=(null==(U=u.message)?void 0:U.includes("retries:"))?u.message:"Loading chunk ".concat(e,' from "').concat(p,'" failed after ').concat(E.max,' retries: "').concat(u.message,'"'),"function"==typeof E.onFail&&E.onFail(I),u;"function"==typeof E.onRetry&&E.onRetry(I);var T="function"==typeof E.delay?E.delay(I):E.delay;return(T>0?new Promise(function(n){return setTimeout(n,T)}):Promise.resolve()).then(function(){return y.apply(y,f)}).then(function(n){var r=(null==d?void 0:d.count)===g+2;if("function"==typeof E.onSuccess&&r){var e=C(N+1);E.onSuccess(e)}return n})})):S}if("undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={}),"undefined"!=typeof __RUNTIME_GLOBALS_REQUIRE__)try{__RUNTIME_GLOBALS_ENSURE_CHUNK__=y,__RUNTIME_GLOBALS_LOAD_SCRIPT__=function(){var n=Array.prototype.slice.call(arguments),r=a[n[3]];return r&&(n[0]=r.nextRetryUrl),f.apply(null,n)},__RUNTIME_GLOBALS_RSBUILD_LOAD_STYLESHEET__=function(n,r){var e=l[r];return e&&e.nextRetryUrl||__RUNTIME_GLOBALS_PUBLIC_PATH__+n}}catch(r){console.error(n,"Register async chunk retry runtime failed",r)}}();

package/dist/runtime/initialChunkRetry.js

@@ -3,18 +3,17 @@
     var ERROR_PREFIX = '[@rsbuild/plugin-assets-retry] ';
     function findCurrentDomain(url, config) {
         var domains = config.domain;
-        var domain = '';
-        for(var i = 0; i < domains.length; i++)if (-1 !== url.indexOf(domains[i])) {
-            domain = domains[i];
-            break;
+        for(var i = 0; i < domains.length; i++){
+            var domain = domains[i];
+            if (-1 !== url.indexOf(domain)) return domain;
         }
-        return domain || window.origin;
+        return window.origin;
     }
     function findNextDomain(url, config) {
         var domains = config.domain;
         var currentDomain = findCurrentDomain(url, config);
         var index = domains.indexOf(currentDomain);
-        return domains[(index + 1) % domains.length] || url;
+        return -1 === index ? currentDomain : domains[(index + 1) % domains.length];
     }
     var postfixRE = /[?#].*$/;
     function cleanUrl(url) {
@@ -39,26 +38,58 @@
         if (null != right && "undefined" != typeof Symbol && right[Symbol.hasInstance]) return !!right[Symbol.hasInstance](left);
         return left instanceof right;
     }
+    function findMatchingRule(url, type, rules) {
+        for(var i = 0; i < rules.length; i++){
+            var rule = rules[i];
+            var tester = rule.test;
+            var shouldMatch = true;
+            if (_instanceof(tester, RegExp)) shouldMatch = tester.test(url);
+            else if ('string' == typeof tester) {
+                var regexp = new RegExp(tester);
+                shouldMatch = regexp.test(url);
+            } else if ('function' == typeof tester) shouldMatch = tester(url);
+            if (rule.domain && rule.domain.length > 0) {
+                var domain = findCurrentDomain(url, rule);
+                if (!rule.domain.includes(domain)) shouldMatch = false;
+            }
+            if (rule.type && rule.type.length > 0) {
+                if (!rule.type.includes(type)) shouldMatch = false;
+            }
+            if (shouldMatch) return rule;
+        }
+        return null;
+    }
+    function initialChunkRetry_instanceof(left, right) {
+        if (null != right && "undefined" != typeof Symbol && right[Symbol.hasInstance]) return !!right[Symbol.hasInstance](left);
+        return left instanceof right;
+    }
     var TAG_TYPE = {
         link: HTMLLinkElement,
         script: HTMLScriptElement,
         img: HTMLImageElement
     };
     function getRequestUrl(element) {
-        if (_instanceof(element, HTMLScriptElement) || _instanceof(element, HTMLImageElement)) return element.src;
-        if (_instanceof(element, HTMLLinkElement)) return element.href;
+        if (initialChunkRetry_instanceof(element, HTMLScriptElement) || initialChunkRetry_instanceof(element, HTMLImageElement)) return element.src;
+        if (initialChunkRetry_instanceof(element, HTMLLinkElement)) return element.href;
         return null;
     }
-    function validateTargetInfo(config, e) {
+    function validateTargetInfo(rules, e) {
         var target = e.target;
         var tagName = target.tagName.toLocaleLowerCase();
-        var allowTags = config.type;
         var url = getRequestUrl(target);
-        if (!tagName || -1 === allowTags.indexOf(tagName) || !TAG_TYPE[tagName] || !_instanceof(target, TAG_TYPE[tagName]) || !url) return false;
+        if (!url) return false;
+        var ruleIndex = Number(target.dataset.rbRuleI || '-1');
+        var rule = rules[ruleIndex] || findMatchingRule(url, tagName, rules);
+        if (!rule) return false;
+        ruleIndex = rules.indexOf(rule);
+        var allowTags = rule.type;
+        if (!tagName || -1 === allowTags.indexOf(tagName) || !TAG_TYPE[tagName] || !initialChunkRetry_instanceof(target, TAG_TYPE[tagName])) return false;
         return {
             target: target,
             tagName: tagName,
-            url: url
+            url: url,
+            rule: rule,
+            ruleIndex: ruleIndex
         };
     }
     function createElement(origin, attributes) {
@@ -66,20 +97,22 @@
         var crossOriginAttr = crossOrigin ? 'crossorigin="'.concat(crossOrigin, '"') : '';
         var retryTimesAttr = attributes.times ? 'data-rb-retry-times="'.concat(attributes.times, '"') : '';
         var originalQueryAttr = attributes.originalQuery ? 'data-rb-original-query="'.concat(attributes.originalQuery, '"') : '';
+        var ruleIndexAttr = attributes.ruleIndex >= 0 ? 'data-rb-rule-i="'.concat(attributes.ruleIndex, '"') : '';
         var isAsyncAttr = attributes.isAsync ? 'data-rb-async' : '';
-        if (_instanceof(origin, HTMLScriptElement)) {
+        if (initialChunkRetry_instanceof(origin, HTMLScriptElement)) {
             var script = document.createElement("script");
             script.src = attributes.url;
             if (crossOrigin) script.crossOrigin = crossOrigin;
             if (attributes.times) script.dataset.rbRetryTimes = String(attributes.times);
             if (attributes.isAsync) script.dataset.rbAsync = '';
             if (void 0 !== attributes.originalQuery) script.dataset.rbOriginalQuery = attributes.originalQuery;
+            if (attributes.ruleIndex >= 0) script.dataset.rbRuleI = String(attributes.ruleIndex);
             return {
                 element: script,
-                str: '<script src="'.concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(isAsyncAttr, " ").concat(originalQueryAttr, ">") + "<\/script>"
+                str: '<script src="'.concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(isAsyncAttr, " ").concat(ruleIndexAttr, " ").concat(originalQueryAttr, ">") + "<\/script>"
             };
         }
-        if (_instanceof(origin, HTMLLinkElement)) {
+        if (initialChunkRetry_instanceof(origin, HTMLLinkElement)) {
             var link = document.createElement('link');
             link.rel = origin.rel || 'stylesheet';
             if (origin.as) link.as = origin.as;
@@ -89,42 +122,31 @@
             if (void 0 !== attributes.originalQuery) link.dataset.rbOriginalQuery = attributes.originalQuery;
             return {
                 element: link,
-                str: '<link rel="'.concat(link.rel, '" href="').concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(link.as ? 'as="'.concat(link.as, '"') : '', " ").concat(originalQueryAttr, "></link>")
+                str: '<link rel="'.concat(link.rel, '" href="').concat(attributes.url, '" ').concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(link.as ? 'as="'.concat(link.as, '"') : '', " ").concat(ruleIndexAttr, " ").concat(originalQueryAttr, "></link>")
             };
         }
     }
     function reloadElementResource(origin, fresh, attributes) {
-        if (_instanceof(origin, HTMLScriptElement)) if (attributes.isAsync) document.body.appendChild(fresh.element);
+        if (initialChunkRetry_instanceof(origin, HTMLScriptElement)) if (attributes.isAsync) document.body.appendChild(fresh.element);
         else console.warn(ERROR_PREFIX, "load sync script failed, for security only async/defer script can be retried", origin);
-        if (_instanceof(origin, HTMLLinkElement)) document.getElementsByTagName('head')[0].appendChild(fresh.element);
-        if (_instanceof(origin, HTMLImageElement)) {
+        if (initialChunkRetry_instanceof(origin, HTMLLinkElement)) document.getElementsByTagName('head')[0].appendChild(fresh.element);
+        if (initialChunkRetry_instanceof(origin, HTMLImageElement)) {
             origin.src = attributes.url;
             origin.dataset.rbRetryTimes = String(attributes.times);
             origin.dataset.rbOriginalQuery = String(attributes.originalQuery);
         }
     }
-    function retry(config, e) {
-        var targetInfo = validateTargetInfo(config, e);
+    function retry(rules, e) {
+        var targetInfo = validateTargetInfo(rules, e);
         if (false === targetInfo) return;
-        var target = targetInfo.target, tagName = targetInfo.tagName, url = targetInfo.url;
+        var target = targetInfo.target, tagName = targetInfo.tagName, url = targetInfo.url, rule = targetInfo.rule, ruleIndex = targetInfo.ruleIndex;
         if ('undefined' != typeof window && Object.keys(window.__RB_ASYNC_CHUNKS__ || {}).some(function(chunkName) {
             return -1 !== url.indexOf(chunkName);
         })) return;
-        var tester = config.test;
-        if (tester) {
-            if ('string' == typeof tester) {
-                var regexp = new RegExp(tester);
-                tester = function(str) {
-                    return regexp.test(str);
-                };
-            }
-            if ('function' != typeof tester || !tester(url)) return;
-        }
-        var domain = findCurrentDomain(url, config);
-        if (config.domain && config.domain.length > 0 && -1 === config.domain.indexOf(domain)) return;
+        var domain = findCurrentDomain(url, rule);
         var existRetryTimes = Number(target.dataset.rbRetryTimes) || 0;
-        if (existRetryTimes === config.max) {
-            if ('function' == typeof config.onFail) {
+        if (existRetryTimes === rule.max) {
+            if ('function' == typeof rule.onFail) {
                 var context = {
                     times: existRetryTimes,
                     domain: domain,
@@ -132,20 +154,21 @@
                     tagName: tagName,
                     isAsyncChunk: false
                 };
-                config.onFail(context);
+                rule.onFail(context);
             }
             return;
         }
-        var nextDomain = findNextDomain(domain, config);
+        var nextDomain = findNextDomain(domain, rule);
         var _target_dataset_rbOriginalQuery;
         var originalQuery = null != (_target_dataset_rbOriginalQuery = target.dataset.rbOriginalQuery) ? _target_dataset_rbOriginalQuery : getQueryFromUrl(url);
         var isAsync = Boolean(target.dataset.rbAsync) || target.async || target.defer;
         var attributes = {
-            url: getNextRetryUrl(url, domain, nextDomain, existRetryTimes, originalQuery, config),
+            url: getNextRetryUrl(url, domain, nextDomain, existRetryTimes, originalQuery, rule),
             times: existRetryTimes + 1,
-            crossOrigin: config.crossOrigin,
-            isAsync: isAsync,
-            originalQuery: originalQuery
+            originalQuery: originalQuery,
+            ruleIndex: ruleIndex,
+            crossOrigin: rule.crossOrigin,
+            isAsync: isAsync
         };
         var element = createElement(target, attributes);
         var context1 = {
@@ -155,21 +178,21 @@
             tagName: tagName,
             isAsyncChunk: false
         };
-        if ('function' == typeof config.onRetry) config.onRetry(context1);
-        var delayValue = 'function' == typeof config.delay ? config.delay(context1) : config.delay;
+        if ('function' == typeof rule.onRetry) rule.onRetry(context1);
+        var delayValue = 'function' == typeof rule.delay ? rule.delay(context1) : rule.delay;
         if (delayValue > 0) setTimeout(function() {
             reloadElementResource(target, element, attributes);
         }, delayValue);
         else reloadElementResource(target, element, attributes);
     }
-    function load(config, e) {
-        var targetInfo = validateTargetInfo(config, e);
+    function load(rules, e) {
+        var targetInfo = validateTargetInfo(rules, e);
         if (false === targetInfo) return;
-        var target = targetInfo.target, tagName = targetInfo.tagName, url = targetInfo.url;
-        var domain = findCurrentDomain(url, config);
+        var target = targetInfo.target, tagName = targetInfo.tagName, url = targetInfo.url, rule = targetInfo.rule;
+        var domain = findCurrentDomain(url, rule);
         var retryTimes = Number(target.dataset.rbRetryTimes) || 0;
         if (0 === retryTimes) return;
-        if ('function' == typeof config.onSuccess) {
+        if ('function' == typeof rule.onSuccess) {
             var context = {
                 times: retryTimes,
                 domain: domain,
@@ -177,7 +200,7 @@
                 tagName: tagName,
                 isAsyncChunk: false
             };
-            config.onSuccess(context);
+            rule.onSuccess(context);
         }
     }
     function registerInitialChunkRetry() {
@@ -186,14 +209,14 @@
             var config = __RETRY_OPTIONS__;
             if ('undefined' != typeof window && void 0 !== window.document) {
                 document.addEventListener('error', function(e) {
-                    if (e && _instanceof(e.target, Element)) try {
+                    if (e && initialChunkRetry_instanceof(e.target, Element)) try {
                         retry(config, e);
                     } catch (err) {
                         console.error('retry error captured', err);
                     }
                 }, true);
                 document.addEventListener('load', function(e) {
-                    if (e && _instanceof(e.target, Element)) try {
+                    if (e && initialChunkRetry_instanceof(e.target, Element)) try {
                         load(config, e);
                     } catch (err) {
                         console.error('load error captured', err);

package/dist/runtime/initialChunkRetry.min.js

@@ -1 +1 @@
-!function(){"use strict";function e(e,t){for(var n=t.domain,r="",i=0;i<n.length;i++)if(-1!==e.indexOf(n[i])){r=n[i];break}return r||window.origin}var t=/[?#].*$/;function n(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}var r={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement};function i(e,t){var i=t.target,a=i.tagName.toLocaleLowerCase(),o=e.type,c=n(i,HTMLScriptElement)||n(i,HTMLImageElement)?i.src:n(i,HTMLLinkElement)?i.href:null;return!!a&&-1!==o.indexOf(a)&&!!r[a]&&!!n(i,r[a])&&!!c&&{target:i,tagName:a,url:c}}function a(e,t,r){n(e,HTMLScriptElement)&&(r.isAsync?document.body.appendChild(t.element):console.warn("[@rsbuild/plugin-assets-retry] ","load sync script failed, for security only async/defer script can be retried",e)),n(e,HTMLLinkElement)&&document.getElementsByTagName("head")[0].appendChild(t.element),n(e,HTMLImageElement)&&(e.src=r.url,e.dataset.rbRetryTimes=String(r.times),e.dataset.rbOriginalQuery=String(r.originalQuery))}"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={});try{var o=__RETRY_OPTIONS__;"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",function(r){if(r&&n(r.target,Element))try{!function(r,o){var c,s=i(r,o);if(!1!==s){var l=s.target,u=s.tagName,d=s.url;if(!("undefined"!=typeof window&&Object.keys(window.__RB_ASYNC_CHUNKS__||{}).some(function(e){return -1!==d.indexOf(e)}))){var m=r.test;if(m){if("string"==typeof m){var y=new RegExp(m);m=function(e){return y.test(e)}}if("function"!=typeof m||!m(d))return}var f=e(d,r);if(!r.domain||!(r.domain.length>0)||-1!==r.domain.indexOf(f)){var g,p,b,v,_=Number(l.dataset.rbRetryTimes)||0;if(_===r.max){"function"==typeof r.onFail&&r.onFail({times:_,domain:f,url:d,tagName:u,isAsyncChunk:!1});return}var E=(g=r.domain,p=e(f,r),b=g.indexOf(p),g[(b+1)%g.length]||f),S=null!=(c=l.dataset.rbOriginalQuery)?c:(v=d.split("?")[1])?"?".concat(v.split("#")[0]):"",T=!!l.dataset.rbAsync||l.async||l.defer,w={url:function(e,n,r,i,a,o){var c;return e.replace(n,r).replace(t,"")+(c=i+1,!0===o.addQuery?""!==a?"".concat(a,"&retry=").concat(c):"?retry=".concat(c):"function"==typeof o.addQuery?o.addQuery({times:c,originalQuery:a}):"")}(d,f,E,_,S,r),times:_+1,crossOrigin:r.crossOrigin,isAsync:T,originalQuery:S},L=function(e,t){var r=!0===t.crossOrigin?"anonymous":t.crossOrigin,i=r?'crossorigin="'.concat(r,'"'):"",a=t.times?'data-rb-retry-times="'.concat(t.times,'"'):"",o=t.originalQuery?'data-rb-original-query="'.concat(t.originalQuery,'"'):"",c=t.isAsync?"data-rb-async":"";if(n(e,HTMLScriptElement)){var s=document.createElement("script");return s.src=t.url,r&&(s.crossOrigin=r),t.times&&(s.dataset.rbRetryTimes=String(t.times)),t.isAsync&&(s.dataset.rbAsync=""),void 0!==t.originalQuery&&(s.dataset.rbOriginalQuery=t.originalQuery),{element:s,str:'<script src="'.concat(t.url,'" ').concat(i," ").concat(a," ").concat(c," ").concat(o,">")+"<\/script>"}}if(n(e,HTMLLinkElement)){var l=document.createElement("link");return l.rel=e.rel||"stylesheet",e.as&&(l.as=e.as),l.href=t.url,r&&(l.crossOrigin=r),t.times&&(l.dataset.rbRetryTimes=String(t.times)),void 0!==t.originalQuery&&(l.dataset.rbOriginalQuery=t.originalQuery),{element:l,str:'<link rel="'.concat(l.rel,'" href="').concat(t.url,'" ').concat(i," ").concat(a," ").concat(l.as?'as="'.concat(l.as,'"'):""," ").concat(o,"></link>")}}}(l,w),h={times:_,domain:f,url:d,tagName:u,isAsyncChunk:!1};"function"==typeof r.onRetry&&r.onRetry(h);var O="function"==typeof r.delay?r.delay(h):r.delay;O>0?setTimeout(function(){a(l,L,w)},O):a(l,L,w)}}}}(o,r)}catch(e){console.error("retry error captured",e)}},!0),document.addEventListener("load",function(t){if(t&&n(t.target,Element))try{!function(t,n){var r=i(t,n);if(!1!==r){var a=r.target,o=r.tagName,c=r.url,s=e(c,t),l=Number(a.dataset.rbRetryTimes)||0;0!==l&&"function"==typeof t.onSuccess&&t.onSuccess({times:l,domain:s,url:c,tagName:o,isAsyncChunk:!1})}}(o,t)}catch(e){console.error("load error captured",e)}},!0))}catch(e){console.error("monitor error captured",e)}}();
+!function(){"use strict";function e(e,n){for(var t=n.domain,r=0;r<t.length;r++){var a=t[r];if(-1!==e.indexOf(a))return a}return window.origin}var n=/[?#].*$/;function t(e,n){return null!=n&&"undefined"!=typeof Symbol&&n[Symbol.hasInstance]?!!n[Symbol.hasInstance](e):e instanceof n}var r={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement};function a(n,a){var i=a.target,o=i.tagName.toLocaleLowerCase(),c=t(i,HTMLScriptElement)||t(i,HTMLImageElement)?i.src:t(i,HTMLLinkElement)?i.href:null;if(!c)return!1;var s=Number(i.dataset.rbRuleI||"-1"),l=n[s]||function(n,t,r){for(var a=0;a<r.length;a++){var i,o=r[a],c=o.test,s=!0;if((null!=(i=RegExp)&&"undefined"!=typeof Symbol&&i[Symbol.hasInstance]?!!i[Symbol.hasInstance](c):c instanceof i)?s=c.test(n):"string"==typeof c?s=new RegExp(c).test(n):"function"==typeof c&&(s=c(n)),o.domain&&o.domain.length>0){var l=e(n,o);o.domain.includes(l)||(s=!1)}if(o.type&&o.type.length>0&&!o.type.includes(t)&&(s=!1),s)return o}return null}(c,o,n);if(!l)return!1;s=n.indexOf(l);var u=l.type;return!!o&&-1!==u.indexOf(o)&&!!r[o]&&!!t(i,r[o])&&{target:i,tagName:o,url:c,rule:l,ruleIndex:s}}function i(e,n,r){t(e,HTMLScriptElement)&&(r.isAsync?document.body.appendChild(n.element):console.warn("[@rsbuild/plugin-assets-retry] ","load sync script failed, for security only async/defer script can be retried",e)),t(e,HTMLLinkElement)&&document.getElementsByTagName("head")[0].appendChild(n.element),t(e,HTMLImageElement)&&(e.src=r.url,e.dataset.rbRetryTimes=r.times+"",e.dataset.rbOriginalQuery=r.originalQuery+"")}"undefined"==typeof window||window.__RB_ASYNC_CHUNKS__||(window.__RB_ASYNC_CHUNKS__={});try{var o=__RETRY_OPTIONS__;"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",function(r){if(r&&t(r.target,Element))try{!function(r,o){var c,s=a(r,o);if(!1!==s){var l=s.target,u=s.tagName,d=s.url,m=s.rule,y=s.ruleIndex;if(!("undefined"!=typeof window&&Object.keys(window.__RB_ASYNC_CHUNKS__||{}).some(function(e){return -1!==d.indexOf(e)}))){var f,g,p,b,v,_=e(d,m),h=Number(l.dataset.rbRetryTimes)||0;if(h===m.max){"function"==typeof m.onFail&&m.onFail({times:h,domain:_,url:d,tagName:u,isAsyncChunk:!1});return}var E=(g=m.domain,p=e(_,m),-1===(b=g.indexOf(p))?p:g[(b+1)%g.length]),T=null!=(c=l.dataset.rbOriginalQuery)?c:(v=d.split("?")[1])?"?".concat(v.split("#")[0]):"",w=!!l.dataset.rbAsync||l.async||l.defer,L={url:d.replace(_,E).replace(n,"")+(f=h+1,!0===m.addQuery?""!==T?"".concat(T,"&retry=").concat(f):"?retry=".concat(f):"function"==typeof m.addQuery?m.addQuery({times:f,originalQuery:T}):""),times:h+1,originalQuery:T,ruleIndex:y,crossOrigin:m.crossOrigin,isAsync:w},S=function(e,n){var r=!0===n.crossOrigin?"anonymous":n.crossOrigin,a=r?'crossorigin="'.concat(r,'"'):"",i=n.times?'data-rb-retry-times="'.concat(n.times,'"'):"",o=n.originalQuery?'data-rb-original-query="'.concat(n.originalQuery,'"'):"",c=n.ruleIndex>=0?'data-rb-rule-i="'.concat(n.ruleIndex,'"'):"",s=n.isAsync?"data-rb-async":"";if(t(e,HTMLScriptElement)){var l=document.createElement("script");return l.src=n.url,r&&(l.crossOrigin=r),n.times&&(l.dataset.rbRetryTimes=n.times+""),n.isAsync&&(l.dataset.rbAsync=""),void 0!==n.originalQuery&&(l.dataset.rbOriginalQuery=n.originalQuery),n.ruleIndex>=0&&(l.dataset.rbRuleI=n.ruleIndex+""),{element:l,str:'<script src="'.concat(n.url,'" ').concat(a," ").concat(i," ").concat(s," ").concat(c," ").concat(o,">")+"<\/script>"}}if(t(e,HTMLLinkElement)){var u=document.createElement("link");return u.rel=e.rel||"stylesheet",e.as&&(u.as=e.as),u.href=n.url,r&&(u.crossOrigin=r),n.times&&(u.dataset.rbRetryTimes=n.times+""),void 0!==n.originalQuery&&(u.dataset.rbOriginalQuery=n.originalQuery),{element:u,str:'<link rel="'.concat(u.rel,'" href="').concat(n.url,'" ').concat(a," ").concat(i," ").concat(u.as?'as="'.concat(u.as,'"'):""," ").concat(c," ").concat(o,"></link>")}}}(l,L),N={times:h,domain:_,url:d,tagName:u,isAsyncChunk:!1};"function"==typeof m.onRetry&&m.onRetry(N);var O="function"==typeof m.delay?m.delay(N):m.delay;O>0?setTimeout(function(){i(l,S,L)},O):i(l,S,L)}}}(o,r)}catch(e){console.error("retry error captured",e)}},!0),document.addEventListener("load",function(n){if(n&&t(n.target,Element))try{!function(n,t){var r=a(n,t);if(!1!==r){var i=r.target,o=r.tagName,c=r.url,s=r.rule,l=e(c,s),u=Number(i.dataset.rbRetryTimes)||0;0!==u&&"function"==typeof s.onSuccess&&s.onSuccess({times:u,domain:l,url:c,tagName:o,isAsyncChunk:!1})}}(o,n)}catch(e){console.error("load error captured",e)}},!0))}catch(e){console.error("monitor error captured",e)}}();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "repository": "https://github.com/rspack-contrib/rsbuild-plugin-assets-retry",
   "license": "MIT",
   "type": "module",
@@ -30,16 +30,16 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
     "@biomejs/biome": "^1.9.4",
-    "@playwright/test": "^1.53.0",
-    "@rsbuild/core": "^1.3.22",
+    "@playwright/test": "^1.53.2",
+    "@rsbuild/core": "^1.4.2",
     "@rsbuild/plugin-react": "^1.3.2",
-    "@rslib/core": "^0.10.0",
-    "@swc/core": "^1.12.1",
-    "@types/node": "^22.15.32",
+    "@rslib/core": "^0.10.4",
+    "@swc/core": "^1.12.7",
+    "@types/node": "^22.15.34",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@types/serialize-javascript": "^5.0.4",
-    "playwright": "^1.53.0",
+    "playwright": "^1.53.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "serialize-javascript": "^6.0.2",
@@ -54,7 +54,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.12.2",
+  "packageManager": "pnpm@10.12.4",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"