Skip to content

Commit b5c2910

Browse files
committed
🐛 修复header设置导致的请求失败
1 parent ff3b721 commit b5c2910

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

src/runtime/background/utils.ts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,24 +276,24 @@ export function setXhrHeader(
276276
if (lowKey === "origin") {
277277
hasOrigin = true;
278278
}
279-
if (
280-
unsafeHeaders[lowKey] ||
281-
lowKey.startsWith("sec-") ||
282-
lowKey.startsWith("proxy-")
283-
) {
284-
try {
279+
try {
280+
if (
281+
unsafeHeaders[lowKey] ||
282+
lowKey.startsWith("sec-") ||
283+
lowKey.startsWith("proxy-")
284+
) {
285285
xhr.setRequestHeader(
286286
`${headerFlag}-${lowKey}`,
287287
config.headers![key]!
288288
);
289-
} catch (e) {
290-
LoggerCore.getLogger(Logger.E(e)).error(
291-
"GM XHR setRequestHeader error"
292-
);
289+
} else {
290+
// 直接设置header
291+
xhr.setRequestHeader(key, config.headers![key]!);
293292
}
294-
} else {
295-
// 直接设置header
296-
xhr.setRequestHeader(key, config.headers![key]!);
293+
} catch (e) {
294+
LoggerCore.getLogger(Logger.E(e)).error(
295+
"GM XHR setRequestHeader error"
296+
);
297297
}
298298
});
299299
if (!hasOrigin) {
@@ -307,7 +307,13 @@ export function setXhrHeader(
307307
);
308308
}
309309
if (config.cookie) {
310-
xhr.setRequestHeader(`${headerFlag}-cookie`, config.cookie);
310+
try {
311+
xhr.setRequestHeader(`${headerFlag}-cookie`, config.cookie);
312+
} catch (e) {
313+
LoggerCore.getLogger(Logger.E(e)).error(
314+
"GM XHR setRequestHeader cookie error"
315+
);
316+
}
311317
}
312318
if (config.anonymous) {
313319
xhr.setRequestHeader(`${headerFlag}-anonymous`, "true");

0 commit comments

Comments
 (0)