cgserver 13.2.3 → 13.2.5

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

@@ -118,6 +118,9 @@ class MongoExt {
     get debug() {
         return this._mongocfg.debug;
     }
+    get dbName() {
+        return this._connection?.name || "unknown";
+    }
     _connection = null;
     get connection() {
         return this._connection;
@@ -140,11 +143,18 @@ class MongoExt {
         this._mongocfg.options.dbName = this._mongocfg.database;
         this._connection = mongoose_2.default.createConnection("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
         this._connection = this._connection.useDb(this._mongocfg.database);
-        this._connection.on("open", this.onOpen.bind(this));
+        this._connection.once("open", this.onOpen.bind(this));
         this._connection.on("close", this.onClose.bind(this));
         this._connection.on("connectionCreated", this.onConnect.bind(this));
         this._connection.on("connectionClosed", this.onDisconnect.bind(this));
         await this._connection.asPromise();
+        while (this._connection.readyState != mongoose_1.ConnectionStates.connected) {
+            if (this._connection.readyState != mongoose_1.ConnectionStates.connecting) {
+                Log_1.gLog.error("MongoDB connection is not ready, please check the connection settings. Current state: " + this._connection.readyState);
+                return false;
+            }
+            await Core_1.core.sleep(100);
+        }
         console.log("mongo connect success! db=" + this._connection.name);
         return true;
     }
@@ -155,7 +165,10 @@ class MongoExt {
         this._cur_connecting_count--;
     }
     close(force = false) {
-        mongoose_2.default.connection.close(force);
+        if (!this._connection) {
+            return;
+        }
+        this._connection.close(force);
     }
     registerInitCb(cb) {
         this._init_cbs.push(cb);

package/dist/lib/Framework/Decorator/MongoActionCheck.js

@@ -5,13 +5,13 @@ const Log_1 = require("../Logic/Log");
 let MongoActionCheck = function (ret = null) {
     return function (target, propertyName, descriptor) {
         let method = descriptor.value;
-        descriptor.value = function () {
+        descriptor.value = async function () {
             let self = this;
             try {
                 let start_time = Date.now();
-                ret = method.apply(this, arguments);
+                ret = await method.apply(this, arguments);
                 let dt = Date.now() - start_time;
-                self.debug && Log_1.gLog.info({ key: method.name, dt, arguments });
+                self.debug && Log_1.gLog.info({ key: method.name, dt, arguments, dbName: self.dbName });
                 return ret;
             }
             catch (error) {

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

@@ -58,6 +58,7 @@ export declare class MongoExt {
     get curConnectingCount(): number;
     get isValid(): boolean;
     get debug(): boolean;
+    get dbName(): string;
     protected _connection: mongoose.Connection;
     get connection(): mongoose.Connection;
     get connected(): boolean;

package/package.json

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