swpp-backends 2.1.7 → 2.1.10-beta.0

package/dist/ServiceWorkerBuilder.js

@@ -59,7 +59,7 @@ function buildServiceWorker() {
                     url = new URL(request.url)
                 }
             `).replaceAll('// [modifyRequest else-if]', `
-                else if (modify) handleFetch(fetch(request).catch(err => new Response(err, {status: 499})))
+                else if (modify) handleFetch(fetchWithCors(request, false).catch(err => new Response(err, {status: 499})))
             `);
     }
     if (blockRequest) {

package/dist/index.js

@@ -10,7 +10,7 @@ const VersionAnalyzer_1 = require("./VersionAnalyzer");
 const DomBuilder_1 = require("./DomBuilder");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '2.1.7',
+    version: '2.1.8',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-dom.js

@@ -1,6 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
-    /** 检查 SW 是否可用 */
-    const checkServiceWorker = () => 'serviceWorker' in navigator && navigator.serviceWorker.controller
+    if (!navigator.serviceWorker?.controller) return
     /** 发送信息到 sw */
     const postMessage2SW = type => navigator.serviceWorker.controller.postMessage(type)
     const pjaxUpdate = url => {
@@ -19,20 +18,19 @@ document.addEventListener('DOMContentLoaded', () => {
             }
         }
     }
-    if (!checkServiceWorker()) return
-    if (sessionStorage.getItem('updated')) {
-        sessionStorage.removeItem('updated');
+    const SESSION_KEY = 'updated'
+    if (sessionStorage.getItem(SESSION_KEY)) {
+        sessionStorage.removeItem(SESSION_KEY);
         // ${onSuccess}
     } else postMessage2SW('update')
     navigator.serviceWorker.addEventListener('message', event => {
+        sessionStorage.setItem(SESSION_KEY, '1')
         const data = event.data
         switch (data.type) {
             case 'update':
-                const list = data.update
-                if (!list) break
-                sessionStorage.setItem('updated', '1')
+                const list = data.list
                 // noinspection JSUnresolvedVariable,JSUnresolvedFunction
-                if (window.Pjax?.isSupported()) {
+                if (list && window.Pjax?.isSupported()) {
                     list.filter(url => /\.(js|css)$/.test(url))
                         .forEach(pjaxUpdate)
                 }

package/dist/resources/sw-fetch.js

@@ -1,32 +1,21 @@
 /** @type function */
-let getRaceUrls, checkResponse, getSpareUrls
+let getRaceUrls, checkResponse, getSpareUrls, fetchWithCors
 
-module.exports.JS_CODE_DEF_FETCH_FILE = 'const fetchFile = ' + (
-    (request, banCache) => fetch(request, {
-        cache: banCache ? "no-store" : "default",
-        mode: 'cors',
-        credentials: 'same-origin'
-    })
-).toString()
+module.exports.JS_CODE_DEF_FETCH_FILE = 'const fetchFile = fetchWithCors;'
 
 module.exports.JS_CODE_GET_CDN_LIST= 'const fetchFile = ' + (
     (request, banCache) => {
-        const fetchArgs = {
-            cache: banCache ? 'no-store' : 'default',
-            mode: 'cors',
-            credentials: 'same-origin'
-        }
         const list = getRaceUrls(request.url)
-        if (!list || !Promise.any) return fetch(request, fetchArgs)
+        if (!list || !Promise.any) return fetchWithCors(request, banCache)
         const res = list.map(url => new Request(url, request))
         const controllers = []
         // noinspection JSCheckFunctionSignatures
-        return Promise.any(res.map(
-            (it, index) => fetch(it, Object.assign(
-                {signal: (controllers[index] = new AbortController()).signal},
-                fetchArgs
-            )).then(response => checkResponse(response) ? {index, response} : Promise.reject())
-        )).then(it => {
+        return Promise.any(
+            res.map((it, index) => fetchWithCors(
+                it, banCache,
+                {signal: (controllers[index] = new AbortController()).signal}
+            ).then(response => checkResponse(response) ? {index, response} : Promise.reject()))
+        ).then(it => {
             for (let i in controllers) {
                 if (i !== it.index) controllers[i].abort()
             }
@@ -37,24 +26,18 @@ module.exports.JS_CODE_GET_CDN_LIST= 'const fetchFile = ' + (
 
 module.exports.JS_CODE_GET_SPARE_URLS = 'const fetchFile = ' + (
     (request, banCache, spare = null) => {
-        const fetchArgs = {
-            cache: banCache ? 'no-store' : 'default',
-            mode: 'cors',
-            credentials: 'same-origin'
-        }
         if (!spare) {
             spare = getSpareUrls(request.url)
-            if (!spare) return fetch(request, fetchArgs)
+            if (!spare) return fetchWithCors(request, banCache)
         }
         const list = spare.list
         const controllers = new Array(list.length)
         // noinspection JSCheckFunctionSignatures
         const startFetch =
-            index => fetch(
+            index => fetchWithCors(
                 new Request(list[index], request),
-                Object.assign({
-                    signal: (controllers[index] = new AbortController()).signal
-                }, fetchArgs)
+                banCache,
+                {signal: (controllers[index] = new AbortController()).signal}
             ).then(response => checkResponse(response) ? {r: response, i: index} : Promise.reject())
         return new Promise((resolve, reject) => {
             let flag = true

package/dist/resources/sw-template.js

@@ -5,7 +5,6 @@
     const CACHE_NAME = '@$$[cacheName]'
     /** 控制信息存储地址（必须以`/`结尾） */
     const CTRL_PATH = 'https://id.v3/'
-    let escapeTrigger
 
 // [insertion site] values
 
@@ -26,13 +25,16 @@
         self.skipWaiting()
         const escape = '@$$[escape]'
         if (escape) {
-            readVersion().then(oldVersion => {
-                if (oldVersion?.escape !== escape) {
-                    escapeTrigger = true
-                    // noinspection JSUnresolvedVariable
-                    caches.delete(CACHE_NAME)
-                        .then(() => clients.matchAll())
-                        .then(list => list.forEach(client => client.postMessage({type: 'escape'})))
+            readVersion().then(async oldVersion => {
+                // noinspection JSIncompatibleTypesComparison
+                if (oldVersion && oldVersion.escape !== escape) {
+                    // noinspection JSValidateTypes
+                    oldVersion.escape = escape
+                    await caches.delete(CACHE_NAME)
+                    await writeVersion(oldVersion)
+                    // noinspection JSUnresolvedReference
+                    const list = await clients.matchAll()
+                    list.forEach(client => client.postMessage({type: 'escape'}))
                 }
             })
         }
@@ -92,8 +94,8 @@
         }
         cacheMap.set(cacheKey, cache = [])
         /** 处理拉取 */
-        const handleFetch = promise =>
-            event.respondWith(promise.then(response => {
+        const handleFetch = promise => event.respondWith(
+            promise.then(response => {
                 for (let item of cache) {
                     item.s(response.clone())
                 }
@@ -104,7 +106,8 @@
             }).then(() => {
                 cacheMap.delete(cacheKey)
                 return promise
-            }))
+            })
+        )
         const cacheRule = findCache(url)
         if (cacheRule) {
             let key = `https://${url.host}${url.pathname}`
