swpp-backends 1.0.7 → 1.0.11

package/dist/js/Import.js

@@ -0,0 +1,3 @@
+module.exports = () => {
+    return import('got')
+}

package/dist/{FileAnalyzer.js → ts/FileAnalyzer.js}

@@ -29,10 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceRequest = exports.findCache = exports.eachAllLinkInJavaScript = exports.eachAllLinkInCss = exports.eachAllLinkInHtml = exports.eachAllLinkInUrl = exports.buildVersionJson = exports.readMergeVersionMap = exports.readNewVersionJson = exports.readOldVersionJson = exports.submitCacheInfo = exports.loadVersionJson = exports.isStable = exports.isExclude = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const node_fetch_1 = require("node-fetch");
 const SwppRules_1 = require("./SwppRules");
 const crypto = __importStar(require("crypto"));
-const buffer_1 = require("buffer");
 const fast_html_parser_1 = __importDefault(require("fast-html-parser"));
 const css_1 = __importDefault(require("css"));
 const Utils_1 = require("./Utils");
@@ -93,12 +91,12 @@ exports.isStable = isStable;
  */
 async function loadVersionJson(url) {
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (response?.status === 404) {
+    if (response?.statusCode === 404) {
         (0, Utils_1.warn)('LoadVersionJson', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
         return _oldVersionJson = null;
     }
     else {
-        return _oldVersionJson = (await response.json());
+        return _oldVersionJson = (JSON.parse(response.body));
     }
 }
 exports.loadVersionJson = loadVersionJson;
@@ -253,8 +251,8 @@ async function eachAllLinkInUrl(domain, url, result, event) {
         }
     }
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (![200, 301, 302, 307, 308].includes(response?.status ?? 0)) {
-        (0, Utils_1.error)('LinkItorInUrl', `拉取文件 [${url}] 时出现错误：${response?.status}`);
+    if (![200, 301, 302, 307, 308].includes(response?.statusCode ?? 0)) {
+        (0, Utils_1.error)('LinkItorInUrl', `拉取文件 [${url}] 时出现错误：${response?.statusCode}`);
         return;
     }
     event?.(url);
@@ -273,15 +271,15 @@ async function eachAllLinkInUrl(domain, url, result, event) {
     switch (true) {
         case pathname.endsWith('.html'):
         case pathname.endsWith('/'):
-            content = await response.text();
+            content = response.body;
             update();
             return eachAllLinkInHtml(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
         case pathname.endsWith('.css'):
-            content = await response.text();
+            content = response.body;
             update();
             return eachAllLinkInCss(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
         case pathname.endsWith('.js'):
-            content = await response.text();
+            content = response.body;
             update();
             return eachAllLinkInJavaScript(domain, content, result, nextEvent);
         default:
@@ -289,8 +287,7 @@ async function eachAllLinkInUrl(domain, url, result, event) {
                 result[url] = [];
             }
             else {
-                const buffer = buffer_1.Buffer.from(await response.arrayBuffer());
-                result[url] = crypto.createHash('md5').update(buffer).digest('hex');
+                result[url] = crypto.createHash('md5').update(response.rawBody).digest('hex');
             }
             break;
     }
@@ -496,7 +493,7 @@ function replaceRequest(url) {
     if (!('modifyRequest' in rules))
         return url;
     const { modifyRequest } = rules;
-    const request = new node_fetch_1.Request(url);
+    const request = new Request(url);
     return modifyRequest?.(request, (0, Utils_1.readEjectData)()?.nodeEject)?.url ?? url;
 }
 exports.replaceRequest = replaceRequest;

package/dist/{UpdateJsonBuilder.js → ts/UpdateJsonBuilder.js}

@@ -20,11 +20,11 @@ async function loadUpdateJson(url) {
     if (_oldJson !== undefined)
         return _oldJson;
     const response = await (0, Utils_1.fetchFile)(url);
-    if (response.status === 404) {
+    if (response?.statusCode === 404) {
         (0, Utils_1.warn)('LoadUpdateJson', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
         return _oldJson = null;
     }
-    return _oldJson = (await response.json());
+    return _oldJson = (JSON.parse(response.body));
 }
 exports.loadUpdateJson = loadUpdateJson;
 /**

package/dist/{Utils.js → ts/Utils.js}

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceDevRequest = exports.fetchFile = exports.getSource = exports.readEjectData = exports.calcEjectValues = exports.warn = exports.error = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const SwppRules_1 = require("./SwppRules");
 const logger = require('hexo-log').default({
     debug: false,
@@ -140,27 +136,31 @@ exports.getSource = getSource;
  * **调用该函数前必须调用过 [loadRules]**
  */
 async function fetchFile(link) {
+    const GotType = await require('../js/Import.js')();
     const url = replaceDevRequest(link);
     const timeout = (0, SwppRules_1.readRules)().config.external.timeout;
-    const controller = new AbortController();
-    const opts = {
+    const options = {
+        http2: true,
         headers: {
             referer: 'kmar-swpp',
             'User-Agent': 'kmar-swpp'
-        }
+        },
+        timeout: {
+            response: timeout
+        },
+        retry: { limit: 0 }
     };
     try {
         if (typeof url === 'string') {
-            setTimeout(() => controller.abort('timeout'), timeout + 100);
-            return await (0, node_fetch_1.default)(url, opts);
+            return await GotType.got.get(url, options);
         }
         else {
-            return await fetchSpeed(url, opts, timeout);
+            return await fetchSpeed(url, options);
         }
     }
     catch (err) {
         // @ts-ignore
-        if (err.name === 'AbortError') {
+        if (err instanceof GotType.TimeoutError) {
             logger.error(`[SWPP FetchFile] 拉取文件 [${link}] 时出现了超时错误，如果您构建所在的位置无法访问该资源，` +
                 "请尝试通过 DevReplace（https://kmar.top/posts/73014407/#4ea71e00）功能解决该问题。");
             throw 'timeout';
@@ -180,29 +180,22 @@ function replaceDevRequest(link) {
 }
 exports.replaceDevRequest = replaceDevRequest;
 /** 通过 CDN 竞速的方式拉取文件 */
-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');
+async function fetchSpeed(list, options) {
+    const GotType = await require('../js/Import.js')();
+    const controllers = list.map(_ => new AbortController());
+    const result = await Promise.any(list.map((it, index) => GotType.got.get(it, Object.assign({ signal: controllers[index].signal }, options)).then((response) => {
+        if ([200, 301, 302, 307, 308].includes(response.statusCode))
+            return { index, response };
+        throw response;
+    })));
+    if ('index' in result && 'response' in result) {
+        for (let i = 0; i < controllers.length; i++) {
+            if (i !== result.index)
+                controllers[i].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()))).catch(err => ({ err }));
-    if ('err' in result) {
-        if (overtime)
-            throw { name: 'AbortError' };
-        else
-            throw result.err;
+        return result.response;
     }
-    for (let i = 0; i < controllers.length; i++) {
-        if (i !== result.index)
-            controllers[i].abort();
+    else {
+        throw result;
     }
-    return result.response;
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "swpp-backends",
-  "version": "1.0.7",
-  "main": "dist/index.js",
-  "typings": "types/index.d.ts",
+  "version": "1.0.11",
+  "main": "dist/ts/index.js",
+  "typings": "types/ts/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",
   "author": "kmar",
   "license": "AGPL-3.0",
@@ -13,16 +13,16 @@
   "devDependencies": {
     "@types/css": "^0.0.33",
     "@types/fast-html-parser": "^1.0.2",
+    "@types/got": "^9.6.12",
     "@types/node": "^20.4.5",
-    "@types/node-fetch": "^2.6.4",
     "gulp": "^4.0.2",
     "typescript": "^5.1.6"
   },
   "dependencies": {
     "css": "^3.0.0",
     "fast-html-parser": "^1.0.1",
-    "hexo-log": "^4.1.0",
-    "node-fetch": "^2.6.12"
+    "got": "^13.0.0",
+    "hexo-log": "^4.1.0"
   },
   "repository": {
     "type": "git",

package/types/{SwppRules.d.ts → ts/SwppRules.d.ts}

@@ -1,4 +1,3 @@
-import { Request, Response } from 'node-fetch';
 import { SwppConfig } from './SwppConfig';
 /**
  * 读取最后一次构建的 rules

package/types/{Utils.d.ts → ts/Utils.d.ts}

@@ -1,3 +1,4 @@
+import got from 'got';
 export declare function error(type: string, message: string): void;
 export declare function warn(type: string, message: string): void;
 export interface EjectCache {
@@ -32,7 +33,7 @@ export declare function getSource(obj: any, typeChecker?: ((name: string) => boo
  *
  * **调用该函数前必须调用过 [loadRules]**
  */
-export declare function fetchFile(link: string): Promise<import("node-fetch").Response>;
+export declare function fetchFile(link: string): Promise<got.Response<any>>;
 /**
  * 替换编译期的 URL（CDN 竞速）
  *