cgserver 6.6.0 → 6.6.3

package/dist/lib/Config/ServerConfig.js

@@ -14,7 +14,14 @@ class ServerConfig extends FrameworkConfig_1.FrameworkConfig {
         super();
         this._suffix = server_name;
         this._server_name = server_name;
+    }
+    init() {
+        let ret = super.init();
+        if (!ret) {
+            return ret;
+        }
         exports.GServerCfg = this;
+        return ret;
     }
 }
 exports.ServerConfig = ServerConfig;

package/dist/lib/Database/MongoManager.js

@@ -63,7 +63,7 @@ class MongoManager {
         this._inited = true;
         Log_1.GLog.info("mongo config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mongo));
         let client = new mongo.MongoClient("mongodb://" + ServerConfig_1.GServerCfg.db.mongo.host + ":" + ServerConfig_1.GServerCfg.db.mongo.port, ServerConfig_1.GServerCfg.db.mongo.options);
-        await client.connect();
+        await Core_1.core.safeCall(client.connect, client);
         this.onConnect();
         this._mongo = client.db(ServerConfig_1.GServerCfg.db.mongo.database);
         for (let i = 0; i < this._init_cbs.length; ++i) {
@@ -97,7 +97,7 @@ class MongoManager {
         let col = this._mongo.collection(collection);
         try {
             let where = this._convertWhere({ _id: key });
-            let rs = await col.findOneAndUpdate(where, { $inc: { id: 1 } }, { upsert: true });
+            let rs = await Core_1.core.safeCall(col.findOneAndUpdate, col, where, { $inc: { id: 1 } }, { upsert: true });
             if (rs.ok) {
                 return rs.value.id + 1;
             }
@@ -140,6 +140,7 @@ class MongoManager {
             one = await col.findOne(where, { projection: property });
         }
         catch (e) {
+            Log_1.GLog.error({ collection, property, where });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -169,6 +170,7 @@ class MongoManager {
             list = await cursor.toArray();
         }
         catch (e) {
+            Log_1.GLog.error({ collection, property, where, sort, skip, limit });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -188,6 +190,7 @@ class MongoManager {
             count = await col.countDocuments(where || {}, options);
         }
         catch (e) {
+            Log_1.GLog.error({ collection, where });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -207,6 +210,7 @@ class MongoManager {
             del_rs = await col.deleteOne(where || {});
         }
         catch (e) {
+            Log_1.GLog.error({ collection, where });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -228,6 +232,7 @@ class MongoManager {
             del_rs = await col.deleteMany(where || {});
         }
         catch (e) {
+            Log_1.GLog.error({ collection, where });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -253,6 +258,7 @@ class MongoManager {
             in_rs = await col.insertOne(data);
         }
         catch (e) {
+            Log_1.GLog.error({ collection, data });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -271,6 +277,7 @@ class MongoManager {
             in_rs = await col.insertMany(data);
         }
         catch (e) {
+            Log_1.GLog.error({ collection, data });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -308,6 +315,7 @@ class MongoManager {
             up_rs = await col.updateOne(where, updatemodel, { upsert: upsert });
         }
         catch (e) {
+            Log_1.GLog.error({ collection, model, where, upsert });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
@@ -338,13 +346,14 @@ class MongoManager {
             up_rs = await col.updateMany(where, updateModel, { upsert: upsert });
         }
         catch (e) {
+            Log_1.GLog.error({ collection, model, where, upsert });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
         return rs;
     }
-    async createIndex(collection, index, callback) {
+    async createIndex(collection, index, options) {
         let rs = { errcode: null, rs: null };
         if (!this._mongo) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
@@ -353,9 +362,10 @@ class MongoManager {
         let i_rs = null;
         try {
             let col = this._mongo.collection(collection);
-            i_rs = await col.createIndex(index, callback);
+            i_rs = await col.createIndex(index, options);
         }
         catch (e) {
+            Log_1.GLog.error({ collection, index });
             Log_1.GLog.error(e.stack);
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }

package/dist/lib/SocketServer/ISocketServer.js

@@ -12,6 +12,7 @@ const MongoManager_1 = require("../Database/MongoManager");
 const MSSqlManager_1 = require("../Database/MSSqlManager");
 const EventTool_1 = require("../Logic/EventTool");
 const ServerConfig_1 = require("../Config/ServerConfig");
+const cgserver_1 = require("../cgserver");
 class ISocketServer {
     //服务器已被关闭
     _is_closed = false;
@@ -69,6 +70,7 @@ class ISocketServer {
         delete this._ws_clients[socketId];
     }
     async run() {
+        cgserver_1.GCgServer.addSocketServer(this);
         await MSSqlManager_1.GMSSqlMgr.init();
         await MysqlManager_1.GMysqlMgr.init();
         await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db.redis);

package/dist/lib/SocketServer/IWebSocket.js

@@ -193,7 +193,6 @@ class IWebSocket {
     onOpen(e) {
     }
     onError(e) {
-        Log_1.GLog.error(this.tipKey + " onError:" + e.message);
     }
     onClose(reasonCode, description) {
         Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);

package/dist/lib/WebServer/IWebServer.js

@@ -9,6 +9,8 @@ const RazorJs_1 = require("./Engine/RazorJs");
 const MongoManager_1 = require("../Database/MongoManager");
 const AlipayTool_1 = require("../ThirdParty/AlipayTool");
 const ServerConfig_1 = require("../Config/ServerConfig");
+const EventTool_1 = require("../Logic/EventTool");
+const cgserver_1 = require("../cgserver");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -17,6 +19,7 @@ class IWebServer {
      * @param server_index 这个是服务器的配置index
      */
     async start(cfg) {
+        cgserver_1.GCgServer.addWebServer(this);
         if (!cfg) {
             Log_1.GLog.error("webserver 配置不存在，启动服务器失败");
             return false;
@@ -30,6 +33,7 @@ class IWebServer {
         this._engine.start();
         this._registerController();
         this._registerRouter();
+        EventTool_1.GEventTool.emit("web_server_init_done");
     }
     stop() {
         this._engine.stop();

package/dist/lib/cgserver.js

@@ -6,6 +6,14 @@ const EventTool_1 = require("./Logic/EventTool");
 const Core_1 = require("./Core/Core");
 const Config_1 = require("./Config/Config");
 class CgServer {
+    _webservers = [];
+    get webServers() {
+        return this._webservers;
+    }
+    _socketservers = [];
+    get socketServers() {
+        return this._socketservers;
+    }
     _events = {};
     _debug = false;
     get debug() {
@@ -14,10 +22,11 @@ class CgServer {
     constructor() {
         this.init();
     }
-    init() {
+    init(servernum = 1) {
         process.on("uncaughtException", this.onUnCaughtException.bind(this));
         process.env.TZ = "Asia/Shanghai";
         EventTool_1.GEventTool.on("socket_server_init_done", this.onStart.bind(this));
+        EventTool_1.GEventTool.on("web_server_init_done", this.onStart.bind(this));
         let argv = process.argv || [];
         for (let i = 0; i < argv.length; ++i) {
             let arg = argv[i].toLowerCase();
@@ -27,7 +36,13 @@ class CgServer {
             }
         }
     }
+    _done = 0;
     onStart() {
+        ++this._done;
+        let total = this._webservers.length + this._socketservers.length;
+        if (this._done != total) {
+            return;
+        }
         let events = this._events["start"] || [];
         for (let i = 0; i < events.length; ++i) {
             Core_1.core.safeCall(events[i]);
@@ -52,5 +67,11 @@ class CgServer {
     onUnCaughtException(e) {
         Log_1.GLog.error(e.stack);
     }
+    addWebServer(server) {
+        this._webservers.push(server);
+    }
+    addSocketServer(server) {
+        this._socketservers.push(server);
+    }
 }
 exports.GCgServer = new CgServer();

package/dist/types/Config/ServerConfig.d.ts

@@ -6,4 +6,5 @@ export declare class ServerConfig extends FrameworkConfig {
     webserver: WebServerConfig;
     get serverName(): string;
     constructor(server_name: any);
+    init(): boolean;
 }

package/dist/types/Database/MongoBaseService.d.ts

@@ -33,7 +33,7 @@ export declare class MongoBaseService<T> {
             id: number;
             des: string;
         };
-        rs: mongo.UpdateResult | mongo.Document;
+        rs: mongo.Document | mongo.UpdateResult;
     }>;
     insert(model: T): Promise<{
         errcode: {

package/dist/types/Database/MongoManager.d.ts

@@ -114,9 +114,9 @@ declare class MongoManager {
             id: number;
             des: string;
         };
-        rs: mongo.UpdateResult | mongo.Document;
+        rs: mongo.Document | mongo.UpdateResult;
     }>;
-    createIndex(collection: string, index: any, callback?: mongo.CreateIndexesOptions): Promise<{
+    createIndex(collection: string, index: any, options?: mongo.CreateIndexesOptions): Promise<{
         errcode: {
             id: number;
             des: string;

package/dist/types/cgserver.d.ts

@@ -1,15 +1,24 @@
+import { IWebServer } from "./WebServer/IWebServer";
+import { ISocketServer } from "./SocketServer/ISocketServer";
 declare class CgServer {
+    protected _webservers: IWebServer[];
+    get webServers(): IWebServer[];
+    protected _socketservers: ISocketServer[];
+    get socketServers(): ISocketServer[];
     protected _events: {
         [name: string]: Function[];
     };
     protected _debug: boolean;
     get debug(): boolean;
     constructor();
-    init(): void;
+    init(servernum?: number): void;
+    protected _done: number;
     onStart(): void;
     addListener(event: "start", func: () => void): void;
     removeListener(event: "start", func: () => void): boolean;
     onUnCaughtException(e: any): void;
+    addWebServer(server: IWebServer): void;
+    addSocketServer(server: ISocketServer): void;
 }
 export declare let GCgServer: CgServer;
 export {};

package/package.json

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