swpp-backends 2.1.2 → 2.1.3

package/dist/ServiceWorkerBuilder.js

@@ -59,7 +59,7 @@ function buildServiceWorker() {
                     url = new URL(request.url)
                 }
             `).replaceAll('// [modifyRequest else-if]', `
-                else if (modify) handleFetch(fetchFile(request, false))
+                else if (modify) handleFetch(fetch(request).catch(err => new Response(err, {status: -1})))
             `);
     }
     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.2',
+    version: '2.1.3',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -121,7 +121,7 @@
             const spare = getSpareUrls(request.url)
             if (spare) handleFetch(fetchFile(request, false, spare))
             // [modifyRequest else-if]
-            else handleFetch(fetch(request))
+            else handleFetch(fetch(request).catch(err => new Response(err, {status: -1})))
         }
     })
 
@@ -134,6 +134,7 @@
                     type: 'update',
                     update: info.list,
                     version: info.version,
+                    old: info.old
                 })
             )
     })
@@ -152,7 +153,7 @@
 
     /**
      * 根据JSON删除缓存
-     * @returns {Promise<{version, list}>}
+     * @returns {Promise<{version, list, old}>}
      */
     const updateJson = () => {
         /**
@@ -171,14 +172,17 @@
             // 跨版本幅度过大，直接清理全站
             return true
         }
-        /** 解析字符串 */
+        /**
+         * 解析字符串
+         * @return {Promise<any>}
+         */
         const parseJson = json => dbVersion.read().then(oldVersion => {
             const {info, global} = json
             const newVersion = {global, local: info[0].version, escape: oldVersion?.escape ?? 0}
             //新用户不进行更新操作
             if (!oldVersion) {
                 dbVersion.write(newVersion)
-                return newVersion
+                return {version: newVersion, old: oldVersion}
             }
             let list = new VersionList()
             let refresh = parseChange(list, info, oldVersion.local)
@@ -189,19 +193,20 @@
                 if (global !== oldVersion.global) list.force = true
                 else list.refresh = true
             }
-            return {list, version: newVersion}
+            return {list, version: newVersion, old: oldVersion}
         })
         return fetchFile(new Request('/update.json'), false)
             .then(response => {
                 if (checkResponse(response))
                     return response.json().then(json =>
                         parseJson(json).then(result => {
-                                return result.list ? deleteCache(result.list)
+                            const info = {version: result.version, old: result.old}
+                            if (result.list)
+                                return deleteCache(result.list)
                                     .then(list => list.length === 0 ? null : list)
-                                    .then(list => ({list, version: result.version}))
-                                    : {version: result}
-                            }
-                        )
+                                    .then(list => Object.assign({list}, info))
+                            else return info
+                        })
                     )
                 else throw `加载 update.json 时遇到异常，状态码：${response.status}`
             })
@@ -232,7 +237,10 @@
             if (this.force) return true
             // noinspection JSValidateTypes
             url = new URL(url)
-            if (this.refresh) return findCache(url).clean
+            if (this.refresh) {
+                // noinspection JSCheckFunctionSignatures
+                return findCache(url).clean
+            }
             else {
                 for (let it of list) {
                     if (it.match(url)) return true

package/package.json

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