hexo-swpp 2.3.6 → 2.4.0-beta.0

package/lib/jsonBuilder.js

@@ -167,7 +167,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
                     .each((i, it) => handleLink(it))
                 const relList = ['stylesheet', 'manifest', 'icon', 'shortcut icon', 'mask-icon']
                 for (let value of relList) {
-                    html(`link[href][rel=${value}]`)
+                    html(`link[href][rel='${value}']`)
                         .map((i, ele) => html(ele).attr('href'))
                         .each((i, it) => handleLink(it))
                 }

package/lib/sw-template.js

@@ -24,8 +24,13 @@
         .then(keys => Promise.all(
             keys.map(async it => {
                 const url = it.url
-                // noinspection ES6MissingAwait,CommaExpressionJS
-                return url !== CTRL_PATH && list.match(url) ? (cache.delete(it), url) : null
+                if (url !== CTRL_PATH && list.match(url)) {
+                    // [debug delete]
+                    // noinspection ES6MissingAwait
+                    cache.delete(it)
+                    return url
+                }
+                return null
             })
         )).then(list => list.filter(it => it))
     )
@@ -43,6 +48,7 @@
                     if (response.status === 200) {
                         const clone = response.clone()
                         caches.open(CACHE_NAME).then(it => it.put(key, clone))
+                        // [debug put]
                     }
                     return response
                 })
@@ -55,6 +61,7 @@
     })
 
     self.addEventListener('message', event => {
+        // [debug message]
         if (event.data === 'update') {
             updateJson().then(info =>
                 // noinspection JSUnresolvedVariable
@@ -116,16 +123,16 @@
                     return newVersion
                 }
                 // noinspection JSIncompatibleTypesComparison
-                let refresh =
-                    escape !== 0 && escape !== oldVersion.escape ? true : parseChange(list, info, oldVersion.local)
+                const aid = escape !== 0 && escape !== oldVersion.escape
+                let refresh = aid ? true : parseChange(list, info, oldVersion.local)
                 dbVersion.write(newVersion)
+                // [debug escape]
                 //如果需要清理全站
                 if (refresh) {
-                    if (global === oldVersion.global)
-                        list.clean(new CacheChangeExpression({'flag': 'all'}))
-                    else list.refresh = true
+                    if (global !== oldVersion.global || aid) list.refresh = true
+                    else list.clean(new CacheChangeExpression({'flag': 'all'}))
                 }
-                return {list: list, version: newVersion}
+                return {list, version: newVersion}
             })
         }
         return fetchFile(new Request('/update.json'), false)

package/lib/swBuilder.js

@@ -120,6 +120,18 @@ module.exports = (hexo, config, pluginConfig, rules) => {
                     return event.respondWith(new Response(null, {status: 208}))
             `)
         }
+        // noinspection JSUnresolvedVariable
+        if (pluginConfig.sw.debug) {
+            swContent = swContent.replaceAll('// [debug delete]', `
+                console.debug(\`delete cache: \${url}\`)
+            `).replaceAll('// [debug put]', `
+                console.debug(\`put cache: \${key}\`)
+            `).replaceAll('// [debug message]', `
+                console.debug(\`receive: \${event.data}\`)
+            `).replaceAll('// [debug escape]', `
+                console.debug(\`escape: \${aid}\`)
+            `)
+        }
         return {
             path: 'sw.js',
             data: swContent

package/package.json

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