swpp-backends 1.0.4 → 1.0.7

package/dist/UpdateJsonBuilder.js

@@ -295,7 +295,8 @@ function getShorthand(url, offset = 0) {
             }
         }
         switch (count) {
-            case 1: return result;
+            case 1:
+            case 0: return result;
             case 2:
                 --index;
                 removeSet.forEach(it => collide.delete(it));

package/dist/Utils.js

@@ -140,26 +140,27 @@ exports.getSource = getSource;
  * **调用该函数前必须调用过 [loadRules]**
  */
 async function fetchFile(link) {
-    const config = (0, SwppRules_1.readRules)().config;
     const url = replaceDevRequest(link);
+    const timeout = (0, SwppRules_1.readRules)().config.external.timeout;
+    const controller = new AbortController();
     const opts = {
         headers: {
             referer: 'kmar-swpp',
             'User-Agent': 'kmar-swpp'
-        },
-        timeout: config.external.timeout
+        }
     };
     try {
         if (typeof url === 'string') {
+            setTimeout(() => controller.abort('timeout'), timeout + 100);
             return await (0, node_fetch_1.default)(url, opts);
         }
         else {
-            return await fetchSpeed(url);
+            return await fetchSpeed(url, opts, timeout);
         }
     }
     catch (err) {
         // @ts-ignore
-        if (err.type === 'request-timeout') {
+        if (err.name === 'AbortError') {
             logger.error(`[SWPP FetchFile] 拉取文件 [${link}] 时出现了超时错误，如果您构建所在的位置无法访问该资源，` +
                 "请尝试通过 DevReplace（https://kmar.top/posts/73014407/#4ea71e00）功能解决该问题。");
             throw 'timeout';
@@ -179,11 +180,26 @@ function replaceDevRequest(link) {
 }
 exports.replaceDevRequest = replaceDevRequest;
 /** 通过 CDN 竞速的方式拉取文件 */
-async function fetchSpeed(list) {
+async function fetchSpeed(list, opts, timeout) {
     const controllers = new Array(list.length);
+    let overtime = false;
+    setTimeout(() => {
+        overtime = true;
+        for (let controller of controllers) {
+            if (controller)
+                controller.abort('timeout');
+        }
+    }, timeout + 200);
     const result = await Promise.any(list.map((it, index) => (0, node_fetch_1.default)(it, {
+        headers: opts.headers,
         signal: (controllers[index] = new AbortController()).signal
-    }).then(response => [200, 301, 302, 307, 308].includes(response.status) ? { index, response } : Promise.reject())));
+    }).then(response => [200, 301, 302, 307, 308].includes(response.status) ? { index, response } : Promise.reject()))).catch(err => ({ err }));
+    if ('err' in result) {
+        if (overtime)
+            throw { name: 'AbortError' };
+        else
+            throw result.err;
+    }
     for (let i = 0; i < controllers.length; i++) {
         if (i !== result.index)
             controllers[i].abort();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",
@@ -14,11 +14,11 @@
     "@types/css": "^0.0.33",
     "@types/fast-html-parser": "^1.0.2",
     "@types/node": "^20.4.5",
+    "@types/node-fetch": "^2.6.4",
     "gulp": "^4.0.2",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@types/node-fetch": "^2.6.4",
     "css": "^3.0.0",
     "fast-html-parser": "^1.0.1",
     "hexo-log": "^4.1.0",