cgserver 12.0.0 → 12.0.2

package/dist/lib/Framework/{ThirdParty → Server/RpcWebSocketServer}/CgMq.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CgMq = exports.RpcConfig = void 0;
-const Core_1 = require("../Core/Core");
-const IRpcServerWebSocket_1 = require("../Server/WebSocketServer/IRpcServerWebSocket");
-const Log_1 = require("../Logic/Log");
+const Core_1 = require("../../Core/Core");
+const Log_1 = require("../../Logic/Log");
+const IRpcServerWebSocket_1 = require("./IRpcServerWebSocket");
 class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
     _cgmq = null;
     _listens = {};
@@ -52,18 +52,23 @@ class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
         return jsonData;
     }
     //把消息发送给rpc服务器，目的是调用远程函数
-    async push(to_group, data, to_id = "", listen = "") {
+    async push(to_group, data, to_id = "", listen = "", is_mq = false) {
         let msg = this.getNewMsg("msg");
         msg.to_group = to_group;
         msg.to_id = to_id;
         msg.data = data;
         msg.listen = listen;
+        msg.__is_mq = is_mq;
         let ret_rpcmsg = await this.callRemote(msg);
         return ret_rpcmsg;
     }
     //收到来自远程的调用消息
     async receive_msg(req_msg) {
         let data = await this._cgmq.onMsg(req_msg);
+        if (req_msg.__is_mq) {
+            //mq消息不需要回复
+            return;
+        }
         let ret_msg = this.toRetMsg(req_msg, data);
         this.send(ret_msg);
     }
@@ -146,13 +151,13 @@ class CgMq {
             }
         });
     }
