cgserver 8.9.3 → 8.9.4

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

@@ -1,195 +1,195 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IWebSocket = exports.BaseMsg = void 0;
-const Log_1 = require("../Logic/Log");
-const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
-const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
-const Core_1 = require("../Core/Core");
-const _ = require("underscore");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
-class BaseMsg {
-    cmd;
-    errcode;
-    servertime = Date.now();
-    constructor(cmd, errcode) {
-        this.cmd = cmd;
-        this.errcode = errcode;
-    }
-}
-exports.BaseMsg = BaseMsg;
-class IWebSocket {
-    /**
-     * 是否同步消息
-     * 默认为true
-     */
-    _is_sync_msg = true;
-    get isSynMsg() {
-        return this._is_sync_msg;
-    }
-    _debug_msg = false;
-    get debug_msg() {
-        return this._debug_msg;
-    }
-    set debug_msg(value) {
-        this._debug_msg = value;
-    }
-    _socket_id = 0;
-    get socketId() {
-        return this._socket_id;
-    }
-    _tipKey = "";
-    get tipKey() {
-        return this._tipKey;
-    }
-    _ws = null;
-    _protoType = IProtoFilter_1.EProtoType.Json;
-    _protoFilter = null;
-    _protoPath = "";
-    _ip = null;
-    get remoteHost() {
-        if (!this._ip) {
-            this._ip = this._ws.remoteAddress;
-            this._ip = this._ip.substring(this._ip.lastIndexOf(":") + 1);
-        }
-        return this._ip;
-    }
-    get connected() {
-        if (this._ws
-            && this._ws.connected == true) {
-            return true;
-        }
-        return false;
-    }
-    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        this._debug_msg = IServerConfig_1.GServerCfg.debug_msg;
-        this._socket_id = parseInt(_.uniqueId());
-        this._protoType = protoType;
-        this._protoPath = protoPath;
-    }
-    getNewMsg(cmd, errcode) {
-        let msg = new BaseMsg(cmd, errcode);
-        return msg;
-    }
-    receive_heartbeat(jsonData) {
-        this.send_heartbeat();
-    }
-    send_heartbeat() {
-        let msg = this.getNewMsg("heartbeat");
-        this.send(msg);
-    }
-    onConnect(_ws) {
-        this._ws = _ws;
-        if (!this._protoFilter) {
-            this._protoFilter = ProtoFactory_1.GProtoFactory.createFilter(this._protoType);
-            this._protoFilter.init(this._protoPath);
-        }
-        this._ws.on("message", this.onMessage.bind(this));
-        this._ws.on("error", this.onError.bind(this));
-        this._ws.on("close", this.onClose.bind(this));
-        this.onOpen();
-    }
-    onMessage(message) {
-        try {
-            let msg = this._onDecode(message);
-            if (this._is_sync_msg) {
-                SyncQueueTool_1.GSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
-            }
-            else {
-                this._onMessage(msg);
-            }
-        }
-        catch (e) {
-            Log_1.GLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
-        }
-    }
-    _onDecode(message, ...params) {
-        let msg = null;
-        if (message.type === 'utf8') {
-            msg = this._protoFilter.decode(message.utf8Data, ...params);
-        }
-        else if (message.type === 'binary') {
-            msg = this._protoFilter.decode(message.binaryData, ...params);
-        }
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = this._protoFilter.encode(data, ...params);
-        return msg;
-    }
-    /**
-     * 过滤消息，每个消息处理之前调用
-     * @param msg
-     * @returns
-     */
-    filterMsg(msg) {
-        if (!msg) {
-            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
-            return false;
-        }
-        if (this._debug_msg && msg.cmd != "heartbeat") {
-            Log_1.GLog.info({ tipKey: this.tipKey, action: "receive", msg });
-        }
-        if (!msg.cmd) {
-            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
-            return false;
-        }
-        return true;
-    }
-    async _onMessage(data) {
-        let jsonData = data;
-        let func = this["receive_" + jsonData.cmd];
-        let ret = this.filterMsg(jsonData);
-        if (!ret) {
-            return;
-        }
-        else if (!func) {
-            let otherfunc = this["receive_other_all"];
-            if (otherfunc) {
-                await Core_1.core.safeCall(otherfunc, this, jsonData);
-            }
-            else {
-                Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
-            }
-        }
-        else {
-            await Core_1.core.safeCall(func, this, jsonData);
-        }
-    }
-    onOpen(e) {
-    }
-    onError(e) {
-    }
-    onClose(reasonCode, description) {
-        Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
-    }
-    send(msg) {
-        if (!this.connected) {
-            return;
-        }
-        if (!msg) {
-            Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
-            return;
-        }
-        if (this._debug_msg
-            && msg.cmd != "heartbeat") {
-            Log_1.GLog.info({ tipKey: this.tipKey, action: "send", msg });
-        }
-        let data = this._onEncode(msg);
-        this._ws.send(data);
-    }
-    close() {
-        this._ws.close();
-    }
-    getServerNameFromCmd(cmd) {
-        if (!cmd || !Core_1.core.isString(cmd)) {
-            return null;
-        }
-        let index = cmd.indexOf("_");
-        if (index <= 0) {
-            return null;
-        }
-        return cmd.substring(0, index);
-    }
-}
-exports.IWebSocket = IWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IWebSocket = exports.BaseMsg = void 0;
+const Log_1 = require("../Logic/Log");
+const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
+const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
+const Core_1 = require("../Core/Core");
+const _ = require("underscore");
+const IServerConfig_1 = require("../Config/IServerConfig");
+const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+class BaseMsg {
+    cmd;
+    errcode;
+    servertime = Date.now();
+    constructor(cmd, errcode) {
+        this.cmd = cmd;
+        this.errcode = errcode;
+    }
+}
+exports.BaseMsg = BaseMsg;
+class IWebSocket {
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    _is_sync_msg = true;
+    get isSynMsg() {
+        return this._is_sync_msg;
+    }
+    _debug_msg = false;
+    get debug_msg() {
+        return this._debug_msg;
+    }
+    set debug_msg(value) {
+        this._debug_msg = value;
+    }
+    _socket_id = 0;
+    get socketId() {
+        return this._socket_id;
+    }
+    _tipKey = "";
+    get tipKey() {
+        return this._tipKey;
+    }
+    _ws = null;
+    _protoType = IProtoFilter_1.EProtoType.Json;
+    _protoFilter = null;
+    _protoPath = "";
+    _ip = null;
+    get remoteHost() {
+        if (!this._ip) {
+            this._ip = this._ws.remoteAddress;
+            this._ip = this._ip.substring(this._ip.lastIndexOf(":") + 1);
+        }
+        return this._ip;
+    }
+    get connected() {
+        if (this._ws
+            && this._ws.connected == true) {
+            return true;
+        }
+        return false;
+    }
+    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        this._debug_msg = IServerConfig_1.GServerCfg.debug_msg;
+        this._socket_id = parseInt(_.uniqueId());
+        this._protoType = protoType;
+        this._protoPath = protoPath;
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = new BaseMsg(cmd, errcode);
+        return msg;
+    }
+    receive_heartbeat(jsonData) {
+        this.send_heartbeat();
+    }
+    send_heartbeat() {
+        let msg = this.getNewMsg("heartbeat");
+        this.send(msg);
+    }
+    onConnect(_ws) {
+        this._ws = _ws;
+        if (!this._protoFilter) {
+            this._protoFilter = ProtoFactory_1.GProtoFactory.createFilter(this._protoType);
+            this._protoFilter.init(this._protoPath);
+        }
+        this._ws.on("message", this.onMessage.bind(this));
+        this._ws.on("error", this.onError.bind(this));
+        this._ws.on("close", this.onClose.bind(this));
+        this.onOpen();
+    }
+    onMessage(message) {
+        try {
+            let msg = this._onDecode(message);
+            if (this._is_sync_msg) {
+                SyncQueueTool_1.GSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
+            }
+            else {
+                this._onMessage(msg);
+            }
+        }
+        catch (e) {
+            Log_1.GLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
+        }
+    }
+    _onDecode(message, ...params) {
+        let msg = null;
+        if (message.type === 'utf8') {
+            msg = this._protoFilter.decode(message.utf8Data, ...params);
+        }
+        else if (message.type === 'binary') {
+            msg = this._protoFilter.decode(message.binaryData, ...params);
+        }
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = this._protoFilter.encode(data, ...params);
+        return msg;
+    }
+    /**
+     * 过滤消息，每个消息处理之前调用
+     * @param msg
+     * @returns
+     */
+    filterMsg(msg) {
+        if (!msg) {
+            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
+            return false;
+        }
+        if (this._debug_msg && msg.cmd != "heartbeat") {
+            Log_1.GLog.info({ tipKey: this.tipKey, action: "receive", msg });
+        }
+        if (!msg.cmd) {
+            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
+            return false;
+        }
+        return true;
+    }
+    async _onMessage(data) {
+        let jsonData = data;
+        let func = this["receive_" + jsonData.cmd];
+        let ret = this.filterMsg(jsonData);
+        if (!ret) {
+            return;
+        }
+        else if (!func) {
+            let otherfunc = this["receive_other_all"];
+            if (otherfunc) {
+                await Core_1.core.safeCall(otherfunc, this, jsonData);
+            }
+            else {
+                Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
+            }
+        }
+        else {
+            await Core_1.core.safeCall(func, this, jsonData);
+        }
+    }
+    onOpen(e) {
+    }
+    onError(e) {
+    }
+    onClose(reasonCode, description) {
+        Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
+    }
+    send(msg) {
+        if (!this.connected) {
+            return;
+        }
+        if (!msg) {
+            Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
+            return;
+        }
+        if (this._debug_msg
+            && msg.cmd != "heartbeat") {
+            Log_1.GLog.info({ tipKey: this.tipKey, action: "send", msg });
+        }
+        let data = this._onEncode(msg);
+        this._ws.send(data);
+    }
+    close() {
+        this._ws.close();
+    }
+    getServerNameFromCmd(cmd) {
+        if (!cmd || !Core_1.core.isString(cmd)) {
+            return null;
+        }
+        let index = cmd.indexOf("_");
+        if (index <= 0) {
+            return null;
+        }
+        return cmd.substring(0, index);
+    }
+}
+exports.IWebSocket = IWebSocket;

