cgserver 8.4.1 → 8.6.0

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

@@ -11,8 +11,8 @@ class MongoBaseService {
     get isInited() {
         return this._inited;
     }
-    get mongo() {
-        return MongoManager_1.GMongoMgr.mongo;
+    get mongoDb() {
+        return MongoManager_1.GMongoMgr.mongoDb;
     }
     _t_type = null;
     constructor(table, type) {

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

@@ -47,9 +47,13 @@ exports.GMongoMgr = null;
 class MongoManager {
     _mongocfg = null;
     _init_cbs = [];
-    _mongo = null;
-    get mongo() {
-        return this._mongo;
+    _mongoDb = null;
+    get mongoDb() {
+        return this._mongoDb;
+    }
+    _mongoClient = null;
+    get mongoClient() {
+        return this._mongoClient;
     }
     _mongo_init_succ = false;
     _inited = false;
@@ -65,7 +69,7 @@ class MongoManager {
         if (this._inited) {
             return false;
         }
-        if (this._mongo) {
+        if (this._mongoDb) {
             return true;
         }
         this._mongocfg = cfg;
@@ -74,7 +78,7 @@ class MongoManager {
         let client = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
         await Core_1.core.safeCall(client.connect, client);
         this.onConnect();
-        this._mongo = client.db(this._mongocfg.database);
+        this._mongoDb = client.db(this._mongocfg.database);
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
         }
@@ -104,11 +108,11 @@ class MongoManager {
      * @returns 小于等于0为异常
      */
     async getAutoIds(key) {
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             return -1;
         }
         let collection = "auto_ids";
-        let col = this._mongo.collection(collection);
+        let col = this._mongoDb.collection(collection);
         try {
             let where = this._convertWhere({ _id: key });
             let rs = await Core_1.core.safeCall(col.findOneAndUpdate, col, where, { $inc: { id: 1 } }, { upsert: true });
@@ -147,13 +151,13 @@ class MongoManager {
     async findOne(collection, property = {}, where = {}) {
         this._convertWhere(where);
         let rs = { errcode: null, one: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let one = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             one = await col.findOne(where, { projection: property });
         }
         catch (e) {
@@ -167,13 +171,13 @@ class MongoManager {
     async findMany(collection, property = {}, where = {}, sort, skip = 0, limit = 0) {
         this._convertWhere(where);
         let rs = { errcode: null, list: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let list = [];
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             let cursor = col.find(where, property);
             if (sort) {
                 cursor = cursor.sort(sort);
@@ -197,13 +201,13 @@ class MongoManager {
     async countDocuments(collection, where, options) {
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let count = -1;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             count = await col.countDocuments(where || {}, options);
         }
         catch (e) {
@@ -217,13 +221,13 @@ class MongoManager {
     async deleteOne(collection, where) {
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let del_rs = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             del_rs = await col.deleteOne(where || {});
         }
         catch (e) {
@@ -239,13 +243,13 @@ class MongoManager {
     async deleteMany(collection, where) {
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let del_rs = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             del_rs = await col.deleteMany(where || {});
         }
         catch (e) {
@@ -265,13 +269,13 @@ class MongoManager {
      */
     async insertOne(collection, data) {
         let rs = { errcode: null, rs: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let in_rs = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             in_rs = await col.insertOne(data);
         }
         catch (e) {
@@ -284,13 +288,13 @@ class MongoManager {
     }
     async insertManay(collection, data) {
         let rs = { errcode: null, rs: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let in_rs = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             in_rs = await col.insertMany(data);
         }
         catch (e) {
@@ -309,7 +313,7 @@ class MongoManager {
         }
         this._convertWhere(where);
         let rs = { errcode: null, rs: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             if (_id) {
                 model["_id"] = _id;
             }
@@ -331,7 +335,7 @@ class MongoManager {
             else {
                 updatemodel = model;
             }
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             up_rs = await col.updateOne(where, updatemodel, { upsert: upsert });
         }
         catch (e) {
@@ -348,7 +352,7 @@ class MongoManager {
     async updateMany(collection, model, where, upsert = false) {
         this._convertWhere(where);
         let rs = { errcode: null, rs: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
@@ -362,7 +366,7 @@ class MongoManager {
             else {
                 updateModel = model;
             }
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             up_rs = await col.updateMany(where, updateModel, { upsert: upsert });
         }
         catch (e) {
@@ -375,13 +379,13 @@ class MongoManager {
     }
     async createIndex(collection, index, options) {
         let rs = { errcode: null, rs: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let i_rs = null;
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             i_rs = await col.createIndex(index, options);
         }
         catch (e) {
@@ -395,13 +399,13 @@ class MongoManager {
     async simpleAggregate(collection, property = {}, where = {}, size, random_size) {
         this._convertWhere(where);
         let rs = { errcode: null, list: null };
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             rs.errcode = _error_1.EErrorCode.No_Mongo;
             return rs;
         }
         let list = [];
         try {
-            let col = this._mongo.collection(collection);
+            let col = this._mongoDb.collection(collection);
             let params = [];
             params.push({ '$match': where || {} });
             params.push({ '$project': property || {} });
@@ -424,12 +428,36 @@ class MongoManager {
         return rs;
     }
     aggregate(collection, pipeline, options) {
-        if (!this._mongo) {
+        if (!this._mongoDb) {
             return;
         }
-        let col = this._mongo.collection(collection);
+        let col = this._mongoDb.collection(collection);
         let agg = col.aggregate(pipeline, options);
         return agg;
     }
+    /**
+     * 快速事务
+     * @param collection
+     * @param cb
+     */
+    async quickTransaction(cb) {
+        if (!this._mongoDb) {
+            return false;
+        }
+        let session = this._mongoClient.startSession();
+        session.startTransaction();
+        try {
+            let rs = await cb(session);
+            await session.commitTransaction();
+            session.endSession();
+            return rs;
+        }
+        catch (e) {
+            await session.abortTransaction();
+            session.endSession();
+            Log_1.GLog.error(e.stack);
+        }
+        return false;
+    }
 }
 exports.GMongoMgr = new MongoManager();

package/dist/lib/Framework/Service/MongoUserService.js

@@ -38,8 +38,8 @@ exports.MongoUserModel = MongoUserModel;
 //暂时不实例化，方便重写
 exports.GUserSer = null;
 class UserService extends MongoBaseService_1.MongoBaseService {
-    constructor(type) {
-        super("user", type);
+    constructor(table, type) {
+        super(table, type);
         exports.GUserSer = this;
     }
     async _createNewUser(account_id, nickname, sex, logo, group) {

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

@@ -4,7 +4,7 @@ export declare class MongoBaseService<T> {
     get table(): string;
     protected _inited: boolean;
     get isInited(): boolean;
-    get mongo(): mongo.Db;
+    get mongoDb(): mongo.Db;
     protected _t_type: {
         new (): T;
     };

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

@@ -39,8 +39,10 @@ export declare let GMongoMgr: MongoManager;
 declare class MongoManager {
     protected _mongocfg: MongoConfig;
     protected _init_cbs: any[];
-    protected _mongo: mongo.Db;
-    get mongo(): mongo.Db;
+    protected _mongoDb: mongo.Db;
+    get mongoDb(): mongo.Db;
+    protected _mongoClient: mongo.MongoClient;
+    get mongoClient(): mongo.MongoClient;
     protected _mongo_init_succ: boolean;
     protected _inited: boolean;
     get isValid(): boolean;
@@ -144,5 +146,11 @@ declare class MongoManager {
         list: any[];
     }>;
     aggregate(collection: string, pipeline?: Document[], options?: mongo.AggregateOptions): mongo.AggregationCursor<mongo.BSON.Document>;
+    /**
+     * 快速事务
+     * @param collection
+     * @param cb
+     */
+    quickTransaction(cb: Function): Promise<false | any>;
 }
 export {};

package/dist/types/Framework/Service/MongoUserService.d.ts

@@ -25,7 +25,7 @@ export declare class MongoUserModel extends MongoBaseModel {
 }
 export declare let GUserSer: UserService<MongoUserModel>;
 export declare class UserService<T extends MongoUserModel> extends MongoBaseService<T> {
-    constructor(type: {
+    constructor(table: string, type: {
         new (): T;
     });
     protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;

package/package.json

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