cgserver 6.1.2 → 6.1.5

package/dist/lib/Database/Decorator/DBCache.js

@@ -18,7 +18,7 @@ class VersionModel {
 exports.VersionModel = VersionModel;
 exports.GDBCache = null;
 class DBCache {
-    _versions = new Map();
+    _versions = {};
     _path = __dirname + "/tmp_table_version.json";
     async init() {
         if (fs.existsSync(this._path)) {
@@ -32,7 +32,7 @@ class DBCache {
             }
         }
         else {
-            this._versions = new Map();
+            this._versions = {};
             fs.writeFileSync(this._path, JSON.stringify(this._versions));
         }
     }

package/dist/lib/Database/Decorator/Property.js

@@ -56,6 +56,6 @@ class TableProperty {
     auto_increment = null;
     charset = "utf8mb4";
     comment = null;
-    items = new Map();
+    items = {};
 }
 exports.TableProperty = TableProperty;

package/dist/lib/Logic/CacheTool.js

@@ -10,7 +10,7 @@ class CacheItem {
     expire_time = -1;
 }
 class CacheTool {
-    _items = new Map();
+    _items = {};
     constructor() {
         //一个小时清除一次过期缓存
         setInterval(this._refresh.bind(this), 60 * 60 * 1000);

package/dist/lib/SocketServer/ISocketServer.js

@@ -37,7 +37,7 @@ class ISocketServer {
         return this._web_socket;
     }
     //来自于用户的链接
-    _ws_clients = new Map();
+    _ws_clients = {};
     _listen_port = 0;
     get listenPort() {
         return this._listen_port;

package/dist/lib/WebServer/Engine/ControllerManager.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GCtrMgr = void 0;
 exports.GCtrMgr = null;
 class ControllerManager {
-    _ctrs = new Map();
-    _ctr_cls = new Map();
+    _static_ctr = {};
+    _ctr_cls = {};
     //module ctrname lower normal
-    _cache_action_names = new Map();
+    _cache_action_names = {};
     registerController(module_name, ctr_name, cls) {
         module_name = module_name.toLowerCase();
         ctr_name = ctr_name.toLowerCase();
@@ -22,7 +22,7 @@ class ControllerManager {
         ctr_name = ctr_name.toLowerCase();
         //不能通过cls.name来获取ctr名称，因为混淆之后类名会变化
         let prototype = cls.prototype;
-        let map_names = new Map();
+        let map_names = {};
         while (prototype && prototype.constructor.name != "BaseController") {
             let names = Object.getOwnPropertyNames(prototype);
             for (let action_name of names) {
@@ -61,15 +61,15 @@ class ControllerManager {
     registerStaticController(module_name, ctr_name, obj) {
         module_name = module_name.toLowerCase();
         ctr_name = ctr_name.toLowerCase();
-        this._ctrs[module_name] = this._ctrs[module_name] || {};
-        this._ctrs[module_name][ctr_name] = obj;
+        this._static_ctr[module_name] = this._static_ctr[module_name] || {};
+        this._static_ctr[module_name][ctr_name] = obj;
         this._cacheActionNameForStatic(module_name, ctr_name, obj);
     }
     _cacheActionNameForStatic(module_name, ctr_name, obj) {
         module_name = module_name.toLowerCase();
         ctr_name = ctr_name.toLowerCase();
         let prototype = Object.getPrototypeOf(obj);
-        let map_names = new Map();
+        let map_names = {};
         while (prototype && prototype.constructor.name != "BaseController") {
             let names = Object.getOwnPropertyNames(prototype);
             for (let func_name of names) {
@@ -91,10 +91,10 @@ class ControllerManager {
         if (controller_name) {
             controller_name = controller_name.toLowerCase();
         }
-        if (!this._ctrs[module_name]) {
+        if (!this._static_ctr[module_name]) {
             return;
         }
-        return this._ctrs[module_name][controller_name];
+        return this._static_ctr[module_name][controller_name];
     }
     getClass(module_name, controller_name) {
         if (module_name) {

package/dist/lib/cgserver.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = 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.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.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 = void 0;
-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 = void 0;
+exports.JsonProtoFilter = 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.ServerConfig = exports.GFCfg = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = void 0;
+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 = void 0;
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
 Object.defineProperty(exports, "GProtoFactory", { enumerable: true, get: function () { return ProtoFactory_1.GProtoFactory; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -25,8 +25,10 @@ var Config_1 = require("./Config/Config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return Config_1.Config; } });
 var FrameworkConfig_1 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "FrameworkConfig", { enumerable: true, get: function () { return FrameworkConfig_1.FrameworkConfig; } });
+Object.defineProperty(exports, "GFCfg", { enumerable: true, get: function () { return FrameworkConfig_1.GFCfg; } });
 var ServerConfig_1 = require("./Config/ServerConfig");
 Object.defineProperty(exports, "ServerConfig", { enumerable: true, get: function () { return ServerConfig_1.ServerConfig; } });
+9;
 var Core_1 = require("./Core/Core");
 Object.defineProperty(exports, "core", { enumerable: true, get: function () { return Core_1.core; } });
 var Timer_1 = require("./Core/Timer");
@@ -61,6 +63,7 @@ var MysqlManager_1 = require("./Database/MysqlManager");
 Object.defineProperty(exports, "GMysqlMgr", { enumerable: true, get: function () { return MysqlManager_1.GMysqlMgr; } });
 var RedisManager_1 = require("./Database/RedisManager");
 Object.defineProperty(exports, "GRedisMgr", { enumerable: true, get: function () { return RedisManager_1.GRedisMgr; } });
+Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
 var CacheTool_1 = require("./Logic/CacheTool");
 Object.defineProperty(exports, "GCacheTool", { enumerable: true, get: function () { return CacheTool_1.GCacheTool; } });
 var HttpTool_1 = require("./Logic/HttpTool");

package/dist/types/Database/Decorator/DBCache.d.ts

@@ -12,7 +12,9 @@ export declare class VersionModel {
 }
 export declare let GDBCache: DBCache;
 declare class DBCache {
-    protected _versions: Map<String, VersionModel>;
+    protected _versions: {
+        [table_name: string]: VersionModel;
+    };
     protected _path: string;
     init(): Promise<void>;
     setVersion(table: string, version: number): Promise<void>;

package/dist/types/Database/Decorator/Property.d.ts

@@ -51,5 +51,7 @@ export declare class TableProperty {
     auto_increment: number;
     charset: string;
     comment: string;
-    items: Map<string, Property>;
+    items: {
+        [name: string]: Property;
+    };
 }

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

@@ -6,7 +6,9 @@ declare class CacheItem {
     expire_time: number;
 }
 declare class CacheTool {
-    protected _items: Map<string, CacheItem>;
+    protected _items: {
+        [key: string]: CacheItem;
+    };
     constructor();
     /**
      * 定时清除缓存

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

@@ -11,7 +11,9 @@ export declare class ISocketServer {
     get fullServerName(): string;
     private _web_socket;
     get serverWebSocket(): ws.server;
-    protected _ws_clients: Map<number, IServerWebSocket>;
+    protected _ws_clients: {
+        [socketid: number]: IServerWebSocket;
+    };
     private _listen_port;
     get listenPort(): number;
     set listenPort(value: number);

package/dist/types/WebServer/Engine/ControllerManager.d.ts

@@ -1,12 +1,26 @@
 import { BaseController } from "../Controller/BaseController";
 export declare let GCtrMgr: ControllerManager;
 declare class ControllerManager {
-    protected _ctrs: Map<string, Map<string, BaseController>>;
-    protected _ctr_cls: Map<string, Map<string, any>>;
-    protected _cache_action_names: Map<string, Map<string, Map<string, string>>>;
-    registerController(module_name: string, ctr_name: string, cls: Function): void;
+    protected _static_ctr: {
+        [module_name: string]: {
+            [ctrname: string]: BaseController;
+        };
+    };
+    protected _ctr_cls: {
+        [module_name: string]: {
+            [ctrname: string]: any;
+        };
+    };
+    protected _cache_action_names: {
+        [module: string]: {
+            [ctrname: string]: {
+                [lower: string]: string;
+            };
+        };
+    };
+    registerController(module_name: string, ctr_name: string, cls: any): void;
     protected _cacheActionName(module_name: string, ctr_name: string, cls: Function): void;
-    getActionName(module_name: string, ctr_name: string, action_name: string): any;
+    getActionName(module_name: string, ctr_name: string, action_name: string): string;
     /**
      * 静态ctr，这样，ctr就不会被多次创建
      * @param module_name

package/dist/types/cgserver.d.ts

@@ -8,7 +8,7 @@ export { Point } from "./AI/Point";
 export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
 export { FrameworkErrorCode } from "./Config/_error_";
 export { Config } from "./Config/Config";
-export { FrameworkConfig } from "./Config/FrameworkConfig";
+export { FrameworkConfig, GFCfg } from "./Config/FrameworkConfig";
 export { ServerConfig } from "./Config/ServerConfig";
 export { core } from "./Core/Core";
 export { Timer } from "./Core/Timer";
@@ -26,7 +26,7 @@ export { GMongoMgr } from './Database/MongoManager';
 export { GMSSqlMgr } from './Database/MSSqlManager';
 export { BaseService as MysqlBaseService } from './Database/BaseService';
 export { GMysqlMgr } from './Database/MysqlManager';
-export { GRedisMgr } from './Database/RedisManager';
+export { GRedisMgr, RedisManager } from './Database/RedisManager';
 export { GCacheTool } from './Logic/CacheTool';
 export { GHttpTool } from './Logic/HttpTool';
 export { GLog } from './Logic/Log';

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "cgserver",
-  "version": "6.1.2",
+  "version": "6.1.5",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
   "main": "./dist/lib/cgserver.js",
-  "types": "./dist/types",
+  "types": "./dist/types/cgserver.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },