cgserver 12.3.6 → 13.0.1

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

@@ -1,43 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gMongoMgr = exports.MongoExt = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
-const mongo = __importStar(require("mongodb"));
-const _error_1 = require("../../Config/_error_");
+exports.gMongoMgr = exports.MongoExt = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoConfig = void 0;
 const Core_1 = require("../../Core/Core");
 const Log_1 = require("../../Logic/Log");
+const mongoose_1 = __importDefault(require("mongoose"));
 class MongoConfig {
     open = false;
     host = "127.0.0.1";
@@ -48,10 +17,6 @@ class MongoConfig {
     debug = false;
 }
 exports.MongoConfig = MongoConfig;
-class MongoBaseModel {
-    _id;
-}
-exports.MongoBaseModel = MongoBaseModel;
 class MrResult {
     /**
      * select 的数据量
@@ -130,14 +95,6 @@ exports.MongoManager = MongoManager;
 class MongoExt {
     _mongocfg = null;
     _init_cbs = [];
-    _mongoDb = null;
-    get mongoDb() {
-        return this._mongoDb;
-    }
-    _mongoClient = null;
-    get mongoClient() {
-        return this._mongoClient;
-    }
     _mongo_init_succ = false;
     _inited = false;
     get isValid() {
@@ -155,26 +112,16 @@ class MongoExt {
         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));
-        await this._mongoClient.connect();
+        mongoose_1.default.connection.on("disconnected", this.onClose.bind(this));
+        mongoose_1.default.connection.on("open", this.onOpen.bind(this));
+        this._mongocfg.options.dbName = this._mongocfg.database;
+        await mongoose_1.default.connect("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
+        mongoose_1.default.connection.useDb(this._mongocfg.database);
+        console.log("mongo connect success! db=" + this._mongocfg.database);
         return true;
     }
-    onConnectionCreated(event) {
-        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionCreated", event });
-    }
-    onConnectionReady(event) {
-        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionReady", event });
-    }
-    onConnectionClosed(event) {
-        this._mongocfg.debug && Log_1.gLog.info({ key: "mongo onConnectionClosed", event });
-    }
     close(force = false) {
-        this._mongoClient.close(force);
+        mongoose_1.default.connection.close(force);
     }
     registerInitCb(cb) {
         this._init_cbs.push(cb);
@@ -182,7 +129,6 @@ class MongoExt {
     onOpen() {
         this._mongo_init_succ = true;
         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]();
         }
@@ -191,9 +137,11 @@ class MongoExt {
     onClose() {
         this._mongo_init_succ = false;
         Log_1.gLog.info("mongo has closed!");
-        this._mongoDb = null;
         this._inited = false;
-        this.init(this._mongocfg);
+        //this.init(this._mongocfg)
+    }
+    onError(err) {
+        Log_1.gLog.error(err);
     }
     /**
      * 获取自增长id
@@ -203,15 +151,10 @@ class MongoExt {
     async getAutoIds(key) {
         let now = Date.now();
         let dt = 0;
-        if (!this._mongoDb) {
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "getAutoIds", dt, arguments });
-            return -1;
-        }
         let collection = "auto_ids";
-        let col = this._mongoDb.collection(collection);
+        let col = mongoose_1.default.connection.collection(collection);
         try {
-            let where = this._convertWhere({ _id: key });
+            let where = { _id: key };
             let rs = await Core_1.core.safeCall(col.findOneAndUpdate, col, where, { $inc: { id: 1 } }, { upsert: true });
             if (rs && rs.id) {
                 return rs.id + 1;
@@ -227,492 +170,6 @@ class MongoExt {
         this._mongocfg.debug && Log_1.gLog.info({ key: "getAutoIds", dt, arguments });
         return -2;
     }
-    _convertWhere(where) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where || !where._id) {
-            return;
-        }
-        if (Core_1.core.isString(where._id) && where._id.length == 24) {
-            let _id = where._id;
-            try {
-                where._id = this.toObjectId(_id);
-            }
-            catch (e) {
-                where._id = _id;
-            }
-        }
-        return where;
-    }
-    toObjectId(id) {
-        return new mongo.BSON.ObjectId(id);
-    }
-    /**
-     * 获取单条消息
-     * @param collection
-     */
-    async findOne(collection, where = {}, property = {}) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, one: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "findOne", dt, arguments });
-            return rs;
-        }
-        let one = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            one = await col.findOne(where, { projection: property });
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, property, where });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.one = one;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "findOne", dt, arguments });
-        return rs;
-    }
-    async distinct(collection, key, where = {}) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, lst: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "distinct", dt, arguments });
-            return rs;
-        }
-        let lst = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            lst = await col.distinct(key, where);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, key, where });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.lst = lst;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "distinct", dt, arguments });
-        return rs;
-    }
-    async findMany(collection, where = {}, property = {}, sort, skip = 0, limit = 0) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, list: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "findMany", dt, arguments });
-            return rs;
-        }
-        let list = [];
-        try {
-            let col = this._mongoDb.collection(collection);
-            let cursor = col.find(where, { projection: property });
-            if (sort) {
-                cursor = cursor.sort(sort);
-            }
-            if (skip) {
-                cursor = cursor.skip(skip);
-            }
-            if (limit) {
-                cursor = cursor.limit(limit);
-            }
-            list = await cursor.toArray();
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, property, where, sort, skip, limit });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.list = list;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "findMany", dt, arguments });
-        return rs;
-    }
-    async countDocuments(collection, where, options) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, count: -1 };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "countDocuments", dt, arguments });
-            return rs;
-        }
-        let count = -1;
-        try {
-            let col = this._mongoDb.collection(collection);
-            count = await col.countDocuments(where || {}, options);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, where });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.count = count;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "countDocuments", dt, arguments });
-        return rs;
-    }
-    async deleteOne(collection, where) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, count: -1 };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            return rs;
-        }
-        let del_rs = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            del_rs = await col.deleteOne(where || {});
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, where });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        if (del_rs) {
-            rs.count = del_rs.deletedCount;
-        }
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "deleteOne", dt, arguments });
-        return rs;
-    }
-    async deleteMany(collection, where) {
-        let now = Date.now();
-        let dt = 0;
-        if (!where) {
-            where = {};
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, count: -1 };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "deleteMany", dt, arguments });
-            return rs;
-        }
-        let del_rs = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            del_rs = await col.deleteMany(where || {});
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, where });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        if (del_rs) {
-            rs.count = del_rs.deletedCount;
-        }
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "deleteMany", dt, arguments });
-        return rs;
-    }
-    /**
-     * 插入数据
-     * @param collection
-     * @param data
-     */
-    async insertOne(collection, data) {
-        let now = Date.now();
-        let dt = 0;
-        let rs = { errcode: null, rs: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "insertOne", dt, arguments });
-            return rs;
-        }
-        let in_rs = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            in_rs = await col.insertOne(data);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, data });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.rs = in_rs;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "insertOne", dt, arguments });
-        return rs;
-    }
-    async insertManay(collection, data) {
-        let now = Date.now();
-        let dt = 0;
-        let rs = { errcode: null, rs: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "insertManay", dt, arguments });
-            return rs;
-        }
-        let in_rs = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            in_rs = await col.insertMany(data);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, data });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.rs = in_rs;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "insertManay", dt, arguments });
-        return rs;
-    }
-    async updateOne(collection, where, model, options) {
-        let now = Date.now();
-        let dt = 0;
-        let _id = model["_id"];
-        delete model["_id"];
-        if (!where && _id) {
-            where["_id"] = _id;
-        }
-        this._convertWhere(where);
-        let rs = { errcode: null, rs: null };
-        if (!this._mongoDb) {
-            if (_id) {
-                model["_id"] = _id;
-            }
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "updateOne", dt, arguments });
-            return rs;
-        }
-        let up_rs = null;
-        try {
-            let updatemodel = null;
-            let money = false;
-            for (let key in model) {
-                if (key.startsWith("$")) {
-                    money = true;
-                }
-            }
-            if (!money) {
-                updatemodel = { "$set": model };
-            }
-            else {
-                updatemodel = model;
-            }
-            let col = this._mongoDb.collection(collection);
-            up_rs = await col.updateOne(where, updatemodel, options);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, model, where, options });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.rs = up_rs;
-        if (up_rs?.upsertedId || _id) {
-            model["_id"] = up_rs?.upsertedId || _id;
-        }
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "updateOne", dt, arguments });
-        return rs;
-    }
-    async updateMany(collection, where, model, options) {
-        let now = Date.now();
-        let dt = 0;
-        this._convertWhere(where);
-        let rs = { errcode: null, rs: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "updateMany", dt, arguments });
-            return rs;
-        }
-        let up_rs = null;
-        try {
-            let updateModel = null;
-            let firstKey = Object.keys(model)[0];
-            if (!firstKey.startsWith("$")) {
-                updateModel = { $set: model };
-            }
-            else {
-                updateModel = model;
-            }
-            let col = this._mongoDb.collection(collection);
-            up_rs = await col.updateMany(where, updateModel, options);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, model, where, options });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.rs = up_rs;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "updateMany", dt, arguments });
-        return rs;
-    }
-    async createIndex(collection, index, options) {
-        let now = Date.now();
-        let dt = 0;
-        let rs = { errcode: null, rs: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "createIndex", dt, arguments });
-            return rs;
-        }
-        let i_rs = null;
-        try {
-            let col = this._mongoDb.collection(collection);
-            i_rs = await col.createIndex(index, options);
-        }
-        catch (e) {
-            Log_1.gLog.error({ collection, index });
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.rs = i_rs;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "createIndex", dt, arguments });
-        return rs;
-    }
-    async simpleAggregate(collection, where, property, size, random_size) {
-        let now = Date.now();
-        let dt = 0;
-        this._convertWhere(where);
-        let rs = { errcode: null, list: null };
-        if (!this._mongoDb) {
-            rs.errcode = _error_1.EErrorCode.No_Mongo;
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "simpleAggregate", dt, arguments });
-            return rs;
-        }
-        let list = [];
-        try {
-            let col = this._mongoDb.collection(collection);
-            let params = [];
-            if (where) {
-                params.push({ '$match': where });
-            }
-            if (property) {
-                params.push({ '$project': property });
-            }
-            if (random_size) {
-                params.push({ '$sample': { 'size': random_size } });
-            }
-            let agg = col.aggregate(params);
-            if (size) {
-                list = await agg.limit(size).toArray();
-            }
-            else {
-                list = await agg.toArray();
-            }
-        }
-        catch (e) {
-            Log_1.gLog.error(e.stack);
-            rs.errcode = _error_1.EErrorCode.Mongo_Error;
-        }
-        rs.list = list;
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "simpleAggregate", dt, arguments });
-        return rs;
-    }
-    aggregate(collection, pipeline, options) {
-        if (!this._mongoDb) {
-            return;
-        }
-        let col = this._mongoDb.collection(collection);
-        let agg = col.aggregate(pipeline, options);
-        return agg;
-    }
-    /**
-     * 快速事务
-     * @param collection
-     * @param cb
-     */
-    async quickTransaction(cb, options) {
-        let now = Date.now();
-        let dt = 0;
-        if (!this._mongoDb) {
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
-            return false;
-        }
-        let session = this._mongoClient.startSession();
-        session.startTransaction(options);
-        try {
-            let rs = await cb(session);
-            await session.commitTransaction();
-            session.endSession();
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
-            return rs;
-        }
-        catch (e) {
-            await session.abortTransaction();
-            Log_1.gLog.error(e.stack);
-        }
-        finally {
-            await session.endSession();
-        }
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "quickTransaction", dt, arguments });
-        return false;
-    }
-    async bulkWrite(collection, operations, options) {
-        let now = Date.now();
-        let dt = 0;
-        if (!this._mongoDb) {
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
-            return;
-        }
-        let bulk = this._mongoDb.collection(collection);
-        let bwr = bulk.bulkWrite(operations, options);
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
-        return bwr;
-    }
-    async findOneAndUpdate(collection, filter, update, options) {
-        this._convertWhere(filter);
-        let now = Date.now();
-        let dt = 0;
-        if (!this._mongoDb) {
-            dt = Date.now() - now;
-            this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
-            return;
-        }
-        let col = this._mongoDb.collection(collection);
-        let rs = await col.findOneAndUpdate(filter, update, options);
-        dt = Date.now() - now;
-        this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
-        return rs;
-    }
 }
 exports.MongoExt = MongoExt;
 exports.gMongoMgr = new MongoManager();

