swpp-backends 0.0.8-alpha → 0.0.10-alpha

package/dist/fileAnalyzer.js

@@ -41,13 +41,15 @@ const Utils_1 = require("./Utils");
  * @param root 根目录
  * @param cb 回调函数（接收的参数是文件的相对路径）
  */
-function eachAllFile(root, cb) {
+async function eachAllFile(root, cb) {
     const stats = fs_1.default.statSync(root);
     if (stats.isFile())
-        cb(root);
+        await cb(root);
     else {
         const files = fs_1.default.readdirSync(root);
-        files.forEach(it => eachAllFile(path_1.default.join(root, it), cb));
+        for (let it of files) {
+            await eachAllFile(path_1.default.join(root, it), cb);
+        }
     }
 }
 /**
@@ -99,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;
 /**
@@ -165,8 +167,8 @@ exports.readMergeVersionMap = readMergeVersionMap;
  */
 async function buildVersionJson(protocol, domain, root) {
     const list = {};
-    eachAllFile(root, async (path) => {
-        const endIndex = path.length - (path.endsWith('/index.html') ? 10 : 0);
+    await eachAllFile(root, async (path) => {
+        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))
@@ -254,7 +256,8 @@ async function eachAllLinkInUrl(domain, url, result, event) {
     const pathname = new URL(url).pathname;
     let content;
     const nextEvent = (it) => {
-        result[url].push(it);
+        if (stable)
+            result[url].push(it);
     };
     const update = () => {
         if (stable)
@@ -360,10 +363,9 @@ async function eachAllLinkInCss(domain, content, result, event) {
         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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "0.0.8-alpha",
+  "version": "0.0.10-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
  *