cgserver 12.0.8 → 12.2.0

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

@@ -1,38 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpc = exports.RpcMsg = void 0;
-const IWebSocket_1 = require("../WebSocketServer/IWebSocket");
-class RpcMsg extends IWebSocket_1.BaseMsg {
-    __rpcid = "";
-    __return = false;
-    //mq消息不需要回复
-    __is_mq = false;
-    /**
-      * 发送者分组
-      */
-    from_group = "";
-    /**
-     * 发送者分组下的某个具体对象id
-     */
-    from_id = "";
-    /**
-     * 必填，目的组
-     */
-    to_group = "";
-    /**
-     * 目的分组下的某个具体对象id
-     */
-    to_id = "";
-    /**
-     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listen="10086",listen,也可以理解为子group
-     */
-    listen = "";
-    /**
-     * 消息携带的数据
-     */
-    data = null;
-}
-exports.RpcMsg = RpcMsg;
-class IRpc {
-}
-exports.IRpc = IRpc;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpc = exports.RpcMsg = void 0;
+const IWebSocket_1 = require("../WebSocketServer/IWebSocket");
+class RpcMsg extends IWebSocket_1.BaseMsg {
+    __rpcid = "";
+    __return = false;
+    //mq消息不需要回复
+    __is_mq = false;
+    /**
+      * 发送者分组
+      */
+    from_group = "";
+    /**
+     * 发送者分组下的某个具体对象id
+     */
+    from_id = "";
+    /**
+     * 必填，目的组
+     */
+    to_group = "";
+    /**
+     * 目的分组下的某个具体对象id
+     */
+    to_id = "";
+    /**
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listen="10086",listen,也可以理解为子group
+     */
+    listen = "";
+    /**
+     * 消息携带的数据
+     */
+    data = null;
+}
+exports.RpcMsg = RpcMsg;
+class IRpc {
+}
+exports.IRpc = IRpc;

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

@@ -1,253 +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 = Core_1.core.getUuid();
-    }
-    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) {
-            //直接丢掉
-            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: "一个接收者都没找到" };
-            req_msg.__return = true;
-            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;
+"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 = Core_1.core.getUuid();
+    }
+    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) {
+            //直接丢掉
+            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: "一个接收者都没找到" };
+            req_msg.__return = true;
+            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;