cgserver 9.1.0 → 9.1.2

package/README.md

@@ -1,3 +1,9 @@
+9.1.2
+1、losslessjson
+9.1.1
+1、扩展mongomgr的一个接口addMongo，removeMongo方便自由增减
+2、清除部分无用代码
+3、mongoext的mongoclient未被初始化修正
 9.1.0
 1、支持多mongo示例
 2、支持多service实例

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

@@ -53,21 +53,35 @@ class MongoManager {
     async init(cfgs) {
         for (let i = 0; i < cfgs.length; ++i) {
             let cfg = cfgs[i];
-            if (this._dbs[cfg.database]) {
-                Log_1.GLog.error("数据库配置得database不能相同!database=" + cfg.database);
-                return false;
-            }
-            let mongoext = new MongoExt();
-            let ret = await mongoext.init(cfg);
+            let ret = await this.addMongo(cfg);
             if (!ret) {
-                Log_1.GLog.error("数据库初始化失败!cfg=" + JSON.stringify(cfg));
                 return false;
             }
-            this._dbs[cfg.database] = mongoext;
-            this._defdbname = cfg.database;
         }
         return true;
     }
+    async addMongo(cfg) {
+        if (this._dbs[cfg.database]) {
+            Log_1.GLog.error("数据库配置得database不能相同!database=" + cfg.database);
+            return false;
+        }
+        let mongoext = new MongoExt();
+        let ret = await mongoext.init(cfg);
+        if (!ret) {
+            Log_1.GLog.error("数据库初始化失败!cfg=" + JSON.stringify(cfg));
+            return false;
+        }
+        this._dbs[cfg.database] = mongoext;
+        this._defdbname = cfg.database;
+        return true;
+    }
+    async removeMongo(dbname, force = false) {
+        let mongo = this.getMongo(dbname);
+        if (!mongo) {
+            return false;
+        }
+        mongo.close(force);
+    }
     getMongo(dbname = "") {
         if (!dbname) {
             dbname = this._defdbname;
@@ -108,15 +122,18 @@ class MongoExt {
         this._mongocfg = cfg;
         this._inited = true;
         Log_1.GLog.info("mongo config=" + JSON.stringify(this._mongocfg));
-        let client = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
-        await Core_1.core.safeCall(client.connect, client);
+        this._mongoClient = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
+        await Core_1.core.safeCall(this._mongoClient.connect, this._mongoClient);
         this.onConnect();
-        this._mongoDb = client.db(this._mongocfg.database);
+        this._mongoDb = this._mongoClient.db(this._mongocfg.database);
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
         }
         return true;
     }
+    close(force = false) {
+        this._mongoClient.close(force);
+    }
     registerInitCb(cb) {
         this._init_cbs.push(cb);
     }
@@ -124,17 +141,6 @@ class MongoExt {
         this._mongo_init_succ = true;
         Log_1.GLog.info("mongo has connected!");
     }
-    onEnd() {
-        this._mongo_init_succ = false;
-        Log_1.GLog.error("mongo has ended!");
-        Log_1.GLog.info("mongo try reconnect");
-        this.init(this._mongocfg);
-    }
-    onError(err) {
-        Log_1.GLog.error("Error " + err);
-        Log_1.GLog.info("mongo try reconnect");
-        this.init(this._mongocfg);
-    }
     /**
      * 获取自增长id
      * @param key

package/dist/lib/Framework/Logic/HttpTool.js

@@ -5,6 +5,7 @@ const request = require("request");
 const qs = require("querystring");
 const Log_1 = require("./Log");
 const Core_1 = require("../Core/Core");
+const lossless_json_1 = require("lossless-json");
 exports.GHttpTool = null;
 class HttpTool {
     get(options_url) {
@@ -24,7 +25,7 @@ class HttpTool {
                 }
                 try {
                     if (Core_1.core.isString(body)) {
-                        body = JSON.parse(body);
+                        body = (0, lossless_json_1.parse)(body);
                     }
                 }
                 catch (e) {
@@ -56,7 +57,7 @@ class HttpTool {
                 }
                 try {
                     if (Core_1.core.isString(body)) {
-                        body = JSON.parse(body);
+                        body = (0, lossless_json_1.parse)(body);
                     }
                 }
                 catch (e) {

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

@@ -42,6 +42,8 @@ export declare class MongoManager {
     protected _defdbname: string;
     get defdbname(): string;
     init(cfgs: MongoConfig[]): Promise<boolean>;
+    addMongo(cfg: MongoConfig): Promise<boolean>;
+    removeMongo(dbname: string, force?: boolean): Promise<boolean>;
     getMongo(dbname?: string): MongoExt;
 }
 export declare let GMongoMgr: MongoManager;
@@ -57,10 +59,9 @@ export declare class MongoExt {
     get isValid(): boolean;
     constructor();
     init(cfg: MongoConfig): Promise<boolean>;
+    close(force?: boolean): void;
     registerInitCb(cb: Function): void;
     onConnect(): void;
-    onEnd(): void;
-    onError(err: any): void;
     /**
      * 获取自增长id
      * @param key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -62,6 +62,7 @@
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
     "log4js": "^6.9.1",
+    "lossless-json": "^4.0.1",
     "mime": "^3.0.0",
     "mongodb": "^6.7.0",
     "mssql": "^11.0.0",