cgserver 6.5.0 → 6.5.3

package/README.md

@@ -0,0 +1,4 @@
+6.5.3
+1、事件分发器GEventTool添加emit
+6.5.2
+1、添加事件分发器GEventTool

package/dist/lib/Logic/EventTool.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GEventTool = void 0;
+const EventEmitter = require("events");
+class EventTool {
+    _event_emitter = new EventEmitter();
+    constructor() {
+        this._event_emitter.setMaxListeners(0);
+    }
+    on(event, func) {
+        this._event_emitter.on(event, func);
+    }
+    off(event, func) {
+        this._event_emitter.off(event, func);
+    }
+    once(event, func) {
+        this._event_emitter.once(event, func);
+    }
+    emit(event, ...args) {
+        this._event_emitter.emit(event, ...args);
+    }
+}
+exports.GEventTool = new EventTool();

package/dist/lib/WebServer/Controller/BaseUserController.js

@@ -84,6 +84,9 @@ class BaseUserController extends BaseController_1.BaseController {
                 user = (await UserService_1.GUserSer.getById(user_id));
             }
         }
+        if (user) {
+            this._login(user);
+        }
         return user;
     }
     _logout() {

package/dist/lib/WebServer/Controller/MongoBaseUserController.js

@@ -6,8 +6,8 @@ const CacheTool_1 = require("../../Logic/CacheTool");
 const FrameworkConfig_1 = require("../../Config/FrameworkConfig");
 const RedisManager_1 = require("../../Database/RedisManager");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
-const MongoUserService_1 = require("../../Service/MongoUserService");
 const ini_1 = require("../../Service/ini");
+const MongoUserService_1 = require("../../Service/MongoUserService");
 class MongoBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
@@ -39,29 +39,14 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         this._session_id = this._request.getCookie(this._user_session_id) || this._request.params.session_id || this._request.postData.session_id;
         let userId = -1;
         if (this._session_id) {
-            let user = null;
-            if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-                user = CacheTool_1.GCacheTool.get(this._session_id);
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-                let user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
-                if (user_id > 0) {
-                    user = (await MongoUserService_1.GUserSer.getById(user_id));
-                }
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-                let user_id = (await MongoCacheService_1.GMongoCacheSer.getData(this._session_id)) || -1;
-                if (user_id > 0) {
-                    user = (await MongoUserService_1.GUserSer.getById(user_id));
-                }
-            }
+            let user = await this._getUserBySession(this._session_id);
             if (!user) {
                 this._update_session();
                 //Session不存在清除客户端cookie
                 this._response.clearCookie(this._user_session_id);
             }
             else {
-                await this._login(user);
+                this._login(user);
                 userId = user.id;
             }
         }
@@ -74,6 +59,36 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             this._user = this._self_user;
         }
     }
+    async _getUserBySession(session) {
+        let user = null;
+        if (!session) {
+            return user;
+        }
+        //每次强制从cache中先找，提高效率
+        //if(this._engine.cfg.session_type==ESessionType.Cache)
+        {
+            user = CacheTool_1.GCacheTool.get(this._session_id);
+        }
+        if (user) {
+            return user;
+        }
+        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
+            let user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
+            if (user_id > 0) {
+                user = (await MongoUserService_1.GUserSer.getById(user_id));
+            }
+        }
+        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
+            let user_id = (await MongoCacheService_1.GMongoCacheSer.getData(this._session_id)) || -1;
+            if (user_id > 0) {
+                user = (await MongoUserService_1.GUserSer.getById(user_id));
+            }
+        }
+        if (user) {
+            this._login(user);
+        }
+        return user;
+    }
     _logout() {
         if (this._session_id) {
             if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
@@ -94,7 +109,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             return;
         }
         if (!this._session_id) {
-            this._session_id = Math.random().toString(36).substr(2) + user.id;
+            this._session_id = Math.random().toString(36).substring(2) + user.id;
         }
         let time = 0;
         if (this._request.postData.remember == "on") {
@@ -104,10 +119,16 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             time = this._engine.cfg.cookie.expires.account;
         }
         this._response.setCookie(this._user_session_id, this._session_id, time);
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-            CacheTool_1.GCacheTool.add(this._session_id, user, time * 1000);
+        //if(this._engine.cfg.session_type==ESessionType.Cache)
+        {
+            if (time > 24 * 60 * 60) {
+                CacheTool_1.GCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
+            }
+            else {
+                CacheTool_1.GCacheTool.add(this._session_id, user, time * 1000);
+            }
         }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
+        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
             RedisManager_1.GRedisMgr.set(this._session_id, user.id).then(() => {
                 RedisManager_1.GRedisMgr.expire(this._session_id, time);
             });
@@ -122,29 +143,9 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         this._self_user = user;
     }
     /**
-     * 用户信息发生更改，同步更新session里面的用户信息
+     * 已经被启用
      */
     async _update_session() {
-        if (!this._session_id) {
-            return;
-        }
-        let user_id = -1;
-        let um = null;
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-            um = CacheTool_1.GCacheTool.get(this._session_id);
-            if (um) {
-                user_id = um.id;
-            }
-        }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
-        }
-        if (user_id < 0) {
-            this._session_id = null;
-            return;
-        }
-        um = (await MongoUserService_1.GUserSer.getById(user_id));
-        this._login(um);
     }
     async update_user(user_id) {
         let user = (await MongoUserService_1.GUserSer.getById(user_id));

package/dist/lib/cgserver.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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.GCgServer = 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 = void 0;
+exports.GCgServer = 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 = 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");
@@ -159,6 +159,8 @@ 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 EventTool_1 = require("./Logic/EventTool");
+Object.defineProperty(exports, "GEventTool", { enumerable: true, get: function () { return EventTool_1.GEventTool; } });
 const Log_2 = require("./Logic/Log");
 class CgServer {
     constructor() {

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

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+import * as EventEmitter from "events";
+declare class EventTool {
+    protected _event_emitter: EventEmitter;
+    constructor();
+    on(event: string, func: (...args: any[]) => void): void;
+    off(event: string, func: (...args: any[]) => void): void;
+    once(event: string, func: (...args: any[]) => void): void;
+    emit(event: string, ...args: any[]): void;
+}
+export declare let GEventTool: EventTool;
+export {};

package/dist/types/WebServer/Controller/MongoBaseUserController.d.ts

@@ -13,10 +13,11 @@ export declare class MongoBaseUserController<T extends UserModel> extends BaseCo
     get isProxy(): boolean;
     get isCommon(): boolean;
     init(): Promise<void>;
+    protected _getUserBySession(session: string): Promise<T>;
     protected _logout(): void;
     protected _login(user: T): void;
     /**
-     * 用户信息发生更改，同步更新session里面的用户信息
+     * 已经被启用
      */
     protected _update_session(): Promise<void>;
     update_user(user_id: number): Promise<void>;

package/dist/types/cgserver.d.ts

@@ -73,6 +73,7 @@ export { Request } from './WebServer/Engine/Request';
 export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
 export { GAsyncQueueTool } from './Logic/AsyncQueueTool';
+export { GEventTool } from './Logic/EventTool';
 declare class CgServer {
     constructor();
     init(): void;

package/package.json

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