🐛 兼容较低的浏览器内核 #647

Author: CodFrm

src/app/service/service_worker/script.ts

@@ -5,7 +5,13 @@ import Logger from "@App/app/logger/logger";
 import LoggerCore from "@App/app/logger/core";
 import Cache from "@App/app/cache";
 import CacheKey from "@App/app/cache_key";
-import { checkSilenceUpdate, InfoNotification, openInCurrentTab, randomMessageFlag } from "@App/pkg/utils/utils";
+import {
+  checkSilenceUpdate,
+  getBrowserType,
+  InfoNotification,
+  openInCurrentTab,
+  randomMessageFlag,
+} from "@App/pkg/utils/utils";
 import { ltever } from "@App/pkg/utils/semver";
 import type { Script, SCRIPT_RUN_STATUS, ScriptDAO, ScriptRunResource } from "@App/app/repo/scripts";
 import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAO } from "@App/app/repo/scripts";
@@ -107,7 +113,23 @@ export class ScriptService {
         types: ["main_frame"],
       }
     );
-    // 获取i18n
+    // 兼容 chrome 内核 < 128 处理
+    const condition: chrome.declarativeNetRequest.RuleCondition = {
+      regexFilter: "^([^#]+?)\\.user(\\.bg|\\.sub)?\\.js((\\?).*|$)",
+      resourceTypes: [chrome.declarativeNetRequest.ResourceType.MAIN_FRAME],
+      requestMethods: ["get" as chrome.declarativeNetRequest.RequestMethod],
+    };
+    const browserType = getBrowserType();
+    if (browserType.chrome && browserType.chromeVersion >= 128) {
+      condition.excludedResponseHeaders = [
+        {
+          header: "Content-Type",
+          values: ["text/html"],
+        },
+      ];
+    } else {
+      condition.excludedRequestDomains = ["github.com"];
+    }
     // 重定向到脚本安装页
     chrome.declarativeNetRequest.updateDynamicRules(
       {
@@ -122,17 +144,7 @@ export class ScriptService {
                 regexSubstitution: `https://docs.scriptcat.org${localePath}/docs/script_installation/#url=\\0`,
               },
             },
-            condition: {
-              regexFilter: "^([^#]+?)\\.user(\\.bg|\\.sub)?\\.js((\\?).*|$)",
-              resourceTypes: [chrome.declarativeNetRequest.ResourceType.MAIN_FRAME],
-              requestMethods: ["get" as chrome.declarativeNetRequest.RequestMethod],
-              excludedResponseHeaders: [
-                {
-                  header: "Content-Type",
-                  values: ["text/html"],
-                },
-              ],
-            },
+            condition: condition,
           },
         ],
       },

src/pkg/utils/utils.ts

@@ -1,15 +1,5 @@
 import type { Metadata, Script } from "@App/app/repo/scripts";
 
-// export function randomString(e = 32): string {
-//   const t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz";
-//   const a = t.length;
-//   const n = new Array(e);
-//   for (let i = 0; i < e; i++) {
-//     n[i] = t[(Math.random() * a) | 0];
-//   }
-//   return n.join("");
-// }
-
 function randNum(a: number, b: number) {
   return Math.floor(Math.random() * (b - a + 1)) + a;
 }
@@ -235,6 +225,7 @@ export function getBrowserType() {
     webkit: 0, // Safari, Orion
     chrome: 0, // Chrome, Chromium, Brave, Edge
     unknown: 0,
+    chromeVersion: 0,
   };
   if (isFirefox()) {
     o.firefox = 1;
@@ -250,6 +241,7 @@ export function getBrowserType() {
         const isEdgeBrowser = isEdge();
         const chromeVersion = getBrowserVersion();
         o.chrome = (isEdgeBrowser ? 2 : 1) | (chromeVersion < 120 ? 4 : chromeVersion < 138 ? 8 : 16);
+        o.chromeVersion = chromeVersion;
       } else {
         o.unknown = 1;
       }