hexo-swpp 2.8.0 → 2.8.1

package/index.js

@@ -8,10 +8,92 @@ const enable = (config.swpp ?? hexo.theme.config.swpp)?.enable
 if (enable) {
     const configLoader = require('./lib/configLoader')
     const rules = configLoader.load(hexo)
+    const ejectValues = calcEjectValues(hexo, rules)
     // 排序
     require('./lib/sort.js')(rules.config)
     // 生成 update.json
-    require('./lib/jsonBuilder.js')(hexo, config, rules)
+    require('./lib/jsonBuilder.js')(hexo, config, rules, ejectValues.obj)
     // 生成 sw.js
-    require('./lib/swBuilder.js')(hexo, config, rules)
+    require('./lib/swBuilder.js')(hexo, config, rules, ejectValues.str)
+}
+
+/**
+ * 计算导出的键值表
+ * @param hexo
+ * @param rules
+ * @return {?{str: string, obj: *}}
+ */
+function calcEjectValues(hexo, rules) {
+    if (!('ejectValues' in rules)) return null
+    const obj = rules.ejectValues(hexo, rules)
+    const nodeObj = {}
+    let result = ''
+    for (let key in obj) {
+        if (!key.match(/^[A-Za-z0-9]+$/)) {
+            logger.error(`[SWPP EjectValues] 变量名 [${key}] 仅允许包含英文字母和阿拉伯数字！`)
+            throw "变量名异常：" + key
+        }
+        const data = obj[key]
+        const type = typeof data.value
+        nodeObj[key] = data.value
+        switch (type) {
+            case 'undefined': break
+            case 'boolean': case 'number': case 'string': case 'bigint':
+                result += `    ${data.prefix} eject${key[0].toUpperCase()}${key.substring(1)} = ${getSource(data.value)}`
+                break
+            default:
+                logger.error(`[SWPP EjectValues] 不支持导出 ${type} 类型的数据。`)
+                throw `不支持的键值：key=${key}, value type=${type}`
+        }
+    }
+    return {
+        obj: nodeObj, str: result
+    }
+}
+
+/**
+ * 获取任意对象（symbol 类型除外）的源码
+ * @param any {any} 对象
+ * @param separator {string} 分隔符
+ * @param whiteList {string[]?} 白名单
+ * @param mapper {?function(string):string} 输出转换函数
+ * @return {string}
+ */
+function getSource(any, separator = '\n', whiteList = null, mapper = null) {
+    let result
+    switch (typeof any) {
+        case 'undefined':
+            result = `undefined${separator}`
+            break
+        case 'object': {
+            result = whiteList ? '' : '{\n'
+            result += Object.getOwnPropertyNames(any)
+                .filter(key => !whiteList || whiteList.includes(key))
+                .map(key => {
+                    const value = any[key]
+                    let nextMapper = null
+                    if (whiteList && key === 'cacheList') {
+                        nextMapper = str => str.replace(/\(\s*(.*?)\s*,\s*\$eject\s*\)/g, "$1")
+                            .replaceAll(/\$eject\.(\w+)/g, (_, match) => `eject${match[0].toUpperCase()}${match.substring(1)}`)
+                    }
+                    return whiteList ? `const ${key} = ${getSource(value, '', null, nextMapper)}` : `${key}: ${getSource(value, '')}`
+                }).join(whiteList ? '\n' : ',\n')
+            result += (whiteList ? '' : '\n}') + separator
+            break
+        }
+        case 'string':
+            result = `'${any}'${separator}`
+            break
+        case 'bigint':
+            result = `${any.toString()}n${separator}`
+            break
+        default:
+            result = any.toString() + separator
+            break
+        case 'symbol':
+            logger.error("[SWPP ServiceWorkerBuilder] 不支持写入 symbol 类型，请从 sw-rules.js 中移除相关内容！")
+            throw '不支持写入 symbol 类型'
+    }
+    if (mapper) result = mapper(result)
+    return result
 }

package/lib/jsonBuilder.js

