cgserver 10.1.3 → 10.2.0

package/README.md

@@ -1,3 +1,6 @@
+10.2.0
+1、修复redis
+2、增加对cgrank的支持
 10.0.25
 1、Config 支持原始数据
 10.0.23

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

@@ -36,6 +36,7 @@ class RedisManager {
             });
             this._redis.on("end", this.onEnd.bind(this));
             this._redis.on("error", this.onError.bind(this));
+            this._redis.connect();
         });
         let ret = await p;
         for (let key in this._redis) {

package/dist/lib/Framework/ThirdParty/CgRankToo.js

@@ -0,0 +1,179 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GCgRankTool = exports.CgRankCommandItem = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankErrcode = void 0;
+const HttpTool_1 = require("../Logic/HttpTool");
+class CgRankErrcode {
+    id = 0;
+    des = "";
+}
+exports.CgRankErrcode = CgRankErrcode;
+class CgRankRankItem {
+    id = "";
+    score = 0;
+    rank = 0;
+    other = {};
+}
+exports.CgRankRankItem = CgRankRankItem;
+class CgRankRankData {
+    //每个榜都有一个关键词
+    key = "";
+    //数据
+    maps = {};
+    //有序列表
+    list = [];
+    timeout = -1;
+}
+exports.CgRankRankData = CgRankRankData;
+class CgRankCommandItem {
+    id = "";
+    score = 0;
+    inc = {};
+    set = {};
+}
+exports.CgRankCommandItem = CgRankCommandItem;
+class CgRankTool {
+    _url = "";
+    init(url) {
+        this._url = url;
+        return true;
+    }
+    /**
+     *
+     * @param key 排行榜的关键字
+     * @returns
+     */
+    async removeRank(key) {
+        let msg = {
+            cmd: "removeRank",
+            key: key
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async saveAllRank() {
+        let msg = {
+            cmd: "saveAllRank"
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async getRankItem(key, id) {
+        let msg = {
+            cmd: "getRankItem",
+            key: key,
+            id: id
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async getRankItems(key, ids) {
+        let msg = {
+            cmd: "getRankItems",
+            key: key,
+            ids: ids
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    /**
+     *
+     * @param key
+     * @param start
+     * @param count 小于等于0表示全部
+     */
+    async getRankList(key, start, count) {
+        let msg = {
+            cmd: "getRankList",
+            key: key,
+            start: start,
+            count: count
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async getRankCount(key) {
+        let msg = {
+            cmd: "getRankCount",
+            key: key
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async getRevRankList(key, start, count) {
+        let msg = {
+            cmd: "getRevRankList",
+            key: key,
+            start: start,
+            count: count
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async addToRank(key, id, score, other, isreplace = false) {
+        let msg = {
+            cmd: "addToRank",
+            key: key,
+            id: id,
+            score: score,
+            other: other,
+            isreplace: isreplace
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async addsToRank(key, datas, isreplace = false) {
+        let msg = {
+            cmd: "addsToRank",
+            key: key,
+            datas: datas,
+            isreplace: isreplace
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async removeFromRank(key, id) {
+        let msg = {
+            cmd: "removeFromRank",
+            key: key,
+            id: id
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async updateInRank(key, command) {
+        let msg = {
+            cmd: "updateInRank",
+            key: key,
+            command: command
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async updatesInRank(key, commands) {
+        let msg = {
+            cmd: "updatesInRank",
+            key: key,
+            commands: commands
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async executeCommand(key, commands) {
+        let msg = {
+            cmd: "executeCommand",
+            key: key,
+            commands: commands
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+    async anyCall(call, ...args) {
+        let msg = {
+            cmd: call,
+            args: args
+        };
+        let rs = await HttpTool_1.gHttpTool.post({ url: this._url, json: msg });
+        return rs.body;
+    }
+}
+exports.GCgRankTool = new CgRankTool();

package/dist/lib/Framework/index_export_.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = 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.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = void 0;
-exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.AlipayCallBack = exports.AlipayResult = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = void 0;
+exports.EProtoType = exports.RedisManager = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = 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.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankCommandItem = exports.GCgRankTool = void 0;
+exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.AlipayCallBack = exports.AlipayResult = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = void 0;
+var CgRankToo_1 = require("./ThirdParty/CgRankToo");
+Object.defineProperty(exports, "GCgRankTool", { enumerable: true, get: function () { return CgRankToo_1.GCgRankTool; } });
+Object.defineProperty(exports, "CgRankCommandItem", { enumerable: true, get: function () { return CgRankToo_1.CgRankCommandItem; } });
+Object.defineProperty(exports, "CgRankRankItem", { enumerable: true, get: function () { return CgRankToo_1.CgRankRankItem; } });
+Object.defineProperty(exports, "CgRankRankData", { enumerable: true, get: function () { return CgRankToo_1.CgRankRankData; } });
 var MongoServiceManager_1 = require("./Database/Mongo/MongoServiceManager");
 Object.defineProperty(exports, "MongoServiceManager", { enumerable: true, get: function () { return MongoServiceManager_1.MongoServiceManager; } });
 var AiObject_1 = require("./AI/AiObject");

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

@@ -0,0 +1,103 @@
+export declare class CgRankErrcode {
+    id: number;
+    des: string;
+}
+export declare class CgRankRankItem {
+    id: string;
+    score: number;
+    rank: number;
+    other: {
+        [key: string]: any;
+    };
+}
+export declare class CgRankRankData {
+    key: string;
+    maps: {
+        [id: string]: CgRankRankItem;
+    };
+    list: CgRankRankItem[];
+    timeout: number;
+}
+export declare class CgRankCommandItem {
+    id: string;
+    score: number;
+    inc: {
+        [key: string]: number;
+    };
+    set: {
+        [key: string]: number;
+    };
+}
+declare class CgRankTool {
+    protected _url: string;
+    init(url: string): boolean;
+    /**
+     *
+     * @param key 排行榜的关键字
+     * @returns
+     */
+    removeRank(key: string): Promise<{
+        errcode?: CgRankErrcode;
+    }>;
+    saveAllRank(): Promise<{
+        keys: string[];
+    }>;
+    getRankItem(key: string, id: string): Promise<{
+        rank: CgRankRankItem;
+    }>;
+    getRankItems(key: string, ids: string[]): Promise<{
+        ranks: {
+            [id: string]: CgRankRankItem;
+        };
+    }>;
+    /**
+     *
+     * @param key
+     * @param start
+     * @param count 小于等于0表示全部
+     */
+    getRankList(key: string, start: number, count: number): Promise<{
+        ranks: CgRankRankItem[];
+    }>;
+    getRankCount(key: string): Promise<{
+        count: number;
+    }>;
+    getRevRankList(key: string, start: number, count: number): Promise<{
+        ranks: CgRankRankItem[];
+    }>;
+    addToRank(key: string, id: string, score: number, other: any, isreplace?: boolean): Promise<{
+        rank: CgRankRankItem;
+    }>;
+    addsToRank(key: string, datas: {
+        [id: string]: CgRankCommandItem;
+    }, isreplace?: boolean): Promise<{
+        ranks: {
+            [id: string]: CgRankRankItem;
+        };
+    }>;
+    removeFromRank(key: string, id: string): Promise<{
+        rank: CgRankRankItem;
+    }>;
+    updateInRank(key: string, command: CgRankCommandItem): Promise<{
+        rank: CgRankRankItem;
+    }>;
+    updatesInRank(key: string, commands: {
+        [id: string]: CgRankCommandItem;
+    }): Promise<{
+        ranks: {
+            [id: string]: CgRankRankItem;
+        };
+    }>;
+    executeCommand(key: string, commands: {
+        [id: string]: CgRankCommandItem;
+    }): Promise<{
+        ranks: {
+            [id: string]: CgRankRankItem;
+        };
+    }>;
+    anyCall(call: string, ...args: any[]): Promise<{
+        result: any;
+    }>;
+}
+export declare let GCgRankTool: CgRankTool;
+export {};

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

@@ -1,3 +1,4 @@
+export { GCgRankTool, CgRankCommandItem, CgRankRankItem, CgRankRankData } from './ThirdParty/CgRankToo';
 export { MongoServiceManager } from './Database/Mongo/MongoServiceManager';
 export { AiObject } from "./AI/AiObject";
 export { AStar } from "./AI/Astar";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "10.1.3",
+  "version": "10.2.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -41,7 +41,6 @@
     "@types/mssql": "^9.1.5",
     "@types/node": "^20.11.20",
     "@types/nodemailer": "^6.4.14",
-    "@types/redis": "^4.0.11",
     "@types/reflect-metadata": "^0.1.0",
     "@types/request": "^2.48.12",
     "@types/underscore": "^1.11.15",