swpp-backends 2.0.7 → 2.0.9

package/dist/FileAnalyzer.js

@@ -175,13 +175,17 @@ exports.isStable = isStable;
 async function loadVersionJson(url) {
     const key = 'oldVersionJson';
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (response?.status === 404 || response?.code === 'ENOTFOUND') {
-        (0, Utils_1.warn)('LoadVersionJson', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
+    if (response.status === 404 || response?.code === 'ENOTFOUND') {
+        (0, Utils_1.warn)('VersionJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
         return (0, Variant_1.writeVariant)(key, null);
     }
-    else {
-        return (0, Variant_1.writeVariant)(key, await response.json());
+    else if (![200, 301, 302, 307, 308].includes(response.status)) {
+        (0, Utils_1.error)('VersionJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
+        if ('status' in response)
+            throw `拉取时出现 ${response.status} 异常`;
+        throw response;
     }
+    return (0, Variant_1.writeVariant)(key, await response.json());
 }
 exports.loadVersionJson = loadVersionJson;
 /** 提交要存储到 version json 的值 */

package/dist/UpdateJsonBuilder.js

@@ -34,6 +34,8 @@ function buildUpdateJson(root, dif) {
         if (userUpdate.flag === (0, Variant_1.readOldVersionJson)()?.external?.swppFlag)
             userUpdate = undefined;
     }
+    if (!dif)
+        dif = (0, Variant_1.readAnalyzeResult)();
     // 如果需要强制刷新直接返回
     if (dif.force || userUpdate?.force)
         return {
@@ -113,10 +115,16 @@ exports.submitChange = submitChange;
 async function loadUpdateJson(url) {
     const key = 'oldUpdateJson';
     const response = await (0, Utils_1.fetchFile)(url).catch(err => err);
-    if (response?.status === 404 || response.code === 'ENOTFOUND') {
-        (0, Utils_1.warn)('LoadUpdateJson', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
+    if (response.status === 404 || response.code === 'ENOTFOUND') {
+        (0, Utils_1.warn)('UpdateJsonLoader', `拉取 ${url} 时出现 404 错误，如果您是第一次构建请忽略这个警告。`);
         return (0, Variant_1.writeVariant)(key, null);
     }
+    else if (![200, 301, 302, 307, 308].includes(response.status)) {
+        (0, Utils_1.error)('UpdateJsonLoader', `拉取 ${url} 时出现 ${response.status} 错误！`);
+        if ('status' in response)
+            throw `拉取时出现 ${response.status} 异常`;
+        throw response;
+    }
     return (0, Variant_1.writeVariant)(key, await response.json());
 }
 exports.loadUpdateJson = loadUpdateJson;

package/dist/index.js

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

package/dist/resources/sw-template.js

@@ -195,11 +195,12 @@
          */
         this.match = url => {
             if (this.force) return true
-            else if (this.refresh) return findCache(url).clean
+            // noinspection JSValidateTypes
+            url = new URL(url)
+            if (this.refresh) return findCache(url).clean
             else {
-                const obj = new URL(url)
                 for (let it of list) {
-                    if (it.match(obj)) return true
+                    if (it.match(url)) return true
                 }
             }
             return false
@@ -232,7 +233,7 @@
         const getMatch = () => {
             switch (json['flag']) {
                 case 'html':
-                    return url => url.match(/(\/|\.html)$/)
+                    return url => url.pathname.match(/(\/|\.html)$/)
                 case 'end':
                     return url => forEachValues(value => url.href.endsWith(value))
                 case 'begin':

package/package.json

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

package/types/UpdateJsonBuilder.d.ts

@@ -10,7 +10,7 @@ import { AnalyzeResult } from './VersionAnalyzer';
  * @param root 网站根路径（包括网络协议）
  * @param dif 网站文件变化
  */
-export declare function buildUpdateJson(root: string, dif: AnalyzeResult): UpdateJson;
+export declare function buildUpdateJson(root: string, dif?: AnalyzeResult): UpdateJson;
 /** 提交修改 */
 export declare function submitChange(...change: ChangeExpression[]): void;
 /**