cgserver 10.4.0 → 11.0.0

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

@@ -21,6 +21,10 @@ class RpcMsg extends IWebSocket_1.BaseMsg {
      * 目的分组下的某个具体对象id
      */
     to_id = "";
+    /**
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listem="10086",listem,也可以理解为子group
+     */
+    listen = "";
     /**
      * 消息携带的数据
      */

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

@@ -13,6 +13,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     _id = "";
     //超时时间
     _timeout = 3000;
+    _listens = {};
     _genId(pre = "") {
         return pre + "_" + Core_1.core.getUuid();
     }
@@ -60,6 +61,61 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
             super.send(msg);
         });
     }
+    receive_init(req_msg) {
+        if (req_msg.__rpcid) {
+            req_msg.__return = true;
+        }
+        if (!req_msg.from_group) {
+            let ret_msg = this.toRetMsg(req_msg, req_msg.data, { id: 10004, des: "初始化消息必须带有identity" });
+            this.send(ret_msg);
+            return;
+        }
+        this._group = req_msg.from_group;
+        this._id = req_msg.from_id;
+        let ret_msg = this.toRetMsg(req_msg, null);
+        this.send(ret_msg);
+    }
+    receive_listen(req_msg) {
+        if (req_msg.__rpcid) {
+            req_msg.__return = true;
+        }
+        let data = req_msg.data;
+        if (!data || !Core_1.core.isArray(data)) {
+            let ret_msg = this.toRetMsg(req_msg, req_msg.data, { id: 10005, des: "listen data not correct must be string[]" });
+            this.send(ret_msg);
+            return;
+        }
+        for (let i = 0; i < data.length; i++) {
+            let listen = data[i];
+            if (!listen) {
+                continue;
+            }
+            this._listens[listen] = true;
+        }
+        let ret_msg = this.toRetMsg(req_msg, null);
+        this.send(ret_msg);
+    }
+    receive_unlisten(req_msg) {
+        if (req_msg.__rpcid) {
+            req_msg.__return = true;
+        }
+        let data = req_msg.data;
+        if (!data || !Core_1.core.isArray(data)) {
+            let ret_msg = this.toRetMsg(req_msg, req_msg.data, { id: 10005, des: "listen data not correct must be string[]" });
+            this.send(ret_msg);
+            return;
+        }
+        for (let i = 0; i < data.length; i++) {
+            let listen = data[i];
+            if (!listen) {
+                continue;
+            }
+            this._listens[listen] = undefined;
+            delete this._listens[listen];
+        }
+        let ret_msg = this.toRetMsg(req_msg, null);
+        this.send(ret_msg);
+    }
     receive_other_all(msg) {
         Log_1.gLog.error({ des: "no handle", msg });
     }

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

@@ -19,12 +19,25 @@ class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
         let jsonData = await this.callRemote(msg);
         return jsonData;
     }
+    async listen(data) {
+        let msg = this.getNewMsg("listen");
+        msg.data = data;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    async unlisten(data) {
+        let msg = this.getNewMsg("unlisten");
+        msg.data = data;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
     //把消息发送给rpc服务器，目的是调用远程函数
-    async push(to_group, data, to_id = "") {
+    async push(to_group, data, to_id = "", listen = "") {
         let msg = this.getNewMsg("msg");
         msg.to_group = to_group;
         msg.to_id = to_id;
         msg.data = data;
+        msg.listen = listen;
         let ret_rpcmsg = await this.callRemote(msg);
         return ret_rpcmsg;
     }

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

@@ -18,6 +18,10 @@ export declare class RpcMsg extends BaseMsg {
      * 目的分组下的某个具体对象id
      */
     to_id: string;
+    /**
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listem="10086",listem,也可以理解为子group
+     */
+    listen: string;
     /**
      * 消息携带的数据
      */

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

@@ -7,6 +7,9 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
     protected _group: string;
     protected _id: string;
     protected _timeout: number;
+    protected _listens: {
+        [key: string]: boolean;
+    };
     protected _genId(pre?: string): string;
     getNewMsg(cmd: string, errcode?: {
         id: number;
@@ -17,6 +20,9 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
         des: string;
     }): RpcMsg;
     callRemote(msg: RpcMsg): Promise<unknown>;
+    receive_init(req_msg: RpcMsg): void;
+    receive_listen(req_msg: RpcMsg): void;
+    receive_unlisten(req_msg: RpcMsg): void;
     receive_other_all(msg: RpcMsg): void;
     protected _onMessage(msg: RpcMsg): Promise<void>;
 }

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

@@ -5,7 +5,9 @@ declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     constructor(cgmq: CgMq);
     onOpen(e?: any): void;
     init(): Promise<RpcMsg>;
-    push(to_group: string, data: any, to_id?: string): Promise<RpcMsg>;
+    listen(data: string[]): Promise<RpcMsg>;
+    unlisten(data: string[]): Promise<RpcMsg>;
+    push(to_group: string, data: any, to_id?: string, listen?: string): Promise<RpcMsg>;
     receive_msg(req_msg: RpcMsg): Promise<void>;
 }
 export declare class RpcConfig {

package/package.json

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