package/dist/lib/Framework/SocketServer/ProtoFilter/GoogleProtoFilter.js

@@ -1,57 +1,57 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoogleProtoFilter = void 0;
-const Log_1 = require("../../Logic/Log");
-const protobufjs = require("protobufjs");
-class GoogleProtoFilter {
-    _root = new protobufjs.Root();
-    _inited = false;
-    init(path) {
-        if (this._inited) {
-            return;
-        }
-        this._inited = true;
-        try {
-            this._root.loadSync(path, { keepCase: true });
-        }
-        catch (e) {
-            Log_1.GLog.error(e);
-            return false;
-        }
-        return true;
-    }
-    encode(data, root) {
-        let msg = { cmd: data.cmd };
-        msg[msg.cmd] = data;
-        msg[msg.cmd].cmd = undefined;
-        msg["errcode"] = data.errcode;
-        msg["tip"] = data.tip;
-        data.errcode = undefined;
-        delete data.errcode;
-        delete msg[msg.cmd].cmd;
-        let body = this._root.lookupType(root);
-        var errMsg = body.verify(msg);
-        if (errMsg)
-            throw Error(errMsg);
-        var msgBody = body.create(msg);
-        var bufferBody = body.encode(msgBody).finish();
-        return bufferBody;
-    }
-    decode(data, root) {
-        let body = this._root.lookupType(root);
-        if (!body) {
-            Log_1.GLog.info("proto body not in proto(!" + root + ")");
-            return null;
-        }
-        let msgBody = body.decode(data);
-        if (!msgBody) {
-            Log_1.GLog.info("proto body decode wrong!");
-            return null;
-        }
-        let objBody = body.toObject(msgBody);
-        let obj = objBody[objBody.cmd];
-        obj.cmd = objBody.cmd;
-        return obj;
-    }
-}
-exports.GoogleProtoFilter = GoogleProtoFilter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GoogleProtoFilter = void 0;
+const Log_1 = require("../../Logic/Log");
+const protobufjs = require("protobufjs");
+class GoogleProtoFilter {
+    _root = new protobufjs.Root();
+    _inited = false;
+    init(path) {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        try {
+            this._root.loadSync(path, { keepCase: true });
+        }
+        catch (e) {
+            Log_1.GLog.error(e);
+            return false;
+        }
+        return true;
+    }
+    encode(data, root) {
+        let msg = { cmd: data.cmd };
+        msg[msg.cmd] = data;
+        msg[msg.cmd].cmd = undefined;
+        msg["errcode"] = data.errcode;
+        msg["tip"] = data.tip;
+        data.errcode = undefined;
+        delete data.errcode;
+        delete msg[msg.cmd].cmd;
+        let body = this._root.lookupType(root);
+        var errMsg = body.verify(msg);
+        if (errMsg)
+            throw Error(errMsg);
+        var msgBody = body.create(msg);
+        var bufferBody = body.encode(msgBody).finish();
+        return bufferBody;
+    }
+    decode(data, root) {
+        let body = this._root.lookupType(root);
+        if (!body) {
+            Log_1.GLog.info("proto body not in proto(!" + root + ")");
+            return null;
+        }
+        let msgBody = body.decode(data);
+        if (!msgBody) {
+            Log_1.GLog.info("proto body decode wrong!");
+            return null;
+        }
+        let objBody = body.toObject(msgBody);
+        let obj = objBody[objBody.cmd];
+        obj.cmd = objBody.cmd;
+        return obj;
+    }
+}
+exports.GoogleProtoFilter = GoogleProtoFilter;

