cgserver 6.6.2 → 6.6.3

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/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/types/Database/MongoManager.d.ts

@@ -116,7 +116,7 @@ declare class MongoManager {
         };
         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/package.json

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