cgserver 11.0.0 → 11.2.0

package/dist/lib/Framework/SocketServer/IRpcClientWebSocket.js

@@ -14,6 +14,12 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     //超时时间
     _timeout = 3000;
     _listens = {};
+    isListenning(listen) {
+        if (!listen) {
+            return true;
+        }
+        return !!this._listens[listen];
+    }
     _genId(pre = "") {
         return pre + "_" + Core_1.core.getUuid();
     }

package/dist/lib/Framework/ThirdParty/CgMq.js

@@ -117,15 +117,15 @@ class CgMq {
             }
         });
     }
-    async callRemote(group, to_id, func_name, ...args) {
+    async callRemote(group, to_id, listen, func_name, ...args) {
         let time = Date.now();
         let data = {
             cmd: func_name,
             args: args
         };
-        let ret_rpcmsg = await this._ws.push(group, data, to_id);
+        let ret_rpcmsg = await this._ws.push(group, data, to_id, listen);
         if (this._ws.debug_msg) {
-            Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
+            Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name + "-" + listen);
         }
         return ret_rpcmsg;
     }
@@ -136,5 +136,11 @@ class CgMq {
         }
         return;
     }
+    async listen(data) {
+        return await this._ws.listen(data);
+    }
+    async unlisten(data) {
+        return await this._ws.unlisten(data);
+    }
 }
 exports.CgMq = CgMq;

package/dist/lib/Framework/ThirdParty/Rpc.js

@@ -15,13 +15,15 @@ class Remote {
     }
     _to_group = "";
     _to_id = "";
-    constructor(group, id, cgmq) {
+    _listen = "";
+    constructor(group, id, cgmq, listen) {
         this._to_group = group;
         this._to_id = id;
+        this._listen = listen;
         this._cgmq = cgmq;
     }
     async call(func_name, ...args) {
-        this._retmsg = await this._cgmq.callRemote(this._to_group, this._to_id, func_name, ...args);
+        this._retmsg = await this._cgmq.callRemote(this._to_group, this._to_id, this._listen, func_name, ...args);
         let datas = this._retmsg.data;
         let ret = { rets: datas, ret: null };
         if (datas && datas.length > 0) {
@@ -40,8 +42,8 @@ class Rpc {
         let ret = await this._cgmq.init(cfg, this.onMsg.bind(this));
         return ret;
     }
-    getRemote(group, id = "") {
-        return new Remote(group, id, this._cgmq);
+    getRemote(group, id = "", listener = "") {
+        return new Remote(group, id, this._cgmq, listener);
     }
     async onMsg(msg) {
         if (!msg || !msg.data || !msg.data.cmd) {
@@ -56,5 +58,13 @@ class Rpc {
         let data = await Core_1.core.safeCall(func, this, ...msg.data?.args, msg);
         return data;
     }
+    async listen(listeners) {
+        let ret = await this._cgmq.listen(listeners);
+        return ret;
+    }
+    async unlisten(listeners) {
+        let ret = await this._cgmq.unlisten(listeners);
+        return ret;
+    }
 }
 exports.Rpc = Rpc;

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

@@ -10,6 +10,7 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
     protected _listens: {
         [key: string]: boolean;
     };
+    isListenning(listen: string): boolean;
     protected _genId(pre?: string): string;
     getNewMsg(cmd: string, errcode?: {
         id: number;

package/dist/types/Framework/ThirdParty/CgMq.d.ts

@@ -41,7 +41,9 @@ export declare class CgMq {
      * @returns
      */
     init(cfg: RpcConfig, onmsg?: (msg: RpcMsg) => any): Promise<unknown>;
-    callRemote(group: string, to_id: string, func_name: string, ...args: any[]): Promise<RpcMsg>;
+    callRemote(group: string, to_id: string, listen: string, func_name: string, ...args: any[]): Promise<RpcMsg>;
     onMsg(msg: RpcMsg): Promise<any>;
+    listen(data: string[]): Promise<RpcMsg>;
+    unlisten(data: string[]): Promise<RpcMsg>;
 }
 export {};

package/dist/types/Framework/ThirdParty/Rpc.d.ts

@@ -7,7 +7,8 @@ declare class Remote {
     get cgmq(): CgMq;
     protected _to_group: string;
     protected _to_id: string;
-    constructor(group: string, id: string, cgmq: CgMq);
+    protected _listen: string;
+    constructor(group: string, id: string, cgmq: CgMq, listen: string);
     call(func_name: string, ...args: any[]): Promise<{
         rets: any[];
         ret: any;
@@ -17,7 +18,9 @@ export declare class Rpc {
     protected _cgmq: CgMq;
     get cgmq(): CgMq;
     init(cfg: RpcConfig): Promise<unknown>;
-    getRemote(group: string, id?: string): Remote;
+    getRemote(group: string, id?: string, listener?: string): Remote;
     onMsg(msg: RpcMsg): Promise<any>;
+    listen(listeners: string[]): Promise<RpcMsg>;
+    unlisten(listeners: string[]): Promise<RpcMsg>;
 }
 export {};

package/package.json

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