hexo-swpp 2.3.0-beta.2 → 2.3.1

package/lib/jsonBuilder.js

@@ -13,7 +13,9 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
     const root = config.url + (config.root ?? '/')
     const domain = new URL(root).hostname
 
+    // noinspection JSUnresolvedVariable
     hexo.extend.console.register('swpp', '生成前端更新需要的 json 文件以及相关缓存', {}, async () => {
+        // noinspection JSUnresolvedVariable
         if (!fs.existsSync(config.public_dir))
             return logger.info('未检测到发布目录，跳过 swpp 执行')
         const cachePath = 'cacheList.json'
@@ -38,6 +40,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
 
     /** 判断指定文件是否需要排除 */
     const isExclude = pathname => {
+        // noinspection JSUnresolvedVariable
         for (let reg of pluginConfig.json.exclude) {
             if (pathname.match(new RegExp(reg, 'i'))) return true
         }
@@ -63,10 +66,13 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
      */
     const buildNewJson = path => new Promise(resolve => {
         const result = {}                   // 存储新的 MD5 表
+        // noinspection JSUnresolvedVariable
         const removeIndex = config.pretty_urls?.trailing_index
+        // noinspection JSUnresolvedVariable
         const removeHtml = config.pretty_urls?.trailing_html
         const taskList = []                 // 拉取任务列表
         const cache = new Set()             // 已经计算过的文件
+        // noinspection JSUnresolvedVariable
         eachAllFile(config.public_dir, path => {
             if (!fs.existsSync(path)) return logger.error(`${path} 不存在！`)
             let endIndex
@@ -118,10 +124,12 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             }
             // 处理指定 JS
             const handleJsContent = text => {
+                // noinspection JSUnresolvedVariable
                 if (!external.js) return
                 if (cache.has(text)) return
                 cache.add(text)
                 external.js.forEach(it => {
+                    // noinspection JSUnresolvedVariable
                     const reg = new RegExp(`${it.head}(['"\`])(.*?)\\1${it.tail}`, 'mg')
                     text.match(reg)?.forEach(content => {
                         try {
@@ -173,6 +181,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             }
         })
         Promise.all(taskList).then(() => {
+            // noinspection JSUnresolvedVariable
             const publicRoot = config.public_dir
             fs.writeFileSync(nodePath.join(publicRoot, path), JSON.stringify(result), 'utf-8')
             logger.info(`Generated: ${path}`)
@@ -240,15 +249,17 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
 
     /** 判断指定资源是否需要合并 */
     const isMerge = (pathname, tidied) => {
+        // noinspection JSUnresolvedVariable
         const optional = pluginConfig.json.merge
+        const {tag_dir, archive_dir, category_dir} = config
         if (!optional) return false
-        if (pathname.includes(`/${config.tag_dir}/`)) {
+        if (pathname.includes(`/${tag_dir}/`)) {
             if (optional.tags ?? true)
                 return tidied.tags = true
-        } else if (pathname.includes(`/${config.archive_dir}/`)) {
+        } else if (pathname.includes(`/${archive_dir}/`)) {
             if (optional.archives ?? true)
                 return tidied.archives = true
-        } else if (pathname.includes(`/${config.category_dir}/`)) {
+        } else if (pathname.includes(`/${category_dir}/`)) {
             if (optional.categories ?? true)
                 return tidied.categories = true
         } else if (pathname.startsWith('/page/') || pathname.length <= 1) {
@@ -325,6 +336,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             global: (oldUpdate?.global ?? 0) + (tidied.updateGlobal ? 1 : 0),
             info: [newInfo]
         }
+        // noinspection JSUnresolvedVariable
         const charLimit = pluginConfig.json.charLimit ?? 1024
         if (JSON.stringify(result).length > charLimit) {
             return {
@@ -379,15 +391,17 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
     const pushUpdateToInfo = (info, tidied) => {
         const merges = []       // 要合并的更新
         // 推送页面更新
+        // noinspection JSUnresolvedVariable
         if (tidied.page.size > (pluginConfig.json.maxHtml ?? 15)) {
             // 如果 html 数量超过阈值就直接清掉所有 html
             info.change.push({flag: 'html'})
         } else {
             const pages = []        // 独立更新
             tidied.page.forEach(it => pages.push(it))
-            if (tidied.tags) merges.push(config.tag_dir)
-            if (tidied.archives) merges.push(config.archive_dir)
-            if (tidied.categories) merges.push(config.category_dir)
+            const {tag_dir, archive_dir, category_dir} = config
+            if (tidied.tags) merges.push(tag_dir)
+            if (tidied.archives) merges.push(archive_dir)
+            if (tidied.categories) merges.push(category_dir)
             if (tidied.index) {
                 pages.push(clipPageName(root, false))
                 merges.push('page')
@@ -426,6 +440,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             /** 标记是否更新 global 版本号 */
             updateGlobal: expand?.global
         }
+        // noinspection JSUnresolvedVariable
         const mode = pluginConfig.json.precisionMode
         for (let it of dif) {
             const url = new URL(nodePath.join(root, it))  // 当前文件的 URL
@@ -475,6 +490,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         for (let value of external.replace) {
             for (let source of value.source) {
                 if (url.match(source)) {
+                    // noinspection JSUnresolvedVariable
                     url = url.replace(source, value.dist)
                 }
             }

package/lib/sw-template.js

@@ -129,14 +129,17 @@
             })
         }
         return fetchFile(new Request('/update.json'), false)
-            .then(response => response.json())
-            .then(json =>
-                parseJson(json).then(result =>
-                    result.list ? deleteCache(result.list).then(list => {
-                        return {list, version: result.version}
-                    }) : {version: result}
-                )
-            )
+            .then(response => {
+                if (checkResponse(response))
+                    return response.json().then(json =>
+                        parseJson(json).then(result =>
+                            result.list ? deleteCache(result.list).then(list => {
+                                return {list, version: result.version}
+                            }) : {version: result}
+                        )
+                    )
+                else throw `加载 update.json 时遇到异常，状态码：${response.status}`
+            })
     }
 
     /**

package/lib/swBuilder.js

@@ -11,7 +11,9 @@ module.exports = (hexo, config, pluginConfig, rules) => {
 
     const root = config.url + (config.root ?? '/')
 
+    // noinspection JSUnresolvedVariable
     hexo.extend.generator.register('buildSw', () => {
+        // noinspection JSUnresolvedVariable
         if (pluginConfig.sw.custom) return
         const absPath = module.path + '/sw-template.js'
         const rootPath = nodePath.resolve('./')
@@ -20,6 +22,7 @@ module.exports = (hexo, config, pluginConfig, rules) => {
         let cache = fs.readFileSync('sw-rules.js', 'utf8')
             .replaceAll('module.exports.', 'const ')
         if (!fetchNoCache) {
+            // noinspection JSUnresolvedVariable
             if (pluginConfig.sw.cdnRacing && getCdnList) {
                 cache +=`
                     const fetchFile = (request, banCache) => {
@@ -45,57 +48,60 @@ module.exports = (hexo, config, pluginConfig, rules) => {
                         })
                     }
                 `
-            } else if (pluginConfig.sw.spareUrl && getSpareUrls) {
-                cache += `
-                    const fetchFile = (request, banCache, spare = null) => {
-                        const fetchArgs = {
-                            cache: banCache ? 'no-store' : 'default',
-                            mode: 'cors',
-                            credentials: 'same-origin'
-                        }
-                        if (!spare) spare = getSpareUrls(request.url)
-                        if (!spare) return fetch(request, fetchArgs)
-                        const list = spare.list
-                        const controllers = []
-                        let error = 0
-                        return new Promise((resolve, reject) => {
-                            const pull = () => {
-                                const flag = controllers.length
-                                if (flag === list.length) return
-                                const plusError = () => {
-                                    if (++error === list.length) reject(\`请求 \${request.url} 失败\`)
-                                    else if (flag + 1 === controllers.length) {
-                                        clearTimeout(controllers[flag].id)
-                                        pull()
+            } else { // noinspection JSUnresolvedVariable
+                if (pluginConfig.sw.spareUrl && getSpareUrls) {
+                    cache += `
+                        const fetchFile = (request, banCache, spare = null) => {
+                            const fetchArgs = {
+                                cache: banCache ? 'no-store' : 'default',
+                                mode: 'cors',
+                                credentials: 'same-origin'
+                            }
+                            if (!spare) spare = getSpareUrls(request.url)
+                            if (!spare) return fetch(request, fetchArgs)
+                            const list = spare.list
+                            const controllers = []
+                            let error = 0
+                            return new Promise((resolve, reject) => {
+                                const pull = () => {
+                                    const flag = controllers.length
+                                    if (flag === list.length) return
+                                    const plusError = () => {
+                                        if (++error === list.length) reject(\`请求 \${request.url} 失败\`)
+                                        else if (flag + 1 === controllers.length) {
+                                            clearTimeout(controllers[flag].id)
+                                            pull()
+                                        }
                                     }
+                                    controllers.push({
+                                        ctrl: new AbortController(),
+                                        id: setTimeout(pull, spare.timeout)
+                                    })
+                                    fetch(new Request(list[flag], request), fetchArgs).then(response => {
+                                        if (checkResponse(response)) {
+                                            for (let i in controllers) {
+                                                if (i !== flag) controllers[i].ctrl.abort()
+                                            }
+                                            clearTimeout(controllers[controllers.length - 1].id)
+                                            resolve(response)
+                                        } else plusError()
+                                    }).catch(plusError)
                                 }
-                                controllers.push({
-                                    ctrl: new AbortController(),
-                                    id: setTimeout(pull, spare.timeout)
-                                })
-                                fetch(new Request(list[flag], request), fetchArgs).then(response => {
-                                    if (checkResponse(response)) {
-                                        for (let i in controllers) {
-                                            if (i !== flag) controllers[i].ctrl.abort()
-                                        }
-                                        clearTimeout(controllers[controllers.length - 1].id)
-                                        resolve(response)
-                                    } else plusError()
-                                }).catch(plusError)
-                            }
-                            pull()
+                                pull()
+                            })
+                        }
+                    `
+                } else cache += `
+                        const fetchFile = (request, banCache) => fetch(request, {
+                            cache: banCache ? "no-store" : "default",
+                            mode: 'cors',
+                            credentials: 'same-origin'
                         })
-                    }
-                `
-            } else cache += `
-                const fetchFile = (request, banCache) => fetch(request, {
-                    cache: banCache ? "no-store" : "default",
-                    mode: 'cors',
-                    credentials: 'same-origin'
-                })
-            `
+                    `
+            }
         }
         if (!getSpareUrls) cache += `\nconst getSpareUrls = _ => {}`
+        // noinspection JSUnresolvedVariable
         let swContent = fs.readFileSync(relativePath, 'utf8')
             .replaceAll("const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')", cache)
             .replaceAll("'@$$[escape]'", (pluginConfig.sw.escape ?? 0).toString())
@@ -110,7 +116,8 @@ module.exports = (hexo, config, pluginConfig, rules) => {
         }
         if (blockRequest) {
             swContent = swContent.replace('// [blockRequest call]', `
-                if (blockRequest(url)) return
+                if (blockRequest(url))
+                    return event.respondWith(new Response(null, {status: 208}))
             `)
         }
         return {
@@ -120,24 +127,24 @@ module.exports = (hexo, config, pluginConfig, rules) => {
     })
 
     // 生成注册 sw 的代码
-    hexo.extend.injector.register('head_begin', () => {
-        return `<script>
-              (() => {
-                const sw = navigator.serviceWorker
-                const error = () => ${pluginConfig.sw.onerror}
-                if (!sw?.register('${new URL(root).pathname}sw.js')?.then(() => {
-                  if (!sw.controller) ${pluginConfig.sw.onsuccess}
-                })?.catch(error)) error()
-              })()
-          </script>`
-    }, "default")
+    // noinspection JSUnresolvedVariable
+    hexo.extend.injector.register('head_begin', () =>
+            `<script>
+                (() => {
+                    const sw = navigator.serviceWorker
+                    const error = () => ${pluginConfig.sw.onerror}
+                    if (!sw?.register('${new URL(root).pathname}sw.js')?.then(() => {
+                        if (!sw.controller) ${pluginConfig.sw.onsuccess}
+                    })?.catch(error)) error()
+                })()
+            </script>`,
+        "default")
 
     // 插入 sw-dom.js
     if (!pluginConfig.dom?.custom) {
-        hexo.extend.injector.register('body_begin', () => {
-            // noinspection HtmlUnknownTarget
-            return `<script src="/sw-dom.js"></script>`
-        })
+        // noinspection JSUnresolvedVariable,HtmlUnknownTarget
+        hexo.extend.injector.register('body_begin', () => `<script src="/sw-dom.js"></script>`)
+        // noinspection JSUnresolvedVariable
         hexo.extend.generator.register('buildDomJs', () => {
             const absPath = module.path + '/sw-dom.js'
             const rootPath = nodePath.resolve('./')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.3.0-beta.2",
+  "version": "2.3.1",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",