hexo-swpp 2.7.0-beta.1 → 2.7.0-beta.2

package/index.js

@@ -4,51 +4,15 @@
 
 const config = hexo.config
 const enable = (config.swpp ?? hexo.theme.config.swpp)?.enable
-const logger = require('hexo-log')()
+
 
 if (enable) {
-    const rules = loadRules()
-    const defConfig = require('./lib/defConfig')
-    if (!rules.config) {
-        logger.error("未在 sw-rules.js 中查找到插件配置！")
-        throw '插件配置缺失'
-    }
+    const configLoader = require('./lib/configLoader')
+    const rules = configLoader.load(hexo)
     // 排序
-    require('./lib/sort.js')(defConfig, rules.config)
+    require('./lib/sort.js')(rules.config)
     // 生成 update.json
-    require('./lib/jsonBuilder.js')(hexo, config, defConfig, rules)
+    require('./lib/jsonBuilder.js')(hexo, config, rules)
     // 生成 sw.js
-    require('./lib/swBuilder.js')(hexo, config, defConfig, rules)
-}
-
-// 加载 sw-rules.js 文件
-function loadRules() {
-    const nodePath = require('path')
-    const fs = require('fs')
-    const themeName = hexo.config.theme
-    // 根目录下的文件
-    const root = nodePath.resolve('./', 'sw-rules.js')
-    // themes 文件夹下的文件
-    const themes = nodePath.resolve('./themes/', themeName, 'sw-rules.js')
-    // node_modules 文件下的文件
-    const modules = nodePath.resolve('./node_modules/', `hexo-theme-${themeName}/sw-rules.js`)
-    const exists = {
-        root: fs.existsSync(root),
-        themes: fs.existsSync(themes),
-        modules: fs.existsSync(modules)
-    }
-    if (!(exists.root || exists.themes || exists.modules)) {
-        const tip = "未找到 sw-rules.js 文件"
-        logger.error(`[sw-rules]: ${tip}`)
-        throw tip
-    }
-    let result = {}
-    if (exists.themes)
-        result = require(themes)
-    else if (exists.modules) {
-        result = require(modules)
-    }
-    if ('afterTheme' in result)
-        logger.error("[sw-rules]: 主题目录下的 sw-rules.js 中不应当包含 afterTheme 函数！")
-    return exists.root ? { ...result, ...require(root) } : result
+    require('./lib/swBuilder.js')(hexo, config, rules)
 }

package/lib/{defConfig.js → configLoader.js}

@@ -1,5 +1,45 @@
+// 配置加载器
+
+const logger = require('hexo-log')()
+
+// 加载 sw-rules.js
+module.exports.load = hexo => {
+    const rules = loadRules(hexo)
+    const handle = (obj, def, list) => {
+        for (let key in def) {
+            const defValue = def[key]
+            const value = obj[key]
+            switch (typeof value) {
+                case 'undefined':
+                    obj[key] = defValue
+                    break
+                case 'object':
+                    const defA = Array.isArray(defValue)
+                    const objA = Array.isArray(value)
+                    if (defA !== objA) {
+                        logger.error(`[ConfigLoader] ${list.join('.')} 值与标准值类型不相同！已经使用默认配置项替代。`)
+                        obj[key] = defValue
+                        break
+                    }
+                    if (!defA) {
+                        list.append(key)
+                        handle(value, defValue, list)
+                        list.pop()
+                    }
+                    break
+            }
+        }
+    }
+    if (!('config' in rules)) {
+        logger.error("[ConfigLoader] 未在 sw-rules.js 中查询到配置项！")
+        throw '配置项缺失！'
+    }
+    handle(rules.config, defConfig, [])
+    return rules
+}
+
 // 存储缺省配置
