调整通信

packages/message/message_queue.ts

@@ -1,98 +1,57 @@
 import EventEmitter from "eventemitter3";
-import { ApiFunction, MessageConnect, MessageSend, Server } from "./server";
-import { sendMessage } from "./client";
 import Logger from "@App/app/logger/logger";
 import LoggerCore from "@App/app/logger/core";
 
 export type SubscribeCallback = (message: any) => void;
-
-export class Broker {
-  constructor(private msg: MessageSend) {}
-
-  // 订阅
-  async subscribe(topic: string, handler: SubscribeCallback): Promise<MessageConnect> {
-    LoggerCore.getInstance().logger({ service: "messageQueue" }).debug("subscribe", { topic });
-    const con = await this.msg.connect({ action: "messageQueue", data: { action: "subscribe", topic } });
-    con.onMessage((msg: { action: string; topic: string; message: any }) => {
-      if (msg.action === "message") {
-        handler(msg.message);
-      }
-    });
-    return con;
-  }
-
-  // 发布
-  publish(topic: string, message: any) {
-    sendMessage(this.msg, "messageQueue", { action: "publish", topic, message });
-  }
-}
+// 释放订阅
+export type Unsubscribe = () => void;
 
 // 消息队列
 export class MessageQueue {
-  topicConMap: Map<string, { name: string; con: MessageConnect }[]> = new Map();
-
   private EE: EventEmitter = new EventEmitter();
 
-  logger: Logger;
-  constructor(api: Server) {
-    api.on("messageQueue", this.handler());
-    this.logger = LoggerCore.getInstance().logger({ service: "messageQueue" });
+  constructor() {
+    chrome.runtime.onMessage.addListener((msg) => {
+      if (msg.action === "messageQueue") {
+        this.handler(msg.data);
+      }
+    });
   }
 
-  handler(): ApiFunction {
-    return ({ action, topic, message }: { action: string; topic: string; message: any }, con) => {
-      this.logger.trace("messageQueueHandler", { action, topic, message });
-      if (!con) {
-        throw new Error("con is required");
-      }
-      if (!topic) {
-        throw new Error("topic is required");
-      }
-      switch (action) {
-        case "subscribe":
-          this.subscribe(topic, con as MessageConnect);
-          break;
-        case "publish":
-          this.publish(topic, message);
-          break;
-        default:
-          throw new Error("action not found");
-      }
+  handler({ action, topic, message }: { action: string; topic: string; message: any }) {
+    LoggerCore.getInstance()
+      .logger({ service: "messageQueue" })
+      .trace("messageQueueHandler", { action, topic, message });
+    if (!topic) {
+      throw new Error("topic is required");
+    }
+    switch (action) {
+      case "message":
+        this.EE.emit(topic, message);
+        break;
+      default:
+        throw new Error("action not found");
+    }
+  }
+
+  subscribe(topic: string, handler: SubscribeCallback): Unsubscribe {
+    this.EE.on(topic, handler);
+    return () => {
+      this.EE.off(topic, handler);
     };
   }
 
-  private subscribe(topic: string, con: MessageConnect) {
-    let list = this.topicConMap.get(topic);
-    if (!list) {
-      list = [];
-      this.topicConMap.set(topic, list);
-    }
-    list.push({ name: topic, con });
-    con.onDisconnect(() => {
-      let list = this.topicConMap.get(topic);
-      // 移除断开连接的con
-      list = list!.filter((item) => item.con !== con);
-      this.topicConMap.set(topic, list);
-      this.logger.debug("disconnect", { topic });
-    });
-  }
-
   publish(topic: string, message: any) {
-    const list = this.topicConMap.get(topic);
-    list?.forEach((item) => {
-      item.con.sendMessage({ action: "message", topic, message });
+    chrome.runtime.sendMessage({
+      action: "messageQueue",
+      data: { action: "message", topic, message },
     });
     this.EE.emit(topic, message);
-    this.logger.trace("publish", { topic, message, list: list?.length });
+    LoggerCore.getInstance().logger({ service: "messageQueue" }).trace("publish", { topic, message });
   }
 
   // 只发布给当前环境
   emit(topic: string, message: any) {
     this.EE.emit(topic, message);
   }
-
-  // 同环境下使用addListener
-  addListener(topic: string, handler: (message: any) => void) {
-    this.EE.on(topic, handler);
-  }
 }