cgserver 12.0.8 → 12.2.0

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

@@ -1,94 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpcServerWebSocket = void 0;
-const _ = require("underscore");
-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 {
-    /**
-     * 自己的身份
-     */
-    _group = "";
-    _id = "";
-    //超时时间
-    _timeout = 3000;
-    constructor(group, id, timeout = 3000) {
-        super();
-        this._group = group;
-        this._id = id;
-        this._timeout = timeout || 3000;
-    }
-    _genId(pre = "") {
-        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
-    }
-    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.__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 null;
-        }
-        if (msg.__is_mq) {
-            //mq消息不需要回复
-            this.send(msg);
-            return null;
-        }
-        return new Promise((resolve, reject) => {
-            let handler = null;
-            let func = (retRpcMsg) => {
-                if (handler) {
-                    clearTimeout(handler);
-                    handler = null;
-                }
-                resolve(retRpcMsg);
-            };
-            handler = setTimeout(() => {
-                EventTool_1.gEventTool.off(msg.__rpcid, func);
-                let error_msg = this.getNewMsg(msg.cmd, { id: 10086, des: "timeout" });
-                error_msg.__return = true;
-                resolve(error_msg);
-            }, this._timeout);
-            EventTool_1.gEventTool.once(msg.__rpcid, func);
-            super.send(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);
-    }
-}
-exports.IRpcServerWebSocket = IRpcServerWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcServerWebSocket = void 0;
+const _ = require("underscore");
+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 {
+    /**
+     * 自己的身份
+     */
+    _group = "";
+    _id = "";
+    //超时时间
+    _timeout = 3000;
+    constructor(group, id, timeout = 3000) {
+        super();
+        this._group = group;
+        this._id = id;
+        this._timeout = timeout || 3000;
+    }
+    _genId(pre = "") {
+        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+    }
+    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.__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 null;
+        }
+        if (msg.__is_mq) {
+            //mq消息不需要回复
+            this.send(msg);
+            return null;
+        }
+        return new Promise((resolve, reject) => {
+            let handler = null;
+            let func = (retRpcMsg) => {
+                if (handler) {
+                    clearTimeout(handler);
+                    handler = null;
+                }
+                resolve(retRpcMsg);
+            };
+            handler = setTimeout(() => {
+                EventTool_1.gEventTool.off(msg.__rpcid, func);
+                let error_msg = this.getNewMsg(msg.cmd, { id: 10086, des: "timeout" });
+                error_msg.__return = true;
+                resolve(error_msg);
+            }, this._timeout);
+            EventTool_1.gEventTool.once(msg.__rpcid, func);
+            super.send(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);
+    }
+}
+exports.IRpcServerWebSocket = IRpcServerWebSocket;

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

@@ -1,44 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IClientSocket = void 0;
-const Log_1 = require("../../Logic/Log");
-const ISocket_1 = require("./ISocket");
-const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
-/**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
- */
-class IClientSocket extends ISocket_1.ISocket {
-    _server = null;
-    get server() {
-        return this._server;
-    }
-    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        super(protoType, protoPath);
-        this._server = server;
-        this._tipKey = this._server.name;
-    }
-    onClose(reasonCode, description) {
-        super.onClose(reasonCode, description);
-        this._server.removeServerSocketBySocketId(this._socket_id);
-    }
-    broadCast(data) {
-        if (!data) {
-            Log_1.gLog.info("Send Message warning:null data!");
-            return;
-        }
-        Log_1.gLog.info("broadCast:----------------------------------");
-        Log_1.gLog.info(data);
-        let msg = this._protoFilter.encode(data);
-        this._server.broadCast(msg);
-    }
-    _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgReq");
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgRes");
-        return msg;
-    }
-}
-exports.IClientSocket = IClientSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IClientSocket = void 0;
+const Log_1 = require("../../Logic/Log");
+const ISocket_1 = require("./ISocket");
+const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
+class IClientSocket extends ISocket_1.ISocket {
+    _server = null;
+    get server() {
+        return this._server;
+    }
+    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        super(protoType, protoPath);
+        this._server = server;
+        this._tipKey = this._server.name;
+    }
+    onClose(reasonCode, description) {
+        super.onClose(reasonCode, description);
+        this._server.removeServerSocketBySocketId(this._socket_id);
+    }
+    broadCast(data) {
+        if (!data) {
+            Log_1.gLog.info("Send Message warning:null data!");
+            return;
+        }
+        Log_1.gLog.info("broadCast:----------------------------------");
+        Log_1.gLog.info(data);
+        let msg = this._protoFilter.encode(data);
+        this._server.broadCast(msg);
+    }
+    _onDecode(message, ...params) {
+        let msg = super._onDecode(message, "msgReq");
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = super._onEncode(data, "msgRes");
+        return msg;
+    }
+}
+exports.IClientSocket = IClientSocket;

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

