🐛 修复GM XHR 重定向丢失header的问题 #664

close #664

Author: CodFrm

README.md

@@ -68,8 +68,6 @@ ScriptCat（脚本猫）是一个功能强大的用户脚本管理器，基于
 | Chrome | [正式版本](https://chrome.google.com/webstore/detail/scriptcat/ndcooeababalnlpkfedmmbbbgkljhpjf) [Beta版本](https://chromewebstore.google.com/detail/%E8%84%9A%E6%9C%AC%E7%8C%AB-beta/jaehimmlecjmebpekkipmpmbpfhdacom?authuser=0&hl=zh-CN) | ✅ 可用 |
 | Edge | [正式版本](https://microsoftedge.microsoft.com/addons/detail/scriptcat/liilgpjgabokdklappibcjfablkpcekh) [Beta版本](https://microsoftedge.microsoft.com/addons/detail/scriptcat-beta/nimmbghgpcjmeniofmpdfkofcedcjpfi) | ✅ 可用 |
 | Firefox | [正式版本](https://addons.mozilla.org/zh-CN/firefox/addon/scriptcat/) [Beta版本](https://addons.mozilla.org/zh-CN/firefox/addon/scriptcat-pre/) | ✅ MV2 |
-| GitHub Releases | [GitHub Releases](https://github.com/scriptscat/scriptcat/releases) | ✅ 可用 |
-| GitHub Actions | [GitHub Actions](https://github.com/scriptscat/scriptcat/actions/workflows/build.yaml) | 每次提交触发 |
 
 #### 手动安装
 

README_EN.md

@@ -68,8 +68,6 @@ ScriptCat is a powerful userscript manager based on Tampermonkey's design philos
 | Chrome | [Stable Version](https://chrome.google.com/webstore/detail/scriptcat/ndcooeababalnlpkfedmmbbbgkljhpjf) [Beta Version](https://chromewebstore.google.com/detail/%E8%84%9A%E6%9C%AC%E7%8C%AB-beta/jaehimmlecjmebpekkipmpmbpfhdacom?authuser=0&hl=zh-CN) | ✅ Available |
 | Edge | [Stable Version](https://microsoftedge.microsoft.com/addons/detail/scriptcat/liilgpjgabokdklappibcjfablkpcekh) [Beta Version](https://microsoftedge.microsoft.com/addons/detail/scriptcat-beta/nimmbghgpcjmeniofmpdfkofcedcjpfi) | ✅ Available |
 | Firefox | [Stable Version](https://addons.mozilla.org/zh-CN/firefox/addon/scriptcat/) [Beta Version](https://addons.mozilla.org/zh-CN/firefox/addon/scriptcat-pre/) | ✅ MV2 |
-| GitHub Releases | [GitHub Releases](https://github.com/scriptscat/scriptcat/releases) | ✅ Available |
-| GitHub Actions | [GitHub Actions](https://github.com/scriptscat/scriptcat/actions/workflows/build.yaml) | Triggered on every commit |
 
 #### Manual Installation
 

README_RU.md

@@ -57,8 +57,6 @@ ScriptCat — это мощный менеджер пользовательск
 | Chrome | [Стабильная версия](https://chrome.google.com/webstore/detail/scriptcat/ndcooeababalnlpkfedmmbbbgkljhpjf) / [Beta](https://chromewebstore.google.com/detail/%E8%84%9A%E6%9C%AC%E7%8C%AB-beta/jaehimmlecjmebpekkipmpmbpfhdacom) | ✅ Доступно |
 | Edge | [Стабильная версия](https://microsoftedge.microsoft.com/addons/detail/scriptcat/liilgpjgabokdklappibcjfablkpcekh) / [Beta](https://microsoftedge.microsoft.com/addons/detail/scriptcat-beta/nimmbghgpcjmeniofmpdfkofcedcjpfi) | ✅ Доступно |
 | Firefox | [Стабильная версия](https://addons.mozilla.org/firefox/addon/scriptcat/) / [Beta](https://addons.mozilla.org/firefox/addon/scriptcat-pre/) | ✅ MV2 |
-| GitHub Releases | [GitHub Releases](https://github.com/scriptscat/scriptcat/releases) | ✅ Доступно |
-| GitHub Actions | [GitHub Actions](https://github.com/scriptscat/scriptcat/actions/workflows/build.yaml) | Запускается при каждом коммите |
 
 #### Ручная установка
 Если доступ к магазину расширений невозможен, вы можете скачать ZIP-архив последней версии с [GitHub Releases](https://github.com/scriptscat/scriptcat/releases) и установить его вручную.

src/app/service/service_worker/gm_api.ts

@@ -732,6 +732,9 @@ export default class GMApi {
     };
     let finalUrl = "";
     // 等待response
+    this.cache.set("gmXhrRequest:params:" + requestId, {
+      redirect: params.redirect,
+    });
     this.gmXhrHeadersReceived.addListener(
       "headersReceived:" + requestId,
       (details: chrome.webRequest.OnHeadersReceivedDetails) => {
@@ -1211,7 +1214,9 @@ export default class GMApi {
                 }
               }
             });
-            if (location) {
+            const params = this.cache.get("gmXhrRequest:params:" + requestId) as GMSend.XHRDetails;
+            // 如果是重定向，并且不是manual模式，则需要重新设置dnr规则
+            if (location && params.redirect !== "manual") {
               // 处理重定向后的unsafeHeader
               const rule = this.cache.get("dnrRule:" + requestId) as chrome.declarativeNetRequest.Rule;
               // 修改匹配链接
@@ -1233,6 +1238,7 @@ export default class GMApi {
             this.cache.delete("gmXhrRequest:" + details.requestId);
             this.cache.delete("dnrRule:" + requestId);
             this.cache.delete("gmXhrRequest:finalUrl:" + requestId);
+            this.cache.delete("gmXhrRequest:params:" + requestId);
             chrome.declarativeNetRequest.updateSessionRules({
               removeRuleIds: [parseInt(requestId)],
             });