swpp-backends 2.0.4 → 2.0.6

package/dist/FileAnalyzer.js

@@ -108,10 +108,13 @@ async function buildVersionJson(protocol, domain, root) {
     cacheInfoMap.forEach((value, key) => {
         external[key] = value;
     });
-    return (0, Variant_1.writeVariant)('newVersionJson', {
+    if ('update' in rules) {
+        external.swppFlag = rules.update.flag;
+    }
+    return (0, Variant_1.writeVariant)('newVersionJson', (0, Utils_1.deepFreeze)({
         version: 3,
         list, external
-    });
+    }));
 }
 exports.buildVersionJson = buildVersionJson;
 /**

package/dist/UpdateJsonBuilder.js

@@ -31,8 +31,7 @@ function buildUpdateJson(root, dif) {
             (0, Utils_1.error)('UpdateJsonBuilder', '规则文件的 update 项目必须包含 flag 值！');
             throw '规则文件的 update 不合规';
         }
-        (0, Variant_1.readNewVersionJson)().external.flag = userUpdate.flag;
-        if (userUpdate.flag === (0, Variant_1.readOldVersionJson)()?.external?.flag)
+        if (userUpdate.flag === (0, Variant_1.readOldVersionJson)()?.external?.swppFlag)
             userUpdate = undefined;
     }
     // 如果需要强制刷新直接返回
@@ -273,11 +272,6 @@ function zipJson(json) {
  * + **执行该函数前必须调用过 [calcEjectValues]**
  */
 function getShorthand(url, offset = 0) {
-    if (url.endsWith('/')) {
-        const startIndex = url.indexOf('//') + 2;
-        if (url.indexOf('/', startIndex) === url.length - 1)
-            return '/';
-    }
     const map = (0, Variant_1.readMergeVersionMap)();
     let collide = new Set();
     for (let mapKey in map) {

package/dist/index.js

@@ -10,7 +10,7 @@ const VersionAnalyzer_1 = require("./VersionAnalyzer");
 const DomBuilder_1 = require("./DomBuilder");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '2.0.4',
+    version: '2.0.6',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -194,8 +194,9 @@
             if (this.force) return true
             else if (this.refresh) return findCache(url).clean
             else {
+                const obj = new URL(url)
                 for (let it of list) {
-                    if (it.match(url)) return true
+                    if (it.match(obj)) return true
                 }
             }
             return false
@@ -230,13 +231,14 @@
                 case 'html':
                     return url => url.match(/(\/|\.html)$/)
                 case 'end':
-                    return url => forEachValues(value => url.endsWith(value))
+                    return url => forEachValues(value => url.href.endsWith(value))
                 case 'begin':
-                    return url => forEachValues(value => url.startsWith(value))
+                    return url => forEachValues(value => url.pathname.startsWith(value))
                 case 'str':
-                    return url => forEachValues(value => url.includes(value))
+                    return url => forEachValues(value => url.href.includes(value))
                 case 'reg':
-                    return url => forEachValues(value => url.match(new RegExp(value, 'i')))
+                    // noinspection JSCheckFunctionSignatures
+                    return url => forEachValues(value => url.href.match(new RegExp(value, 'i')))
                 default: throw `未知表达式：${JSON.stringify(json)}`
             }
         }

package/package.json

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