hexo-swpp 2.6.0 → 2.6.2

package/lib/sw-template.js

@@ -60,14 +60,15 @@
 
     self.addEventListener('fetch', event => {
         let request = event.request
-        if (request.method !== 'GET' || request.url.startsWith('http')) return
+        if (request.method !== 'GET' || !request.url.startsWith('http')) return
         // [modifyRequest call]
         const url = new URL(request.url)
         // [blockRequest call]
         if (findCache(url)) {
             const key = `${url.protocol}//${url.host}${url.pathname}`
-            event.respondWith(caches.match(key).then(cache =>
-                cache ? cache : fetchFile(request, true).then(response => {
+            event.respondWith(caches.match(key).then(cache => {
+                // [debug find]
+                return cache ?? fetchFile(request, true).then(response => {
                     if (checkResponse(response)) {
                         const clone = response.clone()
                         caches.open(CACHE_NAME).then(it => it.put(key, clone))
@@ -75,7 +76,7 @@
                     }
                     return response
                 })
-            ))
+            }))
         } else {
             const spare = getSpareUrls(request.url)
             if (spare) event.respondWith(fetchFile(request, false, spare))

package/lib/swBuilder.js

@@ -22,31 +22,33 @@ module.exports = (hexo, config, pluginConfig, rules) => {
         /**
          * 获取任意对象（symbol 类型除外）的源码
          * @param any {any} 对象
+         * @param separator {string} 分隔符
          * @param whiteList {string[]?} 白名单
          * @return {string}
          */
-        function getSource(any, whiteList = null) {
+        function getSource(any, separator = '\n', whiteList = null) {
             switch (typeof any) {
-                case 'undefined': return 'undefined\n'
+                case 'undefined': return `undefined${separator}`
                 case 'object': {
-                    let result = ''
-                    for (let key in any) {
-                        if (whiteList && !whiteList.includes(key)) continue
-                        const value = any[key]
-                        result += `${whiteList ? 'const ' : ''}${key} = ${getSource(value)}\n`
-                    }
-                    return result + '\n'
+                    let result = whiteList ? '' : '{\n'
+                    result += Object.getOwnPropertyNames(any)
+                        .filter(key => !whiteList || whiteList.includes(key))
+                        .map(key => {
+                            const value = any[key]
+                            return whiteList ? `const ${key} = ${getSource(value, '')}` : `${key}: ${getSource(value, '')}`
+                        }).join(whiteList ? '\n' : ',\n')
+                    return result + (whiteList ? '' : '\n}') + separator
                 }
-                case 'string': return `'${any}'\n`
+                case 'string': return `'${any}'${separator}`
+                case 'bigint': return `${any.toString()}n${separator}`
+                default: return any.toString() + separator
                 case 'symbol':
                     logger.error("[sw builder]: 不支持写入 symbol 类型，请从 sw-rules.js 中移除相关内容！")
                     throw '不支持写入 symbol 类型'
-                case 'bigint': return `${any.toString()}n\n`
-                default: return any.toString() + '\n'
             }
         }
         // 获取拓展文件
-        let cache = getSource(rules, [
+        let cache = getSource(rules, '\n\n', [
             'cacheList', 'modifyRequest', 'getCdnList', 'getSpareUrls', 'blockRequest',
             ...('external' in rules && Array.isArray(rules.external) ? rules.external : [])
         ])
@@ -164,6 +166,8 @@ module.exports = (hexo, config, pluginConfig, rules) => {
                 console.debug(\`receive: \${event.data}\`)
             `).replaceAll('// [debug escape]', `
                 console.debug(\`escape: \${aid}\`)
+            `).replaceAll('// [debug find]', `
+                console.debug(\`find: \${cache}\`)
             `)
         }
         return {

package/package.json

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