cgserver 12.2.3 → 12.2.4

package/README.md

@@ -1,5 +1,8 @@
 # 版本更新日志
 
+## v12.2.4
+- mongo 添加了mongo的执行日志
+
 ## v12.2.3
 - mongo 添加了await，不太重要这个更新
 

package/dist/lib/Framework/Database/Mongo/MongoManager.js

@@ -44,6 +44,8 @@ class MongoConfig {
     port = 27017;
     options = null;
     database = 'mongodb';
+    //决定是否显示mongo的执行时间等日志
+    debug = false;
 }
 exports.MongoConfig = MongoConfig;
 class MongoBaseModel {
@@ -163,13 +165,13 @@ class MongoExt {
         return true;
     }
     onConnectionCreated(event) {
-        Log_1.gLog.info({ key: "mongo onConnectionCreated", event });
+        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionCreated", event });
     }
     onConnectionReady(event) {
-        Log_1.gLog.info({ key: "mongo onConnectionReady", event });
+        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionReady", event });
     }
     onConnectionClosed(event) {
-        Log_1.gLog.info({ key: "mongo onConnectionClosed", event });
+        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionClosed", event });
     }
     close(force = false) {
         this._mongoClient.close(force);
@@ -199,7 +201,11 @@ class MongoExt {
      * @returns 小于等于0为异常
      */
     async getAutoIds(key) {
+        let now = Date.now();
+        let dt = 0;
         if (!this._mongoDb) {
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "getAutoIds", dt, arguments });
             return -1;
         }
         let collection = "auto_ids";
@@ -210,14 +216,20 @@ class MongoExt {
             if (rs && rs.id) {
                 return rs.id + 1;
             }
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "getAutoIds", dt, arguments });
             return 1;
         }
         catch (e) {
             Log_1.gLog.error(e.stack);
         }
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "getAutoIds", dt, arguments });
         return -2;
     }
     _convertWhere(where) {
+        let now = Date.now();
+        let dt = 0;
         if (!where || !where._id) {
             return;
         }
@@ -240,6 +252,8 @@ class MongoExt {
      * @param collection
      */
     async findOne(collection, where = {}, property = {}) {
+        let now = Date.now();
+        let dt = 0;
         if (!where) {
             where = {};
         }
@@ -247,6 +261,8 @@ class MongoExt {
         let rs = { errcode: null, one: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "findOne", dt, arguments });
             return rs;
         }
         let one = null;
@@ -260,9 +276,13 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.one = one;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "findOne", dt, arguments });
         return rs;
     }
     async distinct(collection, key, where = {}) {
+        let now = Date.now();
+        let dt = 0;
         if (!where) {
             where = {};
         }
@@ -270,6 +290,8 @@ class MongoExt {
         let rs = { errcode: null, lst: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "distinct", dt, arguments });
             return rs;
         }
         let lst = null;
@@ -283,9 +305,13 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.lst = lst;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "distinct", dt, arguments });
         return rs;
     }
     async findMany(collection, where = {}, property = {}, sort, skip = 0, limit = 0) {
+        let now = Date.now();
+        let dt = 0;
         if (!where) {
             where = {};
         }
@@ -293,6 +319,8 @@ class MongoExt {
         let rs = { errcode: null, list: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "findMany", dt, arguments });
             return rs;
         }
         let list = [];
@@ -316,13 +344,22 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "findMany", dt, arguments });
         return rs;
     }
     async countDocuments(collection, where, options) {
+        let now = Date.now();
+        let dt = 0;
+        if (!where) {
+            where = {};
+        }
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "countDocuments", dt, arguments });
             return rs;
         }
         let count = -1;
@@ -336,9 +373,16 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.count = count;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "countDocuments", dt, arguments });
         return rs;
     }
     async deleteOne(collection, where) {
+        let now = Date.now();
+        let dt = 0;
+        if (!where) {
+            where = {};
+        }
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
         if (!this._mongoDb) {
@@ -358,13 +402,22 @@ class MongoExt {
         if (del_rs) {
             rs.count = del_rs.deletedCount;
         }
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "deleteOne", dt, arguments });
         return rs;
     }
     async deleteMany(collection, where) {
+        let now = Date.now();
+        let dt = 0;
+        if (!where) {
+            where = {};
+        }
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "deleteMany", dt, arguments });
             return rs;
         }
         let del_rs = null;
