swpp-backends 3.0.0 → 3.1.0-beta1

package/dist/index.d.ts

@@ -5,7 +5,6 @@ export { utils, RuntimeException } from './swpp/untils';
 export { ResourcesScanner, FileUpdateTracker, } from './swpp/ResourcesScanner';
 export { JsonBuilder, UpdateJson, UpdateChangeExp, TrackerHeaderDiff } from './swpp/JsonBuilder';
 export { SwCompiler, CompilationData, RuntimeData, BrowserVersion } from './swpp/SwCompiler';
-export { NetworkFileHandler, FiniteConcurrencyFetcher } from './swpp/NetworkFileHandler';
 export { KeyValueDatabase, readThisValue } from './swpp/database/KeyValueDatabase';
 export { RuntimeKeyValueDatabase } from './swpp/database/RuntimeKeyValueDatabase';
 export { RuntimeEventCode } from './swpp/database/RuntimeEventCode';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 // noinspection JSUnusedGlobalSymbols
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineLazyInitConfig = exports.defineNoCacheConfig = exports.defineContextConfig = exports.defineIndivisibleConfig = exports.NoCacheConfig = exports.IndivisibleConfig = exports.SpecialConfig = exports.defineModifier = exports.defineCompilationFP = exports.defineCompilationEnv = exports.defineCrossEnv = exports.defineRuntimeDep = exports.defineCrossDep = exports.defineRuntimeCore = exports.defineDomConfig = exports.defineRuntimeEvent = exports.defineConfig = exports.ConfigLoader = exports.DomCode = exports.AllowNotFoundEnum = exports.CompilationEnv = exports.CrossDepCode = exports.CrossEnv = exports.RuntimeDepCode = exports.RuntimeCoreCode = exports.RuntimeEventCode = exports.RuntimeKeyValueDatabase = exports.readThisValue = exports.KeyValueDatabase = exports.FiniteConcurrencyFetcher = exports.RuntimeData = exports.CompilationData = exports.SwCompiler = exports.JsonBuilder = exports.FileUpdateTracker = exports.ResourcesScanner = exports.RuntimeException = exports.utils = exports.BasicActions = exports.swppVersion = void 0;
+exports.defineLazyInitConfig = exports.defineNoCacheConfig = exports.defineContextConfig = exports.defineIndivisibleConfig = exports.NoCacheConfig = exports.IndivisibleConfig = exports.SpecialConfig = exports.defineModifier = exports.defineCompilationFP = exports.defineCompilationEnv = exports.defineCrossEnv = exports.defineRuntimeDep = exports.defineCrossDep = exports.defineRuntimeCore = exports.defineDomConfig = exports.defineRuntimeEvent = exports.defineConfig = exports.ConfigLoader = exports.DomCode = exports.AllowNotFoundEnum = exports.CompilationEnv = exports.CrossDepCode = exports.CrossEnv = exports.RuntimeDepCode = exports.RuntimeCoreCode = exports.RuntimeEventCode = exports.RuntimeKeyValueDatabase = exports.readThisValue = exports.KeyValueDatabase = exports.RuntimeData = exports.CompilationData = exports.SwCompiler = exports.JsonBuilder = exports.FileUpdateTracker = exports.ResourcesScanner = exports.RuntimeException = exports.utils = exports.BasicActions = exports.swppVersion = void 0;
 /** 版本号 */
 exports.swppVersion = require('../package.json').version;
 var BasicActions_1 = require("./swpp/BasicActions");
@@ -18,8 +18,6 @@ var SwCompiler_1 = require("./swpp/SwCompiler");
 Object.defineProperty(exports, "SwCompiler", { enumerable: true, get: function () { return SwCompiler_1.SwCompiler; } });
 Object.defineProperty(exports, "CompilationData", { enumerable: true, get: function () { return SwCompiler_1.CompilationData; } });
 Object.defineProperty(exports, "RuntimeData", { enumerable: true, get: function () { return SwCompiler_1.RuntimeData; } });
