swpp-backends 2.0.3 → 2.0.5

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;
 /**
@@ -384,7 +387,7 @@ async function eachAllLinkInCss(domain, url, content, result, event) {
                 i = right + 2;
         }
         sub.match(/(url\(.*?\))|(@import\s+['"].*?['"])|((https?:)?\/\/[^\s/$.?#].\S*)/g)
-            ?.map(it => it.replace(/(^url\((['"]?))|((['"]?)\)$)|(^@import\s+['"])|(['"]$)/g, ''))
+            ?.map(it => it.replace(/(^url\(\s*(['"]?))|((['"]?\s*)\)$)|(^@import\s+['"])|(['"]$)/g, ''))
             ?.map(it => {
             switch (true) {
                 case it.startsWith('http'):

package/dist/UpdateJsonBuilder.js

@@ -31,7 +31,7 @@ function buildUpdateJson(root, dif) {
             (0, Utils_1.error)('UpdateJsonBuilder', '规则文件的 update 项目必须包含 flag 值！');
             throw '规则文件的 update 不合规';
         }
-        if (userUpdate.flag === (0, Variant_1.readOldVersionJson)()?.external?.flag)
+        if (userUpdate.flag === (0, Variant_1.readOldVersionJson)()?.external?.swppFlag)
             userUpdate = undefined;
     }
     // 如果需要强制刷新直接返回
@@ -272,6 +272,11 @@ 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.3',
+    version: '2.0.5',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -148,8 +148,8 @@
             // [debug escape]
             //如果需要清理全站
             if (refresh) {
-                if (global !== oldVersion.global) list.refresh = true
-                else list.clean(new CacheChangeExpression({'flag': 'all'}))
+                if (global !== oldVersion.global) list.force = true
+                else list.refresh = true
             }
             return {list, version: newVersion}
         })
@@ -185,22 +185,14 @@
             list.push(element)
         }
 
-        /**
-         * 清除列表，并将指定元素推入列表中
-         * @param element {CacheChangeExpression} 要推入的元素，留空表示不推入
-         */
-        this.clean = element => {
-            list.length = 0
-            if (!element) this.push(element)
-        }
-
         /**
          * 判断指定 URL 是否和某一条规则匹配
          * @param url {string} URL
          * @return {boolean}
          */
         this.match = url => {
-            if (this.refresh) return true
+            if (this.force) return true
+            else if (this.refresh) return findCache(url).clean
             else {
                 for (let it of list) {
                     if (it.match(url)) return true

package/package.json

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