@@ -380,6 +433,8 @@ class MongoExt {
         if (del_rs) {
             rs.count = del_rs.deletedCount;
         }
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "deleteMany", dt, arguments });
         return rs;
     }
     /**
@@ -388,9 +443,13 @@ class MongoExt {
      * @param data
      */
     async insertOne(collection, data) {
+        let now = Date.now();
+        let dt = 0;
         let rs = { errcode: null, rs: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "insertOne", dt, arguments });
             return rs;
         }
         let in_rs = null;
@@ -404,12 +463,18 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "insertOne", dt, arguments });
         return rs;
     }
     async insertManay(collection, data) {
+        let now = Date.now();
+        let dt = 0;
         let rs = { errcode: null, rs: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "insertManay", dt, arguments });
             return rs;
         }
         let in_rs = null;
@@ -423,9 +488,13 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = in_rs;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "insertManay", dt, arguments });
         return rs;
     }
     async updateOne(collection, where, model, options) {
+        let now = Date.now();
+        let dt = 0;
         let _id = model["_id"];
         delete model["_id"];
         if (!where && _id) {
@@ -438,6 +507,8 @@ class MongoExt {
                 model["_id"] = _id;
             }
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "updateOne", dt, arguments });
             return rs;
         }
         let up_rs = null;
@@ -467,13 +538,19 @@ class MongoExt {
         if (up_rs?.upsertedId || _id) {
             model["_id"] = up_rs?.upsertedId || _id;
         }
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "updateOne", dt, arguments });
         return rs;
     }
     async updateMany(collection, where, model, options) {
+        let now = Date.now();
+        let dt = 0;
         this._convertWhere(where);
         let rs = { errcode: null, rs: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "updateMany", dt, arguments });
             return rs;
         }
         let up_rs = null;
@@ -495,12 +572,18 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = up_rs;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "updateMany", dt, arguments });
         return rs;
     }
     async createIndex(collection, index, options) {
+        let now = Date.now();
+        let dt = 0;
         let rs = { errcode: null, rs: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "createIndex", dt, arguments });
             return rs;
         }
         let i_rs = null;
@@ -514,13 +597,19 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.rs = i_rs;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "createIndex", dt, arguments });
         return rs;
     }
     async simpleAggregate(collection, where, property, size, random_size) {
+        let now = Date.now();
+        let dt = 0;
         this._convertWhere(where);
         let rs = { errcode: null, list: null };
         if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "simpleAggregate", dt, arguments });
             return rs;
         }
         let list = [];
@@ -549,6 +638,8 @@ class MongoExt {
             rs.errcode = _error_1.EErrorCode.Mongo_Error;
         }
         rs.list = list;
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "simpleAggregate", dt, arguments });
         return rs;
     }
     aggregate(collection, pipeline, options) {
@@ -565,7 +656,11 @@ class MongoExt {
      * @param cb
      */
     async quickTransaction(cb, options) {
+        let now = Date.now();
+        let dt = 0;
         if (!this._mongoDb) {
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
             return false;
         }
         let session = this._mongoClient.startSession();
@@ -574,6 +669,8 @@ class MongoExt {
             let rs = await cb(session);
             await session.commitTransaction();
             session.endSession();
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
             return rs;
         }
         catch (e) {
@@ -583,14 +680,22 @@ class MongoExt {
         finally {
             await session.endSession();
         }
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
         return false;
     }
     async bulkWrite(collection, operations, options) {
+        let now = Date.now();
+        let dt = 0;
         if (!this._mongoDb) {
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
             return;
         }
         let bulk = this._mongoDb.collection(collection);
         let bwr = bulk.bulkWrite(operations, options);
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
         return bwr;
     }
 }

package/dist/lib/Framework/Server/RpcWebSocketServer/IRpcClientWebSocket.js

@@ -198,7 +198,9 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
         let wses = [];
         if (req_msg.to_id) {
             let ws = this.getWsByGroupId(req_msg.to_group, req_msg.to_id);
-            wses.push(ws);
+            if (ws) {
+                wses.push(ws);
+            }
         }
         else {
             wses = this.getWsByGroup(req_msg.to_group, req_msg.listen);

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

@@ -5,6 +5,7 @@ export declare class MongoConfig {
     port: number;
     options: mongo.MongoClientOptions;
     database: string;
+    debug: boolean;
 }
 export declare class MongoBaseModel {
     _id: mongo.ObjectId;

package/package.json

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