cgserver 12.0.0 → 12.0.1

package/dist/types/Framework/Server/SocketServer/PacketParser.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare class PacketParser {
     private buffer;
     private offset;

package/dist/types/Framework/Server/WebSocketServer/IClientWebSocket.d.ts

@@ -1,7 +1,7 @@
-import { IWebSocketServer } from './IWebSocketServer';
-import { IWebSocket } from './IWebSocket';
 import { EProtoType } from '../ProtoFilter/IProtoFilter';
 import * as ws from 'websocket';
+import { IWebSocket } from './IWebSocket';
+import { IWebSocketServer } from './IWebSocketServer';
 /**
  * 服务器接收到的客户端的连接
  * 客户端的session对象

package/dist/types/Framework/Server/WebSocketServer/IWebSocketServer.d.ts

@@ -1,7 +1,7 @@
-import { IClientWebSocket } from './IClientWebSocket';
 import * as ws from 'websocket';
 import { IServerConfig } from '../../Config/IServerConfig';
 import { BaseMsg } from './IWebSocket';
+import { IClientWebSocket } from './IClientWebSocket';
 export declare class IWebSocketServer {
     protected _cfg: IServerConfig;
     get cfg(): IServerConfig;
@@ -13,6 +13,9 @@ export declare class IWebSocketServer {
     protected _ws_clients: {
         [socketid: number]: IClientWebSocket;
     };
+    get wsClients(): {
+        [socketid: number]: IClientWebSocket;
+    };
     get listenPort(): number;
     /**
      * websocket can accepted protocol

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

@@ -1,14 +1,15 @@
-import { RpcMsg } from "../Server/WebSocketServer/IRpc";
-import { CgMq, RpcConfig } from "./CgMq";
+import { CgMq, RpcConfig } from "../Server/RpcWebSocketServer/CgMq";
+import { RpcMsg } from "../Server/RpcWebSocketServer/IRpc";
 declare class Remote {
-    protected _retmsg: RpcMsg;
+    protected _retmsg: RpcMsg | null;
     get retMsg(): RpcMsg;
     protected _cgmq: CgMq;
     get cgmq(): CgMq;
     protected _to_group: string;
     protected _to_id: string;
     protected _listen: string;
-    constructor(group: string, id: string, cgmq: CgMq, listen: string);
+    protected _is_mq: boolean;
+    constructor(group: string, id: string, cgmq: CgMq, listen: string, is_mq?: boolean);
     call(func_name: string, ...args: any[]): Promise<{
         rets: any[];
         ret: any;
@@ -18,7 +19,8 @@ export declare class Rpc {
     protected _cgmq: CgMq;
     get cgmq(): CgMq;
     init(cfg: RpcConfig): Promise<boolean>;
-    getRemote(group: string, id?: string, listener?: string): Remote;
+    getRemote(group: string, id?: string, listener?: string, is_mq?: boolean): Remote;
+    getRemoteMq(group: string, id?: string, listener?: string): Remote;
     onMsg(msg: RpcMsg): Promise<any>;
     listen(listeners: string[]): Promise<RpcMsg>;
     unlisten(listeners: string[]): Promise<RpcMsg>;

package/dist/types/Framework/index_export_.d.ts

@@ -69,11 +69,11 @@ export { IServerSocket } from './Server/SocketServer/IServerSocket';
 export { ISocket } from './Server/SocketServer/ISocket';
 export { ISocketServer } from './Server/SocketServer/ISocketServer';
 export { PacketParser } from './Server/SocketServer/PacketParser';
-export { RpcMsg as RpcBaseMsg } from './Server/WebSocketServer/IRpc';
+export { RpcMsg as RpcBaseMsg } from './Server/RpcWebSocketServer/IRpc';
 export { Rpc } from './ThirdParty/Rpc';
-export { CgMq, RpcConfig } from './ThirdParty/CgMq';
-export { IRpcServerWebSocket } from './Server/WebSocketServer/IRpcServerWebSocket';
-export { IRpcClientWebSocket } from './Server/WebSocketServer/IRpcClientWebSocket';
+export { CgMq, RpcConfig } from './Server/RpcWebSocketServer/CgMq';
+export { IRpcServerWebSocket } from './Server/RpcWebSocketServer/IRpcServerWebSocket';
+export { IRpcClientWebSocket } from './Server/RpcWebSocketServer/IRpcClientWebSocket';
 export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
 export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';
 export { global } from "./global";

package/package.json

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

package/dist/lib/Framework/Database/MSSqlManager.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMSSqlMgr = exports.MSSqlManager = exports.MssqlReturn = exports.MSSqlConfig = void 0;
-const mssql = require("mssql");
-const DBCache_1 = require("./Decorator/DBCache");
-class MSSqlConfig {
-    open = false;
-    auto = false;
-    domain = '127.0.0.1';
-    port = 3306;
-    user = 'root';
-    password = 'root';
-    database = 'gameall';
-    charset = 'utf8mb4';
-}
-exports.MSSqlConfig = MSSqlConfig;
-class MssqlReturn {
-    error = null;
-    fields = null;
-    list = null;
-}
-exports.MssqlReturn = MssqlReturn;
-class MSSqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get pool() {
-        return this._pool;
-    }
-    get isValid() {
-        return !!this._pool;
-    }
-    constructor() {
-    }
-    async init(cfg) {
-        if (this._pool
-            || !cfg
-            || !cfg.open) {
-            return;
-        }
-        this._pool = await mssql.connect(cfg);
-        console.log("mssql config=" + JSON.stringify(cfg));
-        //这个的初始化位置不能变，必须位于cbs前，pool后
-        await DBCache_1.gDbCache.init();
-        for (let i = 0; i < this._init_cbs.length; ++i) {
-            this._init_cbs[i]();
-        }
-    }
-    registerInitCb(cb) {
-        this._init_cbs.push(cb);
-    }
-}
-exports.MSSqlManager = MSSqlManager;
-exports.gMSSqlMgr = new MSSqlManager();

package/dist/lib/Framework/Database/MysqlBaseService.js

@@ -1,280 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlBaseService = exports.BaseModel = void 0;
-const Log_1 = require("../Logic/Log");
-const DBCache_1 = require("./Decorator/DBCache");
-const Property_1 = require("./Decorator/Property");
-const MysqlManager_1 = require("./MysqlManager");
-class BaseModel {
-}
-exports.BaseModel = BaseModel;
-class MysqlBaseService {
-    _table = "";
-    get table() {
-        return this._table;
-    }
-    get version() {
-        let table = this._t_type.prototype[Property_1.TableProperty.key];
-        return table.version;
-    }
-    _inited = false;
-    get isInited() {
-        return this._inited;
-    }
-    _t_type = null;
-    constructor(type) {
-        this._t_type = type;
-        if (MysqlManager_1.gMysqlMgr.isValid) {
-            this._init();
-        }
-        else {
-            MysqlManager_1.gMysqlMgr.registerInitCb(this._init.bind(this));
-        }
-    }
-    async _init() {
-        if (this._inited) {
-            return;
-        }
-        this._inited = true;
-        let table = this._t_type.prototype[Property_1.TableProperty.key];
-        if (!table || !table.table) {
-            throw new Error("数据表的类必须要具有Table装饰器");
-        }
-        this._table = "`" + table.table + "`";
-        if (!MysqlManager_1.gMysqlMgr.cfg.auto) {
-            //未开启自动创建数据表
-            return;
-        }
-        let droped = await this._checkDropTable(table.version);
-        if (!droped) {
-            Log_1.gLog.info("table(" + this._table + ")无需升级...");
-            //既然版本号没变，就快速返回
-            return;
-        }
-        let primary_key = null;
-        let sql = "create table if not exists " + this._table + " (";
-        for (let key in table.items) {
-            let item = table.items[key];
-            sql += "`" + key + "`" + " " + item.type;
-            if (item.type == Property_1.EPropertyType.Varchar
-                || item.type == Property_1.EPropertyType.Char
-                || item.type == Property_1.EPropertyType.NVarchar) {
-                sql += "(" + item.type_len + ")";
-            }
-            if (item.is_notnull) {
-                sql += " not null";
-            }
-            if (item.default != undefined && !item.is_primary) {
-                sql += " default \'" + item.default + "\'";
-            }
-            if (item.auto_increment) {
-                sql += " auto_increment";
-            }
-            if (item.is_primary) {
-                primary_key = key;
-            }
-            sql += ",";
-        }
-        if (primary_key) {
-            sql += "primary key (`" + primary_key + "`),";
-            sql += "unique key `" + primary_key + "_unique` (`" + primary_key + "`)";
-        }
-        else {
-            //去掉最后一个逗号
-            sql = sql.substr(0, sql.length - 1);
-        }
-        sql += ")";
-        sql += " engine=" + table.engine;
-        if (table.auto_increment != null) {
-            sql += " auto_increment=" + table.auto_increment;
-        }
-        sql += " default charset=" + table.charset;
-        if (table.comment) {
-            sql += " comment=\'" + table.comment + "\';";
-        }
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
-        if (sr.error) {
-            Log_1.gLog.error(sr.error);
-            throw Error("table(" + this._table + ")创建失败...");
-        }
-        else {
-            DBCache_1.gDbCache.setVersion(this.table, table.version);
-            Log_1.gLog.info("table(" + this._table + ")初始化成功...");
-            await this._onReCreated();
-        }
-    }
-    async _onReCreated() {
-    }
-    async _onDroped() {
-    }
-    async _checkDropTable(cur_version) {
-        let local_version = DBCache_1.gDbCache.getVersion(this._table);
-        if (local_version == cur_version) {
-            return false;
-        }
-        let sql = "drop table if exists " + this._table;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
-        if (sr.error) {
-            Log_1.gLog.error(sr.error);
-            throw Error(sr.error);
-        }
-        else {
-            Log_1.gLog.info("table(" + this._table + ")删除成功...");
-            await this._onDroped();
-        }
-        return true;
-    }
-    /**
-     * 没有id的表不能使用该函数
-     * @param id
-     */
-    async getById(id) {
-        let tm = null;
-        let sr = await MysqlManager_1.gMysqlMgr.query("select * from " + this._table + " where id=? limit 1", [id]);
-        if (sr.error || sr.queryResult.length <= 0) {
-            return tm;
-        }
-        tm = sr.result[0];
-        return tm;
-    }
-    async get(proterty, where, args) {
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        sql += " limit 1";
-        let tm = null;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        if (sr.queryResult && sr.queryResult.length > 0) {
-            tm = sr.queryResult[0];
-        }
-        return tm;
-    }
-    async getTotal(where, args) {
-        let sql = "select ";
-        sql += "count(*) as num";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let total = 0;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        if (sr.queryResult && sr.queryResult.length > 0) {
-            total = sr.queryResult[0].num || 0;
-        }
-        return total;
-    }
-    async gets(proterty, where, args) {
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let tms = null;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        tms = sr.queryResult;
-        return tms;
-    }
-    async getCount(where, args) {
-        let sql = "select count(*) as num from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        if (sr.error || sr.queryResult.length <= 0) {
-            return 0;
-        }
-        return sr.result[0]["num"] || 0;
-    }
-    async getRandoms(num, proterty, where, args) {
-        num = num || 5;
-        let sql = "select ";
-        sql += proterty || "*";
-        sql += " from " + this._table;
-        if (where) {
-            sql += " where " + where;
-        }
-        sql += " order by rand() limit ?";
-        args = args || [];
-        args.push(num);
-        let tms = null;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        tms = sr.queryResult;
-        return tms;
-    }
-    async updateProperty(set, where, args, limit) {
-        let sql = "update " + this._table + " set ";
-        if (set) {
-            sql += set;
-        }
-        else {
-            sql += "?";
-        }
-        if (where) {
-            sql += " where " + where;
-        }
-        if (limit) {
-            sql += " limit " + limit;
-        }
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        return sr;
-    }
-    async update(model, where, args, limit) {
-        let sql = "update " + this._table + " set ?";
-        if (!where) {
-            where = " id=?";
-        }
-        sql += " where " + where;
-        let id = model["id"];
-        delete model["id"];
-        let u_m = JSON.parse(JSON.stringify(model));
-        if (!args) {
-            args = [u_m, id];
-        }
-        else {
-            args.unshift(u_m);
-        }
-        if (limit) {
-            sql += " limit " + limit;
-        }
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        if (id) {
-            model["id"] = id;
-        }
-        return sr;
-    }
-    async insert(model, ip) {
-        let table = model[Property_1.TableProperty.key];
-        let id_property = table.items["id"];
-        if (id_property) {
-            if (id_property.auto_increment) {
-                delete model["id"];
-            }
-        }
-        if (table.items["create_time"] && model["create_time"] <= 0) {
-            model["create_time"] = Date.now();
-        }
-        if (table.items["create_ip"] && ip) {
-            model["create_ip"] = ip;
-        }
-        let sql = "insert into " + this._table + " set ?";
-        //这步的做法是为了去掉model种的TableProperty.key(___table___)
-        model = JSON.parse(JSON.stringify(model));
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, [model]);
-        return sr;
-    }
-    async removeById(id) {
-        let sql = "delete from " + this._table + " where id=?";
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, [id]);
-        return sr;
-    }
-    async remove(where, args) {
-        let sql = "delete from " + this._table + " where " + where;
-        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
-        return sr;
-    }
-}
-exports.MysqlBaseService = MysqlBaseService;

