🐛 修复GM xhr document问题 #716

Author: CodFrm

src/app/service/content/content.ts

@@ -49,9 +49,8 @@ export default class ContentRuntime {
               xhr.responseType = "document";
               xhr.open("GET", data.params[0]);
               xhr.onload = () => {
-                resolve({
-                  relatedTarget: xhr.response,
-                });
+                const nodeId = (this.msg as CustomEventMessage).sendRelatedTarget(xhr.response);
+                resolve(nodeId);
               };
               xhr.send();
             });

src/app/service/content/gm_api.ts

@@ -342,8 +342,8 @@ export default class GMApi extends GM_Base {
 
   @GMContext.API()
   public async CAT_fetchDocument(url: string): Promise<Document | undefined> {
-    const data = await this.sendMessage("CAT_fetchDocument", [url]);
-    return (<CustomEventMessage>this.message).getAndDelRelatedTarget(data.relatedTarget) as Document;
+    const nodeId = await this.sendMessage("CAT_fetchDocument", [url]);
+    return (<CustomEventMessage>this.message).getAndDelRelatedTarget(nodeId) as Document;
   }
 
   static _GM_cookie(

src/pkg/utils/utils.ts

@@ -108,17 +108,17 @@ export async function openInCurrentTab(url: string, tabId?: number) {
   try {
     await chrome.tabs.create(createProperties);
     return;
-  } catch {
-    // do nothing
+  } catch (e: any) {
+    console.error("Error opening tab:", e);
   }
   // 失敗的話，刪去 openerTabId 和 windowId ，再次嘗試打開
   delete createProperties.openerTabId;
   delete createProperties.windowId;
   try {
     await chrome.tabs.create(createProperties);
     return;
-  } catch {
-    // do nothing
+  } catch (e: any) {
+    console.error("Retry opeing tab error:", e);
   }
 }