cgserver 13.1.7 → 13.2.0

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

@@ -11,6 +11,14 @@ class MongoBaseService {
     _model;
     _schema;
     _collection_name;
+    _dbname = "";
+    _mongo = null;
+    get mongo() {
+        if (!this._mongo) {
+            this._mongo = MongoManager_1.gMongoMgr.getMongo(this._dbname);
+        }
+        return this._mongo;
+    }
     get model() {
         if (this._model) {
             return this._model;
@@ -27,68 +35,69 @@ class MongoBaseService {
         this._model = mongoose_1.default.model(this._collection_name, this._schema);
         return this._model;
     }
-    constructor(collection_name, schema) {
+    constructor(collection_name, schema, dbname) {
         this._collection_name = collection_name;
         schema.set('collection', collection_name);
         this._schema = schema;
         this._schema.set('minimize', false);
+        this._dbname = dbname;
     }
     async findOne(filter, projection, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().findOne(this.model, filter, projection, options);
+        let ret = await this.mongo.findOne(this.model, filter, projection, options);
         return ret;
     }
     async find(filter, projection, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().find(this.model, filter, projection, options);
+        let ret = await this.mongo.find(this.model, filter, projection, options);
         return ret;
     }
     async findById(id, projection, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().findById(this.model, id, projection, options);
+        let ret = await this.mongo.findById(this.model, id, projection, options);
         return ret;
     }
     async create(doc) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().create(this.model, doc);
+        let ret = await this.mongo.create(this.model, doc);
         return ret;
     }
     async insert(doc) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().insert(this.model, doc);
+        let ret = await this.mongo.insert(this.model, doc);
         return ret;
     }
     async updateOne(filter, update, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().updateOne(this.model, filter, update, options);
+        let ret = await this.mongo.updateOne(this.model, filter, update, options);
         return ret;
     }
     async updateMany(filter, update, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().updateMany(this.model, filter, update, options);
+        let ret = await this.mongo.updateMany(this.model, filter, update, options);
         return ret;
     }
     async deleteOne(filter) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().deleteOne(this.model, filter);
+        let ret = await this.mongo.deleteOne(this.model, filter);
         return ret;
     }
     async deleteMany(filter) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().deleteMany(this.model, filter);
+        let ret = await this.mongo.deleteMany(this.model, filter);
         return ret;
     }
     async exists(filter) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().exists(this.model, filter);
+        let ret = await this.mongo.exists(this.model, filter);
         return ret;
     }
     // 用于聚合查询
     aggregate(pipeline) {
-        let ret = MongoManager_1.gMongoMgr.getMongo().aggregate(this.model, pipeline);
+        let ret = this.mongo.aggregate(this.model, pipeline);
         return ret;
     }
     // findOneAndUpdate method for MongoDB operations
     async findOneAndUpdate(filter, update, options) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().findOneAndUpdate(this.model, filter, update, options);
+        let ret = await this.mongo.findOneAndUpdate(this.model, filter, update, options);
         return ret;
     }
     async countDocuments(filter) {
-        let ret = await MongoManager_1.gMongoMgr.getMongo().countDocuments(this.model, filter);
+        let ret = await this.mongo.countDocuments(this.model, filter);
         return ret;
     }
     async getAutoIds() {
-        let id = await MongoManager_1.gMongoMgr.getMongo().getAutoIds(this.model.collection.name);
+        let id = await this.mongo.getAutoIds(this.model.collection.name);
         return id;
     }
 }

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

@@ -96,6 +96,9 @@ class MongoManager {
         if (!dbname) {
             dbname = this._defdbname;
         }
+        if (!dbname) {
+            return null;
+        }
         return this._dbs[dbname];
     }
 }
@@ -115,6 +118,10 @@ class MongoExt {
     get debug() {
         return this._mongocfg.debug;
     }
+    _connection = null;
+    get connection() {
+        return this._connection;
+    }
     constructor() {
     }
     async init(cfg) {
@@ -127,14 +134,14 @@ class MongoExt {
         this._mongocfg = cfg;
         this._inited = true;
         Log_1.gLog.info("mongo config=" + JSON.stringify(this._mongocfg));
-        mongoose_2.default.connection.on("open", this.onOpen.bind(this));
-        mongoose_2.default.connection.on("close", this.onClose.bind(this));
         this._mongocfg.options.dbName = this._mongocfg.database;
-        let mg = await mongoose_2.default.connect("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
-        mongoose_2.default.connection.useDb(this._mongocfg.database);
-        mongoose_2.default.connection.getClient().on("connectionCreated", this.onConnect.bind(this));
-        mongoose_2.default.connection.getClient().on("connectionClosed", this.onDisconnect.bind(this));
-        console.log("mongo connect success! db=" + this._mongocfg.database);
+        this._connection = await mongoose_2.default.createConnection("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
+        this._connection.on("open", this.onOpen.bind(this));
+        this._connection.on("close", this.onClose.bind(this));
+        this._connection.useDb(this._mongocfg.database);
+        this._connection.on("connectionCreated", this.onConnect.bind(this));
+        this._connection.on("connectionClosed", this.onDisconnect.bind(this));
+        console.log("mongo connect success! db=" + this._connection.db.databaseName);
         return true;
     }
     onConnect() {
@@ -336,6 +343,9 @@ class MongoExt {
     }
 }
 exports.MongoExt = MongoExt;
+__decorate([
+    (0, MongoActionCheck_1.MongoActionCheck)(false)
+], MongoExt.prototype, "init", null);
 __decorate([
     (0, MongoActionCheck_1.MongoActionCheck)(-1)
 ], MongoExt.prototype, "getAutoIds", null);

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

@@ -1,11 +1,14 @@
 import mongoose, { FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
-import { IMongoBaseModel } from './MongoManager';
+import { IMongoBaseModel, MongoExt } from './MongoManager';
 export declare class MongoBaseService<T extends IMongoBaseModel> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
     protected _collection_name: string;
+    protected _dbname: string;
+    protected _mongo: MongoExt;
+    get mongo(): MongoExt;
     get model(): mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}> & mongoose.Default__v<mongoose.Require_id<T>>>, any>;
-    constructor(collection_name: string, schema: mongoose.Schema<T>);
+    constructor(collection_name: string, schema: mongoose.Schema<T>, dbname?: string);
     findOne(filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
     find(filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
     findById(id: string | Types.ObjectId, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T>;

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

@@ -47,7 +47,7 @@ export declare class MongoManager {
     init(cfgs: MongoConfig[]): Promise<boolean>;
     addMongo(cfg: MongoConfig): Promise<boolean>;
     removeMongo(dbname: string, force?: boolean): Promise<boolean>;
-    getMongo(dbname?: string): MongoExt;
+    getMongo(dbname?: string): MongoExt | null;
 }
 export declare class MongoExt {
     protected _mongocfg: MongoConfig;
@@ -58,6 +58,8 @@ export declare class MongoExt {
     get curConnectingCount(): number;
     get isValid(): boolean;
     get debug(): boolean;
+    protected _connection: mongoose.Connection;
+    get connection(): mongoose.Connection;
     constructor();
     init(cfg: MongoConfig): Promise<boolean>;
     onConnect(): void;

package/package.json

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