@@ -127,7 +130,7 @@
             const spare = getSpareUrls(request.url)
             if (spare) handleFetch(fetchFile(request, false, spare))
             // [modifyRequest else-if]
-            else handleFetch(fetch(request).catch(err => new Response(err, {status: 499})))
+            else handleFetch(fetchWithCors(request, false).catch(err => new Response(err, {status: 499})))
         }
     })
 
@@ -141,6 +144,21 @@
             )
     })
 
+    /**
+     * 添加 cors 配置请求指定资源
+     * @param request {Request|string}
+     * @param banCache {boolean} 是否禁用 HTTP 缓存
+     * @param optional {RequestInit?} 额外的配置项
+     * @return {Promise<Response>}
+     */
+    const fetchWithCors = (request, banCache, optional) => fetch(
+        request,
+        Object.assign({
+            cache: optional ? "no-store" : "default",
+            mode: 'cors'
+        }, optional || {})
+    )
+
     /**
      * 判断指定 url 击中了哪一种缓存，都没有击中则返回 null
      * @param url {URL}
@@ -187,10 +205,9 @@
             /** @type {BrowserVersion} */
             const newVersion = {global, local: info[0].version, escape: oldVersion?.escape ?? 0}
             // 新用户和刚进行过逃逸操作的用户不进行更新操作
-            if (!oldVersion || escapeTrigger) {
+            if (!oldVersion) {
                 // noinspection JSValidateTypes
                 newVersion.escape = '@$$[escape]'
-                escapeTrigger = false
                 writeVersion(newVersion)
                 return {new: newVersion, old: oldVersion}
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "2.1.7",
+  "version": "2.1.10-beta.0",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",