Merge branch 'release/mv3'

Author: CodFrm

src/app/service/service_worker/gm_api.ts

@@ -719,6 +719,7 @@ export default class GMApi {
       statusCode: 0,
       responseHeader: "",
     };
+    let finalUrl = "";
     // 等待response
     this.gmXhrHeadersReceived.addListener(
       "headersReceived:" + requestId,
@@ -727,6 +728,7 @@ export default class GMApi {
           resultParam.responseHeader += header.name + ": " + header.value + "\n";
         });
         resultParam.statusCode = details.statusCode;
+        finalUrl = this.cache.get("gmXhrRequest:finalUrl:" + requestId);
         this.gmXhrHeadersReceived.removeAllListeners("headersReceived:" + requestId);
       }
     );
@@ -740,6 +742,10 @@ export default class GMApi {
       // 发送到content
       // 替换msg.data.responseHeaders
       msg.data.responseHeaders = resultParam.responseHeader || msg.data.responseHeaders;
+      // 替换finalUrl
+      if (finalUrl) {
+        msg.data.finalUrl = finalUrl;
+      }
       sender.getConnect().sendMessage(msg);
     });
     sender.getConnect().onDisconnect(() => {
@@ -1149,6 +1155,8 @@ export default class GMApi {
               rule.action.requestHeaders = rule.action.requestHeaders?.filter(
                 (header) => header.header.toLowerCase() !== "cookie"
               );
+              // 设置重定向url，获取到实际的请求地址
+              this.cache.set("gmXhrRequest:finalUrl:" + requestId, location);
               chrome.declarativeNetRequest.updateSessionRules({
                 removeRuleIds: [parseInt(requestId)],
                 addRules: [rule],
@@ -1159,6 +1167,7 @@ export default class GMApi {
             // 删除关联与DNR
             this.cache.delete("gmXhrRequest:" + details.requestId);
             this.cache.delete("dnrRule:" + requestId);
+            this.cache.delete("gmXhrRequest:finalUrl:" + requestId);
             chrome.declarativeNetRequest.updateSessionRules({
               removeRuleIds: [parseInt(requestId)],
             });