cgserver 6.1.3 → 6.1.4

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/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,30 @@
 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]: {
+                new (): BaseController;
+            };
+        };
+    };
+    protected _cache_action_names: {
+        [module: string]: {
+            [ctrname: string]: {
+                [lower: string]: string;
+            };
+        };
+    };
+    registerController(module_name: string, ctr_name: string, cls: {
+        new (): BaseController;
+    }): 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
@@ -16,6 +34,6 @@ declare class ControllerManager {
     registerStaticController(module_name: string, ctr_name: string, obj: BaseController): void;
     protected _cacheActionNameForStatic(module_name: string, ctr_name: string, obj: BaseController): void;
     getStaticCtr(module_name: string, controller_name: string): BaseController;
-    getClass(module_name: string, controller_name: string): any;
+    getClass(module_name: string, controller_name: string): new () => BaseController;
 }
 export {};

package/package.json

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