cgserver 12.0.8 → 12.2.0

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

@@ -1,57 +1,90 @@
-"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";
+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.GoogleProtoFilter = void 0;
+const Log_1 = require("../../Logic/Log");
+const protobufjs = __importStar(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/Server/ProtoFilter/IProtoFilter.js

@@ -1,9 +1,9 @@
-"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[EProtoType["Custom"] = 3] = "Custom";
-})(EProtoType = exports.EProtoType || (exports.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[EProtoType["Custom"] = 3] = "Custom";
+})(EProtoType || (exports.EProtoType = EProtoType = {}));

package/dist/lib/Framework/Server/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/Server/ProtoFilter/ProtoFactory.js

@@ -1,35 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gProtoFactory = exports.ProtoFactory = void 0;
-const GoogleProtoFilter_1 = require("./GoogleProtoFilter");
-const JsonProtoFilter_1 = require("./JsonProtoFilter");
-const IProtoFilter_1 = require("./IProtoFilter");
-class ProtoFactory {
-    _filters = new Map();
-    _type_filter_classes = new Map();
-    constructor() {
-        this.registerFilter(IProtoFilter_1.EProtoType.Json, JsonProtoFilter_1.JsonProtoFilter);
-        this.registerFilter(IProtoFilter_1.EProtoType.GoogleProtoBuffer, GoogleProtoFilter_1.GoogleProtoFilter);
-    }
-    registerFilter(type, proto_filter_class) {
-        this._type_filter_classes[type] = proto_filter_class;
-    }
-    createFilter(type) {
-        let filter = this._filters.get(type);
-        if (filter) {
-            return filter;
-        }
-        let proto_class = this._type_filter_classes[type];
-        if (proto_class) {
-            filter = new proto_class();
-        }
-        else {
-            //默认
-            filter = new JsonProtoFilter_1.JsonProtoFilter();
-        }
-        this._filters.set(type, filter);
-        return filter;
-    }
-}
-exports.ProtoFactory = ProtoFactory;
-exports.gProtoFactory = new ProtoFactory();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gProtoFactory = exports.ProtoFactory = void 0;
+const GoogleProtoFilter_1 = require("./GoogleProtoFilter");
+const JsonProtoFilter_1 = require("./JsonProtoFilter");
+const IProtoFilter_1 = require("./IProtoFilter");
+class ProtoFactory {
+    _filters = new Map();
+    _type_filter_classes = new Map();
+    constructor() {
+        this.registerFilter(IProtoFilter_1.EProtoType.Json, JsonProtoFilter_1.JsonProtoFilter);
+        this.registerFilter(IProtoFilter_1.EProtoType.GoogleProtoBuffer, GoogleProtoFilter_1.GoogleProtoFilter);
+    }
+    registerFilter(type, proto_filter_class) {
+        this._type_filter_classes[type] = proto_filter_class;
+    }
+    createFilter(type) {
+        let filter = this._filters.get(type);
+        if (filter) {
+            return filter;
+        }
+        let proto_class = this._type_filter_classes[type];
+        if (proto_class) {
+            filter = new proto_class();
+        }
+        else {
+            //默认
+            filter = new JsonProtoFilter_1.JsonProtoFilter();
+        }
+        this._filters.set(type, filter);
+        return filter;
+    }
+}
+exports.ProtoFactory = ProtoFactory;
+exports.gProtoFactory = new ProtoFactory();

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

