swpp-backends 1.0.2 → 1.0.3

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.3",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",

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[];