swpp-backends 2.0.5 → 2.0.7

package/dist/UpdateJsonBuilder.js

@@ -272,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.5',
+    version: '2.0.7',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -18,15 +18,18 @@
     self.addEventListener('install', () => {
         self.skipWaiting()
         const escape = '@$$[escape]'
-        dbVersion.read().then(oldVersion => {
-            if (oldVersion && oldVersion.escape !== escape) {
-                oldVersion.escape = escape
-                // noinspection JSUnresolvedVariable
-                caches.delete(CACHE_NAME)
-                    .then(() => clients.matchAll())
-                    .then(list => list.forEach(client => client.postMessage({type: 'escape'})))
-            }
-        })
+        if (escape) {
+            dbVersion.read().then(oldVersion => {
+                if (oldVersion && oldVersion.escape !== escape) {
+                    oldVersion.escape = escape
+                    dbVersion.write(oldVersion)
+                    // noinspection JSUnresolvedVariable
+                    caches.delete(CACHE_NAME)
+                        .then(() => clients.matchAll())
+                        .then(list => list.forEach(client => client.postMessage({type: 'escape'})))
+                }
+            })
+        }
     })
 
     // sw 激活后立即对所有页面生效，而非等待刷新
@@ -136,7 +139,7 @@
         /** 解析字符串 */
         const parseJson = json => dbVersion.read().then(oldVersion => {
             const {info, global} = json
-            const newVersion = {global, local: info[0].version, escape: oldVersion?.escape}
+            const newVersion = {global, local: info[0].version, escape: oldVersion?.escape ?? 0}
             //新用户不进行更新操作
             if (!oldVersion) {
                 dbVersion.write(newVersion)
@@ -194,8 +197,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 +234,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.5",
+  "version": "2.0.7",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",