🚧 firefox兼容

Author: CodFrm

packages/filesystem/baidu/baidu.ts

@@ -65,7 +65,7 @@ export default class BaiduFileSystem implements FileSystem {
         {
           id: 100,
           action: {
-            type: chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
+            type: "modifyHeaders" as chrome.declarativeNetRequest.RuleActionType,
             responseHeaders: [{ operation: chrome.declarativeNetRequest.HeaderOperation.REMOVE, header: "cookie" }],
           },
           condition: {

packages/message/extension_message.ts

@@ -60,13 +60,14 @@ export class ExtensionMessage extends ExtensionMessageSend implements Message {
     });
     if (this.onUserScript) {
       // 监听用户脚本的连接
-      chrome.runtime.onUserScriptConnect.addListener((port) => {
-        const handler = (msg: any) => {
-          port.onMessage.removeListener(handler);
-          callback(msg, new ExtensionMessageConnect(port));
-        };
-        port.onMessage.addListener(handler);
-      });
+      chrome.runtime.onUserScriptConnect &&
+        chrome.runtime.onUserScriptConnect.addListener((port) => {
+          const handler = (msg: any) => {
+            port.onMessage.removeListener(handler);
+            callback(msg, new ExtensionMessageConnect(port));
+          };
+          port.onMessage.addListener(handler);
+        });
     }
   }
 
@@ -80,12 +81,13 @@ export class ExtensionMessage extends ExtensionMessageSend implements Message {
     });
     if (this.onUserScript) {
       // 监听用户脚本的消息
-      chrome.runtime.onUserScriptMessage.addListener((msg, sender, sendResponse) => {
-        if (msg.action === "messageQueue") {
-          return false;
-        }
-        return callback(msg, sendResponse, sender);
-      });
+      chrome.runtime.onUserScriptMessage &&
+        chrome.runtime.onUserScriptMessage.addListener((msg, sender, sendResponse) => {
+          if (msg.action === "messageQueue") {
+            return false;
+          }
+          return callback(msg, sendResponse, sender);
+        });
     }
   }
 }

packages/message/window_message.ts

@@ -168,7 +168,7 @@ export class ServiceWorkerMessageSend implements MessageSend {
   constructor() {}
 
   async init() {
-    if (!this.target) {
+    if (!this.target && self.clients) {
       const list = await self.clients.matchAll({ includeUncontrolled: true, type: "window" });
       this.target = list[0];
       self.addEventListener("message", (e) => {

src/app/service/service_worker/gm_api.ts

@@ -429,7 +429,7 @@ export default class GMApi {
     const rule = {} as chrome.declarativeNetRequest.Rule;
     rule.id = ruleId;
     rule.action = {
-      type: chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
+      type: "modifyHeaders" as chrome.declarativeNetRequest.RuleActionType,
       requestHeaders: requestHeaders,
     };
     rule.priority = 1;

src/app/service/service_worker/script.ts

@@ -72,12 +72,12 @@ export class ScriptService {
                     id: 2,
                     priority: 1,
                     action: {
-                      type: chrome.declarativeNetRequest.RuleActionType.ALLOW,
+                      type: "allow" as chrome.declarativeNetRequest.RuleActionType,
                     },
                     condition: {
                       regexFilter: targetUrl,
                       resourceTypes: [chrome.declarativeNetRequest.ResourceType.MAIN_FRAME],
-                      requestMethods: [chrome.declarativeNetRequest.RequestMethod.GET],
+                      requestMethods: ["get" as chrome.declarativeNetRequest.RequestMethod],
                     },
                   },
                 ],
@@ -118,15 +118,15 @@ export class ScriptService {
             id: 1,
             priority: 1,
             action: {
-              type: chrome.declarativeNetRequest.RuleActionType.REDIRECT,
+              type: "redirect" as chrome.declarativeNetRequest.RuleActionType,
               redirect: {
                 regexSubstitution: `https://docs.scriptcat.org${localePath}/docs/script_installation/#url=\\0`,
               },
             },
             condition: {
               regexFilter: "^([^#]+?)\\.user(\\.bg|\\.sub)?\\.js((\\?).*|$)",
               resourceTypes: [chrome.declarativeNetRequest.ResourceType.MAIN_FRAME],
-              requestMethods: [chrome.declarativeNetRequest.RequestMethod.GET],
+              requestMethods: ["get" as chrome.declarativeNetRequest.RequestMethod],
               // 排除常见的符合上述条件的域名
               excludedRequestDomains: ["github.com"],
             },

src/manifest.json

@@ -9,7 +9,10 @@
     "open_in_tab": true
   },
   "background": {
-    "service_worker": "src/service_worker.js"
+    "service_worker": "src/service_worker.js",
+    "scripts": [
+      "src/service_worker.js"
+    ]
   },
   "action": {
     "default_popup": "src/popup.html",

src/pages/options/routes/ScriptList.tsx

@@ -617,7 +617,6 @@ function ScriptList() {
   const dealColumns: ColumnProps[] = [];
 
   newColumns.forEach((item) => {
-    console.log(newColumns);
     switch (item.width) {
       case -1:
         break;

src/pkg/config/chrome_storage.ts

@@ -16,7 +16,7 @@ export default class ChromeStorage {
     return new Promise((resolve) => {
       key = this.buildKey(key);
       this.storage.get(key, (items) => {
-        resolve(items[key]);
+        resolve(items && items[key]);
       });
     });
   }