feat: msg push

src/onebot/network/active-http.ts

@@ -10,6 +10,7 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
     isOpen: boolean = false;
 
     constructor(
+        public name: string,
         public url: string,
         public secret: string | undefined,
         public core: NapCatCore,

src/onebot/network/active-websocket.ts

@@ -15,6 +15,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
     private heartbeatRef: NodeJS.Timeout | null = null;
 
     constructor(
+        public name: string,
         public url: string,
         public reconnectIntervalInMillis: number,
         public heartbeatIntervalInMillis: number,
@@ -147,7 +148,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
             return;
         }
-        const retdata = await action.websocketHandle(receiveData.params, echo ?? '');
+        const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name);
         this.checkStateAndReply<any>({ ...retdata });
     }
 }

src/onebot/network/index.ts

@@ -6,6 +6,7 @@ export type OB11EmitEventContent = OB11BaseEvent | OB11Message;
 
 export interface IOB11NetworkAdapter {
     actions?: ActionMap;
+    name: string;
 
     onEvent<T extends OB11EmitEventContent>(event: T): void;
 
@@ -15,19 +16,34 @@ export interface IOB11NetworkAdapter {
 }
 
 export class OB11NetworkManager {
-    adapters: IOB11NetworkAdapter[] = [];
+    adapters: Map<string, IOB11NetworkAdapter> = new Map();
 
     async openAllAdapters() {
-        return Promise.all(this.adapters.map(adapter => adapter.open()));
+        return Promise.all(Array.from(this.adapters.values()).map(adapter => adapter.open()));
     }
 
     async emitEvent(event: OB11EmitEventContent) {
-        //console.log('adapters', this.adapters.length);
-        return Promise.all(this.adapters.map(adapter => adapter.onEvent(event)));
+        return Promise.all(Array.from(this.adapters.values()).map(adapter => adapter.onEvent(event)));
     }
 
+    async emitEventByName(names: string[], event: OB11EmitEventContent) {
+        return Promise.all(names.map(name => {
+            const adapter = this.adapters.get(name);
+            if (adapter) {
+                return adapter.onEvent(event);
+            }
+        }));
+    }
+    async emitEventByNames(map:Map<string,OB11EmitEventContent>){
+        return Promise.all(Array.from(map.entries()).map(([name, event]) => {
+            const adapter = this.adapters.get(name);
+            if (adapter) {
+            return adapter.onEvent(event);
+            }
+        }));
+    }
     registerAdapter(adapter: IOB11NetworkAdapter) {
-        this.adapters.push(adapter);
+        this.adapters.set(adapter.name, adapter);
     }
 
     async registerAdapterAndOpen(adapter: IOB11NetworkAdapter) {
@@ -36,24 +52,28 @@ export class OB11NetworkManager {
     }
 
     async closeSomeAdapters(adaptersToClose: IOB11NetworkAdapter[]) {
-        this.adapters = this.adapters.filter(adapter => !adaptersToClose.includes(adapter));
-        await Promise.all(adaptersToClose.map(adapter => adapter.close()));
+        for (const adapter of adaptersToClose) {
+            this.adapters.delete(adapter.name);
+            await adapter.close();
+        }
+    }
+
+    findSomeAdapter(name: string) {
+        return this.adapters.get(name);
     }
 
-    /**
-     * Close all adapters that satisfy the predicate.
-     */
     async closeAdapterByPredicate(closeFilter: (adapter: IOB11NetworkAdapter) => boolean) {
-        await this.closeSomeAdapters(this.adapters.filter(closeFilter));
+        const adaptersToClose = Array.from(this.adapters.values()).filter(closeFilter);
+        await this.closeSomeAdapters(adaptersToClose);
     }
 
     async closeAllAdapters() {
-        await Promise.all(this.adapters.map(adapter => adapter.close()));
-        this.adapters = [];
+        await Promise.all(Array.from(this.adapters.values()).map(adapter => adapter.close()));
+        this.adapters.clear();
     }
 }
 
 export * from './active-http';
 export * from './active-websocket';
 export * from './passive-http';
-export * from './passive-websocket';
+export * from './passive-websocket';

src/onebot/network/passive-http.ts

@@ -12,6 +12,7 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
     private isOpen: boolean = false;
 
     constructor(
+        public name: string,
         public port: number,
         public token: string,
         public core: NapCatCore,
@@ -101,7 +102,7 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
         const action = this.actions.get(actionName);
         if (action) {
             try {
-                const result = await action.handle(payload);
+                const result = await action.handle(payload,this.name);
                 return res.json(result);
             } catch (error: any) {
                 return res.json(OB11Response.error(error?.stack?.toString() || error?.message || 'Error Handle', 200));

src/onebot/network/passive-websocket.ts

@@ -24,6 +24,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     wsClientWithEvent: WebSocket[] = [];
 
     constructor(
+        public name: string,
         ip: string,
         port: number,
         heartbeatInterval: number,
@@ -188,7 +189,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient);
             return;
         }
-        const retdata = await action.websocketHandle(receiveData.params, echo ?? '');
+        const retdata = await action.websocketHandle(receiveData.params, echo ?? '', this.name);
         this.checkStateAndReply<any>({ ...retdata }, wsClient);
     }
 }