package/dist/lib/Framework/Database/MysqlManager.js

@@ -1,105 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMysqlMgr = exports.MysqlManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
-const Log_1 = require("../Logic/Log");
-const _error_1 = require("./../Config/_error_");
-const mysql2 = require("mysql2/promise");
-const DBCache_1 = require("./Decorator/DBCache");
-class MysqlConfig {
-    open = false;
-    auto = false;
-    poolcfg = null;
-}
-exports.MysqlConfig = MysqlConfig;
-class SqlReturn {
-    error = null;
-    result = null;
-    fields = null;
-    get queryResult() {
-        return this.result;
-    }
-    get execResult() {
-        return this.result;
-    }
-}
-exports.SqlReturn = SqlReturn;
-class SqlReturns {
-    error = null;
-    srs = [];
-}
-exports.SqlReturns = SqlReturns;
-class MysqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get isValid() {
-        return !!this._pool;
-    }
-    _cfg = null;
-    get cfg() {
-        return this._cfg;
-    }
-    constructor() {
-    }
-    async init(cfg) {
-        if (this._pool
-            || !cfg
-            || !cfg.open) {
-            return;
-        }
-        this._cfg = cfg;
-        this._pool = mysql2.createPool(cfg.poolcfg);
-        console.log("mysql config=" + JSON.stringify(cfg));
-        //这个的初始化位置不能变，必须位于cbs前，pool后
-        if (cfg.auto) {
-            await DBCache_1.gDbCache.init();
-        }
-        for (let i = 0; i < this._init_cbs.length; ++i) {
-            this._init_cbs[i]();
-        }
-    }
-    registerInitCb(cb) {
-        this._init_cbs.push(cb);
-    }
-    async query(sqlStr, values) {
-        let sr = new SqlReturn();
-        if (!this._pool) {
-            //表示没有开通数据库，不用记录错误日志
-            sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.gLog.error(sr.error);
-            return sr;
-        }
-        try {
-            const [result, fields] = await this._pool.query(sqlStr, values);
-            sr.result = result;
-            sr.fields = fields;
-        }
-        catch (error) {
-            sr.error = _error_1.EErrorCode.No_Mysql;
-            Log_1.gLog.error(sr.error);
-            return sr;
-        }
-        return sr;
-    }
-    async transaction(sqls) {
-        let srs = new SqlReturns();
-        try {
-            await this._pool.beginTransaction();
-            for (let i = 0; i < sqls.length; ++i) {
-                let sql = sqls[i];
-                let sr = await this.query(sql.sql, sql.values);
-                if (sr.error) {
-                    srs.error = sr.error;
-                    await this._pool.rollback();
-                    return srs;
-                }
-            }
-            await this._pool.commit();
-        }
-        catch (err) {
-            srs.error = err;
-            Log_1.gLog.error(err);
-        }
-    }
-}
-exports.MysqlManager = MysqlManager;
-exports.gMysqlMgr = new MysqlManager();

