cgserver 12.2.0 → 12.2.2

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

@@ -150,13 +150,12 @@ class MongoExt {
         if (this._inited) {
             return false;
         }
-        if (this._mongoDb) {
-            return true;
-        }
         this._mongocfg = cfg;
         this._inited = true;
         Log_1.gLog.info("mongo config=" + JSON.stringify(this._mongocfg));
         this._mongoClient = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
+        this._mongoClient.on("open", this.onOpen.bind(this));
+        this._mongoClient.on("close", this.onClose.bind(this));
         this._mongoClient.on("connectionCreated", this.onConnectionCreated.bind(this));
         this._mongoClient.on("connectionReady", this.onConnectionReady.bind(this));
         this._mongoClient.on("connectionClosed", this.onConnectionClosed.bind(this));
@@ -168,17 +167,9 @@ class MongoExt {
     }
     onConnectionReady(event) {
         Log_1.gLog.info({ key: "mongo onConnectionReady", event });
-        this.onConnect();
-        this._mongoDb = this._mongoClient.db(this._mongocfg.database);
-        for (let i = 0; i < this._init_cbs.length; ++i) {
-            this._init_cbs[i]();
-        }
-        this._init_cbs = [];
     }
     onConnectionClosed(event) {
         Log_1.gLog.info({ key: "mongo onConnectionClosed", event });
-        this._inited = false;
-        this.init(this._mongocfg);
     }
     close(force = false) {
         this._mongoClient.close(force);
@@ -186,9 +177,21 @@ class MongoExt {
     registerInitCb(cb) {
         this._init_cbs.push(cb);
     }
-    onConnect() {
+    onOpen() {
         this._mongo_init_succ = true;
-        Log_1.gLog.info("mongo has connected!");
+        Log_1.gLog.info("mongo has opened!");
+        this._mongoDb = this._mongoClient.db(this._mongocfg.database);
+        for (let i = 0; i < this._init_cbs.length; ++i) {
+            this._init_cbs[i]();
+        }
+        this._init_cbs = [];
+    }
+    onClose() {
+        this._mongo_init_succ = false;
+        Log_1.gLog.info("mongo has closed!");
+        this._mongoDb = null;
+        this._inited = false;
+        this.init(this._mongocfg);
     }
     /**
      * 获取自增长id

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

@@ -63,7 +63,8 @@ export declare class MongoExt {
     onConnectionClosed(event: mongo.ConnectionClosedEvent): void;
     close(force?: boolean): void;
     registerInitCb(cb: Function): void;
-    onConnect(): void;
+    onOpen(): void;
+    onClose(): void;
     /**
      * 获取自增长id
      * @param key

package/package.json

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