-var NetworkFileHandler_1 = require("./swpp/NetworkFileHandler");
-Object.defineProperty(exports, "FiniteConcurrencyFetcher", { enumerable: true, get: function () { return NetworkFileHandler_1.FiniteConcurrencyFetcher; } });
 var KeyValueDatabase_1 = require("./swpp/database/KeyValueDatabase");
 Object.defineProperty(exports, "KeyValueDatabase", { enumerable: true, get: function () { return KeyValueDatabase_1.KeyValueDatabase; } });
 Object.defineProperty(exports, "readThisValue", { enumerable: true, get: function () { return KeyValueDatabase_1.readThisValue; } });

package/dist/swpp/FilePath.d.ts

@@ -1,4 +1,3 @@
-import { CompilationData } from './SwCompiler';
 export declare class FilePath {
     readonly absPath: string;
     readonly baseProject: string | null;
@@ -27,10 +26,6 @@ export declare class FilePath {
      * 检查路径是否指向一个目录
      */
     isDirectory(): Promise<boolean>;
-    /**
-     * 检查路径是否指向一个文件
-     */
-    isFile(): Promise<boolean>;
     /**
      * 将指定目录拼接到当前路径之后
      */
@@ -44,10 +39,6 @@ export declare class FilePath {
      * @param consumer
      */
     walkAllFile(consumer: (filePath: FilePath) => Promise<void> | void): Promise<void>;
-    /**
-     * 获取文件名
-     */
-    fileName(): string;
     /**
      * 获取上一级目录
      */
@@ -60,12 +51,6 @@ export declare class FilePath {
     mkdirs(): Promise<void>;
     /** 空目录 */
     static EMPTY: FilePath;
-    /**
-     * 从绝对路径获取 FilePath
-     * @param absPath 绝对路径
-     * @param compilation 编译期数据
-     */
-    static fromAbsPath(absPath: string, compilation: CompilationData): FilePath;
     /**
      * 构建网站根目录的 FilePath
      * @param path 绝对路径或相对路径（相对于项目根目录），以 `/` 开头或 `x:/` 开头判定为绝对路径

package/dist/swpp/FilePath.js

@@ -48,14 +48,6 @@ class FilePath {
             this.statCache = await fs_1.default.promises.stat(this.absPath);
         return this.statCache.isDirectory();
     }
-    /**
-     * 检查路径是否指向一个文件
-     */
-    async isFile() {
-        if (!this.statCache)
-            this.statCache = await fs_1.default.promises.stat(this.absPath);
-        return this.statCache.isFile();
-    }
     /**
      * 将指定目录拼接到当前路径之后
      */
@@ -99,12 +91,6 @@ class FilePath {
             }
         } while (queue.length);
     }
-    /**
-     * 获取文件名
-     */
-    fileName() {
-        return path_1.default.posix.basename(this.absPath);
-    }
     /**
      * 获取上一级目录
      */
@@ -130,25 +116,6 @@ class FilePath {
             await fs_1.default.promises.mkdir(parent.absPath, { recursive: true });
         }
     }
-    /**
-     * 从绝对路径获取 FilePath
-     * @param absPath 绝对路径
-     * @param compilation 编译期数据
-     */
-    static fromAbsPath(absPath, compilation) {
-        absPath = path_1.default.posix.normalize(absPath);
-        const projectRoot = compilation.compilationEnv.read('PROJECT_PATH');
-        const publicRoot = compilation.compilationEnv.read('PUBLIC_PATH');
-        if (projectRoot.absPath.startsWith(absPath)) {
-            return projectRoot.join(absPath.substring(projectRoot.absPath.length));
-        }
-        else if (publicRoot.absPath.startsWith(absPath)) {
-            return publicRoot.join(absPath.substring(publicRoot.absPath.length));
-        }
-        else {
-            return new FilePath(absPath, null, null);
-        }
-    }
     /**
      * 构建网站根目录的 FilePath
      * @param path 绝对路径或相对路径（相对于项目根目录），以 `/` 开头或 `x:/` 开头判定为绝对路径

package/dist/swpp/ResourcesScanner.d.ts

@@ -10,8 +10,6 @@ export declare class ResourcesScanner {
     constructor(compilation: CompilationData, oldTracker?: FileUpdateTracker | undefined);
     /** 扫描指定目录下的所有文件 */
     scanLocalFile(path: FilePath): Promise<FileUpdateTracker>;
-    /** 扫描网络文件 */
-    private scanNetworkFile;
 }
 /**
  * 文件更新监听器
@@ -26,11 +24,6 @@ export declare class FileUpdateTracker {
     constructor(compilation: CompilationData, oldTracker?: FileUpdateTracker | undefined);
     /** 更新一个文件的标识符 */
     update(uri: string, value: string | Set<string> | string[]): void;
