swpp-backends 3.0.0-alpha.3 → 3.0.0-alpha.5

package/dist/swpp/JsonBuilder.js

@@ -17,7 +17,7 @@ class JsonBuilder {
     }
     // noinspection JSUnusedGlobalSymbols
     async buildJson() {
-        const json = await this.compilation.compilationEnv.read('VERSION_FILE').fetcher();
+        const json = await this.compilation.compilationEnv.read('SWPP_JSON_FILE').fetcher();
         if (json.info.length == 0) {
             json.info.push({ version: 1 });
             return json;

package/dist/swpp/ResourcesScanner.js

@@ -248,7 +248,10 @@ class FileUpdateTracker {
     }
     // noinspection JSUnusedGlobalSymbols
     /** 从网络拉取并解析 tracker */
-    static async parserJsonFromNetwork(compilation, url) {
+    static async parserJsonFromNetwork(compilation) {
+        const domain = compilation.compilationEnv.read('DOMAIN_HOST');
+        const jsonInfo = compilation.compilationEnv.read('SWPP_JSON_FILE');
+        const url = new URL(jsonInfo.trackerPath, `https://${domain}`);
         const fetcher = compilation.compilationEnv.read('FETCH_NETWORK_FILE');
         const isNotFound = compilation.compilationEnv.read('IS_NOT_FOUND');
         const notFoundLevel = compilation.compilationEnv.read('ALLOW_NOT_FOUND');

package/dist/swpp/SwCompiler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeData = exports.SwCompiler = void 0;
 const CrossDepCode_1 = require("./database/CrossDepCode");
+const DomCode_1 = require("./database/DomCode");
 const RuntimeCoreCode_1 = require("./database/RuntimeCoreCode");
 const RuntimeDepCode_1 = require("./database/RuntimeDepCode");
 const CrossEnv_1 = require("./database/CrossEnv");
@@ -44,6 +45,8 @@ class RuntimeData {
         this.runtimeEvent = new RuntimeEventCode_1.RuntimeEventCode();
         /** 运行时/编译时工具函数 */
         this.crossDep = new CrossDepCode_1.CrossDepCode();
+        /** DOM 相关设置 */
+        this.domConfig = new DomCode_1.DomCode();
     }
     getDatabase(key) {
         if (!(key in this))

package/dist/swpp/config/ConfigLoader.js

@@ -67,7 +67,7 @@ class ConfigLoader {
         const config = this.config;
         // 写入运行时信息
         const writeRuntime = () => {
-            const insertList = ['runtimeDep', 'runtimeCore', 'runtimeEvent'];
+            const insertList = ['runtimeDep', 'runtimeCore', 'runtimeEvent', 'domConfig'];
             for (let str of insertList) {
                 const configValue = config[str];
                 if (!configValue)
@@ -174,8 +174,5 @@ ConfigLoader.extensions = [
     'js', 'ts', 'cjs', 'cts', 'mjs', 'mjs'
 ];
 ConfigLoader.jiti = (0, jiti_1.createJiti)(__filename, {
-    fsCache: false,
-    alias: {
-        'swpp-backends': path_1.default.join(__dirname, '..', '..', 'index')
-    }
+    fsCache: false
 });

package/dist/swpp/database/CompilationEnv.js

@@ -97,15 +97,16 @@ function buildCommon(_env, crossEnv, crossCode) {
             }
         }),
         /** 获取已经上线的版本文件 */
-        VERSION_FILE: (0, KeyValueDatabase_1.buildEnv)({
+        SWPP_JSON_FILE: (0, KeyValueDatabase_1.buildEnv)({
             default: {
-                path: 'update.json',
+                trackerPath: 'swpp/tracker.json',
+                versionPath: 'swpp/update.json',
                 async fetcher() {
                     const host = env.read('DOMAIN_HOST');
                     const fetcher = env.read('FETCH_NETWORK_FILE');
                     const isNotFound = env.read('IS_NOT_FOUND');
                     try {
-                        const response = await fetcher.fetch(`https://${host}/${this.path}`);
+                        const response = await fetcher.fetch(new URL(this.versionPath, `https://${host}`));
                         if (!isNotFound.response(response)) {
                             const json = await response.json();
                             return json;

package/dist/swpp/database/DomCode.js

@@ -16,6 +16,7 @@ class DomCode extends RuntimeKeyValueDatabase_1.RuntimeKeyValueDatabase {
     }
     buildInnerSource() {
         const map = this.entries();
+        delete map['registry'];
         const inlineCode = Object.keys(map)
             .filter(it => it.startsWith('_inline'))
             .map(it => `${it}()`);
@@ -38,6 +39,19 @@ let pjaxUpdate;
 let postMessage2Sw;
 function buildCommon() {
     return {
+        registry: {
+            default: () => {
+                const sw = navigator.serviceWorker;
+                if (sw) {
+                    sw.register('sw.js')
+                        .then(() => console.log('SWPP 注册成功'))
+                        .catch(err => console.error('SWPP 注册失败', err));
+                }
+                else {
+                    console.warn('当前浏览器不支持 SW');
+                }
+            }
+        },
         postMessage2Sw: {
             default: (type) => controller.postMessage(type)
         },

package/package.json

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

package/types/swpp/ResourcesScanner.d.ts

@@ -65,5 +65,5 @@ export declare class FileUpdateTracker {
     /** 解序列化数据 */
     static unJson(compilation: CompilationData, jsonStr: string): FileUpdateTracker;
     /** 从网络拉取并解析 tracker */
-    static parserJsonFromNetwork(compilation: CompilationData, url: RequestInfo | URL): Promise<FileUpdateTracker>;
+    static parserJsonFromNetwork(compilation: CompilationData): Promise<FileUpdateTracker>;
 }

package/types/swpp/SwCompiler.d.ts

@@ -1,5 +1,6 @@
 import { CompilationEnv } from './database/CompilationEnv';
 import { CrossDepCode } from './database/CrossDepCode';
+import { DomCode } from './database/DomCode';
 import { RuntimeCoreCode } from './database/RuntimeCoreCode';
 import { RuntimeDepCode } from './database/RuntimeDepCode';
 import { CrossEnv } from './database/CrossEnv';
@@ -15,17 +16,19 @@ export declare class SwCompiler {
 /** 运行时数据 */
 export declare class RuntimeData {
     /** 控制插入顺序 */
-    readonly insertOrder: (Exclude<keyof RuntimeData, 'insertOrder'> | string)[];
+    readonly insertOrder: (Exclude<keyof RuntimeData, 'insertOrder' | 'domConfig'> | string)[];
     /** 运行时环境变量 */
-    readonly crossEnv: CrossEnv;
+    crossEnv: CrossEnv;
     /** 运行时工具函数 */
-    readonly runtimeDep: RuntimeDepCode;
+    runtimeDep: RuntimeDepCode;
     /** 运行时核心功能函数 */
-    readonly runtimeCore: RuntimeCoreCode;
+    runtimeCore: RuntimeCoreCode;
     /** 运行时事件注册 */
-    readonly runtimeEvent: RuntimeEventCode;
+    runtimeEvent: RuntimeEventCode;
     /** 运行时/编译时工具函数 */
-    readonly crossDep: CrossDepCode;
+    crossDep: CrossDepCode;
+    /** DOM 相关设置 */
+    domConfig: DomCode;
     getDatabase(key: string): RuntimeKeyValueDatabase<any, {}>;
 }
 /** 编译时数据 */

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

@@ -27,8 +27,9 @@ declare function buildCommon(_env: any, crossEnv: CrossEnv, crossCode: CrossDepC
     /** 版本信息长度限制 */
     readonly VERSION_LENGTH_LIMIT: import("./KeyValueDatabase").DatabaseValue<number>;
     /** 获取已经上线的版本文件 */
-    readonly VERSION_FILE: import("./KeyValueDatabase").DatabaseValue<{
-        path: string;
+    readonly SWPP_JSON_FILE: import("./KeyValueDatabase").DatabaseValue<{
+        trackerPath: string;
+        versionPath: string;
         fetcher(): Promise<UpdateJson>;
     }>;
     /** 读取一个本地文件 */

package/types/swpp/database/DomCode.d.ts

@@ -6,6 +6,9 @@ export declare class DomCode extends RuntimeKeyValueDatabase<any, COMMON_TYPE_DO
     buildInnerSource(): string;
 }
 declare function buildCommon(): {
+    readonly registry: {
+        readonly default: () => void;
+    };
     readonly postMessage2Sw: {
         readonly default: (type: string) => void;
     };