hexo-swpp 1.7.1 → 2.0.0-beta.0

package/index.js

@@ -16,7 +16,7 @@ const config = hexo.config
 const pluginConfig = config.swpp || hexo.theme.config
 const root = config.url + (config.root ?? '/')
 const domain = new URL(root).hostname
-const { cacheList, replaceList } = pluginConfig?.enable ? require(findScript()) : undefined
+const { cacheList, modifyRequest, fetchNoCache, getUrlList } = pluginConfig?.enable ? require(findScript()) : undefined
 
 if (pluginConfig?.enable) {
     // 生成 update.json
@@ -38,9 +38,40 @@ if (pluginConfig?.enable) {
         const absPath = module.path + '/sw-template.js'
         const rootPath = nodePath.resolve('./')
         const relativePath = nodePath.relative(rootPath, absPath)
-        const cache = fs.readFileSync('sw-cache.js', 'utf8')
+        // 获取拓展文件
+        let cache = fs.readFileSync('sw-cache.js', 'utf8')
             .replaceAll('module.exports.cacheList', 'const cacheList')
             .replaceAll('module.exports.modifyRequest', 'const modifyRequest')
+        if (!fetchNoCache) {
+            if (pluginConfig.sw.cdnRacing && getUrlList) {
+                cache +=`
+                    const fetchNoCache = request => {
+                        // noinspection JSUnresolvedFunction
+                        const list = getUrlList(request.url)
+                        if (!list) return fetch(request, {cache: "no-store"})
+                        const res = list.map(url => {
+                            const cpy = request.clone()
+                            cpy.url = url
+                            return cpy
+                        })
+                        res.push(request)
+                        const controller = new AbortController()
+                        return Promise.any(res.map(
+                            it => fetch(it, {
+                                cache: "no-store",
+                                signal: controller.signal
+                            }).then(response => {
+                                if (response.status === 200 || response.status === 301 || response.status === 302) {
+                                    controller.abort()
+                                    return response
+                                }
+                                return Promise.reject()
+                            })
+                        ))
+                    }
+                `
+            } else cache += '\nconst fetchNoCache = request => fetch(request, {cache: "no-store"})'
+        }
         const swContent = fs.readFileSync(relativePath, 'utf8')
             .replaceAll("const { cacheList, modifyRequest } = require('../sw-cache')", cache)
             .replaceAll("'@$$[escape]'", (pluginConfig.sw.escape ?? 0).toString())
@@ -517,15 +548,9 @@ function findCache(url) {
 }
 
 function replaceRequest(url) {
-    for (let key in replaceList) {
-        const value = replaceList[key]
-        for (let source of value.source) {
-            if (url.match(source)) {
-                url = url.replace(source, value.dist)
-            }
-        }
-    }
-    return url
+    const request = new Request(url)
+    const edit = modifyRequest(request)
+    return edit ? request.url : url
 }
 
 function replaceDevRequest(url) {

package/package.json

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

package/sw-template.js

@@ -9,7 +9,7 @@
     self.addEventListener('install', () => self.skipWaiting())
 
     // noinspection JSFileReferences
-    const { cacheList, modifyRequest } = require('../sw-cache')
+    const { cacheList, modifyRequest, fetchNoCache } = require('../sw-cache')
 
     /**
      * 删除指定缓存
@@ -60,9 +60,6 @@
         }
     })
 
-    /** 忽略浏览器HTTP缓存的请求指定request */
-    const fetchNoCache = request => fetch(request, {cache: "no-store"})
-
     /** 判断指定url击中了哪一种缓存，都没有击中则返回null */
     function findCache(url) {
         for (let key in cacheList) {