@@ -1,4 +1,4 @@
-module.exports = (hexo, hexoConfig, swRules) => {
+module.exports = (hexo, hexoConfig, swRules, ejectValues) => {
     const logger = require('hexo-log')()
     const fs = require('fs')
     const fetch = require('node-fetch')
@@ -271,7 +271,7 @@ module.exports = (hexo, hexoConfig, swRules) => {
         const result = []
         if (!oldCache) return result
         const refresh = oldCache.version !== newCache.version
-        if (refresh) return false
+        if (refresh) return undefined
         if (oldCache.version) oldCache = oldCache.list
         for (let path in oldCache) {
             if (newCache.list[path] !== oldCache[path]) result.push(path)
@@ -510,7 +510,7 @@ module.exports = (hexo, hexoConfig, swRules) => {
         url = new URL(replaceRequest(url.href))
         for (let key in cacheList) {
             const value = cacheList[key]
-            if (value.match(url)) return value
+            if (value.match(url, ejectValues)) return value
         }
         return null
     }

package/lib/swBuilder.js

@@ -1,6 +1,4 @@
-const logger = require('hexo-log')()
-
-module.exports = (hexo, hexoConfig, rules) => {
+module.exports = (hexo, hexoConfig, rules, ejectValues) => {
     const {
         modifyRequest,
         fetchNoCache,
@@ -113,7 +111,7 @@ module.exports = (hexo, hexoConfig, rules) => {
         const keyword = "const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')"
         // noinspection JSUnresolvedVariable
         let swContent = fs.readFileSync(relativePath, 'utf8')
-            .replaceAll("// [insertion site] values", calcEjectValues(hexo, rules) ?? '')
+            .replaceAll("// [insertion site] values", ejectValues ?? '')
             .replaceAll(keyword, cache)
             .replaceAll("'@$$[escape]'", (serviceWorkerConfig.escape).toString())
             .replaceAll("'@$$[cacheName]'", `'${serviceWorkerConfig.cacheName}'`)
@@ -174,61 +172,4 @@ module.exports = (hexo, hexoConfig, rules) => {
             }
         })
     }
-}
-
-/**
- * 计算导出的键值表
- * @return {?string}
- */
-function calcEjectValues(hexo, rules) {
-    if (!('ejectValues' in rules)) return null
-    const obj = rules.ejectValues(hexo, rules)
-    let result = ''
-    for (let key in obj) {
-        if (!key.startsWith('eject')) {
-            logger.error(`[SWPP EjectValues] 变量名 [${key}] 应当以“eject”开头！`)
-            throw `变量名 [${key}] 不符合规范`
-        }
-        const data = obj[key]
-        const type = typeof data.value
-        switch (type) {
-            case 'undefined': break
-            case 'boolean': case 'number': case 'string': case 'bigint':
-                result += `    ${data.prefix} ${key} = ${getSource(data.value)}`
-                break
-            default:
-                logger.error(`[SWPP EjectValues] 不支持导出 ${type} 类型的数据。`)
-                throw `不支持的键值：key=${key}, value type=${type}`
-        }
-    }
-    return result
-}
-
-/**
- * 获取任意对象（symbol 类型除外）的源码
- * @param any {any} 对象
- * @param separator {string} 分隔符
- * @param whiteList {string[]?} 白名单
- * @return {string}
- */
-function getSource(any, separator = '\n', whiteList = null) {
-    switch (typeof any) {
-        case 'undefined': return `undefined${separator}`
-        case 'object': {
-            let result = whiteList ? '' : '{\n'
-            result += Object.getOwnPropertyNames(any)
-                .filter(key => !whiteList || whiteList.includes(key))
-                .map(key => {
-                    const value = any[key]
-                    return whiteList ? `const ${key} = ${getSource(value, '')}` : `${key}: ${getSource(value, '')}`
-                }).join(whiteList ? '\n' : ',\n')
-            return result + (whiteList ? '' : '\n}') + separator
-        }
-        case 'string': return `'${any}'${separator}`
-        case 'bigint': return `${any.toString()}n${separator}`
-        default: return any.toString() + separator
-        case 'symbol':
-            logger.error("[SWPP ServiceWorkerBuilder] 不支持写入 symbol 类型，请从 sw-rules.js 中移除相关内容！")
-            throw '不支持写入 symbol 类型'
-    }
 }

package/package.json

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