cgserver 13.2.2 → 13.2.4

package/README.md

@@ -1,4 +1,6 @@
 # 版本更新日志
+## v13.2.3
+- Improve MongoDB connection validation and error handling
 ## v13.2.2
 - Fix MongoDB connection initialization logic
 ## v13.2.1

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

@@ -23,11 +23,15 @@ class MongoBaseService {
         if (this._model) {
             return this._model;
         }
-        if (mongoose_1.default.connection.readyState !== 1) {
+        if (!this.mongo) {
+            Log_1.gLog.error("MongoDB connection is not established, please check the connection settings.");
+            throw new Error("MongoDB connection is not established");
+        }
+        if (!this.mongo.connected) {
             Log_1.gLog.error("MongoDB connection is not ready, please check the connection settings. Current state: " + mongoose_1.default.connection.readyState);
             throw new Error("MongoDB connection is not ready");
         }
-        let db = mongoose_1.default.connection.db;
+        let db = this.mongo.connection.db;
         if (!db || db.databaseName == "test") {
             Log_1.gLog.error("MongoDB connection is not valid, please check the connection settings.");
             throw new Error("MongoDB connection is not valid");

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

@@ -122,6 +122,9 @@ class MongoExt {
     get connection() {
         return this._connection;
     }
+    get connected() {
+        return this._connection && this._connection.readyState === 1;
+    }
     constructor() {
     }
     async init(cfg) {
@@ -137,11 +140,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;
     }
@@ -152,7 +162,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/types/Framework/Database/Mongo/MongoManager.d.ts

@@ -60,6 +60,7 @@ export declare class MongoExt {
     get debug(): boolean;
     protected _connection: mongoose.Connection;
     get connection(): mongoose.Connection;
+    get connected(): boolean;
     constructor();
     init(cfg: MongoConfig): Promise<boolean>;
     onConnect(): void;

package/package.json

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