删去不使用的 listenPageMessages, 修正 CAT_fetchDocument

Author: cyfung1031

src/app/service/content/gm_api/gm_api.ts

@@ -481,7 +481,7 @@ export default class GMApi extends GM_Base {
 
   @GMContext.API()
   public async CAT_fetchDocument(url: string): Promise<Document | undefined> {
-    return urlToDocumentInContentPage(this, url);
+    return urlToDocumentInContentPage(this, url, isContent);
   }
 
   static _GM_cookie(

src/app/service/content/gm_api/gm_xhr.ts

@@ -94,9 +94,9 @@ export const convObjectToURL = async (object: string | URL | Blob | File | undef
   return url;
 };
 
-export const urlToDocumentInContentPage = async (a: GMApi, url: string) => {
+export const urlToDocumentInContentPage = async (a: GMApi, url: string, isContent: boolean) => {
   // url (e.g. blob url) -> XMLHttpRequest (CONTENT) -> Document (CONTENT)
-  const nodeId = await a.sendMessage("CAT_fetchDocument", [url]);
+  const nodeId = await a.sendMessage("CAT_fetchDocument", [url, isContent]);
   return (<CustomEventMessage>a.message).getAndDelRelatedTarget(nodeId) as Document;
 };
 

src/scripting.ts

@@ -65,21 +65,6 @@ const setupDeliveryChannel = () => {
   messageDeliveryToPage.setup(`evt_${token}_deliveryMessage`);
 };
 
-// ================================
-// 页面消息监听（调试用）
-// ================================
-
-// 页面消息监听（TBC）
-const listenPageMessages = () => {
-  const token = requireScriptingToken();
-  pageAddEventListener(`evt_${token}_listen_page`, (ev) => {
-    if (!(ev instanceof CustomEvent)) return;
-    const { tag, value, from } = ev.detail;
-    // 仅打印 (TBC)
-    console.log(tag, value, from);
-  });
-};
-
 // ================================
 // Server 构建与 service_worker 转发
 // ================================
@@ -102,13 +87,15 @@ const handleRuntimeGmApi = (
       return fetch(data.params[0]).then((res) => res.blob());
     }
     case "CAT_fetchDocument": {
+      const [url, isContent] = data.params;
       return new Promise((resolve) => {
         const xhr = new XMLHttpRequest();
         xhr.responseType = "document";
-        xhr.open("GET", data.params[0]);
+        xhr.open("GET", url);
         xhr.onload = () => {
-          // TBC
-          const nodeId = (<CustomEventMessage>senderToInject).sendRelatedTarget(xhr.response);
+          // 根据来源选择不同的消息桥（content / inject）
+          const msg = isContent ? senderToContent : senderToInject;
+          const nodeId = msg.sendRelatedTarget(xhr.response);
           resolve(nodeId);
         };
         xhr.send();
@@ -221,9 +208,6 @@ const onMessageFlagReceived = (MessageFlag: string) => {
       const server = new Server("scripting", [scriptExecutorMsgTxIT, scriptExecutorMsgTxCT]);
       prepareServer(server, senderToExt, scriptExecutorMsgTxIT, scriptExecutorMsgTxCT);
 
-      // 页面消息监听（TBC）
-      listenPageMessages();
-
       // 建立向页面投递消息的 delivery 通道
       setupDeliveryChannel();
     }