-module.exports = {
+const defConfig = {
     // sw 有关配置项
     serviceWorker: {
         /**
@@ -169,4 +209,37 @@ module.exports = {
      * 排序规则为优先按照字符串长度排序，若长度一致按照字典序排序
      */
     sort: {}
+}
+
+// 加载 sw-rules.js 文件
+const loadRules = hexo => {
+    const nodePath = require('path')
+    const fs = require('fs')
+    // noinspection JSUnresolvedReference
+    const themeName = hexo.config.theme
+    // 根目录下的文件
+    const root = nodePath.resolve('./', 'sw-rules.js')
+    // themes 文件夹下的文件
+    const themes = nodePath.resolve('./themes/', themeName, 'sw-rules.js')
+    // node_modules 文件下的文件
+    const modules = nodePath.resolve('./node_modules/', `hexo-theme-${themeName}/sw-rules.js`)
+    const exists = {
+        root: fs.existsSync(root),
+        themes: fs.existsSync(themes),
+        modules: fs.existsSync(modules)
+    }
+    if (!(exists.root || exists.themes || exists.modules)) {
+        const tip = "未找到 sw-rules.js 文件"
+        logger.error(`[sw-rules]: ${tip}`)
+        throw tip
+    }
+    let result = {}
+    if (exists.themes)
+        result = require(themes)
+    else if (exists.modules) {
+        result = require(modules)
+    }
+    if ('afterTheme' in result)
+        logger.error("[sw-rules]: 主题目录下的 sw-rules.js 中不应当包含 afterTheme 函数！")
+    return exists.root ? { ...result, ...require(root) } : result
 }

package/lib/jsonBuilder.js

@@ -1,4 +1,4 @@
-module.exports = (hexo, hexoConfig, defConfig, swRules) => {
+module.exports = (hexo, hexoConfig, swRules) => {
     const logger = require('hexo-log')()
     const fs = require('fs')
     const fetch = require('node-fetch')
@@ -47,7 +47,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
     /** 判断指定文件是否需要排除 */
     const isExclude = pathname => {
         // noinspection JSUnresolvedVariable
-        const exclude = config.json?.exclude ?? defConfig.json.exclude
+        const exclude = config.json?.exclude
         for (let reg of exclude) {
             if (pathname.match(reg)) return true
         }
@@ -56,7 +56,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
 
     /** 判断是否跳过网络拉取 */
     const isSkipFetch = url => {
-        const skipList = config.external?.skip ?? defConfig.external.skip
+        const skipList = config.external.skip
         for (let reg of skipList) {
             if (url.match(reg)) return true
         }
@@ -96,7 +96,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
                 result[key] = crypto.createHash('md5').update(content).digest('hex')
             }
             // 外链监控
-            const external = config.external ?? defConfig.external
+            const external = config.external
             if (!external.enable) return
             const indexOf = (str, ...chars) => {
                 let result = str.length
@@ -221,7 +221,7 @@ module.exports = (hexo, hexoConfig, defConfig, 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: config.external?.timeout ?? defConfig.external.timeout
+            timeout: config.external.timeout
         }).then(response => {
             switch (response.status) {
                 case 200: case 301: case 302: case 307: case 308:
@@ -356,7 +356,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
             info: [newInfo]
         }
         // noinspection JSUnresolvedVariable
-        const charLimit = config.json?.charLimit ?? defConfig.json.charLimit
+        const charLimit = config.json.charLimit
         if (JSON.stringify(result).length > charLimit) {
             return {
                 global: result.global,
@@ -411,7 +411,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
         const merges = []       // 要合并的更新
         // 推送页面更新
         // noinspection JSUnresolvedVariable
-        if (tidied.page.size > (config.json?.maxHtml ?? defConfig.json.maxHtml)) {
+        if (tidied.page.size > (config.json.maxHtml)) {
             // 如果 html 数量超过阈值就直接清掉所有 html
             info.change.push({flag: 'html'})
         } else {
@@ -466,7 +466,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
             return tidied
         }
         // noinspection JSUnresolvedVariable
-        const mode = config.json?.precisionMode ?? defConfig.json.precisionMode
+        const mode = config.json.precisionMode
         for (let it of dif) {
             const url = new URL(it.match(/^(https?|\/\/)/) ? it : nodePath.join(root, it))  // 当前文件的 URL
             const cache = findCache(url)    // 查询缓存
@@ -510,7 +510,7 @@ module.exports = (hexo, hexoConfig, defConfig, swRules) => {
     }
 
     function replaceDevRequest(url) {
-        const external = config.external ?? defConfig.external
+        const external = config.external
         if (!external.enable || !external.replace) return url
         for (let value of external.replace) {
             for (let source of value.source) {

package/lib/sort.js

@@ -1,7 +1,7 @@
 const nodePath = require("path")
 
 /** 对 Hexo 内的属性进行排序 */
-module.exports = (defConfig, config) => {
+module.exports = config => {
     const compare = (a, b) => {
         const result = a.length === b.length ? a < b : a.length < b.length
         return result ? -1 : 1
@@ -19,7 +19,7 @@ module.exports = (defConfig, config) => {
         tags: 'name',
         categories: 'name'
     }
-    Object.assign(list, config.sort ?? defConfig.sort)
+    Object.assign(list, config.sort)
     const Locals = require(`${nodePath.resolve('./', 'node_modules/hexo/lib/hexo/locals')}`).prototype
     const get = Locals.get
     Locals.get = function(name) {

package/lib/swBuilder.js

@@ -1,4 +1,4 @@
-module.exports = (hexo, hexoConfig, defConfig, rules) => {
+module.exports = (hexo, hexoConfig, rules) => {
     const {
         modifyRequest,
         fetchNoCache,
@@ -12,7 +12,7 @@ module.exports = (hexo, hexoConfig, defConfig, rules) => {
     const logger = require('hexo-log')()
 
     const root = hexoConfig.url + (hexoConfig.root ?? '/')
-    const serviceWorkerConfig = config.serviceWorker ?? defConfig.serviceWorker
+    const serviceWorkerConfig = config.serviceWorker
 
     // noinspection JSUnresolvedVariable
     hexo.extend.generator.register('buildSw', () => {
@@ -141,8 +141,8 @@ module.exports = (hexo, hexoConfig, defConfig, rules) => {
         // noinspection JSUnresolvedVariable
         let swContent = fs.readFileSync(relativePath, 'utf8')
             .replaceAll(keyword, cache)
-            .replaceAll("'@$$[escape]'", (serviceWorkerConfig.escape ?? 0).toString())
-            .replaceAll("'@$$[cacheName]'", `'${serviceWorkerConfig.cacheName ?? 'kmarBlogCache'}'`)
+            .replaceAll("'@$$[escape]'", (serviceWorkerConfig.escape).toString())
+            .replaceAll("'@$$[cacheName]'", `'${serviceWorkerConfig.cacheName}'`)
         if (modifyRequest) {
             swContent = swContent.replaceAll('// [modifyRequest call]', `
                 const modify = modifyRequest(request)
@@ -176,14 +176,14 @@ module.exports = (hexo, hexoConfig, defConfig, rules) => {
     })
 
     // 生成注册 sw 的代码
-    const registerConfig = config.register ?? defConfig.register
+    const registerConfig = config.register
     if (registerConfig.enable) {
         // noinspection JSUnresolvedVariable
         hexo.extend.injector.register('head_begin', () => registerConfig.builder(root, hexoConfig, config), "default")
     }
 
     // 插入 sw-dom.js
-    const domConfig = config.dom ?? defConfig.dom
+    const domConfig = config.dom
     if (domConfig.enable) {
         // noinspection JSUnresolvedVariable,HtmlUnknownTarget
         hexo.extend.injector.register('body_begin', () => `<script src="/sw-dom.js"></script>`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.7.0-beta.1",
+  "version": "2.7.0-beta.2",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",
@@ -15,7 +15,7 @@
     "lib/swBuilder.js",
     "lib/jsonBuilder.js",
     "lib/sort.js",
-    "lib/defConfig.js"
+    "lib/configLoader.js"
   ],
   "keywords": [
     "hexo",