🐛 修复header设置导致的请求失败

scriptscat · Apr 29, 2024 · b5c2910 · b5c2910
1 parent ff3b721
commit b5c2910
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/runtime/background/utils.ts b/src/runtime/background/utils.ts
@@ -276,24 +276,24 @@ export function setXhrHeader(
       if (lowKey === "origin") {
         hasOrigin = true;
       }
-      if (
-        unsafeHeaders[lowKey] ||
-        lowKey.startsWith("sec-") ||
-        lowKey.startsWith("proxy-")
-      ) {
-        try {
+      try {
+        if (
+          unsafeHeaders[lowKey] ||
+          lowKey.startsWith("sec-") ||
+          lowKey.startsWith("proxy-")
+        ) {
           xhr.setRequestHeader(
             `${headerFlag}-${lowKey}`,
             config.headers![key]!
           );
-        } catch (e) {
-          LoggerCore.getLogger(Logger.E(e)).error(
-            "GM XHR setRequestHeader error"
-          );
+        } else {
+          // 直接设置header
+          xhr.setRequestHeader(key, config.headers![key]!);
         }
-      } else {
-        // 直接设置header
-        xhr.setRequestHeader(key, config.headers![key]!);
+      } catch (e) {
+        LoggerCore.getLogger(Logger.E(e)).error(
+          "GM XHR setRequestHeader error"
+        );
       }
     });
     if (!hasOrigin) {
@@ -307,7 +307,13 @@ export function setXhrHeader(
     );
   }
   if (config.cookie) {
-    xhr.setRequestHeader(`${headerFlag}-cookie`, config.cookie);
+    try {
+      xhr.setRequestHeader(`${headerFlag}-cookie`, config.cookie);
+    } catch (e) {
+      LoggerCore.getLogger(Logger.E(e)).error(
+        "GM XHR setRequestHeader cookie error"
+      );
+    }
   }
   if (config.anonymous) {
     xhr.setRequestHeader(`${headerFlag}-anonymous`, "true");