hexo-swpp 2.6.0-beta.0 → 2.6.0-beta.2

package/index.js

@@ -22,11 +22,11 @@ function loadRules() {
     const fs = require('fs')
     const themeName = hexo.config.theme
     // 根目录下的文件
-    const root = nodePath.resolve('./', 'sw-rules')
+    const root = nodePath.resolve('./', 'sw-rules.js')
     // themes 文件夹下的文件
-    const themes = nodePath.resolve('./themes/', themeName)
+    const themes = nodePath.resolve('./themes/', themeName, 'sw-rules.js')
     // node_modules 文件下的文件
-    const modules = nodePath.resolve('./node_modules/', `hexo-theme-${themeName}`)
+    const modules = nodePath.resolve('./node_modules/', `hexo-theme-${themeName}/sw-rules.js`)
     const exists = {
         root: fs.existsSync(root),
         themes: fs.existsSync(themes),
@@ -34,13 +34,16 @@ function loadRules() {
     }
     if (!(exists.root || exists.themes || exists.modules)) {
         const tip = "未找到 sw-rules.js 文件"
-        logger.error(tip)
+        logger.error(`[sw-rules]: ${tip}`)
         throw tip
     }
     let result = {}
     if (exists.themes)
         result = require(themes)
-    else if (exists.modules)
+    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/sw-template.js

@@ -32,7 +32,7 @@
     self.addEventListener('activate', event => event.waitUntil(clients.claim()))
 
     // noinspection JSFileReferences
-    const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')
+    const { cacheList, fetchFile, getSpareUrls, afterJoin, afterTheme } = require('../sw-rules')
 
     // 检查请求是否成功
     // noinspection JSUnusedLocalSymbols

package/lib/swBuilder.js

@@ -8,6 +8,7 @@ module.exports = (hexo, config, pluginConfig, rules) => {
     } = rules
     const nodePath = require('path')
     const fs = require('fs')
+    const logger = require('hexo-log')()
 
     const root = config.url + (config.root ?? '/')
 
@@ -18,11 +19,37 @@ module.exports = (hexo, config, pluginConfig, rules) => {
         const absPath = module.path + '/sw-template.js'
         const rootPath = nodePath.resolve('./')
         const relativePath = nodePath.relative(rootPath, absPath)
+        /**
+         * 获取任意对象（symbol 类型除外）的源码
+         * @param any {any} 对象
+         * @param whiteList {string[]?} 白名单
+         * @return {string}
+         */
+        function getSource(any, whiteList = null) {
+            switch (typeof any) {
+                case 'undefined': return 'undefined\n'
+                case 'object': {
+                    let result = ''
+                    for (let key in any) {
+                        if (whiteList && !whiteList.includes(key)) continue
+                        const value = any[key]
+                        result += `const ${key} = ${getSource(value)}\n`
+                    }
+                    return result + '\n'
+                }
+                case 'string': return `'${any}'\n`
+                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 = JSON.stringify(
-            rules,
-            (_, value) => typeof value === 'function' ? value.toString() : value
-        )
+        let cache = getSource(rules, [
+            'cacheList', 'modifyRequest', 'getCdnList', 'getSpareUrls', 'blockRequest',
+            ...('external' in rules && Array.isArray(rules.external) ? rules.external : [])
+        ])
         if (!fetchNoCache) {
             // noinspection JSUnresolvedVariable
             if (pluginConfig.sw.cdnRacing && getCdnList) {
@@ -103,9 +130,14 @@ module.exports = (hexo, config, pluginConfig, rules) => {
             }
         }
         if (!getSpareUrls) cache += `\nconst getSpareUrls = _ => {}`
+        if ('afterJoin' in rules)
+            cache += `(() => {${getSource(rules.afterJoin)}})()\n`
+        if ('afterTheme' in rules)
+            cache += `(() => {${getSource(rules.afterTheme)}}()\n`
+        const keyword = "const { cacheList, fetchFile, getSpareUrls, afterJoin, afterTheme } = require('../sw-rules')"
         // noinspection JSUnresolvedVariable
         let swContent = fs.readFileSync(relativePath, 'utf8')
-            .replaceAll("const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')", cache)
+            .replaceAll(keyword, cache)
             .replaceAll("'@$$[escape]'", (pluginConfig.sw.escape ?? 0).toString())
             .replaceAll("'@$$[cacheName]'", `'${pluginConfig.sw.cacheName ?? 'kmarBlogCache'}'`)
         if (modifyRequest) {

package/package.json

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