@rsbuild/plugin-assets-retry 1.0.3 → 1.0.5

package/dist/runtime/asyncChunkRetry.js

@@ -73,8 +73,12 @@ function getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl) {
   var absolutePath = getAbsolutePathFromUrl(originalSrcUrl);
   return nextDomain + absolutePath + getUrlRetryQuery(existRetryTimes, getQueryFromUrl(originalSrcUrl));
 }
-function getCurrentRetry(chunkId) {
-  return retryCollector[chunkId];
+
+// shared between ensureChunk and loadScript
+var globalCurrRetrying = {};
+function getCurrentRetry(chunkId, existRetryTimes) {
+  var _retryCollector$chunk;
+  return (_retryCollector$chunk = retryCollector[chunkId]) === null || _retryCollector$chunk === void 0 ? void 0 : _retryCollector$chunk[existRetryTimes];
 }
 function initRetry(chunkId) {
   var _config$domain$, _config$domain3;
@@ -83,32 +87,32 @@ function initRetry(chunkId) {
   var existRetryTimes = 1;
   var nextDomain = (_config$domain$ = (_config$domain3 = config.domain) === null || _config$domain3 === void 0 ? void 0 : _config$domain3[0]) !== null && _config$domain$ !== void 0 ? _config$domain$ : window.origin;
   return {
-    existRetryTimes: existRetryTimes,
     nextDomain: nextDomain,
     nextRetryUrl: getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl),
     originalScriptFilename: originalScriptFilename,
     originalSrcUrl: originalSrcUrl
   };
 }
-function nextRetry(chunkId) {
-  var currRetry = getCurrentRetry(chunkId);
+function nextRetry(chunkId, existRetryTimes) {
+  var currRetry = getCurrentRetry(chunkId, existRetryTimes);
   var nextRetry;
-  if (!currRetry) {
+  var nextExistRetryTimes = existRetryTimes + 1;
+  if (existRetryTimes === 0 || currRetry === undefined) {
     nextRetry = initRetry(chunkId);
+    retryCollector[chunkId] = [];
   } else {
     var originalScriptFilename = currRetry.originalScriptFilename,
       originalSrcUrl = currRetry.originalSrcUrl;
-    var existRetryTimes = currRetry.existRetryTimes + 1;
     var nextDomain = findNextDomain(currRetry.nextDomain);
     nextRetry = {
-      existRetryTimes: existRetryTimes,
       nextDomain: nextDomain,
-      nextRetryUrl: getNextRetryUrl(existRetryTimes, nextDomain, originalSrcUrl),
+      nextRetryUrl: getNextRetryUrl(nextExistRetryTimes, nextDomain, originalSrcUrl),
       originalScriptFilename: originalScriptFilename,
       originalSrcUrl: originalSrcUrl
     };
   }
-  retryCollector[chunkId] = nextRetry;
+  retryCollector[chunkId][nextExistRetryTimes] = nextRetry;
+  globalCurrRetrying[chunkId] = nextRetry;
   return nextRetry;
 }
 
@@ -119,33 +123,62 @@ var originalGetCssFilename = (_ref = (_RUNTIME_GLOBALS_GET = __RUNTIME_GLOBALS_G
   return null;
 };
 var originalLoadScript = __RUNTIME_GLOBALS_LOAD_SCRIPT__;
+var ERROR_PREFIX = '[@rsbuild/plugin-assets-retry] ';
 
 // if users want to support es5, add Promise polyfill first https://github.com/webpack/webpack/issues/12877
-function ensureChunk(chunkId) {
-  var result = originalEnsureChunk(chunkId);
-  var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
-  var originalCssFilename = originalGetCssFilename(chunkId);
+function ensureChunk(chunkId,
+// args placeholder, to avoid that other webpack runtime would add arg for __webpack_require__.e
+arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
+  var callingCounter = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {
+    count: 0
+  };
+  for (var _len = arguments.length, args = new Array(_len > 9 ? _len - 9 : 0), _key = 9; _key < _len; _key++) {
+    args[_key - 9] = arguments[_key];
+  }
+  var result = originalEnsureChunk.apply(void 0, [chunkId, arg0, arg1, arg2, arg3, arg4, arg5, arg6, callingCounter].concat(args));
+  try {
+    var originalScriptFilename = originalGetChunkScriptFilename(chunkId);
+    var originalCssFilename = originalGetCssFilename(chunkId);
 
-  // mark the async chunk name in the global variables and share it with initial chunk retry to avoid duplicate retrying
-  if (typeof window !== 'undefined') {
-    if (originalScriptFilename) {
-      window.__RB_ASYNC_CHUNKS__[originalScriptFilename] = true;
-    }
-    if (originalCssFilename) {
-      window.__RB_ASYNC_CHUNKS__[originalCssFilename] = true;
+    // mark the async chunk name in the global variables and share it with initial chunk retry to avoid duplicate retrying
+    if (typeof window !== 'undefined') {
+      if (originalScriptFilename) {
+        window.__RB_ASYNC_CHUNKS__[originalScriptFilename] = true;
+      }
+      if (originalCssFilename) {
+        window.__RB_ASYNC_CHUNKS__[originalCssFilename] = true;
+      }
     }
+  } catch (e) {
+    console.error(ERROR_PREFIX, 'get original script or css filename error', e);
   }
+
+  // if __webpack_require__.e is polluted by other runtime codes, fallback to originalEnsureChunk
+  if (typeof (callingCounter === null || callingCounter === void 0 ? void 0 : callingCounter.count) !== 'number') {
+    return result;
+  }
+  callingCounter.count += 1;
   return result.catch(function (error) {
     var _error$message;
-    var _nextRetry = nextRetry(chunkId),
-      existRetryTimes = _nextRetry.existRetryTimes,
-      originalSrcUrl = _nextRetry.originalSrcUrl,
-      nextRetryUrl = _nextRetry.nextRetryUrl,
-      nextDomain = _nextRetry.nextDomain;
+    // the first calling is not retry
+    // if the failed request is 4 in network panel, callingCounter.count === 4, the first one is the normal request, and existRetryTimes is 3, retried 3 times
+    var existRetryTimes = callingCounter.count - 1;
+    var originalSrcUrl;
+    var nextRetryUrl;
+    var nextDomain;
+    try {
+      var retryResult = nextRetry(chunkId, existRetryTimes);
+      originalSrcUrl = retryResult.originalSrcUrl;
+      nextRetryUrl = retryResult.nextRetryUrl;
+      nextDomain = retryResult.nextDomain;
+    } catch (e) {
+      console.error(ERROR_PREFIX, 'failed to get nextRetryUrl', e);
+      throw error;
+    }
 
-    // At present, we don't consider the switching domain and addQuery of async css chunk
-    // 1. Async js chunk will be requested first. It is rare for async css chunk to fail alone.
-    // 2. the code of loading css in webpack runtime is complex and it may be modified by cssExtractPlugin, increase the complexity of this plugin.
+    // At present, we don't consider the switching domain and addQuery of async CSS chunk
+    // 1. Async js chunk will be requested first. It is rare for async CSS chunk to fail alone.
+    // 2. the code of loading CSS in webpack runtime is complex and it may be modified by cssExtractPlugin, increase the complexity of this plugin.
     var isCssAsyncChunkLoadFailed = Boolean(error === null || error === void 0 || (_error$message = error.message) === null || _error$message === void 0 ? void 0 : _error$message.includes('CSS chunk'));
     var createContext = function createContext(times) {
       return {
@@ -156,9 +189,10 @@ function ensureChunk(chunkId) {
         isAsyncChunk: true
       };
     };
-    var context = createContext(existRetryTimes - 1);
-    if (existRetryTimes > maxRetries) {
-      error.message = "Loading chunk ".concat(chunkId, " from ").concat(originalSrcUrl, " failed after ").concat(maxRetries, " retries: \"").concat(error.message, "\"");
+    var context = createContext(existRetryTimes);
+    if (existRetryTimes >= maxRetries) {
+      var _error$message2;
+      error.message = (_error$message2 = error.message) !== null && _error$message2 !== void 0 && _error$message2.includes('retries:') ? error.message : "Loading chunk ".concat(chunkId, " from ").concat(originalSrcUrl, " failed after ").concat(maxRetries, " retries: \"").concat(error.message, "\"");
       if (typeof config.onFail === 'function') {
         config.onFail(context);
       }
@@ -186,23 +220,26 @@ function ensureChunk(chunkId) {
     if (typeof config.onRetry === 'function') {
       config.onRetry(context);
     }
-    return ensureChunk(chunkId).then(function (result) {
-      if (typeof config.onSuccess === 'function') {
-        var _getCurrentRetry;
-        var _context = createContext(existRetryTimes);
-        var _ref2 = (_getCurrentRetry = getCurrentRetry(chunkId)) !== null && _getCurrentRetry !== void 0 ? _getCurrentRetry : {},
-          currRetryTimes = _ref2.existRetryTimes;
-        if (currRetryTimes === existRetryTimes) {
-          config.onSuccess(_context);
-        }
+    var nextPromise = ensureChunk.apply(void 0, [chunkId, arg0, arg1, arg2, arg3, arg4, arg5, arg6, callingCounter].concat(args));
+    return nextPromise.then(function (result) {
+      // when after retrying the third time
+      // ensureChunk(chunkId, { count: 3 }), at that time, existRetryTimes === 2
+      // after all, callingCounter.count is 4
+      var isLastSuccessRetry = (callingCounter === null || callingCounter === void 0 ? void 0 : callingCounter.count) === existRetryTimes + 2;
+      if (typeof config.onSuccess === 'function' && isLastSuccessRetry) {
+        var _context = createContext(existRetryTimes + 1);
+        config.onSuccess(_context);
       }
       return result;
     });
   });
 }
 function loadScript(originalUrl, done, key, chunkId) {
-  var retry = getCurrentRetry(chunkId);
-  return originalLoadScript(retry ? retry.nextRetryUrl : originalUrl, done, key, chunkId);
+  var retry = globalCurrRetrying[chunkId];
+  for (var _len2 = arguments.length, args = new Array(_len2 > 4 ? _len2 - 4 : 0), _key2 = 4; _key2 < _len2; _key2++) {
+    args[_key2 - 4] = arguments[_key2];
+  }
+  return originalLoadScript.apply(void 0, [retry ? retry.nextRetryUrl : originalUrl, done, key, chunkId].concat(args));
 }
 function registerAsyncChunkRetry() {
   // init global variables shared between initial-chunk-retry and async-chunk-retry
@@ -214,7 +251,7 @@ function registerAsyncChunkRetry() {
       __RUNTIME_GLOBALS_ENSURE_CHUNK__ = ensureChunk;
       __RUNTIME_GLOBALS_LOAD_SCRIPT__ = loadScript;
     } catch (e) {
-      console.error('[@rsbuild/plugin-assets-retry] Register async chunk retry runtime failed', e);
+      console.error(ERROR_PREFIX, 'Register async chunk retry runtime failed', e);
     }
   }
 }

package/dist/runtime/asyncChunkRetry.min.js

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

package/package.json

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