swpp-backends 0.0.10-alpha → 0.0.12-alpha

package/dist/VersionAnalyzer.js

@@ -23,6 +23,8 @@ function analyze(version) {
             remove: []
         }
     };
+    if (!oldVersion)
+        return result;
     if (version.version !== oldVersion.version) {
         result.force = true;
         return result;

package/dist/fileAnalyzer.js

@@ -89,16 +89,22 @@ function isStable(url) {
 }
 exports.isStable = isStable;
 /**
- * 从指定 URL 加载 cache json
+ * 从指定 URL 加载 version json
  *
  * + **执行该函数前必须调用过 [loadRules]**
  */
 async function loadVersionJson(url) {
-    const response = await (0, Utils_1.fetchFile)(url);
-    return _oldVersionJson = (await response.json());
+    const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
+    if (response?.status === 404) {
+        (0, Utils_1.warn)('LoadVersionJson', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
+        return _oldVersionJson = null;
+    }
+    else {
+        return _oldVersionJson = (await response.json());
+    }
 }
 exports.loadVersionJson = loadVersionJson;
-let _oldVersionJson;
+let _oldVersionJson = undefined;
 let _newVersionJson;
 let _mergeVersionMap;
 const event = new Map();
@@ -114,7 +120,7 @@ exports.submitCacheInfo = submitCacheInfo;
  * + **调用该函数前必须调用过 [loadCacheJson]**
  */
 function readOldVersionJson() {
-    if (!_oldVersionJson) {
+    if (_oldVersionJson === undefined) {
         (0, Utils_1.error)('OldVersionReader', 'version json 尚未初始化');
         throw 'version json 尚未初始化';
     }
@@ -149,7 +155,7 @@ function readMergeVersionMap() {
     if (_mergeVersionMap)
         return _mergeVersionMap;
     const map = {};
-    Object.assign(map, readOldVersionJson().list);
+    Object.assign(map, readOldVersionJson()?.list ?? {});
     Object.assign(map, readNewVersionJson().list);
     return _mergeVersionMap = map;
 }
@@ -182,12 +188,12 @@ async function buildVersionJson(protocol, domain, root) {
         if (pathname.endsWith('/') || pathname.endsWith('.html')) {
             if (!content)
                 content = fs_1.default.readFileSync(path, 'utf-8');
-            await eachAllLinkInHtml(domain, content, list);
+            await eachAllLinkInHtml(domain, protocol + domain, content, list);
         }
         else if (pathname.endsWith('.css')) {
             if (!content)
                 content = fs_1.default.readFileSync(path, 'utf-8');
-            await eachAllLinkInCss(domain, content, list);
+            await eachAllLinkInCss(domain, protocol + domain, content, list);
         }
         else if (pathname.endsWith('.js')) {
             if (!content)
@@ -195,8 +201,12 @@ async function buildVersionJson(protocol, domain, root) {
             await eachAllLinkInJavaScript(domain, content, list);
         }
     });
+    const external = {};
+    event.forEach((value, key) => {
+        external[key] = value;
+    });
     return _newVersionJson = {
-        version: 3, list, external: event
+        version: 3, list, external
     };
 }
 exports.buildVersionJson = buildVersionJson;
@@ -226,8 +236,8 @@ async function eachAllLinkInUrl(domain, url, result, event) {
     event?.(url);
     const stable = isStable(url);
     if (stable) {
-        const old = readOldVersionJson().list;
-        if (url in old) {
+        const old = readOldVersionJson()?.list;
+        if (Array.isArray(old?.[url])) {
             const copyTree = (key) => {
                 const value = old[key];
                 if (!value)
@@ -244,14 +254,10 @@ async function eachAllLinkInUrl(domain, url, result, event) {
             return;
         }
     }
-    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 response = await (0, Utils_1.fetchFile)(url).catch(err => err);
+    if (![200, 301, 302, 307, 308].includes(response?.status ?? 0)) {
+        (0, Utils_1.error)('LinkItorInUrl', `拉取文件 [${url}] 时出现错误：${response?.status}`);
+        return;
     }
     const pathname = new URL(url).pathname;
     let content;
@@ -270,12 +276,12 @@ async function eachAllLinkInUrl(domain, url, result, event) {
         case pathname.endsWith('/'):
             content = await response.text();
             update();
-            await eachAllLinkInHtml(domain, content, result, nextEvent);
+            await eachAllLinkInHtml(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
             break;
         case pathname.endsWith('.css'):
             content = await response.text();
             update();
-            await eachAllLinkInCss(domain, content, result, nextEvent);
+            await eachAllLinkInCss(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
             break;
         case pathname.endsWith('.js'):
             content = await response.text();
@@ -303,11 +309,12 @@ exports.eachAllLinkInUrl = eachAllLinkInUrl;
  * + **调用该函数前必须调用过 [loadCacheJson]**
  *
  * @param domain 网站域名
+ * @param root 当前资源的根
  * @param content HTML 文件内容
  * @param result 存放结果的对象
  * @param event 检索到 URL 时触发的事件
  */
-async function eachAllLinkInHtml(domain, content, result, event) {
+async function eachAllLinkInHtml(domain, root, content, result, event) {
     const each = async (node) => {
         let url = undefined;
         switch (node.tagName) {
@@ -334,7 +341,7 @@ async function eachAllLinkInHtml(domain, content, result, event) {
             await eachAllLinkInJavaScript(domain, node.rawText, result, event);
         }
         else if (node.tagName === 'style') {
-            await eachAllLinkInCss(domain, node.rawText, result, event);
+            await eachAllLinkInCss(domain, root, node.rawText, result, event);
         }
         if (node.childNodes) {
             for (let childNode of node.childNodes) {
@@ -342,7 +349,15 @@ async function eachAllLinkInHtml(domain, content, result, event) {
             }
         }
     };
-    await each(fast_html_parser_1.default.parse(content, { style: true, script: true }));
+    let html;
+    try {
+        html = fast_html_parser_1.default.parse(content, { style: true, script: true });
+    }
+    catch (e) {
+        (0, Utils_1.error)('HtmlParser', `HTML [root=${root}] 中存在错误语法`);
+    }
+    if (html)
+        await each(html);
 }
 exports.eachAllLinkInHtml = eachAllLinkInHtml;
 /**
@@ -354,11 +369,12 @@ exports.eachAllLinkInHtml = eachAllLinkInHtml;
  * + **调用该函数前必须调用过 [loadCacheJson]**
  *
  * @param domain 网站域名
+ * @param root 当前资源的 URL 的根
  * @param content CSS 文件内容
  * @param result 存放结果的对象
  * @param event 当检索到一个 URL 后触发的事件
  */
-async function eachAllLinkInCss(domain, content, result, event) {
+async function eachAllLinkInCss(domain, root, content, result, event) {
     const each = async (any) => {
         if (!any)
             return;
@@ -369,9 +385,15 @@ async function eachAllLinkInCss(domain, content, result, event) {
                 case 'declaration':
                     const value = rule.value;
                     const list = value.match(/url\(['"]?([^'")]+)['"]?\)/g)
-                        ?.map(it => it.replace(/(^url\(['"])|(['"]\)$)/g, ''));
+                        ?.map(it => it.replace(/(^url\(['"]?)|(['"]?\)$)/g, ''));
                     if (list) {
                         for (let url of list) {
+                            if (!/^(https?:)|(\/\/)/.test(url)) {
+                                if (url[0] === '/')
+                                    url = root + url.substring(1);
+                                else
+                                    url = root + url;
+                            }
                             await eachAllLinkInUrl(domain, url, result, event);
                         }
                     }
@@ -383,7 +405,15 @@ async function eachAllLinkInCss(domain, content, result, event) {
             }
         }
     };
-    await each(css_1.default.parse(content).stylesheet?.rules);
+    let css;
+    try {
+        css = css_1.default.parse(content).stylesheet?.rules;
+    }
+    catch (e) {
+        (0, Utils_1.error)('CssParser', `CSS [root=${root}] 中存在错误语法`);
+    }
+    if (css)
+        await each(css);
 }
 exports.eachAllLinkInCss = eachAllLinkInCss;
 /**

package/package.json

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

package/types/fileAnalyzer.d.ts

@@ -35,11 +35,11 @@ export declare function isExclude(domain: string, url: string): boolean;
  */
 export declare function isStable(url: string): boolean;
 /**
- * 从指定 URL 加载 cache json
+ * 从指定 URL 加载 version json
  *
  * + **执行该函数前必须调用过 [loadRules]**
  */
-export declare function loadVersionJson(url: string): Promise<VersionJson>;
+export declare function loadVersionJson(url: string): Promise<VersionJson | null>;
 /** 提交要存储到 version json 的值 */
 export declare function submitCacheInfo(key: string, value: any): void;
 /**
@@ -48,7 +48,7 @@ export declare function submitCacheInfo(key: string, value: any): void;
  * + **执行该函数前必须调用过 [loadRules]**
  * + **调用该函数前必须调用过 [loadCacheJson]**
  */
-export declare function readOldVersionJson(): VersionJson;
+export declare function readOldVersionJson(): VersionJson | null;
 /**
  * 读取最后一次构建的 VersionJson
  *
@@ -103,11 +103,12 @@ export declare function eachAllLinkInUrl(domain: string, url: string, result: Ve
  * + **调用该函数前必须调用过 [loadCacheJson]**
  *
  * @param domain 网站域名
+ * @param root 当前资源的根
  * @param content HTML 文件内容
  * @param result 存放结果的对象
  * @param event 检索到 URL 时触发的事件
  */
-export declare function eachAllLinkInHtml(domain: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
+export declare function eachAllLinkInHtml(domain: string, root: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
 /**
  * 检索 CSS 文件中的所有外部链
  *
@@ -117,11 +118,12 @@ export declare function eachAllLinkInHtml(domain: string, content: string, resul
  * + **调用该函数前必须调用过 [loadCacheJson]**
  *
  * @param domain 网站域名
+ * @param root 当前资源的 URL 的根
  * @param content CSS 文件内容
  * @param result 存放结果的对象
  * @param event 当检索到一个 URL 后触发的事件
  */
-export declare function eachAllLinkInCss(domain: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
+export declare function eachAllLinkInCss(domain: string, root: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
 /**
  * 遍历 JS 文件中地所有外部链接
  *