swpp-backends 2.1.1 → 2.1.3

package/dist/FileAnalyzer.js

@@ -27,12 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceRequest = exports.findCache = exports.eachAllLinkInUrl = exports.findFileHandler = exports.registryFileHandler = exports.submitExternalUrl = exports.submitCacheInfo = exports.loadVersionJson = exports.isStable = exports.isExclude = exports.buildVersionJson = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const node_fetch_1 = require("node-fetch");
-const crypto = __importStar(require("crypto"));
 const buffer_1 = require("buffer");
+const crypto = __importStar(require("crypto"));
 const fast_html_parser_1 = __importDefault(require("fast-html-parser"));
+const fs_1 = __importDefault(require("fs"));
+const node_fetch_1 = require("node-fetch");
+const path_1 = __importDefault(require("path"));
+const SwppConfig_1 = require("./SwppConfig");
 const Utils_1 = require("./Utils");
 const Variant_1 = require("./Variant");
 /**
@@ -172,20 +173,22 @@ exports.isStable = isStable;
  *
  * + **执行该函数前必须调用过 [loadRules]**
  */
-async function loadVersionJson(url) {
+async function loadVersionJson(url, level = SwppConfig_1.FileFetchModeLevel.NORMAL) {
     const key = 'oldVersionJson';
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (response.status === 404 || response?.code === 'ENOTFOUND') {
-        (0, Utils_1.warn)('VersionJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
-        return (0, Variant_1.writeVariant)(key, null);
-    }
-    else if (![200, 301, 302, 307, 308].includes(response.status)) {
-        (0, Utils_1.error)('VersionJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
-        if ('status' in response)
-            throw `拉取时出现 ${response.status} 异常`;
-        throw response;
+    switch (true) {
+        case response.status == 404 && level >= SwppConfig_1.FileFetchModeLevel.NORMAL:
+        case response.code == 'ENOTFOUND' && level == SwppConfig_1.FileFetchModeLevel.LOOSE:
+            (0, Utils_1.warn)('VersionJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
+            return (0, Variant_1.writeVariant)(key, null);
+        default:
+            (0, Utils_1.error)('VersionJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
+            if ('status' in response)
+                throw `拉取时出现 ${response.status} 异常`;
+            throw response;
+        case [200, 301, 302, 307, 308].includes(response.status):
+            return (0, Variant_1.writeVariant)(key, await response.json());
     }
-    return (0, Variant_1.writeVariant)(key, await response.json());
 }
 exports.loadVersionJson = loadVersionJson;
 /** 提交要存储到 version json 的值 */

package/dist/ServiceWorkerBuilder.js

@@ -59,7 +59,7 @@ function buildServiceWorker() {
                     url = new URL(request.url)
                 }
             `).replaceAll('// [modifyRequest else-if]', `
-                else if (modify) handleFetch(fetchFile(request, false))
+                else if (modify) handleFetch(fetch(request).catch(err => new Response(err, {status: -1})))
             `);
     }
     if (blockRequest) {

package/dist/SwppConfig.js

@@ -1,2 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileFetchModeLevel = void 0;
+/** 文件拉取模式等级 */
+var FileFetchModeLevel;
+(function (FileFetchModeLevel) {
+    /** 严格，不允许 404 */
+    FileFetchModeLevel[FileFetchModeLevel["STRICT"] = 0] = "STRICT";
+    /** 普通，允许 404，但仅允许服务器返回 404 状态码 */
+    FileFetchModeLevel[FileFetchModeLevel["NORMAL"] = 1] = "NORMAL";
+    /** 宽松，允许任何形式的 404，包括服务器返回 404、DNS 解析失败等 */
+    FileFetchModeLevel[FileFetchModeLevel["LOOSE"] = 2] = "LOOSE";
+})(FileFetchModeLevel || (exports.FileFetchModeLevel = FileFetchModeLevel = {}));

package/dist/UpdateJsonBuilder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShorthand = exports.loadUpdateJson = exports.submitChange = exports.buildUpdateJson = void 0;
+const SwppConfig_1 = require("./SwppConfig");
 const Utils_1 = require("./Utils");
 const Variant_1 = require("./Variant");
 /**
@@ -112,20 +113,22 @@ exports.submitChange = submitChange;
  *
  * + **调用该函数前必须调用过 [loadRules]**
  */
-async function loadUpdateJson(url) {
+async function loadUpdateJson(url, level = SwppConfig_1.FileFetchModeLevel.NORMAL) {
     const key = 'oldUpdateJson';
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (response.status === 404 || response.code === 'ENOTFOUND') {
-        (0, Utils_1.warn)('UpdateJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
-        return (0, Variant_1.writeVariant)(key, null);
+    switch (true) {
+        case response.status == 404 && (level >= SwppConfig_1.FileFetchModeLevel.NORMAL):
+        case response.code == 'ENOTFOUND' && (level == SwppConfig_1.FileFetchModeLevel.LOOSE):
+            (0, Utils_1.warn)('UpdateJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
+            return (0, Variant_1.writeVariant)(key, null);
+        default:
+            (0, Utils_1.error)('UpdateJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
+            if ('status' in response)
+                throw `拉取时出现 ${response.status} 异常`;
+            throw response;
+        case [200, 301, 302, 307, 308].includes(response.status):
+            return (0, Variant_1.writeVariant)(key, await response.json());
     }
-    else if (![200, 301, 302, 307, 308].includes(response.status)) {
-        (0, Utils_1.error)('UpdateJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
-        if ('status' in response)
-            throw `拉取时出现 ${response.status} 异常`;
-        throw response;
-    }
-    return (0, Variant_1.writeVariant)(key, await response.json());
 }
 exports.loadUpdateJson = loadUpdateJson;
 function zipJson(json) {

package/dist/index.js

@@ -10,7 +10,7 @@ const VersionAnalyzer_1 = require("./VersionAnalyzer");
 const DomBuilder_1 = require("./DomBuilder");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '2.1.1',
+    version: '2.1.3',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -121,7 +121,7 @@
             const spare = getSpareUrls(request.url)
             if (spare) handleFetch(fetchFile(request, false, spare))
             // [modifyRequest else-if]
-            else handleFetch(fetch(request))
+            else handleFetch(fetch(request).catch(err => new Response(err, {status: -1})))
         }
     })
 
@@ -134,6 +134,7 @@
                     type: 'update',
                     update: info.list,
                     version: info.version,
+                    old: info.old
                 })
             )
     })
@@ -152,7 +153,7 @@
 
     /**
      * 根据JSON删除缓存
-     * @returns {Promise<{version, list}>}
+     * @returns {Promise<{version, list, old}>}
      */
     const updateJson = () => {
         /**
@@ -171,14 +172,17 @@
             // 跨版本幅度过大，直接清理全站
             return true
         }
-        /** 解析字符串 */
+        /**
+         * 解析字符串
+         * @return {Promise<any>}
+         */
         const parseJson = json => dbVersion.read().then(oldVersion => {
             const {info, global} = json
             const newVersion = {global, local: info[0].version, escape: oldVersion?.escape ?? 0}
             //新用户不进行更新操作
             if (!oldVersion) {
                 dbVersion.write(newVersion)
-                return newVersion
+                return {version: newVersion, old: oldVersion}
             }
             let list = new VersionList()
             let refresh = parseChange(list, info, oldVersion.local)
@@ -189,19 +193,20 @@
                 if (global !== oldVersion.global) list.force = true
                 else list.refresh = true
             }
-            return {list, version: newVersion}
+            return {list, version: newVersion, old: oldVersion}
         })
         return fetchFile(new Request('/update.json'), false)
             .then(response => {
                 if (checkResponse(response))
                     return response.json().then(json =>
                         parseJson(json).then(result => {
-                                return result.list ? deleteCache(result.list)
+                            const info = {version: result.version, old: result.old}
+                            if (result.list)
+                                return deleteCache(result.list)
                                     .then(list => list.length === 0 ? null : list)
-                                    .then(list => ({list, version: result.version}))
-                                    : {version: result}
-                            }
-                        )
+                                    .then(list => Object.assign({list}, info))
+                            else return info
+                        })
                     )
                 else throw `加载 update.json 时遇到异常，状态码：${response.status}`
             })
@@ -232,7 +237,10 @@
             if (this.force) return true
             // noinspection JSValidateTypes
             url = new URL(url)
-            if (this.refresh) return findCache(url).clean
+            if (this.refresh) {
+                // noinspection JSCheckFunctionSignatures
+                return findCache(url).clean
+            }
             else {
                 for (let it of list) {
                     if (it.match(url)) return true

package/package.json

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

package/types/FileAnalyzer.d.ts

@@ -1,3 +1,4 @@
+import { FileFetchModeLevel } from './SwppConfig';
 /**
  * 构建一个 version json
  *
@@ -51,7 +52,7 @@ export declare function isStable(url: string): boolean;
  *
  * + **执行该函数前必须调用过 [loadRules]**
  */
-export declare function loadVersionJson(url: string): Promise<VersionJson | null>;
+export declare function loadVersionJson(url: string, level?: FileFetchModeLevel): Promise<VersionJson | null>;
 /** 提交要存储到 version json 的值 */
 export declare function submitCacheInfo(key: string, value: any): void;
 /** 添加一个要监听的 URL */

package/types/SwppConfig.d.ts

@@ -127,3 +127,12 @@ export interface SwppConfigTemplate {
         replacer?: (srcUrl: string) => string[] | string;
     };
 }
+/** 文件拉取模式等级 */
+export declare enum FileFetchModeLevel {
+    /** 严格，不允许 404 */
+    STRICT = 0,
+    /** 普通，允许 404，但仅允许服务器返回 404 状态码 */
+    NORMAL = 1,
+    /** 宽松，允许任何形式的 404，包括服务器返回 404、DNS 解析失败等 */
+    LOOSE = 2
+}

package/types/UpdateJsonBuilder.d.ts

@@ -1,3 +1,4 @@
+import { FileFetchModeLevel } from './SwppConfig';
 import { AnalyzeResult } from './VersionAnalyzer';
 /**
  * 构建新的 update json
@@ -18,7 +19,7 @@ export declare function submitChange(...change: ChangeExpression[]): void;
  *
  * + **调用该函数前必须调用过 [loadRules]**
  */
-export declare function loadUpdateJson(url: string): Promise<UpdateJson | null>;
+export declare function loadUpdateJson(url: string, level?: FileFetchModeLevel): Promise<UpdateJson | null>;
 /**
  * 获取 URL 的缩写形式
  *