改善 session rule 移除处理 及 scXhrRequests 处理

Author: cyfung1031

src/app/service/service_worker/gm_api/gm_api.ts

@@ -75,7 +75,42 @@ const generateUniqueMarkerID = () => {
 };
 
 type OnBeforeSendHeadersOptions = `${chrome.webRequest.OnBeforeSendHeadersOptions}`;
-type OnHeadersReceivedOptions = `${chrome.webRequest.OnHeadersReceivedOptions}`;
+type ReceiveHeaderOptions = `${chrome.webRequest.OnHeadersReceivedOptions}` &
+  `${chrome.webRequest.OnResponseStartedOptions}`;
+
+// 删除关联与DNR: 不再处理 headerModifer 时清空 Map 关联 及 浏览器 Session Rule
+const headersSettled = (markerID: string) => {
+  const dnrRule = headerModifierMap.get(markerID);
+  const ruleID = dnrRule?.rule.id;
+  if (markerID) {
+    headerModifierMap.delete(markerID);
+  }
+  if (ruleID) {
+    chrome.declarativeNetRequest.updateSessionRules(
+      {
+        removeRuleIds: [ruleID],
+      },
+      () => {
+        const lastError = chrome.runtime.lastError;
+        if (lastError) {
+          console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
+        }
+        removeSessionRuleIdEntry(ruleID);
+      }
+    );
+  }
+};
+
+const cleanupOnAPIError = (requestId: string) => {
+  const markerID = scXhrRequests.get(requestId) as string | undefined;
+  scXhrRequests.delete(requestId);
+  if (!markerID) return;
+  redirectedUrls.delete(markerID);
+  nwErrorResults.delete(markerID);
+  scXhrRequests.delete(markerID);
+  headersReceivedMap.delete(markerID);
+  headersSettled(markerID); // 处理完毕
+};
 
 // GMExternalDependencies接口定义
 // 为了支持外部依赖注入，方便测试和扩展
@@ -851,7 +886,7 @@ export default class GMApi {
         if (reqId) scXhrRequests.delete(reqId);
         scXhrRequests.delete(markerID);
         headersReceivedMap.delete(markerID);
-        headerModifierMap.delete(markerID);
+        headersSettled(markerID); // 处理完毕
       };
       let strategy: GMXhrStrategy | undefined = undefined;
       if (useFetch) {
@@ -1410,6 +1445,7 @@ export default class GMApi {
         if (lastError) {
           console.error("chrome.runtime.lastError in chrome.webRequest.onBeforeRedirect:", lastError);
           // webRequest API 出错不进行后续处理
+          cleanupOnAPIError(details?.requestId);
           return undefined;
         }
         if (details.tabId === -1) {
@@ -1426,7 +1462,7 @@ export default class GMApi {
       }
     );
     const reqOpt: OnBeforeSendHeadersOptions[] = ["requestHeaders"];
-    const respOpt: OnHeadersReceivedOptions[] = ["responseHeaders"];
+    const respOpt: ReceiveHeaderOptions[] = ["responseHeaders"];
     if (!isFirefox()) {
       reqOpt.push("extraHeaders");
       respOpt.push("extraHeaders");
@@ -1438,14 +1474,16 @@ export default class GMApi {
         if (lastError) {
           console.error("chrome.runtime.lastError in chrome.webRequest.onErrorOccurred:", lastError);
           // webRequest API 出错不进行后续处理
+          cleanupOnAPIError(details?.requestId);
           return undefined;
         }
         if (details.tabId === -1) {
           const markerID = scXhrRequests.get(details.requestId);
-          if (markerID) {
-            nwErrorResults.set(markerID, details.error);
-            nwErrorResultPromises.get(markerID)?.();
-          }
+          if (!markerID) return;
+          nwErrorResults.set(markerID, details.error);
+          nwErrorResultPromises.get(markerID)?.();
+
+          headersSettled(markerID); // 错误发生，不处理 header modifiers
         }
       },
       {
@@ -1502,6 +1540,7 @@ export default class GMApi {
         if (lastError) {
           console.error("chrome.runtime.lastError in chrome.webRequest.onBeforeSendHeaders:", lastError);
           // webRequest API 出错不进行后续处理
+          cleanupOnAPIError(details?.requestId);
           return undefined;
         }
         if (details.tabId === -1) {
@@ -1510,7 +1549,11 @@ export default class GMApi {
           if (requestHeaders) {
             // 如 onBeforeSendHeaders 是在 modifyHeaders 前执行，可以更新一下 reqId 和 markerID 的关联
             const markerID = requestHeaders?.find((h) => h.name.toLowerCase() === "x-sc-request-marker")?.value;
-            if (markerID) scXhrRequests.set(reqId, markerID);
+            if (markerID) {
+              // 双向关联
+              scXhrRequests.set(reqId, markerID);
+              scXhrRequests.set(markerID, reqId); // 用于清理
+            }
           }
           const markerID = scXhrRequests.get(reqId);
           if (!markerID) return undefined;
@@ -1525,12 +1568,14 @@ export default class GMApi {
       },
       reqOpt
     );
+
     chrome.webRequest.onHeadersReceived.addListener(
       (details) => {
         const lastError = chrome.runtime.lastError;
         if (lastError) {
           console.error("chrome.runtime.lastError in chrome.webRequest.onBeforeSendHeaders:", lastError);
           // webRequest API 出错不进行后续处理
+          cleanupOnAPIError(details?.requestId);
           return undefined;
         }
         if (details.tabId === -1) {
@@ -1597,21 +1642,7 @@ export default class GMApi {
                   }
                 }
               );
-            } else {
-              // 删除关联与DNR
-              headerModifierMap.delete(markerID);
-              chrome.declarativeNetRequest.updateSessionRules(
-                {
-                  removeRuleIds: [rule.id],
-                },
-                () => {
-                  const lastError = chrome.runtime.lastError;
-                  if (lastError) {
-                    console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
-                  }
-                  removeSessionRuleIdEntry(rule.id);
-                }
-              );
+              return;
             }
           }
         }
@@ -1624,6 +1655,38 @@ export default class GMApi {
       respOpt
     );
 
+    chrome.webRequest.onResponseStarted.addListener(
+      (details) => {
+        // onResponseStarted 触发后，headers 不会再有改动
+        const lastError = chrome.runtime.lastError;
+        if (lastError) {
+          console.error("chrome.runtime.lastError in chrome.webRequest.onResponseStarted:", lastError);
+          // webRequest API 出错不进行后续处理
+          cleanupOnAPIError(details?.requestId);
+          return undefined;
+        }
+        if (details.tabId === -1) {
+          const reqId = details.requestId;
+
+          const markerID = scXhrRequests.get(reqId);
+          if (!markerID) return;
+          if (details.responseHeaders && details.statusCode) {
+            headersReceivedMap.set(markerID, {
+              responseHeaders: details.responseHeaders,
+              statusCode: details.statusCode,
+            });
+          }
+
+          headersSettled(markerID); // onResponseStarted 已触发，headers 已固定
+        }
+      },
+      {
+        urls: ["<all_urls>"],
+        types: ["xmlhttprequest"],
+      },
+      respOpt
+    );
+
     const ruleId = 999;
     const rule = {
       id: ruleId,