@rsbuild/plugin-assets-retry 1.2.0 → 1.2.2

package/README.md

@@ -94,13 +94,21 @@ const defaultAssetsRetryOptions = {
 - **Type:** `string[]`
 - **Default:** `[]`
 
-Specifies the retry domain when assets fail to load. In the `domain` array, the first item is the currently used domain, and the following items are backup domains. When a asset request for a domain fails, Rsbuild will find that domain in the array and replace it with the next domain in the array.
+Specifies the retry domain when assets fail to load. In the `domain` array, the first item is the default domain of static assets, and the following items are backup domains. When a asset request for a domain fails, Rsbuild will find that domain in the array and replace it with the next domain in the array.
 
 For example:
 
 ```js
-pluginAssetsRetry({
-  domain: ["https://cdn1.com", "https://cdn2.com", "https://cdn3.com"],
+// rsbuild.config.ts
+defineConfig({
+  plugins: [
+    pluginAssetsRetry({
+      domain: ["cdn1.com", "cdn2.com", "cdn3.com"],
+    })
+  ],
+  output: {
+    assetPrefix: "https://cdn1.com", // or "//cdn1.com"
+  },
 });
 ```
 

package/README.zh-CN.md

@@ -92,13 +92,21 @@ const defaultOptions = {
 - **类型：** `string[]`
 - **默认值：** `[]`
 
-指定资源加载失败时的重试域名列表。在 `domain` 数组中，第一项是当前使用的域名，后面几项为备用域名。当某个域名的资源请求失败时，Rsbuild 会在数组中找到该域名，并替换为数组的下一个域名。
+指定资源加载失败时的重试域名列表。在 `domain` 数组中，第一项是静态资源默认所在的域名，后面几项为备用域名。当某个域名的资源请求失败时，Rsbuild 会在数组中找到该域名，并替换为数组的下一个域名。
 
 比如：
 
 ```js
-pluginAssetsRetry({
-  domain: ["https://cdn1.com", "https://cdn2.com", "https://cdn3.com"],
+// rsbuild.config.ts
+defineConfig({
+  plugins: [
+    pluginAssetsRetry({
+      domain: ["cdn1.com", "cdn2.com", "cdn3.com"],
+    })
+  ],
+  output: {
+    assetPrefix: "https://cdn1.com", // 或者 "//cdn1.com"
+  },
 });
 ```
 

package/dist/index.cjs

@@ -135,12 +135,8 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 (()=>{
-    __webpack_require__.n = function(module) {
-        var getter = module && module.__esModule ? function() {
-            return module['default'];
-        } : function() {
-            return module;
-        };
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
         __webpack_require__.d(getter, {
             a: getter
         });
@@ -148,7 +144,7 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.d = function(exports1, definition) {
+    __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
             enumerable: true,
             get: definition[key]
@@ -156,12 +152,10 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.o = function(obj, prop) {
-        return Object.prototype.hasOwnProperty.call(obj, prop);
-    };
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();
 (()=>{
-    __webpack_require__.r = function(exports1) {
+    __webpack_require__.r = (exports1)=>{
         if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
             value: 'Module'
         });
@@ -175,8 +169,8 @@ var __webpack_exports__ = {};
     "use strict";
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
-        PLUGIN_ASSETS_RETRY_NAME: ()=>PLUGIN_ASSETS_RETRY_NAME,
-        pluginAssetsRetry: ()=>pluginAssetsRetry
+        pluginAssetsRetry: ()=>pluginAssetsRetry,
+        PLUGIN_ASSETS_RETRY_NAME: ()=>PLUGIN_ASSETS_RETRY_NAME
     });
     const external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -238,12 +232,9 @@ var __webpack_exports__ = {};
                 compilation.hooks.runtimeModule.tap(this.name, (module)=>{
                     var _module_constructor;
                     const { isRspack } = this.options;
-                    const constructorName = isRspack ? module.constructorName : null === (_module_constructor = module.constructor) || void 0 === _module_constructor ? void 0 : _module_constructor.name;
+                    const constructorName = isRspack ? module.constructorName : null == (_module_constructor = module.constructor) ? void 0 : _module_constructor.name;
                     const isCssLoadingRuntimeModule = 'CssLoadingRuntimeModule' === constructorName;
-                    if (isCssLoadingRuntimeModule) {
-                        modifyRuntimeModule(module, (originSource)=>originSource.replace('var fullhref = __webpack_require__.p + href;', 'var fullhref = __webpack_require__.rbLoadStyleSheet ? __webpack_require__.rbLoadStyleSheet(href, chunkId) : (__webpack_require__.p + href);'), isRspack);
-                        return;
-                    }
+                    if (isCssLoadingRuntimeModule) return void modifyRuntimeModule(module, (originSource)=>originSource.replace('var fullhref = __webpack_require__.p + href;', 'var fullhref = __webpack_require__.rbLoadStyleSheet ? __webpack_require__.rbLoadStyleSheet(href, chunkId) : (__webpack_require__.p + href);'), isRspack);
                     const isPublicPathModule = 'publicPath' === module.name || 'PublicPathRuntimeModule' === constructorName || 'AutoPublicPathRuntimeModule' === constructorName;
                     if (isPublicPathModule) {
                         const runtimeCode = this.getRawRuntimeRetryCode();
@@ -306,7 +297,7 @@ 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-2-0.js");
+                    return external_node_path_default().posix.join(distDir, "assets-retry.1-2-2.js");
                 };
                 const formatOptions = (config)=>{
                     const options = {
@@ -315,7 +306,7 @@ var __webpack_exports__ = {};
                     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 ? void 0 : _config_output_minify.js;
+                        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;
@@ -370,8 +361,12 @@ var __webpack_exports__ = {};
             }
         });
 })();
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+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 === [
+    "PLUGIN_ASSETS_RETRY_NAME",
+    "pluginAssetsRetry"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
     value: true
 });

package/dist/index.js

@@ -1,8 +1,8 @@
 import * as __WEBPACK_EXTERNAL_MODULE_crypto__ from "crypto";
-import * as __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__ from "node:fs";
-import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
-import * as __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__ from "node:url";
-import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ from "@rsbuild/core";
+import node_fs from "node:fs";
+import node_path from "node:path";
+import { fileURLToPath } from "node:url";
+import { ensureAssetPrefix, rspack } from "@rsbuild/core";
 var __webpack_modules__ = {
     "./node_modules/.pnpm/randombytes@2.1.0/node_modules/randombytes/index.js": function(module, __unused_webpack_exports, __webpack_require__) {
         module.exports = __webpack_require__("crypto").randomBytes;
@@ -135,12 +135,8 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 (()=>{
-    __webpack_require__.n = function(module) {
-        var getter = module && module.__esModule ? function() {
-            return module['default'];
-        } : function() {
-            return module;
-        };
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
         __webpack_require__.d(getter, {
             a: getter
         });
@@ -148,7 +144,7 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.d = function(exports, definition) {
+    __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]
@@ -156,9 +152,7 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.o = function(obj, prop) {
-        return Object.prototype.hasOwnProperty.call(obj, prop);
-    };
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();
 var serialize_javascript = __webpack_require__("./node_modules/.pnpm/serialize-javascript@6.0.2/node_modules/serialize-javascript/index.js");
 var serialize_javascript_default = /*#__PURE__*/ __webpack_require__.n(serialize_javascript);
@@ -172,7 +166,7 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
-const AsyncChunkRetryPlugin_dirname = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname((0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.fileURLToPath)(import.meta.url));
+const AsyncChunkRetryPlugin_dirname = node_path.dirname(fileURLToPath(import.meta.url));
 function modifyWebpackRuntimeModule(module, modifier) {
     try {
         const originSource = module.getGeneratedCode();
@@ -203,10 +197,10 @@ function pick(obj, keys) {
 }
 class AsyncChunkRetryPlugin {
     getRawRuntimeRetryCode() {
-        const { RuntimeGlobals } = __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack;
+        const { RuntimeGlobals } = rspack;
         const filename = 'asyncChunkRetry';
-        const runtimeFilePath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(AsyncChunkRetryPlugin_dirname, 'runtime', this.options.minify ? `${filename}.min.js` : `${filename}.js`);
-        const rawText = __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].readFileSync(runtimeFilePath, 'utf-8');
+        const runtimeFilePath = node_path.join(AsyncChunkRetryPlugin_dirname, 'runtime', this.options.minify ? `${filename}.min.js` : `${filename}.js`);
+        const rawText = node_fs.readFileSync(runtimeFilePath, 'utf-8');
         return rawText.replaceAll('__RUNTIME_GLOBALS_REQUIRE__', RuntimeGlobals.require).replaceAll('__RUNTIME_GLOBALS_ENSURE_CHUNK__', RuntimeGlobals.ensureChunk).replaceAll('__RUNTIME_GLOBALS_GET_CHUNK_SCRIPT_FILENAME__', RuntimeGlobals.getChunkScriptFilename).replaceAll('__RUNTIME_GLOBALS_GET_CSS_FILENAME__', RuntimeGlobals.getChunkCssFilename).replaceAll('__RUNTIME_GLOBALS_GET_MINI_CSS_EXTRACT_FILENAME__', '__webpack_require__.miniCssF').replaceAll('__RUNTIME_GLOBALS_RSBUILD_LOAD_STYLESHEET__', '__webpack_require__.rbLoadStyleSheet').replaceAll('__RUNTIME_GLOBALS_PUBLIC_PATH__', RuntimeGlobals.publicPath).replaceAll('__RUNTIME_GLOBALS_LOAD_SCRIPT__', RuntimeGlobals.loadScript).replaceAll('__RETRY_OPTIONS__', serialize_javascript_default()(this.runtimeOptions));
     }
     apply(compiler) {
@@ -214,12 +208,9 @@ class AsyncChunkRetryPlugin {
             compilation.hooks.runtimeModule.tap(this.name, (module)=>{
                 var _module_constructor;
                 const { isRspack } = this.options;
-                const constructorName = isRspack ? module.constructorName : null === (_module_constructor = module.constructor) || void 0 === _module_constructor ? void 0 : _module_constructor.name;
+                const constructorName = isRspack ? module.constructorName : null == (_module_constructor = module.constructor) ? void 0 : _module_constructor.name;
                 const isCssLoadingRuntimeModule = 'CssLoadingRuntimeModule' === constructorName;
-                if (isCssLoadingRuntimeModule) {
-                    modifyRuntimeModule(module, (originSource)=>originSource.replace('var fullhref = __webpack_require__.p + href;', 'var fullhref = __webpack_require__.rbLoadStyleSheet ? __webpack_require__.rbLoadStyleSheet(href, chunkId) : (__webpack_require__.p + href);'), isRspack);
-                    return;
-                }
+                if (isCssLoadingRuntimeModule) return void modifyRuntimeModule(module, (originSource)=>originSource.replace('var fullhref = __webpack_require__.p + href;', 'var fullhref = __webpack_require__.rbLoadStyleSheet ? __webpack_require__.rbLoadStyleSheet(href, chunkId) : (__webpack_require__.p + href);'), isRspack);
                 const isPublicPathModule = 'publicPath' === module.name || 'PublicPathRuntimeModule' === constructorName || 'AutoPublicPathRuntimeModule' === constructorName;
                 if (isPublicPathModule) {
                     const runtimeCode = this.getRawRuntimeRetryCode();
@@ -245,7 +236,7 @@ class AsyncChunkRetryPlugin {
         ]);
     }
 }
-const src_dirname = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname((0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.fileURLToPath)(import.meta.url));
+const src_dirname = node_path.dirname(fileURLToPath(import.meta.url));
 const PLUGIN_ASSETS_RETRY_NAME = 'rsbuild:assets-retry';
 function getRuntimeOptions(userOptions) {
     const defaultOptions = {
@@ -271,8 +262,8 @@ function getRuntimeOptions(userOptions) {
 async function getRetryCode(options) {
     const filename = 'initialChunkRetry';
     const { minify, inlineScript: _, ...restOptions } = options;
-    const runtimeFilePath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(src_dirname, 'runtime', minify ? `${filename}.min.js` : `${filename}.js`);
-    const runtimeCode = await __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].promises.readFile(runtimeFilePath, 'utf-8');
+    const runtimeFilePath = node_path.join(src_dirname, 'runtime', minify ? `${filename}.min.js` : `${filename}.js`);
+    const runtimeCode = await node_fs.promises.readFile(runtimeFilePath, 'utf-8');
     const runtimeOptions = getRuntimeOptions(restOptions);
     return `(function(){${runtimeCode}})()`.replace('__RUNTIME_GLOBALS_OPTIONS__', serialize_javascript_default()(runtimeOptions));
 }
@@ -282,7 +273,7 @@ const pluginAssetsRetry = (userOptions = {})=>({
             const { inlineScript = true } = userOptions;
             const getScriptPath = (environment)=>{
                 const distDir = environment.config.output.distPath.js;
-                return __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].posix.join(distDir, "assets-retry.1-2-0.js");
+                return node_path.posix.join(distDir, "assets-retry.1-2-2.js");
             };
             const formatOptions = (config)=>{
                 const options = {
@@ -291,7 +282,7 @@ const pluginAssetsRetry = (userOptions = {})=>({
                 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 ? void 0 : _config_output_minify.js;
+                    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;
@@ -311,7 +302,7 @@ const pluginAssetsRetry = (userOptions = {})=>({
             else {
                 api.modifyHTMLTags(async ({ headTags, bodyTags }, { assetPrefix, environment })=>{
                     const scriptPath = getScriptPath(environment);
-                    const url = (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.ensureAssetPrefix)(scriptPath, assetPrefix);
+                    const url = ensureAssetPrefix(scriptPath, assetPrefix);
                     headTags.unshift({
                         tag: "script",
                         attrs: {

package/dist/runtime/asyncChunkRetry.js

@@ -53,16 +53,15 @@ function getCurrentRetry(chunkId, existRetryTimes, isCssAsyncChunk) {
     return isCssAsyncChunk ? (_retryCssCollector_chunkId = retryCssCollector[chunkId]) === null || _retryCssCollector_chunkId === void 0 ? void 0 : _retryCssCollector_chunkId[existRetryTimes] : (_retryCollector_chunkId = retryCollector[chunkId]) === null || _retryCollector_chunkId === void 0 ? void 0 : _retryCollector_chunkId[existRetryTimes];
 }
 function initRetry(chunkId, isCssAsyncChunk) {
-    var _config_domain;
     var originalScriptFilename = isCssAsyncChunk ? originalGetCssFilename(chunkId) : originalGetChunkScriptFilename(chunkId);
     if (!originalScriptFilename) {
         throw new Error('only support cssExtract');
     }
     var originalPublicPath = __RUNTIME_GLOBALS_PUBLIC_PATH__;
-    var originalSrcUrl = originalPublicPath.startsWith('/') ? window.origin + originalPublicPath + originalScriptFilename : originalPublicPath + originalScriptFilename;
+    var originalSrcUrl = originalPublicPath[0] === '/' && originalPublicPath[1] !== '/' ? window.origin + originalPublicPath + originalScriptFilename : originalPublicPath + originalScriptFilename;
     var originalQuery = getQueryFromUrl(originalSrcUrl);
     var existRetryTimes = 0;
-    var nextDomain = ((_config_domain = config.domain) === null || _config_domain === void 0 ? void 0 : _config_domain[0]) || window.origin;
+    var nextDomain = findCurrentDomain(originalSrcUrl);
     return {
         nextDomain: nextDomain,
         nextRetryUrl: getNextRetryUrl(originalSrcUrl, nextDomain, nextDomain, existRetryTimes, originalQuery),

package/dist/runtime/asyncChunkRetry.min.js

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

package/dist/runtime/initialChunkRetry.js

@@ -30,9 +30,18 @@ function findNextDomain(url, domains) {
 }
 function getRequestUrl(element) {
     if (_instanceof(element, HTMLScriptElement) || _instanceof(element, HTMLImageElement)) {
+        // For <script src="" /> or <img src="" />
+        // element.getAttribute('src') === '' but element.src === baseURI
+        if (!element.getAttribute('src')) {
+            return null;
+        }
         return element.src;
     }
     if (_instanceof(element, HTMLLinkElement)) {
+        // For <link href="" />
+        if (!element.getAttribute('href')) {
+            return null;
+        }
         return element.href;
     }
     return null;

package/dist/runtime/initialChunkRetry.min.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "repository": "https://github.com/rspack-contrib/rsbuild-plugin-assets-retry",
   "license": "MIT",
   "type": "module",
@@ -29,21 +29,21 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@playwright/test": "^1.50.1",
-    "@rsbuild/core": "^1.2.3",
-    "@rsbuild/plugin-react": "^1.1.1",
-    "@rslib/core": "^0.4.0",
-    "@swc/core": "^1.10.18",
-    "@types/node": "^22.13.0",
-    "@types/react": "^19.0.10",
-    "@types/react-dom": "^19.0.4",
+    "@playwright/test": "^1.53.0",
+    "@rsbuild/core": "^1.3.22",
+    "@rsbuild/plugin-react": "^1.3.2",
+    "@rslib/core": "^0.10.0",
+    "@swc/core": "^1.12.1",
+    "@types/node": "^22.15.32",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@types/serialize-javascript": "^5.0.4",
-    "playwright": "^1.50.1",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "playwright": "^1.53.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "serialize-javascript": "^6.0.2",
-    "simple-git-hooks": "^2.11.1",
-    "typescript": "^5.7.3"
+    "simple-git-hooks": "^2.13.0",
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "1.x"
@@ -53,7 +53,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@9.15.9",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"