hexo-swpp 2.3.0 → 2.3.2

package/lib/jsonBuilder.js

@@ -41,7 +41,9 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
     /** 判断指定文件是否需要排除 */
     const isExclude = pathname => {
         // noinspection JSUnresolvedVariable
-        for (let reg of pluginConfig.json.exclude) {
+        const exclude = pluginConfig.json?.exclude
+        if (!exclude) return false
+        for (let reg of exclude) {
             if (pathname.match(new RegExp(reg, 'i'))) return true
         }
         return false
@@ -202,7 +204,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
                 referer: new URL(link).hostname,
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.62'
             },
-            timeout: pluginConfig.external.timeout ?? 1500
+            timeout: pluginConfig.external?.timeout ?? 1500
         }).then(response => {
             switch (response.status) {
                 case 200: case 301: case 302:
@@ -250,9 +252,9 @@ 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
+        const optional = pluginConfig.json?.merge
         if (!optional) return false
+        const {tag_dir, archive_dir, category_dir} = config
         if (pathname.includes(`/${tag_dir}/`)) {
             if (optional.tags ?? true)
                 return tidied.tags = true
@@ -337,7 +339,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             info: [newInfo]
         }
         // noinspection JSUnresolvedVariable
-        const charLimit = pluginConfig.json.charLimit ?? 1024
+        const charLimit = pluginConfig.json?.charLimit ?? 1024
         if (JSON.stringify(result).length > charLimit) {
             return {
                 global: result.global,
@@ -392,7 +394,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         const merges = []       // 要合并的更新
         // 推送页面更新
         // noinspection JSUnresolvedVariable
-        if (tidied.page.size > (pluginConfig.json.maxHtml ?? 15)) {
+        if (tidied.page.size > (pluginConfig.json?.maxHtml ?? 15)) {
             // 如果 html 数量超过阈值就直接清掉所有 html
             info.change.push({flag: 'html'})
         } else {
@@ -441,7 +443,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             updateGlobal: expand?.global
         }
         // noinspection JSUnresolvedVariable
-        const mode = pluginConfig.json.precisionMode
+        const mode = pluginConfig.json?.precisionMode
         for (let it of dif) {
             const url = new URL(nodePath.join(root, it))  // 当前文件的 URL
             const cache = findCache(url)    // 查询缓存
@@ -452,11 +454,11 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             if (!cache.clean) tidied.updateGlobal = true
             if (isMerge(url.pathname, tidied)) continue
             if (it.match(/(\/|\.html)$/)) { // 判断缓存是否是 html
-                if (mode.html ?? false) tidied.page.add(url.pathname)
+                if (mode?.html ?? false) tidied.page.add(url.pathname)
                 else tidied.page.add(clipPageName(url.href, !it.endsWith('/')))
             } else {
                 const extendedName = (it.includes('.') ? it.match(/[^.]+$/)[0] : null) ?? 'default'
-                const setting = mode[extendedName] ?? (mode.default ?? false)
+                const setting = (mode && mode[extendedName]) ?? (mode?.default ?? false)
                 if (setting) tidied.file.add(url.pathname)
                 else {
                     let name = url.href.match(/[^/]+$/)[0]

package/lib/sw-template.js

@@ -138,7 +138,7 @@
                             }) : {version: result}
                         )
                     )
-                else console.error(`拉取 update.json 时出现 ${response.status} 异常`)
+                else throw `加载 update.json 时遇到异常，状态码：${response.status}`
             })
     }
 

package/package.json

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