消息

packages/message/client.ts

@@ -1,9 +1,10 @@
 import LoggerCore from "@App/app/logger/core";
-import { Message, MessageConnect } from "./server";
+import { Message, MessageConnect, MessageSend } from "./server";
+import { ExtensionMessageSend } from "./extension_message";
 
-export async function sendMessage(msg: Message, action: string, data?: any): Promise<any> {
+export async function sendMessage(msg: MessageSend, action: string, data?: any): Promise<any> {
   const res = await msg.sendMessage({ action, data });
-  LoggerCore.getInstance().logger().debug("sendMessage", { action, data, response: res });
+  LoggerCore.getInstance().logger().trace("sendMessage", { action, data, response: res });
   if (res && res.code) {
     console.error(res);
     return Promise.reject(res.message);
@@ -18,7 +19,7 @@ export function connect(msg: Message, action: string, data?: any): Promise<Messa
 
 export class Client {
   constructor(
-    private msg: Message,
+    private msg: ExtensionMessageSend,
     private prefix: string
   ) {
     if (!this.prefix.endsWith("/")) {

packages/message/extension_message.ts

@@ -1,6 +1,25 @@
-import { Message, MessageConnect } from "./server";
+import { Message, MessageConnect, MessageSend } from "./server";
 
-export class ExtensionMessage implements Message {
+export class ExtensionMessageSend implements MessageSend {
+  connect(data: any): Promise<MessageConnect> {
+    return new Promise((resolve) => {
+      const con = chrome.runtime.connect();
+      con.postMessage(data);
+      resolve(new ExtensionMessageConnect(con));
+    });
+  }
+
+  // 发送消息 注意不进行回调的内存泄漏
+  sendMessage(data: any): Promise<any> {
+    return new Promise((resolve) => {
+      chrome.runtime.sendMessage(data, (resp) => {
+        resolve(resp);
+      });
+    });
+  }
+}
+
+export class ExtensionMessage extends ExtensionMessageSend implements Message {
   onConnect(callback: (data: any, con: MessageConnect) => void) {
     chrome.runtime.onConnect.addListener((port) => {
       const handler = (msg: any) => {
@@ -11,29 +30,12 @@ export class ExtensionMessage implements Message {
     });
   }
 
-  connect(data: any): Promise<MessageConnect> {
-    return new Promise((resolve) => {
-      const con = chrome.runtime.connect();
-      con.postMessage(data);
-      resolve(new ExtensionMessageConnect(con));
-    });
-  }
-
   // 注意chrome.runtime.onMessage.addListener的回调函数需要返回true才能处理异步请求
   onMessage(callback: (data: any, sendResponse: (data: any) => void) => void) {
     chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
       return callback(msg, sendResponse);
     });
   }
-
-  // 发送消息 注意不进行回调的内存泄漏
-  sendMessage(data: any): Promise<any> {
-    return new Promise((resolve) => {
-      chrome.runtime.sendMessage(data, (resp) => {
-        resolve(resp);
-      });
-    });
-  }
 }
 
 export class ExtensionMessageConnect implements MessageConnect {

packages/message/message_queue.ts

@@ -1,10 +1,13 @@
 import EventEmitter from "eventemitter3";
-import { ApiFunction, Message, MessageConnect, Server } from "./server";
+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: Message) {}
+  constructor(private msg: MessageSend) {}
 
   // 订阅
   async subscribe(topic: string, handler: SubscribeCallback): Promise<MessageConnect> {
@@ -19,7 +22,7 @@ export class Broker {
 
   // 发布
   publish(topic: string, message: any) {
-    chrome.runtime.sendMessage({ action: "publish", topic, message });
+    sendMessage(this.msg, "messageQueue", { action: "publish", topic, message });
   }
 }
 
@@ -29,12 +32,15 @@ export class MessageQueue {
 
   private EE: EventEmitter = new EventEmitter();
 
+  logger: Logger;
   constructor(api: Server) {
     api.on("messageQueue", this.handler());
+    this.logger = LoggerCore.getInstance().logger({ service: "messageQueue" });
   }
 
   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");
       }
@@ -66,6 +72,7 @@ export class MessageQueue {
       // 移除断开连接的con
       list = list!.filter((item) => item.con !== con);
       this.topicConMap.set(topic, list);
+      this.logger.debug("disconnect", { topic });
     });
   }
 
@@ -75,6 +82,7 @@ export class MessageQueue {
       item.con.sendMessage({ action: "message", topic, message });
     });
     this.EE.emit(topic, message);
+    this.logger.trace("publish", { topic, message, list: list?.length });
   }
 
   // 只发布给当前环境

packages/message/server.ts

@@ -1,8 +1,12 @@
 import LoggerCore from "@App/app/logger/core";
+import { ExtensionMessageSend } from "./extension_message";
 
-export interface Message {
+export interface Message extends MessageSend {
   onConnect(callback: (data: any, con: MessageConnect) => void): void;
   onMessage(callback: (data: any, sendResponse: (data: any) => void) => void): void;
+}
+
+export interface MessageSend {
   connect(data: any): Promise<MessageConnect>;
   sendMessage(data: any): Promise<any>;
 }
@@ -53,7 +57,7 @@ export class Server {
 
   private messageHandle(msg: string, params: any, sendResponse: (response: any) => void) {
     const logger = LoggerCore.getInstance().logger({ env: this.env, msg });
-    logger.debug("messageHandle", { params });
+    logger.trace("messageHandle", { params });
     const func = this.apiFunctionMap.get(msg);
     if (func) {
       try {
@@ -96,7 +100,7 @@ export class Group {
 }
 
 // 转发消息
-export function forwardMessage(path: string, from: Server, to: Message) {
+export function forwardMessage(path: string, from: Server, to: ExtensionMessageSend) {
   from.on(path, (params, fromCon) => {
     if (fromCon) {
       to.connect({ action: path, data: params }).then((toCon) => {