@rsbuild/plugin-assets-retry 1.5.2 → 2.0.1

package/README.md

@@ -330,7 +330,7 @@ Or pass a function that receives `AssetsRetryHookContext` and returns the delay
 ```js
 // Calculate delay based on retry attempts
 pluginAssetsRetry({
-  delay: ctx => (ctx.times + 1) * 1000,
+  delay: (ctx) => (ctx.times + 1) * 1000,
 });
 ```
 
@@ -491,10 +491,12 @@ Example usage in HTML templates:
 
 ```html
 <!-- Filter retry scripts -->
-<%= htmlWebpackPlugin.tags.headTags.filter(tag => tag.attributes['data-rsbuild-assets-retry'] === 'inline') %>
+<%= 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']) %>
+<%= 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.

package/README.zh-CN.md

@@ -328,7 +328,7 @@ pluginAssetsRetry({
 ```js
 // 通过次数来计算延迟时间
 pluginAssetsRetry({
-  delay: ctx => (ctx.times + 1) * 1000,
+  delay: (ctx) => (ctx.times + 1) * 1000,
 });
 ```
 
@@ -472,9 +472,9 @@ Assets Retry 插件通过监听页面 error 事件来获悉当前资源是否加
 
 #### 在 HTML 模板中识别重试脚本
 
-Assets Retry 插件为重试脚本添加了唯一的 `data-rsbuild-assets-retry` 属性，使您可以在自定义 HTML 模板中轻松识别它们。
+Assets Retry 插件为重试脚本添加了唯一的 `data-rsbuild-assets-retry` 属性，使你可以在自定义 HTML 模板中轻松识别它们。
 
-您可以导入属性常量：
+你可以导入属性常量：
 
 ```js
 import { ASSETS_RETRY_DATA_ATTRIBUTE } from '@rsbuild/plugin-assets-retry';
@@ -489,13 +489,15 @@ import { ASSETS_RETRY_DATA_ATTRIBUTE } from '@rsbuild/plugin-assets-retry';
 
 ```html
 <!-- 筛选重试脚本 -->
-<%= htmlWebpackPlugin.tags.headTags.filter(tag => tag.attributes['data-rsbuild-assets-retry'] === 'inline') %>
+<%= htmlWebpackPlugin.tags.headTags.filter(tag =>
+tag.attributes['data-rsbuild-assets-retry'] === 'inline') %>
 
 <!-- 筛选非重试脚本 -->
-<%= htmlWebpackPlugin.tags.headTags.filter(tag => !tag.attributes['data-rsbuild-assets-retry']) %>
+<%= htmlWebpackPlugin.tags.headTags.filter(tag =>
+!tag.attributes['data-rsbuild-assets-retry']) %>
 ```
 
-这允许您将重试脚本放置在 HTML 头部的顶部以获得最佳的加载顺序。
+这允许你将重试脚本放置在 HTML 头部的顶部以获得最佳的加载顺序。
 
 ## License
 

package/dist/index.js