-    /**
-     * 同步指定的稳定资源（同步时会连同同步其连接的稳定资源）
-     * @return 直接或间接连接的一些需要扫描的资源
-     */
-    syncStable(uri: URL, value: string[], oldTracker: FileUpdateTracker): string[];
     /** 读取一个文件的标识符 */
     get(uri: string): string | string[] | undefined;
     /** 归一化 uri */

package/dist/swpp/ResourcesScanner.js

@@ -79,46 +79,8 @@ class ResourcesScanner {
             }, isCached);
             set.forEach(it => urls.add(it));
         });
-        await this.scanNetworkFile(tracker, urls);
         return tracker;
     }
-    /** 扫描网络文件 */
-    async scanNetworkFile(tracker, urls, record = new Set()) {
-        const matchCacheRule = this.compilation.crossDep.read('matchCacheRule');
-        const registry = this.compilation.fileParser;
-        const isStable = this.compilation.compilationEnv.read('isStable');
-        const appendedUrls = new Set();
-        const taskList = new Array(urls.size);
-        let i = 0;
-        for (let url of urls) {
-            const normalizeUri = tracker.normalizeUri(url);
-            if (record.has(normalizeUri.href))
-                continue;
-            record.add(normalizeUri.href);
-            const isCached = matchCacheRule.runOnNode(normalizeUri);
-            if (isCached) {
-                tracker.addUrl(normalizeUri.href);
-            }
-            if (isStable(normalizeUri)) {
-                const oldValue = this.oldTracker?.get?.(normalizeUri.href);
-                if (Array.isArray(oldValue)) {
-                    const list = tracker.syncStable(normalizeUri, oldValue, this.oldTracker);
-                    list.forEach(it => appendedUrls.add(it));
-                    continue;
-                }
-            }
-            taskList[i++] = registry.parserUrlFile(normalizeUri.href, !!isCached)
-                .then(value => {
-                if (isCached) {
-                    tracker.update(value.file, value.mark);
-                }
-                value.urls.forEach(it => appendedUrls.add(it));
-            }).catch(err => untils_1.utils.printError('SCAN NETWORK FILE', err));
-        }
-        await Promise.all(taskList);
-        if (appendedUrls.size !== 0)
-            await this.scanNetworkFile(tracker, appendedUrls, record);
-    }
 }
 exports.ResourcesScanner = ResourcesScanner;
 /**
@@ -148,30 +110,6 @@ class FileUpdateTracker {
             this.map.set(uri, JSON.stringify(Array.from(value)));
         }
     }
-    /**
-     * 同步指定的稳定资源（同步时会连同同步其连接的稳定资源）
-     * @return 直接或间接连接的一些需要扫描的资源
-     */
-    syncStable(uri, value, oldTracker) {
-        const isStable = this.compilation.compilationEnv.read('isStable');
-        this.update(uri.href, value);
-        this.addUrl(uri.href);
-        const result = [];
-        for (let item of value) {
-            this.addUrl(item);
-            const itemUrl = new URL(item);
-            if (isStable(itemUrl)) {
-                const oldValue = oldTracker.get(item);
-                if (Array.isArray(oldValue)) {
-                    const son = this.syncStable(itemUrl, oldValue, oldTracker);
-                    result.push(...son);
-                    continue;
-                }
-            }
-            result.push(item);
-        }
-        return result;
-    }
     /** 读取一个文件的标识符 */
     get(uri) {
         const value = this.map.get(this.normalizeUri(uri).href);
@@ -287,7 +225,7 @@ class FileUpdateTracker {
         let error;
         const result = await (async () => {
             try {
-                const response = await fetcher.fetch(url);
+                const response = await fetcher(url);
                 if (isNotFound.response(response)) {
                     if (notFoundLevel == CompilationEnv_1.AllowNotFoundEnum.REJECT_ALL) {
                         error = new untils_1.RuntimeException(untils_1.exceptionNames.notFound, `拉取 ${url} 时出现 404 错误`);

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

@@ -1,6 +1,5 @@
 import { FilePath } from '../FilePath';
 import { UpdateJson } from '../JsonBuilder';
-import { FiniteConcurrencyFetcher } from '../NetworkFileHandler';
 import { FileUpdateTracker } from '../ResourcesScanner';
 import { CompilationData } from '../SwCompiler';
 import { KeyValueDatabase } from './KeyValueDatabase';
@@ -62,7 +61,7 @@ declare function buildCommon(): {
     /**
      * 拉取网络文件
      */
-    readonly NETWORK_FILE_FETCHER: import("./KeyValueDatabase").DatabaseValue<FiniteConcurrencyFetcher>;
+    readonly NETWORK_FILE_FETCHER: import("./KeyValueDatabase").DatabaseValue<(url: string | URL) => Promise<Response>>;
     /**
      * 判断文件是否是 404
      */
@@ -74,9 +73,5 @@ declare function buildCommon(): {
      * 是否允许 404
      */
     readonly ALLOW_NOT_FOUND: import("./KeyValueDatabase").DatabaseValue<AllowNotFoundEnum>;
-    /**
-     * 检查一个链接是否是稳定的（也就是 URL 不变其返回的结果永远不变）
-     */
-    readonly isStable: import("./KeyValueDatabase").DatabaseValue<(_url: URL) => boolean>;
 };
 export {};

package/dist/swpp/database/CompilationEnv.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllowNotFoundEnum = exports.CompilationEnv = void 0;
 const FilePath_1 = require("../FilePath");
-const NetworkFileHandler_1 = require("../NetworkFileHandler");
 const ResourcesScanner_1 = require("../ResourcesScanner");
 const untils_1 = require("../untils");
 const KeyValueDatabase_1 = require("./KeyValueDatabase");
@@ -117,7 +116,7 @@ function buildCommon() {
                     try {
                         const swppPath = (0, KeyValueDatabase_1.readThisValue)(this, 'swppPath');
                         const versionPath = (0, KeyValueDatabase_1.readThisValue)(this, 'versionPath');
-                        const response = await fetcher.fetch(untils_1.utils.splicingUrl(baseUrl, swppPath, versionPath));
+                        const response = await fetcher(untils_1.utils.splicingUrl(baseUrl, swppPath, versionPath));
                         if (!isNotFound.response(response)) {
                             if (isFetchSuccessful(response)) {
                                 const json = await response.json().catch(err => {
@@ -159,7 +158,7 @@ function buildCommon() {
          * 拉取网络文件
          */
         NETWORK_FILE_FETCHER: (0, KeyValueDatabase_1.buildEnv)({
-            default: new NetworkFileHandler_1.FiniteConcurrencyFetcher()
+            default: (url) => fetch(url)
         }),
         /**
          * 判断文件是否是 404
@@ -186,11 +185,5 @@ function buildCommon() {
                 }
             }
         }),
-        /**
-         * 检查一个链接是否是稳定的（也就是 URL 不变其返回的结果永远不变）
-         */
-        isStable: (0, KeyValueDatabase_1.buildEnv)({
-            default: (_url) => false
-        })
     };
 }

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

@@ -7,14 +7,6 @@ export declare class CompilationFileParser extends KeyValueDatabase<FileParser<c
     constructor();
     /** 解析本地文件 */
     parserLocalFile(path: FilePath, cb?: (content: crypto.BinaryLike) => void, force?: boolean): Promise<Set<string>>;
-    /** 解析网络文件 */
-    parserNetworkFile(response: Response, callback?: (content: crypto.BinaryLike) => Promise<void> | void): Promise<Set<string>>;
-    /**
-     * 解析指定的 URL
-     * @param url 链接
-     * @param isCached 该链接指向的资源是否需要缓存
-     */
-    parserUrlFile(url: string, isCached: boolean): Promise<FileMark>;
     /**
      * 解析指定类型的文件内容
      * @param type 文件类型

package/dist/swpp/database/CompilationFileParser.js

@@ -60,69 +60,6 @@ class CompilationFileParser extends KeyValueDatabase_1.KeyValueDatabase {
             return new Set();
         }
     }
-    /** 解析网络文件 */
-    async parserNetworkFile(response, callback) {
-        const url = response.url;
-        const fileHandler = this.compilation.compilationEnv.read('NETWORK_FILE_FETCHER');
-        const contentType = fileHandler.getUrlContentType(url, response);
-        if (this.hasKey(contentType)) {
-            const parser = this.read(contentType);
-            const content = await parser.readFromNetwork(this.compilation, response);
-            if (callback)
-                await callback(content);
-            return await parser.extractUrls(this.compilation, content, new URL(url));
-        }
-        else {
-            if (callback) {
-                const buffer = await response.arrayBuffer();
-                const array = new Uint8Array(buffer);
-                callback(array);
-            }
-            return new Set();
-        }
-    }
-    /**
-     * 解析指定的 URL
-     * @param url 链接
-     * @param isCached 该链接指向的资源是否需要缓存
-     */
-    async parserUrlFile(url, isCached) {
-        const fileHandler = this.compilation.compilationEnv.read('NETWORK_FILE_FETCHER');
-        const contentType = fileHandler.getUrlContentType(url);
-        if (!contentType && !isCached)
-            return { file: url, mark: '', urls: new Set() };
-        const parser = this.hasKey(contentType) ? this.read(contentType) : undefined;
-        if (!parser && !isCached)
-            return { file: url, mark: '', urls: new Set() };
-        if (parser?.calcUrl) {
-            const result = await parser.calcUrl(url);
-            if (result)
-                return {
-                    file: url,
-                    ...result
-                };
-        }
-        const fetcher = this.compilation.compilationEnv.read('NETWORK_FILE_FETCHER');
-        const urls = new Set();
-        let mark = '';
-        await fetcher.fetch(url)
-            .then(response => this.parserNetworkFile(response, isCached ? content => {
-            mark = untils_1.utils.calcHash(content);
-        } : undefined))
-            .then(urls => urls.forEach(it => urls.add(it)))
-            .catch(err => new Response(JSON.stringify({
-            type: err.type,
-            message: err.message,
-            stack: err.stack,
-            addition: err
-        }), {
-            status: 599,
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        }));
-        return { file: url, mark, urls };
-    }
     /**
      * 解析指定类型的文件内容
      * @param type 文件类型

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

@@ -9,6 +9,8 @@ export declare class CrossEnv extends RuntimeKeyValueDatabase<any, COMMON_TYPE_C
 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 */

package/dist/swpp/database/CrossEnv.js

@@ -32,6 +32,18 @@ function buildCommon() {
     return {
         /** 缓存库名称 */
         CACHE_NAME: (0, KeyValueDatabase_1.buildEnv)({ default: 'kmarBlogCache' }),
+        /** 网站的基准域名 */
+        BASE_URL: (0, KeyValueDatabase_1.buildEnv)({
+            default: (0, ConfigCluster_1.defineLazyInitConfig)((_, compilation) => {
+                const url = compilation.compilationEnv.read('DOMAIN_HOST');
+                return url.href;
+            }),
+            checker(value) {
+                if (this.manual)
+                    return { value, message: '不应当手动设置该项！' };
+                return false;
+            },
+        }),
         /** 永久缓存标记 */
         INFINITE_CACHE: (0, KeyValueDatabase_1.buildEnv)({
             default: Symbol(),

package/dist/swpp/database/RuntimeDepCode.js

@@ -84,8 +84,14 @@ function buildCommon() {
                 const headers = response.headers;
                 if (headers.has(INVALID_KEY))
                     return false;
-                if (rule === INFINITE_CACHE)
-                    return true;
+                // 只有本站资源允许永久缓存
+                if (rule === INFINITE_CACHE) {
+                    const url = response.url;
+                    const baseLength = BASE_URL.length;
+                    if (url.startsWith(BASE_URL) && (url.length === baseLength || url[baseLength] === '/')) {
+                        return true;
+                    }
+                }
                 const storage = headers.get(STORAGE_TIMESTAMP);
                 if (!storage)
                     return true;

package/package.json

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