@@ -1,180 +1,180 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CgMq = exports.RpcConfig = void 0;
-const Core_1 = require("../../Core/Core");
-const IRpcServerWebSocket_1 = require("./IRpcServerWebSocket");
-const Log_1 = require("../../Logic/Log");
-class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
-    _cgmq = null;
-    _listens = {};
-    get listens() {
-        return this._listens;
-    }
-    constructor(cgmq) {
-        super(cgmq.cfg.group, cgmq.cfg.id, cgmq.cfg.timeout);
-        this._cgmq = cgmq;
-        this._debug_msg = true;
-    }
-    onOpen(e) {
-        super.onOpen(e);
-        this.init();
-        this.listen(Object.keys(this._listens));
-    }
-    async init() {
-        let msg = this.getNewMsg("init");
-        let jsonData = await this.callRemote(msg);
-        return jsonData;
-    }
-    async listen(data) {
-        for (let i = 0; i < data.length; i++) {
-            let listen = data[i];
-            if (!listen) {
-                continue;
-            }
-            this._listens[listen] = true;
-        }
-        let msg = this.getNewMsg("listen");
-        msg.data = data;
-        let jsonData = await this.callRemote(msg);
-        return jsonData;
-    }
-    async unlisten(data) {
-        for (let i = 0; i < data.length; i++) {
-            let listen = data[i];
-            if (!listen) {
-                continue;
-            }
-            delete this._listens[listen];
-        }
-        let msg = this.getNewMsg("unlisten");
-        msg.data = data;
-        let jsonData = await this.callRemote(msg);
-        return jsonData;
-    }
-    //把消息发送给rpc服务器，目的是调用远程函数
-    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);
-    }
-}
-class RpcConfig {
-    /**
-     * 当前rpc分组，一旦确认不可更改
-     */
-    group = "";
-    /**
-     * 当前rpc唯一id，一旦确认不可更改
-     */
-    id = "";
-    /**
-     * rpc超时时间，默认3000ms
-     */
-    timeout = 0;
-    host = "";
-    port = -1;
-}
-exports.RpcConfig = RpcConfig;
-class CgMq {
-    _ws = null;
-    get ws() {
-        return this._ws;
-    }
-    get listens() {
-        if (!this._ws) {
-            return {};
-        }
-        return this._ws.listens;
-    }
-    _inited = false;
-    _cfg = null;
-    _onmsg = null;
-    get id() {
-        return this._cfg.id;
-    }
-    get cfg() {
-        return this._cfg;
-    }
-    get group() {
-        return this._cfg?.group || "";
-    }
-    /**
-     *
-     * @param cfg rpc服务器的配置
-     * @param onmsg
-     * @returns
-     */
-    async init(cfg, onmsg) {
-        if (!cfg || !cfg.group || !cfg.id) {
-            return false;
-        }
-        this._cfg = cfg;
-        this._onmsg = onmsg;
-        if (this._inited) {
-            Log_1.gLog.error("dulplicate init for CgMq");
-            return true;
-        }
-        this._inited = true;
-        if (!this._ws) {
-            this._ws = new CgMqServerWebsocket(this);
-        }
-        return new Promise(async (resolve, reject) => {
-            this._ws.connect(cfg.host, cfg.port);
-            let pretime = Date.now();
-            while (true) {
-                if (this._ws.connected) {
-                    resolve(true);
-                    break;
-                }
-                let now = Date.now();
-                if (now - pretime >= this._cfg.timeout) {
-                    this._ws.close();
-                    resolve(false);
-                    break;
-                }
-                await Core_1.core.sleep(100);
-            }
-        });
-    }
-    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, is_mq);
-        if (this._ws.debug_msg) {
-            Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name + "-" + listen);
-        }
-        return ret_rpcmsg;
-    }
-    async onMsg(msg) {
-        if (this._onmsg) {
-            let data = await Core_1.core.safeCall(this._onmsg, null, msg);
-            return data;
-        }
-        return;
-    }
-    async listen(data) {
-        return await this._ws.listen(data);
-    }
-    async unlisten(data) {
-        return await this._ws.unlisten(data);
-    }
-}
-exports.CgMq = CgMq;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CgMq = exports.RpcConfig = void 0;
+const Core_1 = require("../../Core/Core");
+const IRpcServerWebSocket_1 = require("./IRpcServerWebSocket");
+const Log_1 = require("../../Logic/Log");
+class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
+    _cgmq = null;
+    _listens = {};
+    get listens() {
+        return this._listens;
+    }
+    constructor(cgmq) {
+        super(cgmq.cfg.group, cgmq.cfg.id, cgmq.cfg.timeout);
+        this._cgmq = cgmq;
+        this._debug_msg = true;
+    }
+    onOpen(e) {
+        super.onOpen(e);
+        this.init();
+        this.listen(Object.keys(this._listens));
+    }
+    async init() {
+        let msg = this.getNewMsg("init");
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    async listen(data) {
+        for (let i = 0; i < data.length; i++) {
+            let listen = data[i];
+            if (!listen) {
+                continue;
+            }
+            this._listens[listen] = true;
+        }
+        let msg = this.getNewMsg("listen");
+        msg.data = data;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    async unlisten(data) {
+        for (let i = 0; i < data.length; i++) {
+            let listen = data[i];
+            if (!listen) {
+                continue;
+            }
+            delete this._listens[listen];
+        }
+        let msg = this.getNewMsg("unlisten");
+        msg.data = data;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    //把消息发送给rpc服务器，目的是调用远程函数
+    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);
+    }
+}
+class RpcConfig {
+    /**
+     * 当前rpc分组，一旦确认不可更改
+     */
+    group = "";
+    /**
+     * 当前rpc唯一id，一旦确认不可更改
+     */
+    id = "";
+    /**
+     * rpc超时时间，默认3000ms
+     */
+    timeout = 0;
+    host = "";
+    port = -1;
+}
+exports.RpcConfig = RpcConfig;
+class CgMq {
+    _ws = null;
+    get ws() {
+        return this._ws;
+    }
+    get listens() {
+        if (!this._ws) {
+            return {};
+        }
+        return this._ws.listens;
+    }
+    _inited = false;
+    _cfg = null;
+    _onmsg = null;
+    get id() {
+        return this._cfg.id;
+    }
+    get cfg() {
+        return this._cfg;
+    }
+    get group() {
+        return this._cfg?.group || "";
+    }
+    /**
+     *
+     * @param cfg rpc服务器的配置
+     * @param onmsg
+     * @returns
+     */
+    async init(cfg, onmsg) {
+        if (!cfg || !cfg.group || !cfg.id) {
+            return false;
+        }
+        this._cfg = cfg;
+        this._onmsg = onmsg;
+        if (this._inited) {
+            Log_1.gLog.error("dulplicate init for CgMq");
+            return true;
+        }
+        this._inited = true;
+        if (!this._ws) {
+            this._ws = new CgMqServerWebsocket(this);
+        }
+        return new Promise(async (resolve, reject) => {
+            this._ws.connect(cfg.host, cfg.port);
+            let pretime = Date.now();
+            while (true) {
+                if (this._ws.connected) {
+                    resolve(true);
+                    break;
+                }
+                let now = Date.now();
+                if (now - pretime >= this._cfg.timeout) {
+                    this._ws.close();
+                    resolve(false);
+                    break;
+                }
+                await Core_1.core.sleep(100);
+            }
+        });
+    }
+    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, is_mq);
+        if (this._ws.debug_msg) {
+            Log_1.gLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name + "-" + listen);
+        }
+        return ret_rpcmsg;
+    }
+    async onMsg(msg) {
+        if (this._onmsg) {
+            let data = await Core_1.core.safeCall(this._onmsg, null, msg);
+            return data;
+        }
+        return;
+    }
+    async listen(data) {
+        return await this._ws.listen(data);
+    }
+    async unlisten(data) {
+        return await this._ws.unlisten(data);
+    }
+}
+exports.CgMq = CgMq;