cgserver 6.9.460 → 6.9.463

package/dist/lib/Logic/EventTool.js

@@ -19,5 +19,9 @@ class EventTool {
     emit(event, ...args) {
         this._event_emitter.emit(event, ...args);
     }
+    listenerCount(event) {
+        let count = this._event_emitter.listenerCount(event) || 0;
+        return count;
+    }
 }
 exports.GEventTool = new EventTool();

package/dist/lib/SocketServer/IRpc.js

@@ -4,6 +4,7 @@ exports.IRpc = exports.RpcBaseMsg = void 0;
 const IWebSocket_1 = require("./IWebSocket");
 class RpcBaseMsg extends IWebSocket_1.BaseMsg {
     __rpcid = "";
+    __return = false;
 }
 exports.RpcBaseMsg = RpcBaseMsg;
 class IRpc {

package/dist/lib/SocketServer/IRpcClientWebSocket.js

@@ -39,12 +39,19 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
             super.send(msg);
         });
     }
-    receive_other_all(jsonData) {
-        if (jsonData.__rpcid) {
-            EventTool_1.GEventTool.emit(jsonData.__rpcid, jsonData);
+    receive_other_all(msg) {
+        if (msg.__rpcid) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
             return;
         }
-        Log_1.GLog.error({ des: "no handle", jsonData });
+        Log_1.GLog.error({ des: "no handle", msg });
+    }
+    async _onMessage(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        super._onMessage(msg);
     }
 }
 exports.IRpcClientWebSocket = IRpcClientWebSocket;

package/dist/lib/SocketServer/IRpcServerWebSocket.js

@@ -39,12 +39,19 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
             super.send(msg);
         });
     }
-    receive_other_all(jsonData) {
-        if (jsonData.__rpcid) {
-            EventTool_1.GEventTool.emit(jsonData.__rpcid, jsonData);
+    receive_other_all(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
             return;
         }
-        Log_1.GLog.error({ des: "no handle", jsonData });
+        Log_1.GLog.error({ des: "no handle", msg });
+    }
+    async _onMessage(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        super._onMessage(msg);
     }
 }
 exports.IRpcServerWebSocket = IRpcServerWebSocket;

package/dist/lib/ThirdParty/CgMq.js

@@ -57,6 +57,7 @@ class CgMqServerWebsocket extends IRpcClientWebSocket_1.IRpcClientWebSocket {
     async receive_msg(msg) {
         let data = await this._cgmq.onMsg(msg);
         msg.data = data;
+        msg.__return = true;
         this.send(msg);
     }
 }
@@ -119,7 +120,7 @@ class CgMq {
     }
     async onMsg(msg) {
         if (this._onmsg) {
-            let data = await Core_1.core.safeCall(this._onmsg, msg);
+            let data = await Core_1.core.safeCall(this._onmsg, null, msg);
             return data;
         }
         return;

package/dist/types/Logic/EventTool.d.ts

@@ -7,6 +7,7 @@ declare class EventTool {
     off(event: string, func: (...args: any[]) => void): void;
     once(event: string, func: (...args: any[]) => void): void;
     emit(event: string, ...args: any[]): void;
+    listenerCount(event: string): number;
 }
 export declare let GEventTool: EventTool;
 export {};

package/dist/types/SocketServer/IRpc.d.ts

@@ -1,6 +1,7 @@
 import { BaseMsg } from "./IWebSocket";
 export declare class RpcBaseMsg extends BaseMsg {
     __rpcid: string;
+    __return: boolean;
 }
 export declare abstract class IRpc {
     abstract callRemote(msg: RpcBaseMsg): any;

package/dist/types/SocketServer/IRpcClientWebSocket.d.ts

@@ -7,5 +7,6 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
         des: string;
     }): any;
     callRemote(msg: RpcBaseMsg): Promise<unknown>;
-    receive_other_all(jsonData: any): void;
+    receive_other_all(msg: RpcBaseMsg): void;
+    protected _onMessage(msg: RpcBaseMsg): Promise<void>;
 }

package/dist/types/SocketServer/IRpcServerWebSocket.d.ts

@@ -7,5 +7,6 @@ export declare class IRpcServerWebSocket extends IServerWebSocket implements IRp
         des: string;
     }): any;
     callRemote(msg: RpcBaseMsg): Promise<unknown>;
-    receive_other_all(jsonData: any): void;
+    receive_other_all(msg: RpcBaseMsg): void;
+    protected _onMessage(msg: RpcBaseMsg): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.9.460",
+  "version": "6.9.463",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",