-    async callRemote(group, to_id, listen, func_name, ...args) {
+    async callRemote(group, to_id, listen, func_name, is_mq = false, ...args) {
         let time = Date.now();
         let data = {
             cmd: func_name,
             args: args
         };
-        let ret_rpcmsg = await this._ws.push(group, data, to_id, listen);
+        let ret_rpcmsg = await this._ws.push(group, data, to_id, listen, is_mq);
         if (this._ws.debug_msg) {
             Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name + "-" + listen);
         }

package/dist/lib/Framework/Server/{WebSocketServer → RpcWebSocketServer}/IRpc.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IRpc = exports.RpcMsg = void 0;
-const IWebSocket_1 = require("./IWebSocket");
+const IWebSocket_1 = require("../WebSocketServer/IWebSocket");
 class RpcMsg extends IWebSocket_1.BaseMsg {
     __rpcid = "";
     __return = false;
+    //mq消息不需要回复
+    __is_mq = false;
     /**
       * 发送者分组
       */
@@ -22,7 +24,7 @@ class RpcMsg extends IWebSocket_1.BaseMsg {
      */
     to_id = "";
     /**
-     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listem="10086",listem,也可以理解为子group
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listen="10086",listen,也可以理解为子group
      */
     listen = "";
     /**

package/dist/lib/Framework/Server/RpcWebSocketServer/IRpcClientWebSocket.js

@@ -0,0 +1,253 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcClientWebSocket = void 0;
+const IRpc_1 = require("./IRpc");
+const IClientWebSocket_1 = require("../WebSocketServer/IClientWebSocket");
+const Core_1 = require("../../Core/Core");
+const Log_1 = require("../../Logic/Log");
+const EventTool_1 = require("../../Logic/EventTool");
+class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
+    /**
+     * 自己的身份
+     */
+    _group = "";
+    _id = "";
+    //超时时间
+    _timeout = 3000;
+    _listens = {};
+    isListenning(listen) {
+        if (!listen) {
+            return true;
+        }
+        return !!this._listens[listen];
+    }
+    _genId(pre = "") {
+        return pre + "_" + Core_1.core.getUuid();
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = new IRpc_1.RpcMsg(cmd, errcode);
+        msg.__rpcid = this._genId(cmd);
+        msg.__return = false;
+        //mq消息不需要回复
+        msg.__is_mq = false;
+        msg.from_group = this._group;
+        msg.from_id = this._id;
+        msg.to_group = "";
+        msg.to_id = "";
+        msg.listen = "";
+        return msg;
+    }
+    toRetMsg(req_msg, data, errcode) {
+        let ret_msg = new IRpc_1.RpcMsg(req_msg.cmd, errcode);
+        //唯一标识必须保持一致
+        ret_msg.__rpcid = req_msg.__rpcid;
+        ret_msg.__return = true;
+        ret_msg.__is_mq = req_msg.__is_mq;
+        ret_msg.from_group = this._group;
+        ret_msg.from_id = this._id;
+        ret_msg.to_group = req_msg.from_group;
+        ret_msg.to_id = req_msg.from_id;
+        ret_msg.data = data;
+        return ret_msg;
+    }
+    async callRemote(msg) {
+        if (!msg) {
+            Log_1.gLog.error("send null msg!");
+            return;
+        }
+        if (!msg.__rpcid) {
+            msg.__rpcid = this._genId(msg.cmd);
+        }
+        if (msg.__is_mq) {
+            //mq消息不需要回复
+            this.send(msg);
+            return;
+        }
+        return new Promise((resolve, reject) => {
+            let handler = null;
+            let func = (jsonData) => {
+                if (handler) {
+                    clearTimeout(handler);
+                    handler = null;
+                }
+                resolve(jsonData);
+            };
+            handler = setTimeout(() => {
+                EventTool_1.gEventTool.off(msg.__rpcid, func);
+                resolve({ errcode: { id: 10086, des: "timeout" } });
+            }, 3000);
+            EventTool_1.gEventTool.once(msg.__rpcid, func);
+            this.send(msg);
+        });
+    }
+    receive_init(req_msg) {
+        this._group = req_msg.from_group || "";
+        this._id = req_msg.from_id || "";
+        if (!req_msg.from_group) {
+            let ret_msg = this.toRetMsg(req_msg, req_msg.data, { id: 10004, des: "初始化消息必须带有identity" });
+            ret_msg.from_group = "cgrpc";
+            ret_msg.from_id = "";
+            this.send(ret_msg);
+            return;
+        }
+        let ret_msg = this.toRetMsg(req_msg, null);
+        ret_msg.from_group = "cgrpc";
+        ret_msg.from_id = "";
+        this.send(ret_msg);
+    }
+    receive_listen(req_msg) {
+        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[]" });
+            ret_msg.from_group = "cgrpc";
+            ret_msg.from_id = "";
+            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);
+        ret_msg.from_group = "cgrpc";
+        ret_msg.from_id = "";
+        this.send(ret_msg);
+    }
+    receive_unlisten(req_msg) {
+        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[]" });
+            ret_msg.from_group = "cgrpc";
+            ret_msg.from_id = "";
+            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);
+        ret_msg.from_group = "cgrpc";
+        ret_msg.from_id = "";
+        this.send(ret_msg);
+    }
+    receive_other_all(msg) {
+        Log_1.gLog.error({ des: "no handle", msg });
+    }
+    async _onMessage(msg) {
+        if (msg.__return) {
+            let ret = this.filterMsg(msg);
+            if (!ret) {
+                return;
+            }
+            EventTool_1.gEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        super._onMessage(msg);
+    }
+    constructor(server) {
+        super(server);
+        this._debug_msg = true;
+        this._group = "";
+        this._id = global.gCgServer.customprocessid;
+    }
+    getWsByGroup(group, listen) {
+        let wses = [];
+        if (!group) {
+            return wses;
+        }
+        let allClients = this.server.wsClients;
+        for (let key in allClients) {
+            let ct = allClients[key];
+            if (ct._group == group && ct.isListenning(listen)) {
+                wses.push(ct);
+            }
+        }
+        return wses;
+    }
+    getWsByGroupId(group, id) {
+        if (!group) {
+            return null;
+        }
+        let allClients = this.server.wsClients;
+        for (let key in allClients) {
+            let ct = allClients[key];
+            if (ct._group == group && ct._id == id) {
+                return ct;
+            }
+        }
+        return null;
+    }
+    async receive_msg(req_msg) {
+        if (!req_msg.__rpcid) {
+            let retMsg = this.getNewMsg("msg", { id: 10001, des: "非法rpc消息" });
+            this.send(retMsg);
+            return;
+        }
+        if (!req_msg.to_group) {
+            let ret_msg = this.toRetMsg(req_msg, req_msg.data, { id: 10002, des: "消息中必须附带接受方的身份to_group" });
+            this.send(ret_msg);
+            return;
+        }
+        let wses = [];
+        if (req_msg.to_id) {
+            let ws = this.getWsByGroupId(req_msg.to_group, req_msg.to_id);
+            wses.push(ws);
+        }
+        else {
+            wses = this.getWsByGroup(req_msg.to_group, req_msg.listen);
+        }
+        //发送给远程服务器的消息
+        if (wses.length == 0) {
+            req_msg.errcode = { id: 10004, des: "一个接收者都没找到" };
+            this.send(req_msg);
+            return;
+        }
+        let arets = [];
+        let rpc_id = req_msg.__rpcid;
+        let rpc_id_index = 0;
+        for (let key in wses) {
+            let ws = wses[key];
+            req_msg.__rpcid = rpc_id + "_" + rpc_id_index;
+            rpc_id_index++;
+            let ret = ws.callRemote(req_msg);
+            arets.push(ret);
+        }
+        if (req_msg.__is_mq) {
+            //mq消息不需要回复
+            return;
+        }
+        let rets = [];
+        let first_ret = null;
+        for (let key in arets) {
+            let ret = await arets[key];
+            rets.push(ret.data);
+            if (!first_ret) {
+                first_ret = ret;
+            }
+        }
+        //还原rpc_id
+        req_msg.__rpcid = rpc_id;
+        //回复给调用来源的服务器
+        let retMsg = this.toRetMsg(req_msg, rets);
+        if (first_ret) {
+            retMsg.from_group = req_msg.to_group;
+            retMsg.to_group = req_msg.from_group;
+            if (req_msg.to_id) {
+                retMsg.from_id = first_ret.from_id;
+            }
+            else {
+                retMsg.from_id = "";
+            }
+        }
+        this.send(retMsg);
+    }
+}
+exports.IRpcClientWebSocket = IRpcClientWebSocket;

package/dist/lib/Framework/Server/{WebSocketServer → RpcWebSocketServer}/IRpcServerWebSocket.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IRpcServerWebSocket = void 0;
 const _ = require("underscore");
-const IServerWebSocket_1 = require("./IServerWebSocket");
+const IRpc_1 = require("./IRpc");
 const Log_1 = require("../../Logic/Log");
 const EventTool_1 = require("../../Logic/EventTool");
+const IServerWebSocket_1 = require("../WebSocketServer/IServerWebSocket");
 class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
     /**
      * 自己的身份
@@ -23,28 +24,38 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
         return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
     }
     getNewMsg(cmd, errcode) {
-        let msg = super.getNewMsg(cmd, errcode);
+        let msg = new IRpc_1.RpcMsg(cmd, errcode);
         msg.__rpcid = this._genId(cmd);
+        msg.__return = false;
+        msg.__is_mq = false;
         msg.from_group = this._group;
         msg.from_id = this._id;
+        msg.to_group = this._group;
+        msg.to_id = this._id;
         return msg;
     }
     toRetMsg(req_msg, data, errcode) {
         let ret_msg = this.getNewMsg(req_msg.cmd, errcode);
         //唯一标识必须保持一致
-        ret_msg.__return = true;
         ret_msg.__rpcid = req_msg.__rpcid;
-        ret_msg.data = data;
+        ret_msg.__return = true;
+        ret_msg.__is_mq = req_msg.__is_mq;
         ret_msg.from_group = this._group;
         ret_msg.from_id = this._id;
         ret_msg.to_group = req_msg.from_group;
         ret_msg.to_id = req_msg.from_id;
+        ret_msg.data = data;
         return ret_msg;
     }
     async callRemote(msg) {
         if (!msg) {
             Log_1.gLog.error("send null msg!");
-            return;
+            return null;
+        }
+        if (msg.__is_mq) {
+            //mq消息不需要回复
+            this.send(msg);
+            return null;
         }
         return new Promise((resolve, reject) => {
             let handler = null;

package/dist/lib/Framework/Server/SocketServer/ISocket.js

@@ -102,7 +102,7 @@ class ISocket {
             this._packetParser.push(message);
             let packet = this._packetParser.parse();
             while (packet) {
-                this._onMessage(packet);
+                this.onMessage(packet);
                 packet = this._packetParser.parse();
             }
         }
@@ -110,9 +110,9 @@ class ISocket {
             Log_1.gLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
         }
     }
-    onMessage(message) {
+    onMessage(packet) {
         try {
-            let msg = this._onDecode(message);
+            let msg = this._onDecode(packet);
             if (this._is_sync_msg) {
                 SyncQueueTool_1.gSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
             }

package/dist/lib/Framework/Server/SocketServer/ISocketServer.js

@@ -20,12 +20,12 @@ class ISocketServer {
         return this._cfg.serverName;
     }
     //监听websocket
-    _listening_socket = null;
-    get listeningSocket() {
-        return this._listening_socket;
+    _server = null;
+    get server() {
+        return this._server;
     }
     //来自于用户的链接
-    _ws_clients = {};
+    _clients = {};
     get listenPort() {
         return this._cfg.port;
     }
@@ -45,8 +45,8 @@ class ISocketServer {
         this._cfg = cfg;
     }
     removeServerSocketBySocketId(socketId) {
-        this._ws_clients[socketId] = null;
-        delete this._ws_clients[socketId];
+        this._clients[socketId] = null;
+        delete this._clients[socketId];
     }
     async run() {
         cgserver_1.gCgServer.addSocketServer(this);
@@ -61,8 +61,8 @@ class ISocketServer {
             return;
         }
         this._is_runging = false;
-        for (let key in this._ws_clients) {
-            this._ws_clients[key].close();
+        for (let key in this._clients) {
+            this._clients[key].close();
         }
         Log_1.gLog.info("socketserver paused:" + this._cfg.port);
     }
@@ -79,13 +79,13 @@ class ISocketServer {
         方便统计，广播等
     */
     addClient(ws_client) {
-        this._ws_clients[ws_client.socketId] = ws_client;
+        this._clients[ws_client.socketId] = ws_client;
     }
     initSocket(wss) {
-        let server = net.createServer();
-        server.listen(this._cfg.port, this.onListenning.bind(this));
-        server.on("connection", this.onConnection.bind(this));
-        this._listening_socket.on('close', this.onClose.bind(this));
+        this._server = net.createServer();
+        this._server.listen(this._cfg.port, this.onListenning.bind(this));
+        this._server.on("connection", this.onConnection.bind(this));
+        this._server.on('close', this.onClose.bind(this));
     }
     onClose() {
     }
@@ -125,8 +125,8 @@ class ISocketServer {
      * @param msg
      */
     broadCast(msg) {
-        for (var key in this._ws_clients) {
-            let ws = this._ws_clients[key];
+        for (var key in this._clients) {
+            let ws = this._clients[key];
             ws.send(msg);
         }
     }
@@ -135,8 +135,8 @@ class ISocketServer {
      * @returns
      */
     getAnyWebSocket() {
-        for (var key in this._ws_clients) {
-            return this._ws_clients[key];
+        for (var key in this._clients) {
+            return this._clients[key];
         }
         return null;
     }

package/dist/lib/Framework/Server/WebSocketServer/IClientWebSocket.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IClientWebSocket = void 0;
 const Log_1 = require("../../Logic/Log");
-const IWebSocket_1 = require("./IWebSocket");
 const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
+const IWebSocket_1 = require("./IWebSocket");
 /**
  * 服务器接收到的客户端的连接
  * 客户端的session对象

package/dist/lib/Framework/Server/WebSocketServer/IWebSocketServer.js

@@ -30,6 +30,9 @@ class IWebSocketServer {
     }
     //来自于用户的链接
     _ws_clients = {};
+    get wsClients() {
+        return this._ws_clients;
+    }
     get listenPort() {
         return this._cfg.port;
     }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rpc = void 0;
 const Core_1 = require("../Core/Core");
 const Log_1 = require("../Logic/Log");
-const CgMq_1 = require("./CgMq");
+const CgMq_1 = require("../Server/RpcWebSocketServer/CgMq");
 class Remote {
     _retmsg = null;
     get retMsg() {
@@ -16,15 +16,20 @@ class Remote {
     _to_group = "";
     _to_id = "";
     _listen = "";
-    constructor(group, id, cgmq, listen) {
+    _is_mq = false;
+    constructor(group, id, cgmq, listen, is_mq = false) {
         this._to_group = group;
         this._to_id = id;
         this._listen = listen;
+        this._is_mq = is_mq;
         this._cgmq = cgmq;
     }
     async call(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;
+        this._retmsg = await this._cgmq.callRemote(this._to_group, this._to_id, this._listen, func_name, this._is_mq, ...args);
+        let datas = [];
+        if (this._retmsg) {
+            datas = this._retmsg.data;
+        }
         let ret = { rets: datas, ret: null };
         if (datas && datas.length > 0) {
             ret.ret = datas[0];
@@ -42,8 +47,12 @@ class Rpc {
         let ret = await this._cgmq.init(cfg, this.onMsg.bind(this));
         return ret;
     }
-    getRemote(group, id = "", listener = "") {
-        return new Remote(group, id, this._cgmq, listener);
+    getRemote(group, id = "", listener = "", is_mq = false) {
+        return new Remote(group, id, this._cgmq, listener, is_mq);
+    }
+    //mq消息不需要回复
+    getRemoteMq(group, id = "", listener = "") {
+        return this.getRemote(group, id, listener, true);
     }
     async onMsg(msg) {
         if (!msg || !msg.data || !msg.data.cmd) {

package/dist/lib/Framework/index_export_.js

@@ -156,16 +156,16 @@ var ISocketServer_1 = require("./Server/SocketServer/ISocketServer");
 Object.defineProperty(exports, "ISocketServer", { enumerable: true, get: function () { return ISocketServer_1.ISocketServer; } });
 var PacketParser_1 = require("./Server/SocketServer/PacketParser");
 Object.defineProperty(exports, "PacketParser", { enumerable: true, get: function () { return PacketParser_1.PacketParser; } });
-var IRpc_1 = require("./Server/WebSocketServer/IRpc");
+var IRpc_1 = require("./Server/RpcWebSocketServer/IRpc");
 Object.defineProperty(exports, "RpcBaseMsg", { enumerable: true, get: function () { return IRpc_1.RpcMsg; } });
 var Rpc_1 = require("./ThirdParty/Rpc");
 Object.defineProperty(exports, "Rpc", { enumerable: true, get: function () { return Rpc_1.Rpc; } });
-var CgMq_1 = require("./ThirdParty/CgMq");
+var CgMq_1 = require("./Server/RpcWebSocketServer/CgMq");
 Object.defineProperty(exports, "CgMq", { enumerable: true, get: function () { return CgMq_1.CgMq; } });
 Object.defineProperty(exports, "RpcConfig", { enumerable: true, get: function () { return CgMq_1.RpcConfig; } });
-var IRpcServerWebSocket_1 = require("./Server/WebSocketServer/IRpcServerWebSocket");
+var IRpcServerWebSocket_1 = require("./Server/RpcWebSocketServer/IRpcServerWebSocket");
 Object.defineProperty(exports, "IRpcServerWebSocket", { enumerable: true, get: function () { return IRpcServerWebSocket_1.IRpcServerWebSocket; } });
-var IRpcClientWebSocket_1 = require("./Server/WebSocketServer/IRpcClientWebSocket");
+var IRpcClientWebSocket_1 = require("./Server/RpcWebSocketServer/IRpcClientWebSocket");
 Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });
 var SyncCall_1 = require("./Decorator/SyncCall");
 Object.defineProperty(exports, "SyncCall", { enumerable: true, get: function () { return SyncCall_1.SyncCall; } });

package/dist/types/Framework/{ThirdParty → Server/RpcWebSocketServer}/CgMq.d.ts

@@ -1,5 +1,5 @@
-import { IRpcServerWebSocket } from "../Server/WebSocketServer/IRpcServerWebSocket";
-import { RpcMsg } from "../Server/WebSocketServer/IRpc";
+import { IRpcServerWebSocket } from "./IRpcServerWebSocket";
+import { RpcMsg } from "./IRpc";
 declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     protected _cgmq: CgMq;
     protected _listens: {
@@ -13,7 +13,7 @@ declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     init(): 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>;
+    push(to_group: string, data: any, to_id?: string, listen?: string, is_mq?: boolean): Promise<RpcMsg | null>;
     receive_msg(req_msg: RpcMsg): Promise<void>;
 }
 export declare class RpcConfig {
@@ -51,7 +51,7 @@ export declare class CgMq {
      * @returns
      */
     init(cfg: RpcConfig, onmsg?: (msg: RpcMsg) => any): Promise<boolean>;
-    callRemote(group: string, to_id: string, listen: string, func_name: string, ...args: any[]): Promise<RpcMsg>;
+    callRemote(group: string, to_id: string, listen: string, func_name: string, is_mq?: boolean, ...args: any[]): Promise<RpcMsg | null>;
     onMsg(msg: RpcMsg): Promise<any>;
     listen(data: string[]): Promise<RpcMsg>;
     unlisten(data: string[]): Promise<RpcMsg>;

package/dist/types/Framework/{SocketServer → Server/RpcWebSocketServer}/IRpc.d.ts

@@ -1,7 +1,8 @@
-import { BaseMsg } from "./IWebSocket";
+import { BaseMsg } from "../WebSocketServer/IWebSocket";
 export declare class RpcMsg extends BaseMsg {
     __rpcid: string;
     __return: boolean;
+    __is_mq: boolean;
     /**
       * 发送者分组
       */
@@ -19,7 +20,7 @@ export declare class RpcMsg extends BaseMsg {
      */
     to_id: string;
     /**
-     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listem="10086",listem,也可以理解为子group
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listen="10086",listen,也可以理解为子group
      */
     listen: string;
     /**

package/dist/types/Framework/Server/{WebSocketServer → RpcWebSocketServer}/IRpcClientWebSocket.d.ts

@@ -1,5 +1,6 @@
 import { IRpc, RpcMsg } from "./IRpc";
-import { IClientWebSocket } from "./IClientWebSocket";
+import { IClientWebSocket } from "../WebSocketServer/IClientWebSocket";
+import { IWebSocketServer } from "../WebSocketServer/IWebSocketServer";
 export declare class IRpcClientWebSocket extends IClientWebSocket implements IRpc {
     /**
      * 自己的身份
@@ -26,4 +27,8 @@ export declare class IRpcClientWebSocket extends IClientWebSocket implements IRp
     receive_unlisten(req_msg: RpcMsg): void;
     receive_other_all(msg: RpcMsg): void;
     protected _onMessage(msg: RpcMsg): Promise<void>;
+    constructor(server: IWebSocketServer);
+    getWsByGroup(group: string, listen: string): IRpcClientWebSocket[];
+    getWsByGroupId(group: string, id: string): IRpcClientWebSocket;
+    receive_msg(req_msg: RpcMsg): Promise<void>;
 }

package/dist/types/Framework/{SocketServer → Server/RpcWebSocketServer}/IRpcServerWebSocket.d.ts

@@ -1,5 +1,5 @@
-import { IServerWebSocket } from "./IServerWebSocket";
 import { IRpc, RpcMsg } from "./IRpc";
+import { IServerWebSocket } from "../WebSocketServer/IServerWebSocket";
 export declare class IRpcServerWebSocket extends IServerWebSocket implements IRpc {
     /**
      * 自己的身份
@@ -17,7 +17,7 @@ export declare class IRpcServerWebSocket extends IServerWebSocket implements IRp
         id: number;
         des: string;
     }): RpcMsg;
-    callRemote(msg: RpcMsg): Promise<RpcMsg>;
+    callRemote(msg: RpcMsg): Promise<RpcMsg | null>;
     receive_other_all(msg: RpcMsg): void;
     protected _onMessage(msg: RpcMsg): Promise<void>;
 }

package/dist/types/Framework/Server/SocketServer/IClientSocket.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ISocketServer } from './ISocketServer';
 import { ISocket } from './ISocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';

package/dist/types/Framework/Server/SocketServer/IServerSocket.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { ISocket } from './ISocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';
 import * as http from "http";