cgserver 6.6.7 → 6.8.447

package/dist/lib/Core/Core.js

@@ -566,7 +566,7 @@ class core {
         });
     }
     static async safeCall(func, thisArg = null, ...params) {
-        if (!func) {
+        if (!func || !core.isFunction(func)) {
             return;
         }
         try {

package/dist/lib/Logic/AsyncQueueTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAsyncQueueTool = void 0;
+exports.GSyncQueueTool = void 0;
 const Core_1 = require("../Core/Core");
 class AsyncQueueItem {
     key = "";
@@ -40,4 +40,4 @@ class AsyncQueueTool {
         return error;
     }
 }
-exports.GAsyncQueueTool = new AsyncQueueTool();
+exports.GSyncQueueTool = new AsyncQueueTool();

package/dist/lib/Logic/SyncQueueTool.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSyncQueueTool = void 0;
+const Core_1 = require("../Core/Core");
+class SyncQueueItem {
+    key = "";
+    running = false;
+    funcs = [];
+    constructor(key) {
+        this.key = key;
+    }
+    async add(func, thisArg = null, ...params) {
+        return new Promise((resolve, reject) => {
+            this.funcs.push({ func: func, thisArg: thisArg, params: params, resolve: resolve });
+            this._run();
+        });
+    }
+    async _run() {
+        if (this.running) {
+            return;
+        }
+        this.running = true;
+        while (this.funcs.length > 0) {
+            let funcitem = this.funcs.shift();
+            if (!funcitem.func) {
+                continue;
+            }
+            let rs = await Core_1.core.safeCall(funcitem.func, funcitem.thisArg, ...funcitem.params);
+            await Core_1.core.safeCall(funcitem.resolve, null, rs);
+        }
+        this.running = false;
+    }
+}
+class SyncQueueTool {
+    //队列数据,一个key队列必须有先后
+    _queues = {};
+    async add(key, func, thisArg = null, ...params) {
+        this._queues[key] = this._queues[key] || new SyncQueueItem(key);
+        let error = await this._queues[key].add(func, thisArg, ...params);
+        return error;
+    }
+}
+exports.GSyncQueueTool = new SyncQueueTool();

package/dist/lib/SocketServer/IClientWebSocket.js

@@ -5,6 +5,11 @@ const IWebSocket_1 = require("./IWebSocket");
 const ws = require("websocket");
 const Log_1 = require("../Logic/Log");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
+/**
+ * 客户端使用的websocket
+ * 用它去主动连接服务器
+ * 默认自动重连
+ */
 class IClientWebSocket extends IWebSocket_1.IWebSocket {
     _host = "";
     /**

package/dist/lib/SocketServer/IRpcClientWebSocket.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcClientWebSocket = exports.RpcBaseMsg = void 0;
+const _ = require("underscore");
+const EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
+const IClientWebSocket_1 = require("./IClientWebSocket");
+const IWebSocket_1 = require("./IWebSocket");
+class RpcBaseMsg extends IWebSocket_1.BaseMsg {
+    __rpcid = "";
+}
+exports.RpcBaseMsg = RpcBaseMsg;
+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;
+    }
+    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 func = (jsonData) => {
+                resolve(jsonData);
+            };
+            let 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(jsonData) {
+        if (jsonData.__rpcid) {
+            EventTool_1.GEventTool.emit(jsonData.__rpcid, jsonData);
+            return;
+        }
+        Log_1.GLog.error({ des: "no handle", jsonData });
+    }
+}
+exports.IRpcClientWebSocket = IRpcClientWebSocket;

package/dist/lib/SocketServer/IServerWebSocket.js

@@ -4,6 +4,10 @@ exports.IServerWebSocket = void 0;
 const IWebSocket_1 = require("./IWebSocket");
 const Log_1 = require("../Logic/Log");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
 class IServerWebSocket extends IWebSocket_1.IWebSocket {
     _server = null;
     get server() {

package/dist/lib/SocketServer/IWebSocket.js

@@ -1,22 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IWebSocket = void 0;
+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 ServerConfig_1 = require("../Config/ServerConfig");
-let WebSocketIdMgr = {
-    id: _.random(0, 99999999),
-    getNewID() {
-        return this.id++;
-    },
-};
+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 {
-    _await = false;
-    get await() {
-        return this._await;
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    _is_sync_msg = true;
+    get isSynMsg() {
+        return this._is_sync_msg;
     }
     _debug_msg = false;
     get debug_msg() {
@@ -54,16 +63,12 @@ class IWebSocket {
     }
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         this._debug_msg = ServerConfig_1.GServerCfg.debug_msg;
-        this._socket_id = WebSocketIdMgr.getNewID();
+        this._socket_id = parseInt(_.uniqueId());
         this._protoType = protoType;
         this._protoPath = protoPath;
     }
     getNewMsg(cmd, errcode) {
-        let msg = {
-            cmd: cmd,
-            errcode: errcode,
-            servertime: new Date().getTime()
-        };
+        let msg = new BaseMsg(cmd, errcode);
         return msg;
     }
     receive_heartbeat(jsonData) {
@@ -84,15 +89,11 @@ class IWebSocket {
         this._ws.on("close", this.onClose.bind(this));
         this.onOpen();
     }
-    _msgs = [];
     onMessage(message) {
         try {
             let msg = this._onDecode(message);
-            if (this._await) {
-                this._msgs.push(msg);
-                if (!this._run_await) {
-                    this._awaitMessages();
-                }
+            if (this._is_sync_msg) {
+                SyncQueueTool_1.GSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
             }
             else {
                 this._onMessage(msg);
@@ -116,30 +117,21 @@ class IWebSocket {
         let msg = this._protoFilter.encode(data, ...params);
         return msg;
     }
-    _run_await = false;
-    async _awaitMessages() {
-        this._run_await = true;
-        while (this._msgs.length > 0) {
-            let msg = this._msgs.shift();
-            await this._onMessage(msg);
-        }
-        this._run_await = false;
-    }
     /**
      * 过滤消息，每个消息处理之前调用
-     * @param jsonData
+     * @param msg
      * @returns
      */
-    filterMsg(jsonData) {
-        if (this._debug_msg
-            && jsonData
-            && jsonData.cmd != "heartbeat") {
-            Log_1.GLog.info(this.tipKey + "  receive:--------");
-            Log_1.GLog.info({ tipKey: this.tipKey, jsonData });
-        }
-        if (!jsonData.cmd || jsonData.cmd == "") {
-            Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd param,data=');
-            Log_1.GLog.error({ tipKey: this.tipKey, jsonData });
+    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;
@@ -154,40 +146,14 @@ class IWebSocket {
         else if (!func) {
             let otherfunc = this["receive_other_all"];
             if (otherfunc) {
-                try {
-                    if (Core_1.core.isAsyncFunc(otherfunc)) {
-                        //默认支持其他所有处理消息
-                        await otherfunc.call(this, jsonData).catch((reason) => {
-                            Log_1.GLog.error(reason);
-                        });
-                    }
-                    else {
-                        otherfunc.call(this, jsonData);
-                    }
-                }
-                catch (e) {
-                    Log_1.GLog.error(this.tipKey + e.stack);
-                }
+                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 {
-            try {
-                if (Core_1.core.isAsyncFunc(func)) {
-                    //默认支持其他所有处理消息
-                    await func.call(this, jsonData).catch((reason) => {
-                        Log_1.GLog.error(reason);
-                    });
-                }
-                else {
-                    func.call(this, jsonData);
-                }
-            }
-            catch (e) {
-                Log_1.GLog.error(this.tipKey + " error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
-            }
+            await Core_1.core.safeCall(func, this, jsonData);
         }
     }
     onOpen(e) {
@@ -197,21 +163,20 @@ class IWebSocket {
     onClose(reasonCode, description) {
         Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
-    send(data) {
+    send(msg) {
         if (!this.connected) {
             return;
         }
-        if (!data) {
+        if (!msg) {
             Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
             return;
         }
         if (this._debug_msg
-            && data.cmd != "heartbeat") {
-            Log_1.GLog.info(this.tipKey + "  send:-----------------------------------");
-            Log_1.GLog.info({ tipKey: this.tipKey, data });
+            && msg.cmd != "heartbeat") {
+            Log_1.GLog.info({ tipKey: this.tipKey, action: "send", msg });
         }
-        let msg = this._onEncode(data);
-        this._ws.send(msg);
+        let data = this._onEncode(msg);
+        this._ws.send(data);
     }
     close() {
         this._ws.close();

package/dist/lib/ThirdParty/CgMq.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CgMq = exports.CgMqConfig = exports.CgMqRetMsg = void 0;
+const Core_1 = require("../Core/Core");
+const Log_1 = require("../Logic/Log");
+const IRpcClientWebSocket_1 = require("../SocketServer/IRpcClientWebSocket");
+//接受到的消息无需basemsg部分
+class CgMqMsg extends IRpcClientWebSocket_1.RpcBaseMsg {
+    /**
+     * 必填，目的身份
+     */
+    to_identity = "";
+    /**
+     * 消息携带的数据
+     */
+    data = null;
+}
+class CgMqRetMsg extends CgMqMsg {
+    /**
+     * 发送者身份
+     */
+    from_identity = "";
+    /**
+     * audience 数量
+     */
+    count = 0;
+}
+exports.CgMqRetMsg = CgMqRetMsg;
+class CgMqServerWebsocket extends IRpcClientWebSocket_1.IRpcClientWebSocket {
+    _cgmq = null;
+    /**
+     * 自己的身份
+     */
+    _identity = "";
+    constructor(cgmq) {
+        super();
+        this._cgmq = cgmq;
+        this._identity = this._cgmq.cfg.identity;
+    }
+    onOpen(e) {
+        this.init(this._cgmq.cfg.identity);
+    }
+    async init(identity) {
+        let msg = this.getNewMsg("init");
+        msg.identity = identity;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    async push(to_identity, data) {
+        let msg = this.getNewMsg("msg");
+        msg.to_identity = to_identity;
+        msg.data = data;
+        let jsonData = this.callRemote(msg);
+        return jsonData;
+    }
+    async receive_msg(msg) {
+        let data = await this._cgmq.onMsg(msg);
+        msg.data = data;
+        this.send(msg);
+    }
+}
+class CgMqConfig {
+    identity = "";
+    host = "";
+    port = -1;
+}
+exports.CgMqConfig = CgMqConfig;
+class CgMq {
+    _ws = null;
+    _inited = false;
+    _cfg = null;
+    _onmsg = null;
+    get cfg() {
+        return this._cfg;
+    }
+    get identity() {
+        return this._cfg?.identity;
+    }
+    async init(cfg, onmsg) {
+        if (!cfg) {
+            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 >= 3 * 1000) {
+                    this._ws.close();
+                    resolve(false);
+                    break;
+                }
+                await Core_1.core.sleep(100);
+            }
+        });
+    }
+    async callRemote(to_identity, func_name, ...args) {
+        let data = {
+            cmd: func_name,
+            args: args
+        };
+        let jsonData = await this._ws.push(to_identity, data);
+        return jsonData;
+    }
+    async onMsg(msg) {
+        if (this._onmsg) {
+            let data = await Core_1.core.safeCall(this._onmsg, msg);
+            return data;
+        }
+        return;
+    }
+}
+exports.CgMq = CgMq;

package/dist/lib/ThirdParty/CgMqTool.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CgMq = exports.CgMqConfig = void 0;
+const Core_1 = require("../Core/Core");
+const Log_1 = require("../Logic/Log");
+const IRpcClientWebSocket_1 = require("../SocketServer/IRpcClientWebSocket");
+const _ = require("underscore");
+//接受到的消息无需basemsg部分
+class CgMqMsg extends IRpcClientWebSocket_1.RpcBaseMsg {
+    /**
+     * 必填，目的身份
+     */
+    to_identity = "";
+    /**
+     * 消息携带的数据
+     */
+    data = null;
+}
+class CgMqRetMsg extends CgMqMsg {
+    /**
+     * 发送者身份
+     */
+    from_identity = "";
+    /**
+     * audience 数量
+     */
+    count = 0;
+}
+class CgMqServerWebsocket extends IRpcClientWebSocket_1.IRpcClientWebSocket {
+    _cgmq = null;
+    /**
+     * 自己的身份
+     */
+    _identity = "";
+    constructor(cgmq) {
+        super();
+        this._cgmq = cgmq;
+        this._identity = this._cgmq.cfg.identity;
+    }
+    onOpen(e) {
+        this.listen(_.toArray(this._cgmq.listenIdentities));
+    }
+    //
+    async listen(identities) {
+        let msg = this.getNewMsg("listen");
+        msg.identities = identities;
+        let jsonData = await this.callRemote(msg);
+        return jsonData;
+    }
+    async cancelListen(identity) {
+        let msg = this.getNewMsg("cancelListen");
+        msg.identity = identity;
+        let jsonData = this.callRemote(msg);
+        return jsonData;
+    }
+    push(to_identity, data) {
+        let msg = this.getNewMsg("msg");
+        msg.to_identity = to_identity;
+        msg.data = data;
+        this.send(msg);
+    }
+}
+class CgMqConfig {
+    identity = "";
+    host = "";
+    port = -1;
+}
+exports.CgMqConfig = CgMqConfig;
+class CgMq {
+    _ws = null;
+    _inited = false;
+    _cfg = null;
+    get cfg() {
+        return this._cfg;
+    }
+    get identity() {
+        return this._cfg?.identity;
+    }
+    //用kv方便查一些
+    _listen_identities = {};
+    get listenIdentities() {
+        return this._listen_identities;
+    }
+    async init(cfg, identities) {
+        if (!cfg) {
+            return false;
+        }
+        for (let key in identities) {
+            let id = identities[key];
+            this._listen_identities[id] = id;
+        }
+        this._cfg = cfg;
+        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 >= 3 * 1000) {
+                    this._ws.close();
+                    resolve(false);
+                    break;
+                }
+                await Core_1.core.sleep(100);
+            }
+        });
+    }
+    async listen(identity) {
+        if (this._listen_identities[identity]) {
+            return true;
+        }
+        if (!this._ws || !this._ws.connected) {
+            return false;
+        }
+        let ret = this._ws.listen([identity]);
+        return ret;
+    }
+    async cancelListen(identity) {
+        if (this._listen_identities[identity]) {
+            return true;
+        }
+        if (!this._ws || !this._ws.connected) {
+            return false;
+        }
+        let ret = await this._ws.cancelListen(identity);
+        return ret;
+    }
+}
+exports.CgMq = CgMq;

package/dist/lib/ThirdParty/Rpc.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Rpc = exports.RpcConfig = void 0;
+const Core_1 = require("../Core/Core");
+const Log_1 = require("../Logic/Log");
+const CgMq_1 = require("./CgMq");
+class Remote {
+    _cgmq = null;
+    get cgmq() {
+        return this._cgmq;
+    }
+    _to_identity = "";
+    constructor(identity, cgmq) {
+        this._to_identity = identity;
+        this._cgmq = cgmq;
+    }
+    async call(func_name, ...args) {
+        let jsonData = await this._cgmq.callRemote(this._to_identity, func_name, ...args);
+        return jsonData;
+    }
+}
+class RpcConfig extends CgMq_1.CgMqConfig {
+}
+exports.RpcConfig = RpcConfig;
+class Rpc {
+    _cgmq = null;
+    get cgmq() {
+        return this._cgmq;
+    }
+    async init(cfg) {
+        this._cgmq = new CgMq_1.CgMq();
+        let ret = await this._cgmq.init(cfg, this.onMsg.bind(this));
+        return ret;
+    }
+    getRemote(identity) {
+        return new Remote(identity, this._cgmq);
+    }
+    async onMsg(msg) {
+        if (!msg || !msg.data || !msg.data.cmd) {
+            return;
+        }
+        let cmd = msg.data.cmd;
+        let func = this[cmd];
+        if (!func) {
+            Log_1.GLog.error({ des: "rpc no cmd", msg });
+            return;
+        }
+        let data = await Core_1.core.safeCall(func);
+        return data;
+    }
+}
+exports.Rpc = Rpc;

package/dist/lib/ThirdParty/RpcTool.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GRpcTool = void 0;
+class Remote {
+    call(func_name, ...args) {
+    }
+}
+class RpcTool {
+    _cgmq;
+    async init() {
+    }
+}
+exports.GRpcTool = new RpcTool();

package/dist/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.ServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = exports.GCgServer = void 0;
-exports.EAccountState = exports.GEventTool = exports.GAsyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
+exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
@@ -158,9 +158,15 @@ var Response_1 = require("./WebServer/Engine/Response");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return Response_1.Response; } });
 var FrameworkConfig_2 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "WebServerConfig", { enumerable: true, get: function () { return FrameworkConfig_2.WebServerConfig; } });
-var AsyncQueueTool_1 = require("./Logic/AsyncQueueTool");
-Object.defineProperty(exports, "GAsyncQueueTool", { enumerable: true, get: function () { return AsyncQueueTool_1.GAsyncQueueTool; } });
+var SyncQueueTool_1 = require("./Logic/SyncQueueTool");
+Object.defineProperty(exports, "GSyncQueueTool", { enumerable: true, get: function () { return SyncQueueTool_1.GSyncQueueTool; } });
 var EventTool_1 = require("./Logic/EventTool");
 Object.defineProperty(exports, "GEventTool", { enumerable: true, get: function () { return EventTool_1.GEventTool; } });
 var ini_2 = require("./Service/ini");
 Object.defineProperty(exports, "EAccountState", { enumerable: true, get: function () { return ini_2.EAccountState; } });
+var Rpc_1 = require("./ThirdParty/Rpc");
+Object.defineProperty(exports, "Rpc", { enumerable: true, get: function () { return Rpc_1.Rpc; } });
+Object.defineProperty(exports, "RpcConfig", { enumerable: true, get: function () { return Rpc_1.RpcConfig; } });
+var CgMq_1 = require("./ThirdParty/CgMq");
+Object.defineProperty(exports, "CgMq", { enumerable: true, get: function () { return CgMq_1.CgMq; } });
+Object.defineProperty(exports, "CgMqConfig", { enumerable: true, get: function () { return CgMq_1.CgMqConfig; } });

package/dist/types/Core/Core.d.ts

@@ -99,6 +99,6 @@ export declare class core {
      * @param num
      */
     static convertToGlobalStr(num: number): string;
-    static sleep(milliseconds: any): Promise<unknown>;
+    static sleep(milliseconds: number): Promise<unknown>;
     static safeCall(func: Function, thisArg?: any, ...params: any[]): Promise<any>;
 }

package/dist/types/Logic/AsyncQueueTool.d.ts

@@ -17,5 +17,5 @@ declare class AsyncQueueTool {
     };
     add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
 }
-export declare let GAsyncQueueTool: AsyncQueueTool;
+export declare let GSyncQueueTool: AsyncQueueTool;
 export {};

package/dist/types/Logic/SyncQueueTool.d.ts

@@ -0,0 +1,21 @@
+declare class SyncQueueItem {
+    key: string;
+    running: boolean;
+    funcs: {
+        func: Function;
+        thisArg: any;
+        params: any[];
+        resolve?: Function;
+    }[];
+    constructor(key: string);
+    add(func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
+    protected _run(): Promise<void>;
+}
+declare class SyncQueueTool {
+    protected _queues: {
+        [key: string]: SyncQueueItem;
+    };
+    add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
+}
+export declare let GSyncQueueTool: SyncQueueTool;
+export {};

package/dist/types/SocketServer/IClientWebSocket.d.ts

@@ -1,6 +1,11 @@
 import { IWebSocket } from './IWebSocket';
 import * as ws from 'websocket';
 import { EProtoType } from './ProtoFilter/IProtoFilter';
+/**
+ * 客户端使用的websocket
+ * 用它去主动连接服务器
+ * 默认自动重连
+ */
 export declare class IClientWebSocket extends IWebSocket {
     protected _host: string;
     /**

package/dist/types/SocketServer/IRpcClientWebSocket.d.ts

@@ -0,0 +1,14 @@
+import { IClientWebSocket } from "./IClientWebSocket";
+import { BaseMsg } from "./IWebSocket";
+export declare class RpcBaseMsg extends BaseMsg {
+    __rpcid: string;
+}
+export declare class IRpcClientWebSocket extends IClientWebSocket {
+    protected _genId(pre?: string): string;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): any;
+    callRemote(msg: RpcBaseMsg): Promise<unknown>;
+    receive_other_all(jsonData: any): void;
+}

package/dist/types/SocketServer/IServerWebSocket.d.ts

@@ -2,6 +2,10 @@ import { ISocketServer } from './ISocketServer';
 import { IWebSocket } from './IWebSocket';
 import { EProtoType } from './ProtoFilter/IProtoFilter';
 import * as ws from 'websocket';
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
 export declare class IServerWebSocket extends IWebSocket {
     protected _server: ISocketServer;
     get server(): ISocketServer;

package/dist/types/SocketServer/IWebSocket.d.ts

@@ -1,8 +1,24 @@
 import { IProtoFilter, EProtoType } from "./ProtoFilter/IProtoFilter";
 import * as ws from 'websocket';
+export declare class BaseMsg {
+    cmd: string;
+    errcode?: {
+        id: number;
+        des: string;
+    };
+    servertime: number;
+    constructor(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    });
+}
 export declare class IWebSocket {
-    protected _await: boolean;
-    get await(): boolean;
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    protected _is_sync_msg: boolean;
+    get isSynMsg(): boolean;
     protected _debug_msg: boolean;
     get debug_msg(): boolean;
     set debug_msg(value: boolean);
@@ -18,27 +34,27 @@ export declare class IWebSocket {
     get remoteHost(): string;
     get connected(): boolean;
     constructor(protoType?: EProtoType, protoPath?: string);
-    getNewMsg(cmd: any, errcode?: any): any;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): BaseMsg | any;
     receive_heartbeat(jsonData: any): void;
     send_heartbeat(): void;
     onConnect(_ws: ws.connection): void;
-    protected _msgs: Array<any>;
     onMessage(message: ws.Message): void;
     protected _onDecode(message: ws.Message, ...params: any[]): any;
     protected _onEncode(data: any, ...params: any[]): any;
-    protected _run_await: boolean;
-    protected _awaitMessages(): Promise<void>;
     /**
      * 过滤消息，每个消息处理之前调用
-     * @param jsonData
+     * @param msg
      * @returns
      */
-    filterMsg(jsonData: any): boolean;
+    filterMsg(msg: BaseMsg): boolean;
     protected _onMessage(data: any): Promise<void>;
     onOpen(e?: any): void;
     onError(e: Error): void;
     onClose(reasonCode: number, description: string): void;
-    send(data: any): void;
+    send(msg: BaseMsg): void;
     close(): void;
     getServerNameFromCmd(cmd: any): any;
 }

package/dist/types/ThirdParty/CgMq.d.ts

@@ -0,0 +1,50 @@
+import { IRpcClientWebSocket, RpcBaseMsg } from "../SocketServer/IRpcClientWebSocket";
+declare class CgMqMsg extends RpcBaseMsg {
+    /**
+     * 必填，目的身份
+     */
+    to_identity: string;
+    /**
+     * 消息携带的数据
+     */
+    data: any;
+}
+export declare class CgMqRetMsg extends CgMqMsg {
+    /**
+     * 发送者身份
+     */
+    from_identity: string;
+    /**
+     * audience 数量
+     */
+    count: number;
+}
+declare class CgMqServerWebsocket extends IRpcClientWebSocket {
+    protected _cgmq: CgMq;
+    /**
+     * 自己的身份
+     */
+    protected _identity: string;
+    constructor(cgmq: CgMq);
+    onOpen(e?: any): void;
+    init(identity: string): Promise<unknown>;
+    push(to_identity: string, data: any): Promise<unknown>;
+    receive_msg(msg: CgMqRetMsg): Promise<void>;
+}
+export declare class CgMqConfig {
+    identity: string;
+    host: string;
+    port: number;
+}
+export declare class CgMq {
+    protected _ws: CgMqServerWebsocket;
+    protected _inited: boolean;
+    protected _cfg: CgMqConfig;
+    protected _onmsg: (msg: CgMqRetMsg) => any;
+    get cfg(): CgMqConfig;
+    get identity(): string;
+    init(cfg: CgMqConfig, onmsg?: (msg: CgMqRetMsg) => any): Promise<unknown>;
+    callRemote(to_identity: string, func_name: string, ...args: any[]): Promise<unknown>;
+    onMsg(msg: CgMqRetMsg): Promise<any>;
+}
+export {};

package/dist/types/ThirdParty/CgMqTool.d.ts

@@ -0,0 +1,35 @@
+import { IRpcClientWebSocket } from "../SocketServer/IRpcClientWebSocket";
+declare class CgMqServerWebsocket extends IRpcClientWebSocket {
+    protected _cgmq: CgMq;
+    /**
+     * 自己的身份
+     */
+    protected _identity: string;
+    constructor(cgmq: CgMq);
+    onOpen(e?: any): void;
+    listen(identities: string[]): Promise<unknown>;
+    cancelListen(identity: string): Promise<unknown>;
+    push(to_identity: string, data: any): void;
+}
+export declare class CgMqConfig {
+    identity: string;
+    host: string;
+    port: number;
+}
+export declare class CgMq {
+    protected _ws: CgMqServerWebsocket;
+    protected _inited: boolean;
+    protected _cfg: CgMqConfig;
+    get cfg(): CgMqConfig;
+    get identity(): string;
+    protected _listen_identities: {
+        [identity: string]: string;
+    };
+    get listenIdentities(): {
+        [identity: string]: string;
+    };
+    init(cfg: CgMqConfig, identities: string[]): Promise<unknown>;
+    listen(identity: string): Promise<unknown>;
+    cancelListen(identity: string): Promise<unknown>;
+}
+export {};

package/dist/types/ThirdParty/Rpc.d.ts

@@ -0,0 +1,18 @@
+import { CgMq, CgMqConfig, CgMqRetMsg } from "./CgMq";
+declare class Remote {
+    protected _cgmq: CgMq;
+    get cgmq(): CgMq;
+    protected _to_identity: string;
+    constructor(identity: string, cgmq: CgMq);
+    call(func_name: string, ...args: any[]): Promise<unknown>;
+}
+export declare class RpcConfig extends CgMqConfig {
+}
+export declare class Rpc {
+    protected _cgmq: CgMq;
+    get cgmq(): CgMq;
+    init(cfg: RpcConfig): Promise<unknown>;
+    getRemote(identity: string): Remote;
+    onMsg(msg: CgMqRetMsg): Promise<any>;
+}
+export {};

package/dist/types/ThirdParty/RpcTool.d.ts

@@ -0,0 +1,6 @@
+declare class RpcTool {
+    protected _cgmq: any;
+    init(): Promise<void>;
+}
+export declare let GRpcTool: RpcTool;
+export {};

package/dist/types/index.d.ts

@@ -73,6 +73,8 @@ export { RazorJs } from './WebServer/Engine/RazorJs';
 export { Request } from './WebServer/Engine/Request';
 export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
-export { GAsyncQueueTool } from './Logic/AsyncQueueTool';
+export { GSyncQueueTool } from './Logic/SyncQueueTool';
 export { GEventTool } from './Logic/EventTool';
 export { EAccountState } from './Service/ini';
+export { Rpc, RpcConfig } from './ThirdParty/Rpc';
+export { CgMq, CgMqConfig } from './ThirdParty/CgMq';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.6.7",
+  "version": "6.8.447",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",