hexo-swpp 2.0.2 → 2.1.0

package/index.js

@@ -71,30 +71,28 @@ if (pluginConfig?.enable) {
             } else if (pluginConfig.sw.spareUrl && getSpareUrls) {
                 cache += `
                     const fetchFile = (request, banCache, spare = null) => {
-                        if (!spare)
-                            spare = getSpareUrls(request.url)
+                        if (!spare) spare = getSpareUrls(request.url)
                         if (!spare) return fetch(request, {cache: banCache ? 'no-store' : 'default'})
                         const list = spare.list
                         const controllers = []
-                        let index = 0
                         let error = 0
                         return new Promise((resolve, reject) => {
                             const plusError = () => {
                                 if (++error === list.length) reject(\`请求 \${request.url} 失败\`)
                             }
                             const pull = () => {
-                                if (index === list.length) return
-                                const flag = ++index
+                                const flag = controllers.length
+                                if (flag === list.length) return
                                 controllers.push({
                                     ctrl: new AbortController(),
                                     id: setTimeout(pull, spare.timeout)
                                 })
-                                fetch(new Request(list[flag - 1], request)).then(response => {
+                                fetch(new Request(list[flag], request)).then(response => {
                                     if (response.status < 303) {
                                         for (let i in controllers) {
                                             if (i !== flag) controllers[i].ctrl.abort()
-                                            clearTimeout(controllers[i].id)
                                         }
+                                        clearTimeout(controllers[controllers.length - 1].id)
                                         resolve(response)
                                     } else plusError()
                                 }).catch(plusError)
@@ -106,6 +104,7 @@ if (pluginConfig?.enable) {
             } else cache += '\nconst fetchFile = (request, banCache) => fetch(request, {cache: banCache ? "no-store" : "default"})'
         }
         if (!modifyRequest) cache += '\nconst modifyRequest = _ => {}'
+        if (!getSpareUrls) cache += `\nconst getSpareUrls = _ => {}`
         const swContent = fs.readFileSync(relativePath, 'utf8')
             .replaceAll("const { cacheList, modifyRequest, fetchFile, getSpareUrls } = require('../sw-rules')", cache)
             .replaceAll("'@$$[escape]'", (pluginConfig.sw.escape ?? 0).toString())

package/package.json

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

package/sw-template.js

@@ -3,8 +3,8 @@
 (() => {
     /** 缓存库名称 */
     const CACHE_NAME = '@$$[cacheName]'
-    /** 版本名称存储地址（必须以`/`结尾） */
-    const VERSION_PATH = 'https://id.v3/'
+    /** 控制信息存储地址（必须以`/`结尾） */
+    const CTRL_PATH = 'https://id.v3/'
 
     self.addEventListener('install', () => self.skipWaiting())
 
@@ -21,7 +21,7 @@
             keys.map(async it => {
                 const url = it.url
                 // noinspection ES6MissingAwait,CommaExpressionJS
-                return url !== VERSION_PATH && list.match(url) ? (cache.delete(it), url) : null
+                return url !== CTRL_PATH && list.match(url) ? (cache.delete(it), url) : null
             })
         )).then(list => list.filter(it => it))
     )
@@ -29,7 +29,8 @@
     self.addEventListener('fetch', event => {
         let request = event.request
         if (request.method !== 'GET') return
-        const newRequest = modifyRequest(request) || request
+        const modify = modifyRequest(request)
+        const newRequest = modify ?? request
         const url = new URL(newRequest.url)
         if (findCache(url)) {
             const key = `${url.protocol}//${url.host}${url.pathname}`
@@ -45,7 +46,7 @@
         } else {
             const spare = getSpareUrls(newRequest.url)
             if (spare) event.respondWith(fetchFile(newRequest, false, spare))
-            else if (newRequest !== request) event.respondWith(fetch(newRequest))
+            else if (modify) event.respondWith(fetch(newRequest))
         }
     })
 
@@ -94,17 +95,17 @@
         }
         /** 解析字符串 */
         const parseJson = json => {
-            /** 版本号读写操作 */
+            /** 控制信息读写操作 */
             const dbVersion = {
                 write: (id) => caches.open(CACHE_NAME)
-                    .then(cache => cache.put(VERSION_PATH, new Response(JSON.stringify(id)))),
-                read: () => caches.match(VERSION_PATH).then(response => response?.json())
+                    .then(cache => cache.put(CTRL_PATH, new Response(JSON.stringify(id)))),
+                read: () => caches.match(CTRL_PATH).then(response => response?.json())
             }
             let list = new VersionList()
             return dbVersion.read().then(oldVersion => {
                 const {info, global} = json
                 const escape = '@$$[escape]'
-                const newVersion = {global: global, local: info[0].version, escape: escape}
+                const newVersion = {global, local: info[0].version, escape}
                 //新用户不进行更新操作
                 if (!oldVersion) {
                     dbVersion.write(newVersion)