hexo-swpp 2.5.2 → 2.6.0-beta.0

package/index.js

@@ -6,13 +6,41 @@ const config = hexo.config
 const pluginConfig = config.swpp || hexo.theme.config
 
 if (pluginConfig?.enable) {
-    const nodePath = require('path')
-    const rules = require(nodePath.resolve('./', 'sw-rules'))
-
+    const rules = loadRules()
     // 排序
     require('./lib/sort.js')(pluginConfig)
     // 生成 update.json
     require('./lib/jsonBuilder.js')(hexo, config, pluginConfig, rules)
     // 生成 sw.js
     require('./lib/swBuilder.js')(hexo, config, pluginConfig, rules)
+}
+
+// 加载 sw-rules.js 文件
+function loadRules() {
+    const logger = require('hexo-log')()
+    const nodePath = require('path')
+    const fs = require('fs')
+    const themeName = hexo.config.theme
+    // 根目录下的文件
+    const root = nodePath.resolve('./', 'sw-rules')
+    // themes 文件夹下的文件
+    const themes = nodePath.resolve('./themes/', themeName)
+    // node_modules 文件下的文件
+    const modules = nodePath.resolve('./node_modules/', `hexo-theme-${themeName}`)
+    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(tip)
+        throw tip
+    }
+    let result = {}
+    if (exists.themes)
+        result = require(themes)
+    else if (exists.modules)
+        result = require(modules)
+    return exists.root ? { ...result, ...require(root) } : result
 }

package/lib/sw-template.js

@@ -27,12 +27,16 @@
         })
     })
 
+    // sw 激活后立即对所有页面生效，而非等待刷新
+    // noinspection JSUnresolvedReference
+    self.addEventListener('activate', event => event.waitUntil(clients.claim()))
+
     // noinspection JSFileReferences
     const { cacheList, fetchFile, getSpareUrls } = require('../sw-rules')
 
     // 检查请求是否成功
     // noinspection JSUnusedLocalSymbols
-    const checkResponse = response => response.ok || [301, 302, 307].includes(response.status)
+    const checkResponse = response => response.ok || [301, 302, 307, 308].includes(response.status)
 
     /**
      * 删除指定缓存
@@ -56,7 +60,7 @@
 
     self.addEventListener('fetch', event => {
         let request = event.request
-        if (request.method !== 'GET') return
+        if (request.method !== 'GET' || request.url.startsWith('http')) return
         // [modifyRequest call]
         const url = new URL(request.url)
         // [blockRequest call]
@@ -64,7 +68,7 @@
             const key = `${url.protocol}//${url.host}${url.pathname}`
             event.respondWith(caches.match(key).then(cache =>
                 cache ? cache : fetchFile(request, true).then(response => {
-                    if (response.status === 200) {
+                    if (checkResponse(response)) {
                         const clone = response.clone()
                         caches.open(CACHE_NAME).then(it => it.put(key, clone))
                         // [debug put]

package/lib/swBuilder.js

@@ -19,8 +19,10 @@ module.exports = (hexo, config, pluginConfig, rules) => {
         const rootPath = nodePath.resolve('./')
         const relativePath = nodePath.relative(rootPath, absPath)
         // 获取拓展文件
-        let cache = fs.readFileSync('sw-rules.js', 'utf8')
-            .replaceAll('module.exports.', 'const ')
+        let cache = JSON.stringify(
+            rules,
+            (_, value) => typeof value === 'function' ? value.toString() : value
+        )
         if (!fetchNoCache) {
             // noinspection JSUnresolvedVariable
             if (pluginConfig.sw.cdnRacing && getCdnList) {
@@ -141,16 +143,15 @@ module.exports = (hexo, config, pluginConfig, rules) => {
     // 生成注册 sw 的代码
     // noinspection JSUnresolvedVariable
     hexo.extend.injector.register('head_begin', () =>
-            `<script>
-                (() => {
-                    const sw = navigator.serviceWorker
-                    const error = () => ${pluginConfig.sw.onerror}
-                    if (!sw?.register('${new URL(root).pathname}sw.js')?.then(() => {
-                        if (!sw.controller) ${pluginConfig.sw.onsuccess}
-                    })?.catch(error)) error()
-                })()
-            </script>`,
-        "default")
+        pluginConfig.sw?.register ?? `<script>
+            (() => {
+                const sw = navigator.serviceWorker
+                const error = () => ${pluginConfig.sw.onerror}
+                if (!sw?.register('${new URL(root).pathname}sw.js')
+                ${pluginConfig.sw?.onsuccess ? '?.then(() => ' + pluginConfig.sw.onsuccess + ')' : ''}
+                ?.catch(error)) error()
+            })()
+        </script>`, "default")
 
     // 插入 sw-dom.js
     if (!pluginConfig.dom?.custom) {

package/package.json

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