package/dist/lib/Framework/Database/RedisManager.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gRedisMgr = exports.RedisManager = exports.RedisConfig = void 0;
-const redis = require("redis");
-const Log_1 = require("../Logic/Log");
-class RedisConfig {
-    open = false;
-    host = "127.0.0.1";
-    port = 6379;
-    database = 0;
-    password = null;
-}
-exports.RedisConfig = RedisConfig;
-class RedisManager {
-    _redis = null;
-    get redis() {
-        return this._redis;
-    }
-    _redisCfg = null;
-    async init(redisCfg) {
-        let p = new Promise((resolve) => {
-            if (!redisCfg || !redisCfg.open) {
-                resolve(null);
-                return;
-            }
-            if (this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redisCfg = redisCfg;
-            Log_1.gLog.info("begin connect redis=" + JSON.stringify(redisCfg));
-            this._redis = redis.createClient(redisCfg);
-            this._redis.on("connect", () => {
-                this.onConnect();
-                resolve(null);
-            });
-            this._redis.on("end", this.onEnd.bind(this));
-            this._redis.on("error", this.onError.bind(this));
-        });
-        let ret = await p;
-        for (let key in this._redis) {
-            if (typeof this._redis[key] == "function") {
-                this[key] = this._redis[key].bind(this._redis);
-            }
-        }
-        return ret;
-    }
-    onConnect() {
-        Log_1.gLog.info("redis has connected!");
-    }
-    onEnd() {
-        this._redis = null;
-        this.init(this._redisCfg); //重连
-    }
-    onError(err) {
-        Log_1.gLog.info("Error connected=" + this._redis + ": " + err);
-    }
-}
-exports.RedisManager = RedisManager;
-exports.gRedisMgr = new RedisManager();