@rsbuild/plugin-assets-retry 0.5.6 → 0.5.8

package/dist/index.d.ts

@@ -40,6 +40,10 @@ type PluginAssetsRetryOptions = {
      * The callback function when the asset is successfully retried.
      */
     onSuccess?: (options: AssetsRetryHookContext) => void;
+    /**
+     * Whether to minify the runtime JavaScript code of Assets Retry plugin.
+     */
+    minify?: boolean;
 };
 type AssetsRetryHookContext = {
     url: string;

package/dist/index.js

@@ -70,6 +70,7 @@ var init_AssetsRetryPlugin = __esm({
         __publicField(this, "name");
         __publicField(this, "distDir");
         __publicField(this, "inlineScript");
+        __publicField(this, "minify");
         __publicField(this, "HtmlPlugin");
         __publicField(this, "scriptPath");
         __privateAdd(this, _retryOptions, void 0);
@@ -77,6 +78,7 @@ var init_AssetsRetryPlugin = __esm({
           distDir,
           HtmlPlugin,
           inlineScript = true,
+          minify = process.env.NODE_ENV === "production",
           ...retryOptions
         } = options;
         this.name = "AssetsRetryPlugin";
@@ -85,10 +87,14 @@ var init_AssetsRetryPlugin = __esm({
         this.HtmlPlugin = HtmlPlugin;
         this.inlineScript = inlineScript;
         this.scriptPath = "";
+        this.minify = minify;
       }
       async getRetryCode() {
         const { default: serialize } = await import("serialize-javascript");
-        const runtimeFilePath = import_node_path.default.join(__dirname, "./runtime.js");
+        const runtimeFilePath = import_node_path.default.join(
+          __dirname,
+          this.minify ? "runtime.min.js" : "runtime.js"
+        );
         const runtimeCode = await import_shared.fse.readFile(runtimeFilePath, "utf-8");
         return `(function(){${runtimeCode};init(${serialize(
           __privateGet(this, _retryOptions)
@@ -98,7 +104,7 @@ var init_AssetsRetryPlugin = __esm({
         if (!this.scriptPath) {
           this.scriptPath = import_node_path.default.posix.join(
             this.distDir,
-            `assets-retry.${"0.5.6"}.js`
+            `assets-retry.${"0.5.8"}.js`
           );
         }
         return this.scriptPath;
@@ -175,6 +181,10 @@ var pluginAssetsRetry = (options = {}) => ({
       if (options.crossOrigin === void 0) {
         options.crossOrigin = config.html.crossorigin;
       }
+      if (options.minify === void 0) {
+        const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js ?? true;
+        options.minify = minify;
+      }
       chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
         {
           ...options,

package/dist/index.mjs

@@ -70,6 +70,7 @@ var init_AssetsRetryPlugin = __esm({
         __publicField(this, "name");
         __publicField(this, "distDir");
         __publicField(this, "inlineScript");
+        __publicField(this, "minify");
         __publicField(this, "HtmlPlugin");
         __publicField(this, "scriptPath");
         __privateAdd(this, _retryOptions, void 0);
@@ -77,6 +78,7 @@ var init_AssetsRetryPlugin = __esm({
           distDir,
           HtmlPlugin,
           inlineScript = true,
+          minify = process.env.NODE_ENV === "production",
           ...retryOptions
         } = options;
         this.name = "AssetsRetryPlugin";
@@ -85,10 +87,14 @@ var init_AssetsRetryPlugin = __esm({
         this.HtmlPlugin = HtmlPlugin;
         this.inlineScript = inlineScript;
         this.scriptPath = "";
+        this.minify = minify;
       }
       async getRetryCode() {
         const { default: serialize } = await import("serialize-javascript");
-        const runtimeFilePath = path2.join(__dirname, "./runtime.js");
+        const runtimeFilePath = path2.join(
+          __dirname,
+          this.minify ? "runtime.min.js" : "runtime.js"
+        );
         const runtimeCode = await fse.readFile(runtimeFilePath, "utf-8");
         return `(function(){${runtimeCode};init(${serialize(
           __privateGet(this, _retryOptions)
@@ -98,7 +104,7 @@ var init_AssetsRetryPlugin = __esm({
         if (!this.scriptPath) {
           this.scriptPath = path2.posix.join(
             this.distDir,
-            `assets-retry.${"0.5.6"}.js`
+            `assets-retry.${"0.5.8"}.js`
           );
         }
         return this.scriptPath;
@@ -171,6 +177,10 @@ var pluginAssetsRetry = (options = {}) => ({
       if (options.crossOrigin === void 0) {
         options.crossOrigin = config.html.crossorigin;
       }
+      if (options.minify === void 0) {
+        const minify = typeof config.output.minify === "boolean" ? config.output.minify : config.output.minify?.js ?? true;
+        options.minify = minify;
+      }
       chain.plugin(CHAIN_ID.PLUGIN.ASSETS_RETRY).use(AssetsRetryPlugin2, [
         {
           ...options,

package/dist/runtime.js

@@ -1 +1,243 @@
-"use strict";var TAG_TYPE={link:HTMLLinkElement,script:HTMLScriptElement,img:HTMLImageElement},TYPES=Object.keys(TAG_TYPE);function findCurrentDomain(e,t){for(var n="",r=0;r<t.length;r++)if(-1!==e.indexOf(t[r])){n=t[r];break}return n||e}function findNextDomain(e,t){var n=findCurrentDomain(e,t),r=t.indexOf(n);return t[(r+1)%t.length]||e}function getRequestUrl(e){return e instanceof HTMLScriptElement||e instanceof HTMLImageElement?e.src:e instanceof HTMLLinkElement?e.href:null}var defaultConfig={max:3,type:TYPES,domain:[],crossOrigin:!1};function validateTargetInfo(e,t){var n,r=t.target,i=null===(n=r.tagName)||void 0===n?void 0:n.toLocaleLowerCase(),a=e.type,o=getRequestUrl(r);return!!(i&&-1!==a.indexOf(i)&&TAG_TYPE[i]&&r instanceof TAG_TYPE[i]&&o)&&{target:r,tagName:i,url:o}}function createElement(e,t){var n=!0===t.crossOrigin?"anonymous":t.crossOrigin,r=n?'crossorigin="'.concat(n,'"'):"",i=t.times?'data-rsbuild-retry-times="'.concat(t.times,'"'):"",a=t.isAsync?"data-rsbuild-async":"";if(e instanceof HTMLScriptElement){var o=document.createElement("script");return o.src=t.url,n&&(o.crossOrigin=n),t.times&&(o.dataset.rsbuildRetryTimes=String(t.times)),t.isAsync&&(o.dataset.rsbuildAsync=""),{element:o,str:'<script src="'.concat(t.url,'" ').concat(r," ").concat(i," ").concat(a,"><\/script>")}}if(e instanceof HTMLLinkElement){var s=document.createElement("link");return s.rel=e.rel||"stylesheet",e.as&&(s.as=e.as),s.href=t.url,n&&(s.crossOrigin=n),t.times&&(s.dataset.rsbuildRetryTimes=String(t.times)),{element:s,str:'<link rel="'.concat(s.rel,'" href="').concat(t.url,'" ').concat(r," ").concat(i," ").concat(s.as?'as="'.concat(s.as,'"'):"","></link>")}}}function reloadElementResource(e,t,n){e instanceof HTMLScriptElement&&(n.isAsync?document.body.appendChild(t.element):document.write(t.str)),e instanceof HTMLLinkElement&&document.getElementsByTagName("head")[0].appendChild(t.element),e instanceof HTMLImageElement&&(e.src=n.url,e.dataset.rsbuildRetryTimes=String(n.times))}function retry(e,t){var n=validateTargetInfo(e,t);if(!1!==n){var r=n.target,i=n.tagName,a=n.url,o=e.test;if(o){if("string"==typeof o){var s=new RegExp(o);o=function(e){return s.test(e)}}if("function"!=typeof o||!o(a))return}var c=findCurrentDomain(a,e.domain);if(!(e.domain&&e.domain.length>0&&-1===e.domain.indexOf(c))){var l=Number(r.dataset.rsbuildRetryTimes)||0;if(l!==e.max){var m=findNextDomain(c,e.domain),d=Boolean(r.dataset.rsbuildAsync)||r.async||r.defer,u={url:a.replace(c,m),times:l+1,crossOrigin:e.crossOrigin,isAsync:d},f=createElement(r,u);if(e.onRetry&&"function"==typeof e.onRetry){var g={times:l,domain:c,url:a,tagName:i};e.onRetry(g)}reloadElementResource(r,f,u)}else if("function"==typeof e.onFail){var y={times:l,domain:c,url:a,tagName:i};e.onFail(y)}}}}function load(e,t){var n=validateTargetInfo(e,t);if(!1!==n){var r=n.target,i=n.tagName,a=n.url,o=findCurrentDomain(a,e.domain),s=Number(r.dataset.rsbuildRetryTimes)||0;if(0!==s&&"function"==typeof e.onSuccess){var c={times:s,domain:o,url:a,tagName:i};e.onSuccess(c)}}}function resourceMonitor(e,t){"undefined"!=typeof window&&void 0!==window.document&&(document.addEventListener("error",(function(t){t&&t.target instanceof Element&&e(t)}),!0),document.addEventListener("load",(function(e){e&&e.target instanceof Element&&t(e)}),!0))}function init(e){var t=Object.assign({},defaultConfig,e);Array.isArray(t.type)&&0!==t.type.length||(t.type=defaultConfig.type),Array.isArray(t.domain)&&0!==t.domain.length||(t.domain=defaultConfig.domain),Array.isArray(t.domain)&&(t.domain=t.domain.filter(Boolean));try{resourceMonitor((function(e){try{retry(t,e)}catch(e){console.error("retry error captured",e)}}),(function(e){try{load(t,e)}catch(e){console.error("load error captured",e)}}))}catch(e){console.error("monitor error captured",e)}}
+"use strict";
+
+var TAG_TYPE = {
+  link: HTMLLinkElement,
+  script: HTMLScriptElement,
+  img: HTMLImageElement
+};
+var TYPES = Object.keys(TAG_TYPE);
+function findCurrentDomain(url, domainList) {
+  var domain = '';
+  for (var i = 0; i < domainList.length; i++) {
+    if (url.indexOf(domainList[i]) !== -1) {
+      domain = domainList[i];
+      break;
+    }
+  }
+  return domain || url;
+}
+function findNextDomain(url, domainList) {
+  var currentDomain = findCurrentDomain(url, domainList);
+  var index = domainList.indexOf(currentDomain);
+  return domainList[(index + 1) % domainList.length] || url;
+}
+function getRequestUrl(element) {
+  if (element instanceof HTMLScriptElement || element instanceof HTMLImageElement) {
+    return element.src;
+  }
+  if (element instanceof HTMLLinkElement) {
+    return element.href;
+  }
+  return null;
+}
+var defaultConfig = {
+  max: 3,
+  type: TYPES,
+  domain: [],
+  crossOrigin: false
+};
+function validateTargetInfo(config, e) {
+  var _target$tagName;
+  var target = e.target;
+  var tagName = (_target$tagName = target.tagName) === null || _target$tagName === void 0 ? void 0 : _target$tagName.toLocaleLowerCase();
+  var allowTags = config.type;
+  var url = getRequestUrl(target);
+  if (!tagName || allowTags.indexOf(tagName) === -1 || !TAG_TYPE[tagName] || !(target instanceof TAG_TYPE[tagName]) || !url) {
+    return false;
+  }
+  return {
+    target: target,
+    tagName: tagName,
+    url: url
+  };
+}
+function createElement(origin, attributes) {
+  var crossOrigin = attributes.crossOrigin === true ? 'anonymous' : attributes.crossOrigin;
+  var crossOriginAttr = crossOrigin ? "crossorigin=\"".concat(crossOrigin, "\"") : '';
+  var retryTimesAttr = attributes.times ? "data-rsbuild-retry-times=\"".concat(attributes.times, "\"") : '';
+  var isAsyncAttr = attributes.isAsync ? 'data-rsbuild-async' : '';
+  if (origin instanceof HTMLScriptElement) {
+    var script = document.createElement('script');
+    script.src = attributes.url;
+    if (crossOrigin) {
+      script.crossOrigin = crossOrigin;
+    }
+    if (attributes.times) {
+      script.dataset.rsbuildRetryTimes = String(attributes.times);
+    }
+    if (attributes.isAsync) {
+      script.dataset.rsbuildAsync = '';
+    }
+    return {
+      element: script,
+      str: "<script src=\"".concat(attributes.url, "\" ").concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(isAsyncAttr, "></script>")
+    };
+  }
+  if (origin instanceof HTMLLinkElement) {
+    var link = document.createElement('link');
+    link.rel = origin.rel || 'stylesheet';
+    if (origin.as) {
+      link.as = origin.as;
+    }
+    link.href = attributes.url;
+    if (crossOrigin) {
+      link.crossOrigin = crossOrigin;
+    }
+    if (attributes.times) {
+      link.dataset.rsbuildRetryTimes = String(attributes.times);
+    }
+    return {
+      element: link,
+      str: "<link rel=\"".concat(link.rel, "\" href=\"").concat(attributes.url, "\" ").concat(crossOriginAttr, " ").concat(retryTimesAttr, " ").concat(link.as ? "as=\"".concat(link.as, "\"") : '', "></link>")
+    };
+  }
+}
+function reloadElementResource(origin, fresh, options) {
+  if (origin instanceof HTMLScriptElement) {
+    if (options.isAsync) {
+      document.body.appendChild(fresh.element);
+    } else {
+      document.write(fresh.str);
+    }
+  }
+  if (origin instanceof HTMLLinkElement) {
+    document.getElementsByTagName('head')[0].appendChild(fresh.element);
+  }
+  if (origin instanceof HTMLImageElement) {
+    origin.src = options.url;
+    origin.dataset.rsbuildRetryTimes = String(options.times);
+  }
+}
+function retry(config, e) {
+  var targetInfo = validateTargetInfo(config, e);
+  if (targetInfo === false) {
+    return;
+  }
+  var target = targetInfo.target,
+    tagName = targetInfo.tagName,
+    url = targetInfo.url;
+  // Filter by config.test and config.domain
+  var tester = config.test;
+  if (tester) {
+    if (typeof tester === 'string') {
+      var regexp = new RegExp(tester);
+      tester = function tester(str) {
+        return regexp.test(str);
+      };
+    }
+    if (typeof tester !== 'function' || !tester(url)) {
+      return;
+    }
+  }
+  var domain = findCurrentDomain(url, config.domain);
+  if (config.domain && config.domain.length > 0 && config.domain.indexOf(domain) === -1) {
+    return;
+  }
+
+  // If the retry times has exceeded the maximum, fail
+  var existRetryTimes = Number(target.dataset.rsbuildRetryTimes) || 0;
+  if (existRetryTimes === config.max) {
+    if (typeof config.onFail === 'function') {
+      var context = {
+        times: existRetryTimes,
+        domain: domain,
+        url: url,
+        tagName: tagName
+      };
+      config.onFail(context);
+    }
+    return;
+  }
+
+  // Then, we will start to retry
+  var nextDomain = findNextDomain(domain, config.domain);
+  var isAsync = Boolean(target.dataset.rsbuildAsync) || target.async || target.defer;
+  var attributes = {
+    url: url.replace(domain, nextDomain),
+    times: existRetryTimes + 1,
+    crossOrigin: config.crossOrigin,
+    isAsync: isAsync
+  };
+  var element = createElement(target, attributes);
+  if (config.onRetry && typeof config.onRetry === 'function') {
+    var _context = {
+      times: existRetryTimes,
+      domain: domain,
+      url: url,
+      tagName: tagName
+    };
+    config.onRetry(_context);
+  }
+  reloadElementResource(target, element, attributes);
+}
+function load(config, e) {
+  var targetInfo = validateTargetInfo(config, e);
+  if (targetInfo === false) {
+    return;
+  }
+  var target = targetInfo.target,
+    tagName = targetInfo.tagName,
+    url = targetInfo.url;
+  var domain = findCurrentDomain(url, config.domain);
+  var retryTimes = Number(target.dataset.rsbuildRetryTimes) || 0;
+  if (retryTimes === 0) {
+    return;
+  }
+  if (typeof config.onSuccess === 'function') {
+    var context = {
+      times: retryTimes,
+      domain: domain,
+      url: url,
+      tagName: tagName
+    };
+    config.onSuccess(context);
+  }
+}
+function resourceMonitor(error, success) {
+  if (typeof window !== 'undefined' && typeof window.document !== 'undefined') {
+    document.addEventListener('error', function (e) {
+      if (e && e.target instanceof Element) {
+        error(e);
+      }
+    }, true);
+    document.addEventListener('load', function (e) {
+      if (e && e.target instanceof Element) {
+        success(e);
+      }
+    }, true);
+  }
+}
+
+// @ts-expect-error init is a global function, ignore ts(6133)
+function init(options) {
+  var config = Object.assign({}, defaultConfig, options);
+  // Normalize config
+  if (!Array.isArray(config.type) || config.type.length === 0) {
+    config.type = defaultConfig.type;
+  }
+  if (!Array.isArray(config.domain) || config.domain.length === 0) {
+    config.domain = defaultConfig.domain;
+  }
+  if (Array.isArray(config.domain)) {
+    config.domain = config.domain.filter(Boolean);
+  }
+
+  // Bind event in window
+  try {
+    resourceMonitor(function (e) {
+      try {
+        retry(config, e);
+      } catch (err) {
+        console.error('retry error captured', err);
+      }
+    }, function (e) {
+      try {
+        load(config, e);
+      } catch (err) {
+        console.error('load error captured', err);
+      }
+    });
+  } catch (err) {
+    console.error('monitor error captured', err);
+  }
+}

package/dist/runtime.min.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-assets-retry",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "Assets retry plugin for Rsbuild",
   "homepage": "https://rsbuild.dev",
   "repository": {
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "serialize-javascript": "^6.0.2",
-    "@rsbuild/shared": "0.5.6"
+    "@rsbuild/shared": "0.5.8"
   },
   "devDependencies": {
     "@babel/core": "^7.24.3",
@@ -34,11 +34,11 @@
     "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2",
     "terser": "5.29.2",
     "typescript": "^5.4.2",
-    "@rsbuild/core": "0.5.6",
-    "@scripts/test-helper": "0.5.6"
+    "@rsbuild/core": "0.5.8",
+    "@scripts/test-helper": "0.5.8"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.5.6"
+    "@rsbuild/core": "^0.5.8"
   },
   "publishConfig": {
     "access": "public",