cgserver 13.2.9 → 13.2.11

package/README.md

@@ -1,4 +1,6 @@
 # 版本更新日志
+## v13.2.10
+- Refactor auto-increment ID logic for MongoDB
 ## v13.2.3
 - Improve MongoDB connection validation and error handling
 ## v13.2.2

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,12 +1,53 @@
 "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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.MongoBaseService = void 0;
-const mongoose_1 = __importDefault(require("mongoose"));
+exports.GMongoAutoIdsSer = exports.MongoBaseService = void 0;
+const mongoose_1 = __importStar(require("mongoose"));
 const Log_1 = require("../../Logic/Log");
 const MongoManager_1 = require("./MongoManager");
+const SyncCall_1 = require("../../Decorator/SyncCall");
+const underscore_1 = __importDefault(require("underscore"));
 class MongoBaseService {
     _model;
     _schema;
@@ -101,8 +142,27 @@ class MongoBaseService {
         return ret;
     }
     async getAutoIds() {
-        let id = await this.mongo.getAutoIds(this.model.collection.name);
+        let id = await exports.GMongoAutoIdsSer.getIncressId(this._collection_name);
         return id;
     }
 }
 exports.MongoBaseService = MongoBaseService;
+const autoIdSchema = new mongoose_1.Schema({
+    autoid: { type: Number, required: true, default: 0 }
+});
+class MongoAutoIdsService extends MongoBaseService {
+    constructor() {
+        super('auto_ids', autoIdSchema);
+    }
+    async getIncressId(key) {
+        let md = await this.findOneAndUpdate({ _id: key }, { $inc: { autoid: 1 } }, { upsert: true });
+        if (md && md.autoid) {
+            return md.autoid + 1;
+        }
+        return -underscore_1.default.random(2, 999999999);
+    }
+}
+__decorate([
+    (0, SyncCall_1.SyncCall2)(0)
+], MongoAutoIdsService.prototype, "getIncressId", null);
+exports.GMongoAutoIdsSer = new MongoAutoIdsService();

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

@@ -196,21 +196,6 @@ class MongoExt {
     onError(err) {
         Log_1.gLog.error(err);
     }
-    /**
-     * 获取自增长id
-     * @param key
-     * @returns 小于等于0为异常
-     */
-    async getAutoIds(key) {
-        let collection = "auto_ids";
-        let col = mongoose_2.default.connection.collection(collection);
-        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;
-        }
-        return 1;
-    }
     async findOne(model, filter, projection, options) {
         filter = this._convertFilter(filter);
         if (!model) {
@@ -363,9 +348,6 @@ exports.MongoExt = MongoExt;
 __decorate([
     (0, MongoActionCheck_1.MongoActionCheck)(false)
 ], MongoExt.prototype, "init", null);
-__decorate([
-    (0, MongoActionCheck_1.MongoActionCheck)(-1)
-], MongoExt.prototype, "getAutoIds", null);
 __decorate([
     (0, MongoActionCheck_1.MongoActionCheck)(null)
 ], MongoExt.prototype, "findOne", null);

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

@@ -0,0 +1 @@
+export {};

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

@@ -24,3 +24,12 @@ export declare class MongoBaseService<T extends IMongoBaseModel> {
     countDocuments(filter?: FilterQuery<T>): Promise<number>;
     getAutoIds(): Promise<number>;
 }
+export interface IAutoIdModel extends IMongoBaseModel {
+    autoid: number;
+}
+declare class MongoAutoIdsService extends MongoBaseService<IAutoIdModel> {
+    constructor();
+    getIncressId(key: string): Promise<number>;
+}
+export declare let GMongoAutoIdsSer: MongoAutoIdsService;
+export {};

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

@@ -75,12 +75,6 @@ export declare class MongoExt {
         available: any;
     }>;
     onError(err: Error): void;
-    /**
-     * 获取自增长id
-     * @param key
-     * @returns 小于等于0为异常
-     */
-    getAutoIds(key: string): Promise<number>;
     findOne<T>(model: mongoose.Model<T>, filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
     find<T>(model: mongoose.Model<T>, filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
     findById<T>(model: mongoose.Model<T>, id: any, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T | null>;

package/package.json

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