swpp-backends 3.1.0-beta2 → 3.1.1

package/dist/swpp/BasicActions.d.ts

@@ -7,7 +7,6 @@ export declare class BasicActions {
     private readonly isBuildServiceWorker;
     private readonly domJsPath;
     private readonly diffJsonPath;
-    private readonly disableTrack;
     /**
      * 构建一个基础的 swpp 行为封装器
      */
@@ -67,8 +66,6 @@ export interface BasicActionOptions {
     domJsPath?: string;
     /** diff.json 文件路径（相对于网站根目录，留空表示不生成） */
     diffJsonPath?: string;
-    /** 是否进行引用的静态分析，留空表示不进行（禁用静态分析后不能使用无限期缓存） */
-    trackLink?: boolean;
 }
 interface BuildFileInfo {
     key: BasicActionKey;

package/dist/swpp/BasicActions.js

@@ -12,7 +12,7 @@ class BasicActions {
      * 构建一个基础的 swpp 行为封装器
      */
     static async build(optional) {
-        const actions = new BasicActions(optional.context, optional.isServiceWorker, optional.domJsPath, optional.diffJsonPath, optional.trackLink !== true);
+        const actions = new BasicActions(optional.context, optional.isServiceWorker, optional.domJsPath, optional.diffJsonPath);
         await actions.configLoader.loadFromCode({
             compilationEnv: {
                 PUBLIC_PATH: (0, ConfigCluster_1.defineLazyInitConfig)((_, compilation) => {
@@ -22,12 +22,11 @@ class BasicActions {
         });
         return actions;
     }
-    constructor(context, isBuildServiceWorker, domJsPath, diffJsonPath, disableTrack) {
+    constructor(context, isBuildServiceWorker, domJsPath, diffJsonPath) {
         this.context = context;
         this.isBuildServiceWorker = isBuildServiceWorker;
         this.domJsPath = domJsPath;
         this.diffJsonPath = diffJsonPath;
-        this.disableTrack = disableTrack;
         this.configLoader = new ConfigLoader_1.ConfigLoader(this.context);
         /**
          * 各个文件的生成路径，为空则表示不生成（或配置未初始化）
@@ -40,12 +39,6 @@ class BasicActions {
             diffJson: null
         };
         this.buildCaches = {};
-        if (disableTrack) {
-            untils_1.utils.printInfo('Track', '链接追踪（静态分析）已被关闭，缓存主动更新已自动禁用，请勿使用永久缓存');
-        }
-        else {
-            untils_1.utils.printInfo('Track', '链接追踪（静态分析）已开启，如果发现行为异常请及时反馈');
-        }
     }
     /**
      * 加载一个配置文件或配置
@@ -82,57 +75,6 @@ class BasicActions {
         this.runtimeData = runtime;
         this.compilationData = compilation;
         this.configLoader = undefined;
-        if (this.disableTrack) {
-            const matcher = runtime.crossDep.read('matchCacheRule');
-            const checker = (text) => {
-                if (!text.includes('INFINITE_CACHE'))
-                    return true;
-                const list = text.replaceAll('\r', '').split('\n');
-                let inStr = '';
-                let inComment = false;
-                o: for (let string of list) {
-                    for (let i = 0; i < string.length; i++) {
-                        if (inStr) {
-                            if (string[i] == inStr)
-                                inStr = '';
-                        }
-                        else if (inComment) {
-                            if (string[i] == '*' && string[i + 1] === '/') {
-                                inComment = false;
-                                ++i;
-                            }
-                        }
-                        else {
-                            switch (string[i]) {
-                                case '"':
-                                case '`':
-                                case `"`:
-                                    inStr = string[i];
-                                    continue;
-                                case '/':
-                                    if (string[i + 1] === '*') {
-                                        inComment = true;
-                                    }
-                                    else if (string[i + 1] === '/') {
-                                        continue o;
-                                    }
-                                    break;
-                                default:
-                                    if (string.startsWith('INFINITE_CACHE', i)) {
-                                        return false;
-                                    }
-                                    break;
-                            }
-                        }
-                    }
-                }
-                return true;
-            };
-            if (!checker(matcher.runOnBrowser.toString())) {
-                throw new untils_1.RuntimeException(untils_1.exceptionNames.unsupportedOperate, '禁用引用链分析时禁止在 matchCacheRule 返回 INFINITE_CACHE。' +
-                    '如果您没有返回该值，可能是由于存在与该字段同名的变量或其它内容，从而导致 SWPP 误判，请您修改与 INFINITE_CACHE 重复的名称。');
-            }
-        }
         const compilationEnv = compilation.compilationEnv;
         const publicRoot = compilationEnv.read('PUBLIC_PATH');
         const jsonInfo = compilationEnv.read('SWPP_JSON_FILE');
@@ -220,17 +162,6 @@ class BasicActions {
      * @param excludeFilter 需排除的文件
      */
     async saveFiles(excludeFilter = []) {
-        if (this.disableTrack) {
-            if (!excludeFilter.includes('tracker')) {
-                excludeFilter.push('tracker');
-            }
-            if (!excludeFilter.includes('version')) {
-                excludeFilter.push('version');
-            }
-            if (!excludeFilter.includes('diffJson')) {
-                excludeFilter.push('diffJson');
-            }
-        }
         const fileList = await this.buildFiles(excludeFilter);
         for (let item of fileList) {
             if (await item.path.exists()) {

package/dist/swpp/database/CrossDepCode.d.ts

@@ -26,9 +26,15 @@ declare function buildCommon(): {
     readonly isFetchSuccessful: {
         readonly default: FunctionInBrowserAndNode<[response: Response], boolean>;
     };
-    /** 缓存规则 */
+    /**
+     * 缓存规则
+     *
+     * + 返回转换为 false 的值表示不缓存；
+     * + 返回正数表示缓存指定毫秒数；
+     * + 返回负数表示永久缓存（仅对本站资源有效，非本站资源返回负数等价于 24h）
+     */
     readonly matchCacheRule: {
-        readonly default: FunctionInBrowserAndNode<[_url: URL], number | false | symbol | null | undefined>;
+        readonly default: FunctionInBrowserAndNode<[_url: URL], number | false | null | undefined>;
     };
     /** 归一化 URL */
     readonly normalizeUrl: {

package/dist/swpp/database/CrossDepCode.js

@@ -42,7 +42,13 @@ function buildCommon() {
         isFetchSuccessful: {
             default: CrossDepCode.buildBothFunction((response) => [200, 301, 302, 307, 308].includes(response.status))
         },
-        /** 缓存规则 */
+        /**
+         * 缓存规则
+         *
+         * + 返回转换为 false 的值表示不缓存；
+         * + 返回正数表示缓存指定毫秒数；
+         * + 返回负数表示永久缓存（仅对本站资源有效，非本站资源返回负数等价于 24h）
+         */
         matchCacheRule: {
             default: CrossDepCode.buildBothFunction((_url) => false)
         },

package/dist/swpp/database/CrossEnv.d.ts

@@ -11,8 +11,6 @@ declare function buildCommon(): {
     readonly CACHE_NAME: import("./KeyValueDatabase").DatabaseValue<string>;
     /** 网站的基准域名 */
     readonly BASE_URL: import("./KeyValueDatabase").DatabaseValue<string>;
-    /** 永久缓存标记 */
-    readonly INFINITE_CACHE: import("./KeyValueDatabase").DatabaseValue<symbol>;
     /** 存储版本号的 URL */
     readonly VERSION_PATH: import("./KeyValueDatabase").DatabaseValue<string>;
     /** 逃生门版本号 */

package/dist/swpp/database/CrossEnv.js

@@ -44,17 +44,6 @@ function buildCommon() {
                 return false;
             },
         }),
-        /** 永久缓存标记 */
-        INFINITE_CACHE: (0, KeyValueDatabase_1.buildEnv)({
-            default: Symbol(),
-            checker(value) {
-                // noinspection SuspiciousTypeOfGuard
-                if (typeof value !== 'symbol') {
-                    return { value, message: '填写的值应当为一个 Symbol' };
-                }
-                return false;
-            }
-        }),
         /** 存储版本号的 URL */
         VERSION_PATH: (0, KeyValueDatabase_1.buildEnv)({
             default: 'https://id.v3/',

package/dist/swpp/database/RuntimeDepCode.d.ts

@@ -30,7 +30,7 @@ declare function buildCommon(): {
     };
     /** 判断指定的缓存是否是有效缓存 */
     readonly isValidCache: {
-        readonly default: (response: Response, rule: number | symbol) => boolean;
+        readonly default: (response: Response, rule: number) => boolean;
     };
     /** 读取版本号 */
     readonly readVersion: {

package/dist/swpp/database/RuntimeDepCode.js

@@ -85,12 +85,14 @@ function buildCommon() {
                 if (headers.has(INVALID_KEY))
                     return false;
                 // 只有本站资源允许永久缓存
-                if (rule === INFINITE_CACHE) {
+                if (rule < 0) {
                     const url = response.url;
                     const baseLength = BASE_URL.length;
                     if (url.startsWith(BASE_URL) && (url.length === baseLength || url[baseLength] === '/')) {
                         return true;
                     }
+                    // 将rule设置为一天（24小时）
+                    rule = 24 * 60 * 60 * 1000;
                 }
                 const storage = headers.get(STORAGE_TIMESTAMP);
                 if (!storage)

package/package.json

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