@@ -1,81 +1,114 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerSocket = void 0;
-const ISocket_1 = require("./ISocket");
-const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
-const Log_1 = require("../../Logic/Log");
-const net = require("net");
-/**
- * 连接到服务器的websocket
- * 默认自动重连
- */
-class IServerSocket extends ISocket_1.ISocket {
-    _host = "";
-    /**
-     * 连接的服务器地址
-     */
-    get host() {
-        return this._host;
-    }
-    _port = -1;
-    /**
-     * 连接的服务器端口
-     */
-    get port() {
-        return this._port;
-    }
-    _need_close = false;
-    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        super(protoType, protoPath);
-    }
-    connect(domain, port) {
-        this._host = domain || this._host;
-        this._port = port || this._port;
-        this._connect();
-    }
-    _connect() {
-        if (this._socket) {
-            this._socket.destroy();
-            this._socket = null;
-        }
-        this._need_close = false;
-        let url = `${this._host}:${this._port}`;
-        Log_1.gLog.info(this._socket_id + ":try to connect to " + url);
-        this._socket = new net.Socket();
-        this._socket.connect(this._port, this._host);
-        this._socket.on("connect", () => {
-            this.onConnect(this._socket);
-        });
-    }
-    onOpen(e) {
-        super.onOpen(e);
-        Log_1.gLog.info(this._socket_id + ":success to connect to " + this._host + ":" + this._port);
-    }
-    onClose(reasonCode, description) {
-        super.onClose(reasonCode, description);
-        if (!this._need_close) {
-            setTimeout(() => {
-                if (!this._need_close) {
-                    this._connect();
-                }
-            }, 1000);
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    close() {
-        this._need_close = true;
-        super.close();
-    }
-    _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgRes");
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgReq");
-        return msg;
-    }
-}
-exports.IServerSocket = IServerSocket;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IServerSocket = void 0;
+const ISocket_1 = require("./ISocket");
+const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
+const Log_1 = require("../../Logic/Log");
+const net = __importStar(require("net"));
+/**
+ * 连接到服务器的websocket
+ * 默认自动重连
+ */
+class IServerSocket extends ISocket_1.ISocket {
+    _host = "";
+    /**
+     * 连接的服务器地址
+     */
+    get host() {
+        return this._host;
+    }
+    _port = -1;
+    /**
+     * 连接的服务器端口
+     */
+    get port() {
+        return this._port;
+    }
+    _need_close = false;
+    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        super(protoType, protoPath);
+    }
+    connect(domain, port) {
+        this._host = domain || this._host;
+        this._port = port || this._port;
+        this._connect();
+    }
+    _connect() {
+        if (this._socket) {
+            this._socket.destroy();
+            this._socket = null;
+        }
+        this._need_close = false;
+        let url = `${this._host}:${this._port}`;
+        Log_1.gLog.info(this._socket_id + ":try to connect to " + url);
+        this._socket = new net.Socket();
+        this._socket.connect(this._port, this._host);
+        this._socket.on("connect", () => {
+            this.onConnect(this._socket);
+        });
+    }
+    onOpen(e) {
+        super.onOpen(e);
+        Log_1.gLog.info(this._socket_id + ":success to connect to " + this._host + ":" + this._port);
+    }
+    onClose(reasonCode, description) {
+        super.onClose(reasonCode, description);
+        if (!this._need_close) {
+            setTimeout(() => {
+                if (!this._need_close) {
+                    this._connect();
+                }
+            }, 1000);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    close() {
+        this._need_close = true;
+        super.close();
+    }
+    _onDecode(message, ...params) {
+        let msg = super._onDecode(message, "msgRes");
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = super._onEncode(data, "msgReq");
+        return msg;
+    }
+}
+exports.IServerSocket = IServerSocket;