hexo-swpp 2.3.2 → 2.3.4

package/lib/jsonBuilder.js

@@ -185,7 +185,14 @@ 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')
+            fs.writeFileSync(
+                nodePath.join(publicRoot, path),
+                JSON.stringify({
+                    version: 1,
+                    list: result
+                }),
+                'utf-8'
+            )
             logger.info(`Generated: ${path}`)
             resolve(result)
         })
@@ -243,8 +250,11 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
     const compare = (oldCache, newCache) => {
         const result = []
         if (!oldCache) return result
+        const refresh = oldCache.version !== newCache.version
+        if (refresh) return false
+        if (oldCache.version) oldCache = oldCache.list
         for (let path in oldCache) {
-            if (newCache[path] !== oldCache[path]) result.push(path)
+            if (newCache.list[path] !== oldCache[path]) result.push(path)
         }
         return result
     }
@@ -316,14 +326,14 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         }
         // 整理更新的数据
         const tidied = tidyDiff(dif, expand)
-        if (expand?.all) return writeJson({
+        if (expand?.all || tidied.all) return writeJson({
             global: (oldUpdate?.global ?? 0) + (tidied.updateGlobal ? 1 : 0),
-            info: [newInfo]
+            info: [{version: newInfo.version}]
         })
         // 如果没有更新的文件就直接退出
         if (
             tidied.page.size === 0 && tidied.file.size === 0 &&
-            !(tidied.archives || tidied.categories || tidied.tags || tidied.index)
+            !(tidied.archives || tidied.categories || tidied.tags || tidied.index || Object.keys(tidied.custom).length !== 0)
         ) return writeJson(oldUpdate ?? {
             global: 0,
             info: [{version: 0}]
@@ -358,7 +368,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         return result
     }
 
-// 压缩相同项目
+    // 压缩相同项目
     const zipInfo = (newInfo, oldInfo) => {
         oldInfo = oldInfo.change
         newInfo = newInfo.change
@@ -389,7 +399,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         return result.length === 0 ? undefined : result
     }
 
-// 将更新推送到 info
+    // 将更新推送到 info
     const pushUpdateToInfo = (info, tidied) => {
         const merges = []       // 要合并的更新
         // 推送页面更新
@@ -422,7 +432,7 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
         }
     }
 
-// 将 diff 整理分类
+    // 将 diff 整理分类
     const tidyDiff = (dif, expand) => {
         const tidied = {
             /** 所有 HTML 页面 */
@@ -440,12 +450,18 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
             /** 自定义配置项 */
             custom: {},
             /** 标记是否更新 global 版本号 */
-            updateGlobal: expand?.global
+            updateGlobal: expand?.global,
+            /** 是否刷新全部缓存 */
+            all: false
+        }
+        if (!dif) {
+            tidied.all = tidied.updateGlobal = true
+            return tidied
         }
         // noinspection JSUnresolvedVariable
         const mode = pluginConfig.json?.precisionMode
         for (let it of dif) {
-            const url = new URL(nodePath.join(root, it))  // 当前文件的 URL
+            const url = new URL(it.match(/^(https?|\/\/)/) ? it : nodePath.join(root, it))  // 当前文件的 URL
             const cache = findCache(url)    // 查询缓存
             if (!cache) {
                 logger.error(`[buildUpdate] 指定 URL(${url.pathname}) 未查询到缓存规则！`)

package/lib/sw-template.js

@@ -69,7 +69,7 @@
 
     /** 判断指定url击中了哪一种缓存，都没有击中则返回null */
     function findCache(url) {
-        if (url.host === 'localhost') return
+        if (url.hostname === 'localhost') return
         for (let key in cacheList) {
             const value = cacheList[key]
             if (value.match(url)) return value

package/package.json

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