cgserver 8.6.8 → 8.6.10

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

@@ -1,63 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpcClientWebSocket = void 0;
-const _ = require("underscore");
-const EventTool_1 = require("../Logic/EventTool");
-const Log_1 = require("../Logic/Log");
-const IClientWebSocket_1 = require("./IClientWebSocket");
-class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
-    _genId(pre = "") {
-        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
-    }
-    getNewMsg(cmd, errcode) {
-        let msg = super.getNewMsg(cmd, errcode);
-        msg.__rpcid = this._genId(cmd);
-        return msg;
-    }
-    extendRetMsg(msg, errcode) {
-        let basemsg = super.getNewMsg(msg.cmd, errcode);
-        basemsg.__rpcid = msg.__rpcid;
-        _.extend(msg, basemsg);
-        return msg;
-    }
-    async callRemote(msg) {
-        if (!msg) {
-            Log_1.GLog.error("send null msg!");
-            return;
-        }
-        if (!msg.__rpcid) {
-            msg.__rpcid = this._genId(msg.cmd);
-        }
-        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);
-            super.send(msg);
-        });
-    }
-    receive_other_all(msg) {
-        if (msg.__return) {
-            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
-            return;
-        }
-        Log_1.GLog.error({ des: "no handle", msg });
-    }
-    async _onMessage(msg) {
-        if (msg.__return) {
-            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
-            return;
-        }
-        super._onMessage(msg);
-    }
-}
-exports.IRpcClientWebSocket = IRpcClientWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcClientWebSocket = void 0;
+const _ = require("underscore");
+const EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
+const IClientWebSocket_1 = require("./IClientWebSocket");
+class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
+    _genId(pre = "") {
+        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = super.getNewMsg(cmd, errcode);
+        msg.__rpcid = this._genId(cmd);
+        return msg;
+    }
+    extendRetMsg(msg, errcode) {
+        let basemsg = super.getNewMsg(msg.cmd, errcode);
+        basemsg.__rpcid = msg.__rpcid;
+        _.extend(msg, basemsg);
+        return msg;
+    }
+    async callRemote(msg) {
+        if (!msg) {
+            Log_1.GLog.error("send null msg!");
+            return;
+        }
+        if (!msg.__rpcid) {
+            msg.__rpcid = this._genId(msg.cmd);
+        }
+        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);
+            super.send(msg);
+        });
+    }
+    receive_other_all(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        Log_1.GLog.error({ des: "no handle", msg });
+    }
+    async _onMessage(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        super._onMessage(msg);
+    }
+}
+exports.IRpcClientWebSocket = IRpcClientWebSocket;

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

@@ -1,63 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpcServerWebSocket = void 0;
-const _ = require("underscore");
-const EventTool_1 = require("../Logic/EventTool");
-const Log_1 = require("../Logic/Log");
-const IServerWebSocket_1 = require("./IServerWebSocket");
-class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
-    _genId(pre = "") {
-        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
-    }
-    getNewMsg(cmd, errcode) {
-        let msg = super.getNewMsg(cmd, errcode);
-        msg.__rpcid = this._genId(cmd);
-        return msg;
-    }
-    extendRetMsg(msg, errcode) {
-        let basemsg = super.getNewMsg(msg.cmd, errcode);
-        basemsg.__rpcid = msg.__rpcid;
-        _.extend(msg, basemsg);
-        return msg;
-    }
-    async callRemote(msg) {
-        if (!msg) {
-            Log_1.GLog.error("send null msg!");
-            return;
-        }
-        if (!msg.__rpcid) {
-            msg.__rpcid = this._genId(msg.cmd);
-        }
-        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);
-            super.send(msg);
-        });
-    }
-    receive_other_all(msg) {
-        if (msg.__rpcid) {
-            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
-            return;
-        }
-        Log_1.GLog.error({ des: "no handle", msg });
-    }
-    async _onMessage(msg) {
-        if (msg.__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 EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
+const IServerWebSocket_1 = require("./IServerWebSocket");
+class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
+    _genId(pre = "") {
+        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = super.getNewMsg(cmd, errcode);
+        msg.__rpcid = this._genId(cmd);
+        return msg;
+    }
+    extendRetMsg(msg, errcode) {
+        let basemsg = super.getNewMsg(msg.cmd, errcode);
+        basemsg.__rpcid = msg.__rpcid;
+        _.extend(msg, basemsg);
+        return msg;
+    }
+    async callRemote(msg) {
+        if (!msg) {
+            Log_1.GLog.error("send null msg!");
+            return;
+        }
+        if (!msg.__rpcid) {
+            msg.__rpcid = this._genId(msg.cmd);
+        }
+        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);
+            super.send(msg);
+        });
+    }
+    receive_other_all(msg) {
+        if (msg.__rpcid) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        Log_1.GLog.error({ des: "no handle", msg });
+    }
+    async _onMessage(msg) {
+        if (msg.__return) {
+            EventTool_1.GEventTool.emit(msg.__rpcid, msg);
+            return;
+        }
+        super._onMessage(msg);
+    }
+}
+exports.IRpcServerWebSocket = IRpcServerWebSocket;

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

@@ -1,75 +1,75 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerWebSocket = void 0;
-const IWebSocket_1 = require("./IWebSocket");
-const ws = require("websocket");
-const Log_1 = require("../Logic/Log");
-const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
-/**
- * 连接到服务器的websocket
- * 默认自动重连
- */
-class IServerWebSocket extends IWebSocket_1.IWebSocket {
-    _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() {
-        let url = "ws://" + this._host + ":" + this._port + "/";
-        Log_1.GLog.info("Trying to connect to server : " + url);
-        let _ws = new ws.client();
-        _ws.on("connect", super.onConnect.bind(this));
-        _ws.on("connectFailed", this.onClose.bind(this));
-        _ws.connect(url, null, null, { cookie: "client=" + this._tipKey });
-    }
-    onOpen(e) {
-        super.onOpen(e);
-        Log_1.GLog.info("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(this._host, this._port);
-                }
-            }, 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.IServerWebSocket = IServerWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IServerWebSocket = void 0;
+const IWebSocket_1 = require("./IWebSocket");
+const ws = require("websocket");
+const Log_1 = require("../Logic/Log");
+const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
+/**
+ * 连接到服务器的websocket
+ * 默认自动重连
+ */
+class IServerWebSocket extends IWebSocket_1.IWebSocket {
+    _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() {
+        let url = "ws://" + this._host + ":" + this._port + "/";
+        Log_1.GLog.info("Trying to connect to server : " + url);
+        let _ws = new ws.client();
+        _ws.on("connect", super.onConnect.bind(this));
+        _ws.on("connectFailed", this.onClose.bind(this));
+        _ws.connect(url, null, null, { cookie: "client=" + this._tipKey });
+    }
+    onOpen(e) {
+        super.onOpen(e);
+        Log_1.GLog.info("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(this._host, this._port);
+                }
+            }, 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.IServerWebSocket = IServerWebSocket;