swpp-backends 0.0.5-alpha → 0.0.7-alpha

package/dist/UpdateJsonBuilder.js

@@ -34,8 +34,10 @@ exports.loadUpdateJson = loadUpdateJson;
  * + **调用该函数前必须调用过 [loadUpdateJson]**
  */
 function readUpdateJson() {
-    if (_oldJson === undefined)
+    if (_oldJson === undefined) {
+        (0, Utils_1.error)('UpdateJsonReader', 'UpdateJson 尚未初始化');
         throw 'UpdateJson 未初始化';
+    }
     return _oldJson;
 }
 exports.readUpdateJson = readUpdateJson;
@@ -52,8 +54,10 @@ exports.readUpdateJson = readUpdateJson;
  */
 function buildNewInfo(root, dif) {
     const config = (0, SwppRules_1.readRules)().config.json;
-    if (!config)
+    if (!config) {
+        (0, Utils_1.error)('NewInfoBuilder', '功能未开启');
         throw '功能未开启';
+    }
     const old = readUpdateJson();
     let global = old?.global ?? 0;
     if (dif.force)
@@ -274,6 +278,7 @@ function getShorthand(url, offset = 0) {
                 removeSet.forEach(it => collide.delete(it));
                 break;
             default:
+                (0, Utils_1.error)('Shorthand', '意料之外的错误：' + count);
                 throw '意料之外的错误：' + count;
         }
     }

package/dist/fileAnalyzer.js