@@ -1,15 +1,46 @@
-import * as __rspack_external_crypto from "crypto";
-import { __webpack_require__ } from "./rslib-runtime.js";
 import node_fs from "node:fs";
 import node_path from "node:path";
 import { fileURLToPath } from "node:url";
 import { ensureAssetPrefix, logger, rspack } from "@rsbuild/core";
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
 __webpack_require__.add({
-    "./node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        module.exports = __webpack_require__("crypto").randomBytes;
-    },
-    "./node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        var randomBytes = __webpack_require__("./node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js");
+    "./node_modules/.pnpm/serialize-javascript@7.0.5/node_modules/serialize-javascript/index.js" (module) {
         var UID_LENGTH = 16;
         var UID = generateUID();
         var PLACE_HOLDER_REGEXP = new RegExp('(\\\\)?"@__(F|R|D|M|S|A|U|I|B|L)-' + UID + '-(\\d+)__@"', 'g');
@@ -17,6 +48,7 @@ __webpack_require__.add({
         var IS_PURE_FUNCTION = /function.*?\(/;
         var IS_ARROW_FUNCTION = /.*?=>.*?/;
         var UNSAFE_CHARS_REGEXP = /[<>\/\u2028\u2029]/g;
+        var SCRIPT_CLOSE_REGEXP = /<\/script[^>]*>/gi;
         var RESERVED_SYMBOLS = [
             '*',
             'async'
@@ -31,8 +63,16 @@ __webpack_require__.add({
         function escapeUnsafeChars(unsafeChar) {
             return ESCAPED_CHARS[unsafeChar];
         }
+        function escapeFunctionBody(str) {
+            str = str.replace(SCRIPT_CLOSE_REGEXP, function(match) {
+                return match.replace(/</g, '\\u003C').replace(/\//g, '\\u002F').replace(/>/g, '\\u003E');
+            });
+            str = str.replace(/\u2028/g, '\\u2028');
+            str = str.replace(/\u2029/g, '\\u2029');
+            return str;
+        }
         function generateUID() {
-            var bytes = randomBytes(UID_LENGTH);
+            var bytes = crypto.getRandomValues(new Uint8Array(UID_LENGTH));
             var result = '';
             for(var i = 0; i < UID_LENGTH; ++i)result += bytes[i].toString(16);
             return result;
@@ -67,10 +107,8 @@ __webpack_require__.add({
                     if (origValue instanceof Date) return '@__D-' + UID + '-' + (dates.push(origValue) - 1) + '__@';
                     if (origValue instanceof Map) return '@__M-' + UID + '-' + (maps.push(origValue) - 1) + '__@';
                     if (origValue instanceof Set) return '@__S-' + UID + '-' + (sets.push(origValue) - 1) + '__@';
-                    if (origValue instanceof Array) {
-                        var isSparse = origValue.filter(function() {
-                            return true;
-                        }).length !== origValue.length;
+                    if (Array.isArray(origValue)) {
+                        var isSparse = Object.keys(origValue).length !== origValue.length;
                         if (isSparse) return '@__A-' + UID + '-' + (arrays.push(origValue) - 1) + '__@';
                     }
                     if (origValue instanceof URL) return '@__L-' + UID + '-' + (urls.push(origValue) - 1) + '__@';
@@ -81,9 +119,10 @@ __webpack_require__.add({
                 if ('bigint' === type) return '@__B-' + UID + '-' + (bigInts.push(origValue) - 1) + '__@';
                 return value;
             }
-            function serializeFunc(fn) {
+            function serializeFunc(fn, options) {
                 var serializedFn = fn.toString();
                 if (IS_NATIVE_CODE_REGEXP.test(serializedFn)) throw new TypeError('Serializing native function: ' + fn.name);
+                if (options && true !== options.unsafe) serializedFn = escapeFunctionBody(serializedFn);
                 if (IS_PURE_FUNCTION.test(serializedFn)) return serializedFn;
                 if (IS_ARROW_FUNCTION.test(serializedFn)) return serializedFn;
                 var argsStartsAt = serializedFn.indexOf('(');
@@ -105,8 +144,15 @@ __webpack_require__.add({
             if (0 === functions.length && 0 === regexps.length && 0 === dates.length && 0 === maps.length && 0 === sets.length && 0 === arrays.length && 0 === undefs.length && 0 === infinities.length && 0 === bigInts.length && 0 === urls.length) return str;
             return str.replace(PLACE_HOLDER_REGEXP, function(match, backSlash, type, valueIndex) {
                 if (backSlash) return match;
-                if ('D' === type) return "new Date(\"" + dates[valueIndex].toISOString() + "\")";
-                if ('R' === type) return "new RegExp(" + serialize(regexps[valueIndex].source) + ", \"" + regexps[valueIndex].flags + "\")";
+                if ('D' === type) {
+                    var isoStr = String(dates[valueIndex].toISOString());
+                    if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z$/.test(isoStr)) throw new TypeError('Invalid Date ISO string');
+                    return "new Date(\"" + isoStr + "\")";
+                }
+                if ('R' === type) {
+                    var flags = String(regexps[valueIndex].flags).replace(/[^gimsuydv]/g, '');
+                    return "new RegExp(" + serialize(regexps[valueIndex].source) + ", \"" + flags + "\")";
+                }
                 if ('M' === type) return "new Map(" + serialize(Array.from(maps[valueIndex].entries()), options) + ")";
                 if ('S' === type) return "new Set(" + serialize(Array.from(sets[valueIndex].values()), options) + ")";
                 if ('A' === type) return "Array.prototype.slice.call(" + serialize(Object.assign({
@@ -117,26 +163,13 @@ __webpack_require__.add({
                 if ('B' === type) return "BigInt(\"" + bigInts[valueIndex] + "\")";
                 if ('L' === type) return "new URL(" + serialize(urls[valueIndex].toString(), options) + ")";
                 var fn = functions[valueIndex];
-                return serializeFunc(fn);
+                return serializeFunc(fn, options);
             });
         };
-    },
-    crypto (module) {
-        module.exports = __rspack_external_crypto;
     }
 });
-const serialize_javascript = __webpack_require__("./node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js");
+const serialize_javascript = __webpack_require__("./node_modules/.pnpm/serialize-javascript@7.0.5/node_modules/serialize-javascript/index.js");
 var serialize_javascript_default = /*#__PURE__*/ __webpack_require__.n(serialize_javascript);
-function _define_property(obj, key, value) {
-    if (key in obj) Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-    });
-    else obj[key] = value;
-    return obj;
-}
 const AsyncChunkRetryPlugin_dirname = node_path.dirname(fileURLToPath(import.meta.url));
 function modifyWebpackRuntimeModule(module, modifier) {
     try {
@@ -161,6 +194,15 @@ function modifyRuntimeModule(module, modifier, isRspack) {
     else modifyWebpackRuntimeModule(module, modifier);
 }
 class AsyncChunkRetryPlugin {
+    name = 'ASYNC_CHUNK_RETRY_PLUGIN';
+    isRspack;
+    minify;
+    runtimeOptions;
+    constructor(options, isRspack, minify){
+        this.runtimeOptions = options;
+        this.isRspack = isRspack;
+        this.minify = minify;
+    }
     getRawRuntimeRetryCode() {
         const { RuntimeGlobals } = rspack;
         const filename = 'asyncChunkRetry';
@@ -183,21 +225,12 @@ class AsyncChunkRetryPlugin {
             });
         });
     }
-    constructor(options, isRspack, minify){
-        _define_property(this, "name", 'ASYNC_CHUNK_RETRY_PLUGIN');
-        _define_property(this, "isRspack", void 0);
-        _define_property(this, "minify", void 0);
-        _define_property(this, "runtimeOptions", void 0);
-        this.runtimeOptions = options;
-        this.isRspack = isRspack;
-        this.minify = minify;
-    }
 }
 const src_dirname = node_path.dirname(fileURLToPath(import.meta.url));
 const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
 const ASSETS_RETRY_DATA_ATTRIBUTE = 'data-rsbuild-assets-retry';
 function getRuntimeOptions(userOptions, defaultCrossOrigin) {
-    const { inlineScript, minify, ...runtimeOptions } = userOptions;
+    const { inlineScript: _inlineScript, minify: _minify, ...runtimeOptions } = userOptions;
     const defaultOptions = {
         max: 3,
         type: [
@@ -243,7 +276,7 @@ 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-5-2.js");
+                return node_path.posix.join(distDir, "assets-retry.2-0-1.js");
             };
             const getDefaultValueFromRsbuildConfig = (config)=>{
                 const minify = 'boolean' == typeof config.output.minify ? config.output.minify : config.output.minify?.js;

package/dist/runtime/asyncChunkRetry.js

@@ -1,55 +1,50 @@
-(function() {
-    "use strict";
-    var ERROR_PREFIX = '[@rsbuild/plugin-assets-retry] ';
+(()=>{
+    const ERROR_PREFIX = '[@rsbuild/plugin-assets-retry] ';
     function findCurrentDomain(url, config) {
-        var domains = config.domain;
-        for(var i = 0; i < domains.length; i++){
-            var domain = domains[i];
+        const domains = config.domain;
+        for(let i = 0; i < domains.length; i++){
+            const domain = domains[i];
             if (-1 !== url.indexOf(domain)) return domain;
         }
         return window.origin;
     }
     function findNextDomain(url, config) {
-        var domains = config.domain;
-        var currentDomain = findCurrentDomain(url, config);
-        var index = domains.indexOf(currentDomain);
+        const domains = config.domain;
+        const currentDomain = findCurrentDomain(url, config);
+        const index = domains.indexOf(currentDomain);
         return -1 === index ? currentDomain : domains[(index + 1) % domains.length];
     }
-    var postfixRE = /[?#].*$/;
+    const postfixRE = /[?#].*$/;
     function cleanUrl(url) {
         return url.replace(postfixRE, '');
     }
     function getQueryFromUrl(url) {
-        var parts = url.split('?')[1];
-        return parts ? "?".concat(parts.split('#')[0]) : '';
+        const parts = url.split('?')[1];
+        return parts ? `?${parts.split('#')[0]}` : '';
     }
     function getUrlRetryQuery(existRetryTimes, originalQuery, config) {
-        if (true === config.addQuery) return '' !== originalQuery ? "".concat(originalQuery, "&retry=").concat(existRetryTimes) : "?retry=".concat(existRetryTimes);
+        if (true === config.addQuery) return '' !== originalQuery ? `${originalQuery}&retry=${existRetryTimes}` : `?retry=${existRetryTimes}`;
         if ('function' == typeof config.addQuery) return config.addQuery({
             times: existRetryTimes,
-            originalQuery: originalQuery
+            originalQuery
         });
         return '';
     }
     function getNextRetryUrl(currRetryUrl, domain, nextDomain, existRetryTimes, originalQuery, config) {
         return cleanUrl(currRetryUrl.replace(domain, nextDomain)) + getUrlRetryQuery(existRetryTimes + 1, originalQuery, config);
     }
-    function _instanceof(left, right) {
-        if (null != right && "u" > 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);
+        for(let i = 0; i < rules.length; i++){
+            const rule = rules[i];
+            const tester = rule.test;
+            let shouldMatch = true;
+            if (tester instanceof RegExp) shouldMatch = tester.test(url);
             else if ('string' == typeof tester) {
-                var regexp = new RegExp(tester);
+                const 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);
+                const domain = findCurrentDomain(url, rule);
                 if (!rule.domain.includes(domain)) shouldMatch = false;
             }
             if (rule.type && rule.type.length > 0) {
@@ -59,54 +54,54 @@
         }
         return null;
     }
-    var asyncChunkRetry_rules = __RETRY_OPTIONS__;
-    var retryCollector = {};
-    var retryCssCollector = {};
-    var globalCurrRetrying = {};
-    var globalCurrRetryingCss = {};
+    const asyncChunkRetry_rules = __RETRY_OPTIONS__;
+    const retryCollector = {};
+    const retryCssCollector = {};
+    const globalCurrRetrying = {};
+    const globalCurrRetryingCss = {};
     function getCurrentRetry(chunkId, existRetryTimes, isCssAsyncChunk) {
         var _retryCssCollector_chunkId, _retryCollector_chunkId;
         return isCssAsyncChunk ? null == (_retryCssCollector_chunkId = retryCssCollector[chunkId]) ? void 0 : _retryCssCollector_chunkId[existRetryTimes] : null == (_retryCollector_chunkId = retryCollector[chunkId]) ? void 0 : _retryCollector_chunkId[existRetryTimes];
     }
     function initRetry(chunkId, isCssAsyncChunk) {
-        var originalScriptFilename = isCssAsyncChunk ? originalGetCssFilename(chunkId) : originalGetChunkScriptFilename(chunkId);
+        const originalScriptFilename = isCssAsyncChunk ? originalGetCssFilename(chunkId) : originalGetChunkScriptFilename(chunkId);
         if (!originalScriptFilename) throw new Error('only support cssExtract');
-        var originalPublicPath = __RUNTIME_GLOBALS_PUBLIC_PATH__;
-        var originalSrcUrl = '/' === originalPublicPath[0] && '/' !== originalPublicPath[1] ? window.origin + originalPublicPath + originalScriptFilename : originalPublicPath + originalScriptFilename;
-        var originalQuery = getQueryFromUrl(originalSrcUrl);
-        var existRetryTimes = 0;
-        var tagName = isCssAsyncChunk ? 'link' : "script";
-        var rule = findMatchingRule(originalSrcUrl, tagName, asyncChunkRetry_rules);
+        const originalPublicPath = __RUNTIME_GLOBALS_PUBLIC_PATH__;
+        const originalSrcUrl = '/' === originalPublicPath[0] && '/' !== originalPublicPath[1] ? window.origin + originalPublicPath + originalScriptFilename : originalPublicPath + originalScriptFilename;
+        const originalQuery = getQueryFromUrl(originalSrcUrl);
+        const existRetryTimes = 0;
+        const tagName = isCssAsyncChunk ? 'link' : "script";
+        const rule = findMatchingRule(originalSrcUrl, tagName, asyncChunkRetry_rules);
         if (!rule) return null;
-        var nextDomain = findCurrentDomain(originalSrcUrl, rule);
+        const nextDomain = findCurrentDomain(originalSrcUrl, rule);
         return {
-            nextDomain: nextDomain,
+            nextDomain,
             nextRetryUrl: getNextRetryUrl(originalSrcUrl, nextDomain, nextDomain, existRetryTimes, originalQuery, rule),
-            originalScriptFilename: originalScriptFilename,
-            originalSrcUrl: originalSrcUrl,
-            originalQuery: originalQuery,
-            rule: rule
+            originalScriptFilename,
+            originalSrcUrl,
+            originalQuery,
+            rule
         };
     }
     function asyncChunkRetry_nextRetry(chunkId, existRetryTimes, isCssAsyncChunk) {
-        var currRetry = getCurrentRetry(chunkId, existRetryTimes, isCssAsyncChunk);
-        var nextRetry;
-        var nextExistRetryTimes = existRetryTimes + 1;
+        const currRetry = getCurrentRetry(chunkId, existRetryTimes, isCssAsyncChunk);
+        let nextRetry;
+        const 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, rule = currRetry.rule;
-            var nextDomain = findNextDomain(currRetry.nextDomain, rule);
+            const { originalScriptFilename, originalSrcUrl, originalQuery, rule } = currRetry;
+            const nextDomain = findNextDomain(currRetry.nextDomain, rule);
             nextRetry = {
-                nextDomain: nextDomain,
+                nextDomain,
                 nextRetryUrl: getNextRetryUrl(currRetry.nextRetryUrl, currRetry.nextDomain, nextDomain, existRetryTimes, originalQuery, rule),
-                originalScriptFilename: originalScriptFilename,
-                originalSrcUrl: originalSrcUrl,
-                originalQuery: originalQuery,
-                rule: rule
+                originalScriptFilename,
+                originalSrcUrl,
+                originalQuery,
+                rule
             };
         }
         if (isCssAsyncChunk) {
@@ -118,23 +113,21 @@
         }
         return nextRetry;
     }
-    var originalEnsureChunk = __RUNTIME_GLOBALS_ENSURE_CHUNK__;
-    var originalGetChunkScriptFilename = __RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__;
-    var originalGetCssFilename = __RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__ || __RUNTIME_GLOBALS_GET_CSS_FILENAME__ || function() {
-        return null;
-    };
-    var originalLoadScript = __RUNTIME_GLOBALS_LOAD_SCRIPT__;
+    const originalEnsureChunk = __RUNTIME_GLOBALS_ENSURE_CHUNK__;
+    const originalGetChunkScriptFilename = __RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__;
+    const originalGetCssFilename = __RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__ || __RUNTIME_GLOBALS_GET_CSS_FILENAME__ || (()=>null);
+    const originalLoadScript = __RUNTIME_GLOBALS_LOAD_SCRIPT__;
     function ensureChunk(chunkId) {
-        var args = Array.prototype.slice.call(arguments);
+        const args = Array.prototype.slice.call(arguments);
         if (!args[10]) args[10] = {
             count: 0,
             cssFailedCount: 0
         };
-        var callingCounter = args[10];
-        var result = originalEnsureChunk.apply(null, args);
+        const callingCounter = args[10];
+        const result = originalEnsureChunk(...args);
         try {
-            var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
-            var originalCssFilename = originalGetCssFilename(chunkId);
+            const originalScriptFilename = originalGetChunkScriptFilename(chunkId);
+            const originalCssFilename = originalGetCssFilename(chunkId);
             if ("u" > typeof window) {
                 if (originalScriptFilename) window.__RB_ASYNC_CHUNKS__[originalScriptFilename] = true;
                 if (originalCssFilename) window.__RB_ASYNC_CHUNKS__[originalCssFilename] = true;
@@ -144,20 +137,20 @@
         }
         if (!callingCounter || 'number' != typeof callingCounter.count || 'number' != typeof callingCounter.cssFailedCount) return result;
         callingCounter.count += 1;
-        return result.catch(function(error) {
+        return result.catch((error)=>{
             var _error_message;
-            var existRetryTimesAll = callingCounter.count - 1;
-            var cssExistRetryTimes = callingCounter.cssFailedCount;
-            var jsExistRetryTimes = existRetryTimesAll - cssExistRetryTimes;
-            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'));
+            const existRetryTimesAll = callingCounter.count - 1;
+            const cssExistRetryTimes = callingCounter.cssFailedCount;
+            const jsExistRetryTimes = existRetryTimesAll - cssExistRetryTimes;
+            let originalScriptFilename;
+            let nextRetryUrl;
+            let nextDomain;
+            let rule;
+            const 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;
+            const existRetryTimes = isCssAsyncChunkLoadFailed ? cssExistRetryTimes : jsExistRetryTimes;
             try {
-                var retryResult = asyncChunkRetry_nextRetry(chunkId, existRetryTimes, isCssAsyncChunkLoadFailed);
+                const retryResult = asyncChunkRetry_nextRetry(chunkId, existRetryTimes, isCssAsyncChunkLoadFailed);
                 if (!retryResult) throw error;
                 originalScriptFilename = retryResult.originalScriptFilename;
                 nextRetryUrl = retryResult.nextRetryUrl;
@@ -167,33 +160,27 @@
                 if (e !== error) console.error(ERROR_PREFIX, 'failed to get nextRetryUrl', e);
                 throw error;
             }
-            var createContext = function(times) {
-                return {
-                    times: times,
+            const createContext = (times)=>({
+                    times,
                     domain: nextDomain,
                     url: nextRetryUrl,
                     tagName: isCssAsyncChunkLoadFailed ? 'link' : "script",
                     isAsyncChunk: true
-                };
-            };
-            var context = createContext(existRetryTimes);
+                });
+            const context = createContext(existRetryTimes);
             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(rule.max, ' retries: "').concat(error.message, '"');
+                error.message = (null == (_error_message1 = error.message) ? void 0 : _error_message1.includes('retries:')) ? error.message : `Loading chunk ${chunkId} from "${originalScriptFilename}" failed after ${rule.max} retries: "${error.message}"`;
                 if ('function' == typeof rule.onFail) rule.onFail(context);
                 throw error;
             }
             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();
-            return delayPromise.then(function() {
-                return ensureChunk.apply(ensureChunk, args);
-            }).then(function(result) {
-                var isLastSuccessRetry = (null == callingCounter ? void 0 : callingCounter.count) === existRetryTimesAll + 2;
+            const delayTime = 'function' == typeof rule.delay ? rule.delay(context) : rule.delay;
+            const delayPromise = delayTime > 0 ? new Promise((resolve)=>setTimeout(resolve, delayTime)) : Promise.resolve();
+            return delayPromise.then(()=>ensureChunk.apply(ensureChunk, args)).then((result)=>{
+                const isLastSuccessRetry = (null == callingCounter ? void 0 : callingCounter.count) === existRetryTimesAll + 2;
                 if ('function' == typeof rule.onSuccess && isLastSuccessRetry) {
-                    var context = createContext(existRetryTimes + 1);
+                    const context = createContext(existRetryTimes + 1);
                     rule.onSuccess(context);
                 }
                 return result;
@@ -201,13 +188,13 @@
         });
     }
     function loadScript() {
-        var args = Array.prototype.slice.call(arguments);
-        var retry = globalCurrRetrying[args[3]];
+        const args = Array.prototype.slice.call(arguments);
+        const retry = globalCurrRetrying[args[3]];
         if (retry) args[0] = retry.nextRetryUrl;
-        return originalLoadScript.apply(null, args);
+        return originalLoadScript(...args);
     }
     function loadStyleSheet(href, chunkId) {
-        var retry = globalCurrRetryingCss[chunkId];
+        const retry = globalCurrRetryingCss[chunkId];
         return retry && retry.nextRetryUrl || __RUNTIME_GLOBALS_PUBLIC_PATH__ + href;
     }
     function registerAsyncChunkRetry() {

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