swpp-backends 1.0.2 → 1.0.4

package/dist/FileAnalyzer.js

@@ -47,9 +47,7 @@ async function eachAllFile(root, cb) {
         await cb(root);
     else {
         const files = fs_1.default.readdirSync(root);
-        for (let it of files) {
-            await eachAllFile(path_1.default.join(root, it), cb);
-        }
+        await Promise.all(files.map(it => eachAllFile(path_1.default.join(root, it), cb)));
     }
 }
 /**
@@ -277,18 +275,15 @@ async function eachAllLinkInUrl(domain, url, result, event) {
         case pathname.endsWith('/'):
             content = await response.text();
             update();
-            await eachAllLinkInHtml(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
-            break;
+            return eachAllLinkInHtml(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
         case pathname.endsWith('.css'):
             content = await response.text();
             update();
-            await eachAllLinkInCss(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
-            break;
+            return eachAllLinkInCss(domain, url.substring(0, url.lastIndexOf('/') + 1), content, result, nextEvent);
         case pathname.endsWith('.js'):
             content = await response.text();
             update();
-            await eachAllLinkInJavaScript(domain, content, result, nextEvent);
-            break;
+            return eachAllLinkInJavaScript(domain, content, result, nextEvent);
         default:
             if (stable) {
                 result[url] = [];
@@ -316,7 +311,8 @@ exports.eachAllLinkInUrl = eachAllLinkInUrl;
  * @param event 检索到 URL 时触发的事件
  */
 async function eachAllLinkInHtml(domain, root, content, result, event) {
-    const each = async (node) => {
+    const taskList = [];
+    const each = (node) => {
         let url = undefined;
         switch (node.tagName) {
             case 'link':
@@ -336,17 +332,17 @@ async function eachAllLinkInHtml(domain, root, content, result, event) {
                 break;
         }
         if (url) {
-            await eachAllLinkInUrl(domain, url, result, event);
+            taskList.push(eachAllLinkInUrl(domain, url, result, event));
         }
         else if (node.tagName === 'script') {
-            await eachAllLinkInJavaScript(domain, node.rawText, result, event);
+            taskList.push(eachAllLinkInJavaScript(domain, node.rawText, result, event));
         }
         else if (node.tagName === 'style') {
-            await eachAllLinkInCss(domain, root, node.rawText, result, event);
+            taskList.push(eachAllLinkInCss(domain, root, node.rawText, result, event));
         }
         if (node.childNodes) {
             for (let childNode of node.childNodes) {
-                await each(childNode);
+                each(childNode);
             }
         }
     };
@@ -358,7 +354,8 @@ async function eachAllLinkInHtml(domain, root, content, result, event) {
         (0, Utils_1.error)('HtmlParser', `HTML [root=${root}] 中存在错误语法`);
     }
     if (html)
-        await each(html);
+        each(html);
+    return Promise.all(taskList);
 }
 exports.eachAllLinkInHtml = eachAllLinkInHtml;
 /**
@@ -376,12 +373,13 @@ exports.eachAllLinkInHtml = eachAllLinkInHtml;
  * @param event 当检索到一个 URL 后触发的事件
  */
 async function eachAllLinkInCss(domain, root, content, result, event) {
-    const each = async (any) => {
+    const taskList = [];
+    const each = (any) => {
         if (!any)
             return;
         for (let rule of any) {
             if (rule.declarations)
-                await each(rule.declarations);
+                each(rule.declarations);
             switch (rule.type) {
                 case 'declaration':
                     const value = rule.value;
@@ -395,13 +393,13 @@ async function eachAllLinkInCss(domain, root, content, result, event) {
                                 else
                                     url = root + url;
                             }
-                            await eachAllLinkInUrl(domain, url, result, event);
+                            taskList.push(eachAllLinkInUrl(domain, url, result, event));
                         }
                     }
                     break;
                 case 'import':
                     const url = rule.import.trim().replace(/^["']|["']$/g, '');
-                    await eachAllLinkInUrl(domain, url, result, event);
+                    taskList.push(eachAllLinkInUrl(domain, url, result, event));
                     break;
             }
         }
@@ -414,7 +412,8 @@ async function eachAllLinkInCss(domain, root, content, result, event) {
         (0, Utils_1.error)('CssParser', `CSS [root=${root}] 中存在错误语法`);
     }
     if (css)
-        await each(css);
+        each(css);
+    return Promise.all(taskList);
 }
 exports.eachAllLinkInCss = eachAllLinkInCss;
 /**
@@ -430,7 +429,8 @@ exports.eachAllLinkInCss = eachAllLinkInCss;
  * @param result 存放结果的对象
  * @param event 当检索到一个 URL 后触发的事件
  */
-async function eachAllLinkInJavaScript(domain, content, result, event) {
+function eachAllLinkInJavaScript(domain, content, result, event) {
+    const taskList = [];
     const ruleList = (0, SwppRules_1.readRules)().config?.external?.js;
     if (!ruleList) {
         (0, Utils_1.error)('LinkItorInJS', '不应发生的异常');
@@ -440,7 +440,7 @@ async function eachAllLinkInJavaScript(domain, content, result, event) {
         if (typeof value === 'function') {
             const urls = value(content);
             for (let url of urls) {
-                await eachAllLinkInUrl(domain, url, result, event);
+                taskList.push(eachAllLinkInUrl(domain, url, result, event));
             }
         }
         else {
@@ -451,11 +451,12 @@ async function eachAllLinkInJavaScript(domain, content, result, event) {
                 ?.map(it => it.replace(/^['"`]|['"`]$/g, ''));
             if (list) {
                 for (let url of list) {
-                    await eachAllLinkInUrl(domain, url, result, event);
+                    taskList.push(eachAllLinkInUrl(domain, url, result, event));
                 }
             }
         }
     }
+    return Promise.all(taskList);
 }
 exports.eachAllLinkInJavaScript = eachAllLinkInJavaScript;
 /** 判断一个 URL 是否是外部链接 */

package/dist/ServiceWorkerBuilder.js

@@ -22,7 +22,7 @@ function buildServiceWorker() {
     const templatePath = path_1.default.resolve('./', module.path, 'resources/sw-template.js');
     // 获取拓展文件
     let cache = (0, Utils_1.getSource)(rules, undefined, [
-        'cacheList', 'modifyRequest', 'getCdnList', 'getSpareUrls', 'blockRequest', 'fetchFile',
+        'cacheRules', 'modifyRequest', 'getRaceUrls', 'getSpareUrls', 'blockRequest', 'fetchFile',
         ...('external' in rules && Array.isArray(rules.external) ? rules.external : [])
     ], true) + '\n';
     if (!fetchFile) {
@@ -39,7 +39,7 @@ function buildServiceWorker() {
         cache += `(${(0, Utils_1.getSource)(rules['afterJoin'])})()\n`;
     if ('afterTheme' in rules)
         cache += `(${(0, Utils_1.getSource)(rules['afterTheme'])})()\n`;
-    const keyword = "const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')";
+    const keyword = "const { cacheRules, fetchFile, getRaceUrls } = require('../sw-rules')";
     // noinspection JSUnresolvedVariable
     let content = fs_1.default.readFileSync(templatePath, 'utf8')
         .replaceAll("// [insertion site] values", eject?.strValue ?? '')
@@ -83,7 +83,7 @@ const JS_CODE_DEF_FETCH_FILE = `
         credentials: 'same-origin'
     })
 `;
-// getCdnList 函数的代码
+// getRaceUrls 函数的代码
 const JS_CODE_GET_CDN_LIST = `
     const fetchFile = (request, banCache) => {
         const fetchArgs = {
@@ -91,7 +91,7 @@ const JS_CODE_GET_CDN_LIST = `
             mode: 'cors',
             credentials: 'same-origin'
         }
-        const list = getCdnList(request.url)
+        const list = getRaceUrls(request.url)
         if (!list || !Promise.any) return fetch(request, fetchArgs)
         const res = list.map(url => new Request(url, request))
         const controllers = []

package/dist/Utils.js

@@ -105,7 +105,7 @@ function getSource(obj, typeChecker = undefined, whiteList = undefined, isTop =
                     let str = getSource(value, typeChecker);
                     if (str.length === 0)
                         return '';
-                    if (isTop && whiteList && ['cacheList', 'modifyRequest'].includes(key)) {
+                    if (isTop && whiteList && ['cacheRules', 'modifyRequest'].includes(key)) {
                         str = str
                             .replace(/\(\s*(.*?)\s*,\s*\$eject\s*\)/g, "$1") // 去掉箭头函数参数表中的 $eject
                             .replaceAll(/\$eject\.(\w+)/g, (_, match) => `eject${match[0].toUpperCase()}${match.substring(1)}`); // 将函数体中的 $eject.xxx 替换为 ejectXxx

package/dist/resources/sw-template.js

@@ -34,7 +34,7 @@
     self.addEventListener('activate', event => event.waitUntil(clients.claim()))
 
     // noinspection JSFileReferences
-    const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')
+    const { cacheRules, fetchFile, getSpareUrls } = require('../sw-rules')
 
     // 检查请求是否成功
     // noinspection JSUnusedLocalSymbols
@@ -106,8 +106,8 @@
     /** 判断指定url击中了哪一种缓存，都没有击中则返回null */
     function findCache(url) {
         if (url.hostname === 'localhost') return
-        for (let key in cacheList) {
-            const value = cacheList[key]
+        for (let key in cacheRules) {
+            const value = cacheRules[key]
             if (value.match(url)) return value
         }
     }
@@ -219,10 +219,6 @@
      * @constructor
      */
     function CacheChangeExpression(json) {
-        const checkCache = url => {
-            const cache = findCache(new URL(url))
-            return !cache || cache.clean
-        }
         /**
          * 遍历所有value
          * @param action {function(string): boolean} 接受value并返回bool的函数

package/package.json

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

package/types/{fileAnalyzer.d.ts → FileAnalyzer.d.ts}

@@ -93,7 +93,7 @@ export declare function buildVersionJson(protocol: ('https://' | 'http://'), dom
  * @param result 存放结果的对象
  * @param event 检索到一个 URL 时触发的事件
  */
-export declare function eachAllLinkInUrl(domain: string, url: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
+export declare function eachAllLinkInUrl(domain: string, url: string, result: VersionMap, event?: (url: string) => void): Promise<void | any[]>;
 /**
  * 检索 HTML 文件中的所有外部链接
  *
@@ -108,7 +108,7 @@ export declare function eachAllLinkInUrl(domain: string, url: string, result: Ve
  * @param result 存放结果的对象
  * @param event 检索到 URL 时触发的事件
  */
-export declare function eachAllLinkInHtml(domain: string, root: 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<any[]>;
 /**
  * 检索 CSS 文件中的所有外部链
  *
@@ -123,7 +123,7 @@ export declare function eachAllLinkInHtml(domain: string, root: string, content:
  * @param result 存放结果的对象
  * @param event 当检索到一个 URL 后触发的事件
  */
-export declare function eachAllLinkInCss(domain: string, root: 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 文件中地所有外部链接
  *
@@ -137,7 +137,7 @@ export declare function eachAllLinkInCss(domain: string, root: string, content:
  * @param result 存放结果的对象
  * @param event 当检索到一个 URL 后触发的事件
  */
-export declare function eachAllLinkInJavaScript(domain: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<void>;
+export declare function eachAllLinkInJavaScript(domain: string, content: string, result: VersionMap, event?: (url: string) => void): Promise<any[]>;
 /**
  * 查询指定 URL 对应的缓存规则
  *

package/types/SwppConfig.d.ts

@@ -42,7 +42,7 @@ export interface VersionJsonConfig {
     charLimit: number;
     /** 是否合并指定项目 */
     merge: string[];
-    /** 生成 cacheList.json 时忽略的文件 */
+    /** 生成版本信息时忽略的文件 */
     exclude: {
         localhost: RegExp[];
         other: RegExp[];
@@ -100,7 +100,7 @@ export interface SwppConfigTemplate {
         charLimit?: number;
         /** 是否合并指定项目 */
         merge?: string[];
-        /** 生成 cacheList.json 时忽略的文件 */
+        /** 生成版本信息时忽略的文件 */
         exclude?: {
             /** 当前网站的 URL */
             localhost?: RegExp[];