hexo-swpp 2.4.0 → 2.4.1

package/lib/sw-dom.js

@@ -19,22 +19,10 @@ document.addEventListener('DOMContentLoaded', () => {
         }
         resolve(false)
     })
-    const compareUrls = (arg0, arg1) => {
-        if (
-            (arg0.endsWith('/') && arg1.endsWith('/')) ||
-            (arg0.endsWith('/index.html') && arg1.endsWith('/index.html'))
-        ) {
-            let count = 0
-            for (let i = arg0.length - 1, k = arg1.length - 1; arg0[i] === arg1[k]; --i, --k) {
-                if (arg0[i] === '/' && ++count === 2) return true
-            }
-        }
-        return false
-    }
     if (!checkServiceWorker()) return
     if (sessionStorage.getItem('updated')) {
-        // ${onSuccess}
         sessionStorage.removeItem('updated')
+        // ${onSuccess}
     } else postMessage2SW('update')
     navigator.serviceWorker.addEventListener('message', event => {
         const data = event.data
@@ -50,17 +38,12 @@ document.addEventListener('DOMContentLoaded', () => {
                             return pjaxUpdate(url)
                         if (url.endsWith('.css'))
                             return pjaxUpdate(url)
-                        return Promise.resolve(url.endsWith('.json') || compareUrls(url, location.href))
-                    })).then(list => {
-                        for (let it of list) {
-                            if (it) return location.reload()
-                        }
-                        sessionStorage.removeItem('updated')
-                        // ${onSuccess}
-                    })
+                        return Promise.resolve()
+                    })).then(() => location.reload())
                 } else location.reload()
                 break
-            case 'refresh':
+            case 'escape':
+                sessionStorage.setItem('updated', '1')
                 location.reload()
                 break
         }

package/lib/sw-template.js

@@ -6,7 +6,37 @@
     /** 控制信息存储地址（必须以`/`结尾） */
     const CTRL_PATH = 'https://id.v3/'
 
-    self.addEventListener('install', () => self.skipWaiting())
+    /** 控制信息读写操作 */
+    const dbVersion = {
+        write: (id) => caches.open(CACHE_NAME)
+            .then(cache => cache.put(CTRL_PATH, new Response(JSON.stringify(id)))),
+        read: () => caches.match(CTRL_PATH).then(response => response?.json())
+    }
+
+    self.addEventListener('install', () => {
+        self.skipWaiting()
+        const escape = '@$$[escape]'
+        dbVersion.read().then(oldVersion => {
+            if (oldVersion && oldVersion.escape !== escape) {
+                oldVersion.escape = escape
+                const rules = new VersionList()
+                rules.refresh = true
+                // noinspection JSUnresolvedVariable
+                Promise.all([
+                    dbVersion.write(oldVersion),
+                    deleteCache(rules),
+                    updateJson(true)
+                ]).then(
+                    args => clients.matchAll().then(
+                        list => list.forEach(client => client.postMessage({
+                            type: 'escape',
+                            version: args[2].version
+                        }))
+                    )
+                )
+            }
+        })
+    })
 
     // noinspection JSFileReferences
     const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')
@@ -63,7 +93,7 @@
     self.addEventListener('message', event => {
         // [debug message]
         if (event.data === 'update') {
-            updateJson().then(info =>
+            updateJson(false).then(info =>
                 // noinspection JSUnresolvedVariable
                 event.source.postMessage({
                     type: 'update',
@@ -85,9 +115,10 @@
 
     /**
      * 根据JSON删除缓存
+     * @param skip {boolean} 是否跳过更新
      * @returns {Promise<{version, list}>}
      */
-    function updateJson() {
+    function updateJson(skip) {
         /**
          * 解析elements，并把结果输出到list中
          * @return boolean 是否刷新全站缓存
@@ -105,36 +136,25 @@
             return true
         }
         /** 解析字符串 */
-        const parseJson = json => {
-            /** 控制信息读写操作 */
-            const dbVersion = {
-                write: (id) => caches.open(CACHE_NAME)
-                    .then(cache => cache.put(CTRL_PATH, new Response(JSON.stringify(id)))),
-                read: () => caches.match(CTRL_PATH).then(response => response?.json())
+        const parseJson = json => dbVersion.read().then(oldVersion => {
+            const {info, global} = json
+            const newVersion = {global, local: info[0].version, escape: oldVersion.escape}
+            //新用户不进行更新操作
+            if (!oldVersion || skip) {
+                dbVersion.write(newVersion)
+                return newVersion
             }
             let list = new VersionList()
-            return dbVersion.read().then(oldVersion => {
-                const {info, global} = json
-                const escape = '@$$[escape]'
-                const newVersion = {global, local: info[0].version, escape}
-                //新用户不进行更新操作
-                if (!oldVersion) {
-                    dbVersion.write(newVersion)
-                    return newVersion
-                }
-                // noinspection JSIncompatibleTypesComparison
-                let refresh =
-                    escape !== 0 && escape !== oldVersion.escape ? true : parseChange(list, info, oldVersion.local)
-                dbVersion.write(newVersion)
-                //如果需要清理全站
-                if (refresh) {
-                    if (global === oldVersion.global)
-                        list.clean(new CacheChangeExpression({'flag': 'all'}))
-                    else list.refresh = true
-                }
-                return {list: list, version: newVersion}
-            })
-        }
+            let refresh = parseChange(list, info, oldVersion.local)
+            dbVersion.write(newVersion)
+            // [debug escape]
+            //如果需要清理全站
+            if (refresh) {
+                if (global !== oldVersion.global) list.refresh = true
+                else list.clean(new CacheChangeExpression({'flag': 'all'}))
+            }
+            return {list, version: newVersion}
+        })
         return fetchFile(new Request('/update.json'), false)
             .then(response => {
                 if (checkResponse(response))
@@ -156,7 +176,6 @@
     function VersionList() {
 
         const list = []
-        const refresh = false
 
         /**
          * 推送一个表达式
@@ -181,7 +200,7 @@
          * @return {boolean}
          */
         this.match = url => {
-            if (refresh) return true
+            if (this.refresh) return true
             else {
                 for (let it of list) {
                     if (it.match(url)) return true

package/lib/swBuilder.js

@@ -128,6 +128,8 @@ module.exports = (hexo, config, pluginConfig, rules) => {
                 console.debug(\`put cache: \${key}\`)
             `).replaceAll('// [debug message]', `
                 console.debug(\`receive: \${event.data}\`)
+            `).replaceAll('// [debug escape]', `
+                console.debug(\`escape: \${aid}\`)
             `)
         }
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",