@@ -61,7 +61,7 @@ function eachAllFile(root, cb) {
 function isExclude(domain, url) {
     const exclude = (0, SwppRules_1.readRules)().config?.json?.exclude;
     if (!exclude)
-        throw 'exclude 为空';
+        return false;
     const list = isExternalLink(domain, url) ? exclude.other : exclude.localhost;
     for (let reg of list) {
         if (url.match(reg))
@@ -78,7 +78,7 @@ exports.isExclude = isExclude;
 function isStable(url) {
     const stable = (0, SwppRules_1.readRules)().config?.external?.stable;
     if (!stable)
-        throw 'stable 为空';
+        return false;
     for (let reg of stable) {
         if (url.match(reg))
             return true;
@@ -112,8 +112,10 @@ exports.submitCacheInfo = submitCacheInfo;
  * + **调用该函数前必须调用过 [loadCacheJson]**
  */
 function readOldVersionJson() {
-    if (!_oldVersionJson)
-        throw 'cache json 尚未初始化';
+    if (!_oldVersionJson) {
+        (0, Utils_1.error)('OldVersionReader', 'version json 尚未初始化');
+        throw 'version json 尚未初始化';
+    }
     return _oldVersionJson;
 }
 exports.readOldVersionJson = readOldVersionJson;
@@ -126,8 +128,10 @@ exports.readOldVersionJson = readOldVersionJson;
  * + **执行该函数前必须调用过 [calcEjectValues]**
  */
 function readNewVersionJson() {
-    if (!_newVersionJson)
-        throw 'cache json 尚未初始化';
+    if (!_newVersionJson) {
+        (0, Utils_1.error)('NewVersionReader', 'version json 尚未初始化');
+        throw 'version json 尚未初始化';
+    }
     return _newVersionJson;
 }
 exports.readNewVersionJson = readNewVersionJson;
@@ -210,7 +214,7 @@ exports.buildVersionJson = buildVersionJson;
  */
 async function eachAllLinkInUrl(domain, url, result, event) {
     if (url.startsWith('//'))
-        url = 'http' + url;
+        url = 'http:' + url;
     if (url in result)
         return event?.(url);
     if (!url.startsWith('http') || isExclude(domain, url))
@@ -241,9 +245,15 @@ async function eachAllLinkInUrl(domain, url, result, event) {
             return;
         }
     }
-    const response = await (0, Utils_1.fetchFile)(url);
-    if (![200, 301, 302, 307, 308].includes(response.status))
+    const response = await (0, Utils_1.fetchFile)(url).catch(err => {
+        (0, Utils_1.error)('LinkItorInUrl', `拉取文件 [${url}] 时发生异常：${err}`);
+    });
+    if (!response)
+        throw '拉取时异常';
+    if (![200, 301, 302, 307, 308].includes(response.status)) {
+        (0, Utils_1.error)('LinkItorInUrl', `拉取文件 [${url}] 时出现错误：${response.status}`);
         throw response;
+    }
     const pathname = new URL(url).pathname;
     let content;
     const relay = [];
@@ -303,7 +313,9 @@ async function eachAllLinkInHtml(domain, content, result, event) {
         let url = undefined;
         switch (node.tagName) {
             case 'link':
-                url = node.attributes.href;
+                // noinspection SpellCheckingInspection
+                if (node.attributes.rel !== 'preconnect')
+                    url = node.attributes.href;
                 break;
             case 'script':
             case 'img':
@@ -389,8 +401,10 @@ exports.eachAllLinkInCss = eachAllLinkInCss;
  */
 async function eachAllLinkInJavaScript(domain, content, result, event) {
     const ruleList = (0, SwppRules_1.readRules)().config?.external?.js;
-    if (!ruleList)
+    if (!ruleList) {
+        (0, Utils_1.error)('LinkItorInJS', '不应发生的异常');
         throw 'ruleList 为空';
+    }
     for (let value of ruleList) {
         if (typeof value === 'function') {
             const urls = value(content);
@@ -431,7 +445,7 @@ function findCache(url) {
     url = new URL(replaceRequest(url.href));
     for (let key in cacheRules) {
         const value = cacheRules[key];
-        if (value.match(url, eject.nodeEject))
+        if (value.match(url, eject?.nodeEject))
             return value;
     }
     return null;
@@ -449,6 +463,6 @@ function replaceRequest(url) {
         return url;
     const { modifyRequest } = rules;
     const request = new node_fetch_1.Request(url);
-    return modifyRequest?.(request, (0, Utils_1.readEjectData)().nodeEject)?.url ?? url;
+    return modifyRequest?.(request, (0, Utils_1.readEjectData)()?.nodeEject)?.url ?? url;
 }
 exports.replaceRequest = replaceRequest;

package/dist/serviceWorkerBuilder.js

@@ -19,7 +19,7 @@ function buildServiceWorker() {
     const eject = (0, Utils_1.readEjectData)();
     const { modifyRequest, fetchFile, getRaceUrls, getSpareUrls, blockRequest, config } = rules;
     const serviceWorkerConfig = config.serviceWorker;
-    const templatePath = path_1.default.resolve('./', module.path, 'sw-template.js');
+    const templatePath = path_1.default.resolve('./', module.path, 'resources/sw-template.js');
     // 获取拓展文件
     let cache = (0, Utils_1.getSource)(rules, undefined, [
         'cacheList', 'modifyRequest', 'getCdnList', 'getSpareUrls', 'blockRequest', 'fetchFile',
@@ -42,7 +42,7 @@ function buildServiceWorker() {
     const keyword = "const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')";
     // noinspection JSUnresolvedVariable
     let content = fs_1.default.readFileSync(templatePath, 'utf8')
-        .replaceAll("// [insertion site] values", eject.strValue ?? '')
+        .replaceAll("// [insertion site] values", eject?.strValue ?? '')
         .replaceAll(keyword, cache)
         .replaceAll("'@$$[escape]'", (serviceWorkerConfig.escape).toString())
         .replaceAll("'@$$[cacheName]'", `'${serviceWorkerConfig.cacheName}'`);

package/dist/swppRules.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadRules = exports.addRulesMapEvent = exports.readRules = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const Utils_1 = require("./Utils");
 const defConfig = {
     serviceWorker: {
         escape: 0,
@@ -54,8 +55,10 @@ let _rules;
  * **执行该函数前必须调用过 [loadRules]**
  */
 function readRules() {
-    if (!_rules)
+    if (!_rules) {
+        (0, Utils_1.error)('RulesReader', 'rules 尚未初始化');
         throw 'rules 尚未初始化';
+    }
     return _rules;
 }
 exports.readRules = readRules;
@@ -82,8 +85,10 @@ function loadRules(root, fileName, selects) {
         .find(it => fs_1.default.existsSync(it));
     // 其它可选目录下的 rules 文件
     const selectPath = selects.flatMap(value => extensions.map(it => path_1.default.resolve(value, `${fileName}.${it}`))).find(it => fs_1.default.existsSync(it));
-    if (!(rootPath || selectPath))
+    if (!(rootPath || selectPath)) {
+        (0, Utils_1.error)('RulesLoader', '未查询到 rules 文件');
         throw '未查询到 rules 文件';
+    }
     const rootRules = rootPath ? { ...require(rootPath) } : {};
     const selectRules = selectPath ? require(selectPath) : {};
     const config = rootRules.config ?? {};

package/dist/utils.js

@@ -28,8 +28,10 @@ let ejectData = undefined;
  */
 function calcEjectValues(framework) {
     const rules = (0, SwppRules_1.readRules)();
-    if (!('ejectValues' in rules))
+    if (!('ejectValues' in rules)) {
+        ejectData = null;
         return;
+    }
     // noinspection JSUnresolvedReference
     const eject = rules.ejectValues?.(framework, rules);
     const nodeEject = {};
@@ -62,8 +64,10 @@ exports.calcEjectValues = calcEjectValues;
  * + **执行该函数前必须调用过 [calcEjectValues]**
  */
 function readEjectData() {
-    if (!ejectData)
+    if (ejectData === undefined) {
+        error('EjectReader', 'eject data 尚未初始化');
         throw 'eject data 尚未初始化';
+    }
     return ejectData;
 }
 exports.readEjectData = readEjectData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "0.0.5-alpha",
+  "version": "0.0.7-alpha",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",

package/types/utils.d.ts

@@ -18,7 +18,7 @@ export declare function calcEjectValues(framework: any): void;
  * + **执行该函数前必须调用过 [loadRules]**
  * + **执行该函数前必须调用过 [calcEjectValues]**
  */
-export declare function readEjectData(): EjectCache;
+export declare function readEjectData(): EjectCache | null;
 /**
  * 获取指定值的 js 源码表达形式
  * @param obj 要转换的对象