swpp-backends 0.0.9-alpha → 0.0.11-alpha

package/dist/fileAnalyzer.js

@@ -101,10 +101,10 @@ exports.loadVersionJson = loadVersionJson;
 let _oldVersionJson;
 let _newVersionJson;
 let _mergeVersionMap;
-const event = [];
+const event = new Map();
 /** 提交要存储到 version json 的值 */
-function submitCacheInfo(value) {
-    event.push(value);
+function submitCacheInfo(key, value) {
+    event.set(key, value);
 }
 exports.submitCacheInfo = submitCacheInfo;
 /**
@@ -168,7 +168,7 @@ exports.readMergeVersionMap = readMergeVersionMap;
 async function buildVersionJson(protocol, domain, root) {
     const list = {};
     await eachAllFile(root, async (path) => {
-        const endIndex = path.length - (path.endsWith('/index.html') ? 10 : 0);
+        const endIndex = path.length - (/[\/\\]index\.html$/.test(path) ? 10 : 0);
         const url = new URL(protocol + path_1.default.join(domain, path.substring(root.length, endIndex)));
         const pathname = url.pathname;
         if (isExclude(domain, pathname))
@@ -182,12 +182,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 +195,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;
@@ -227,7 +231,7 @@ async function eachAllLinkInUrl(domain, url, result, event) {
     const stable = isStable(url);
     if (stable) {
         const old = readOldVersionJson().list;
-        if (url in old) {
+        if (Array.isArray(old[url])) {
             const copyTree = (key) => {
                 const value = old[key];
                 if (!value)
@@ -270,12 +274,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, content, url.substring(0, url.lastIndexOf('/') + 1), result, nextEvent);
             break;
         case pathname.endsWith('.css'):
             content = await response.text();
             update();
-            await eachAllLinkInCss(domain, content, result, nextEvent);
+            await eachAllLinkInCss(domain, content, url.substring(0, url.lastIndexOf('/') + 1), result, nextEvent);
             break;
         case pathname.endsWith('.js'):
             content = await response.text();
@@ -303,11 +307,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 +339,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) {
@@ -354,25 +359,31 @@ 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;
         for (let rule of any) {
+            if (rule.declarations)
+                await each(rule.declarations);
             switch (rule.type) {
-                case 'rule':
-                    await each(rule.declarations);
-                    break;
                 case 'declaration':
                     const value = rule.value;
                     const list = value.match(/url\(['"]?([^'")]+)['"]?\)/g)
                         ?.map(it => it.replace(/(^url\(['"])|(['"]\)$)/g, ''));
                     if (list) {
                         for (let url of list) {
+                            if (!/^(https?:)|(\/\/)/) {
+                                if (url[0] === '/')
+                                    url = root + url.substring(1);
+                                else
+                                    url = root + url;
+                            }
                             await eachAllLinkInUrl(domain, url, result, event);
                         }
                     }

package/package.json

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

package/types/fileAnalyzer.d.ts

@@ -41,7 +41,7 @@ export declare function isStable(url: string): boolean;
  */
 export declare function loadVersionJson(url: string): Promise<VersionJson>;
 /** 提交要存储到 version json 的值 */
-export declare function submitCacheInfo(value: any): void;
+export declare function submitCacheInfo(key: string, value: any): void;
 /**
  * 读取最后一次加载的 version json
  *
@@ -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 文件中地所有外部链接
  *