package/dist/lib/Framework/SocketServer/ProtoFilter/IProtoFilter.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EProtoType = void 0;
-var EProtoType;
-(function (EProtoType) {
-    EProtoType[EProtoType["Json"] = 1] = "Json";
-    EProtoType[EProtoType["GoogleProtoBuffer"] = 2] = "GoogleProtoBuffer";
-})(EProtoType || (exports.EProtoType = EProtoType = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EProtoType = void 0;
+var EProtoType;
+(function (EProtoType) {
+    EProtoType[EProtoType["Json"] = 1] = "Json";
+    EProtoType[EProtoType["GoogleProtoBuffer"] = 2] = "GoogleProtoBuffer";
+})(EProtoType = exports.EProtoType || (exports.EProtoType = {}));

package/dist/lib/Framework/SocketServer/ProtoFilter/JsonProtoFilter.js

@@ -1,29 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonProtoFilter = void 0;
-const Core_1 = require("../../Core/Core");
-const Log_1 = require("../../Logic/Log");
-class JsonProtoFilter {
-    init(path) {
-        return true;
-    }
-    encode(data) {
-        if (!Core_1.core.isString(data)) {
-            data = JSON.stringify(data);
-        }
-        return data;
-    }
-    decode(data) {
-        try {
-            if (Core_1.core.isString(data)) {
-                data = JSON.parse(data);
-            }
-        }
-        catch (e) {
-            Log_1.GLog.error("decode json data Failed-----data=" + data);
-            return;
-        }
-        return data;
-    }
-}
-exports.JsonProtoFilter = JsonProtoFilter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonProtoFilter = void 0;
+const Core_1 = require("../../Core/Core");
+const Log_1 = require("../../Logic/Log");
+class JsonProtoFilter {
+    init(path) {
+        return true;
+    }
+    encode(data) {
+        if (!Core_1.core.isString(data)) {
+            data = JSON.stringify(data);
+        }
+        return data;
+    }
+    decode(data) {
+        try {
+            if (Core_1.core.isString(data)) {
+                data = JSON.parse(data);
+            }
+        }
+        catch (e) {
+            Log_1.GLog.error("decode json data Failed-----data=" + data);
+            return;
+        }
+        return data;
+    }
+}
+exports.JsonProtoFilter = JsonProtoFilter;

package/dist/lib/Framework/SocketServer/ProtoFilter/ProtoFactory.js

@@ -1,31 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GProtoFactory = void 0;
-const GoogleProtoFilter_1 = require("./GoogleProtoFilter");
-const JsonProtoFilter_1 = require("./JsonProtoFilter");
-const IProtoFilter_1 = require("./IProtoFilter");
-exports.GProtoFactory = null;
-class ProtoFactory {
-    _filters = new Map();
-    createFilter(type) {
-        let filter = this._filters.get(type);
-        if (filter) {
-            return filter;
-        }
-        switch (type) {
-            case IProtoFilter_1.EProtoType.GoogleProtoBuffer:
-                {
-                    filter = new GoogleProtoFilter_1.GoogleProtoFilter();
-                    break;
-                }
-            default:
-                {
-                    filter = new JsonProtoFilter_1.JsonProtoFilter();
-                    break;
-                }
-        }
-        this._filters.set(type, filter);
-        return filter;
-    }
-}
-exports.GProtoFactory = new ProtoFactory();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GProtoFactory = void 0;
+const GoogleProtoFilter_1 = require("./GoogleProtoFilter");
+const JsonProtoFilter_1 = require("./JsonProtoFilter");
+const IProtoFilter_1 = require("./IProtoFilter");
+exports.GProtoFactory = null;
+class ProtoFactory {
+    _filters = new Map();
+    createFilter(type) {
+        let filter = this._filters.get(type);
+        if (filter) {
+            return filter;
+        }
+        switch (type) {
+            case IProtoFilter_1.EProtoType.GoogleProtoBuffer:
+                {
+                    filter = new GoogleProtoFilter_1.GoogleProtoFilter();
+                    break;
+                }
+            default:
+                {
+                    filter = new JsonProtoFilter_1.JsonProtoFilter();
+                    break;
+                }
+        }
+        this._filters.set(type, filter);
+        return filter;
+    }
+}
+exports.GProtoFactory = new ProtoFactory();