package/dist/lib/Framework/Decorator/JsonAuthorityValidate.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonAuthorityValidate = void 0;
-let JsonAuthorityValidate = function (rg) {
+let JsonAuthorityValidate = function () {
     return function (target, propertyName, descriptor) {
         let method = descriptor.value;
         descriptor.value = function () {
@@ -9,10 +9,6 @@ let JsonAuthorityValidate = function (rg) {
             if (!self.isLogin) {
                 self.showJson({ errcode: { id: 1, des: "未登陆" }, err: "未登陆" });
             }
-            if (rg && self.selfUser.role_group != rg) {
-                self.showJson({ errcode: { id: 2, des: "权限不足" }, err: "权限不足" });
-                return;
-            }
             return method.apply(this, arguments);
         };
     };

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

@@ -88,22 +88,37 @@ class Log {
         }
         return message;
     }
-    error(message) {
+    error(message, obj) {
+        if (obj) {
+            message = { key: message, value: obj };
+        }
         message = this._convertMsg(message);
         this._error_logger?.error(message);
     }
-    info(message) {
+    info(message, obj) {
+        if (obj) {
+            message = { key: message, value: obj };
+        }
         message = this._convertMsg(message);
         this._logger?.info(message);
     }
-    warn(message) {
+    warn(message, obj) {
+        if (obj) {
+            message = { key: message, value: obj };
+        }
         message = this._convertMsg(message);
         this._error_logger?.warn(message);
     }
-    record(message) {
+    record(message, obj) {
+        if (obj) {
+            message = { key: message, value: obj };
+        }
         this.info(message);
     }
-    clientLog(message) {
+    clientLog(message, obj) {
+        if (obj) {
+            message = { key: message, value: obj };
+        }
         message = this._convertMsg(message);
         this._client_logger?.info(message);
     }