cgserver 10.0.9 → 10.0.10

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoBaseService = void 0;
 const MongoManager_1 = require("./MongoManager");
+const MongoServiceManager_1 = require("./MongoServiceManager");
 class MongoBaseService {
     _table = "";
     get table() {
@@ -29,6 +30,7 @@ class MongoBaseService {
         this._t_type = type;
         this._table = table;
         this._dbname = dbname;
+        MongoServiceManager_1.gMongoServiceMgr.addService(this);
     }
     async getNextId(key = "") {
         if (!key) {

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

@@ -1,40 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gMongoServiceMgr = exports.MongoServiceManager = void 0;
+const index_export_1 = require("../../index_export_");
+const MongoManager_1 = require("./MongoManager");
 class MongoServiceManager {
     _services = {};
-    addService(service, dbname = "") {
-        if (!this._services[dbname]) {
-            this._services[dbname] = {};
-        }
+    addService(service) {
+        let dbname = service.dbname;
+        dbname = this._tryDef(dbname);
         let table = service.table;
         if (!this._services[dbname][table]) {
-            if (service.dbname != dbname) {
-                service = Object.assign({}, service);
-                service.dbname = dbname;
-            }
             this._services[dbname][table] = service;
         }
         return this._services[dbname][table];
     }
-    getServiceByTable(table, dbname = "") {
-        if (!this._services[dbname]) {
-            this._services[dbname] = {};
+    _tryDef(dbname) {
+        if (!dbname) {
+            dbname = MongoManager_1.gMongoMgr.defdbname;
+            if (dbname && !this._services[dbname]) {
+                this._services[dbname] = this._services[""];
+                delete this._services[""];
+            }
         }
-        if (!this._services[dbname][table]) {
-            return null;
+        else {
+            if (dbname == MongoManager_1.gMongoMgr.defdbname && !this._services[dbname]) {
+                this._services[dbname] = this._services[""];
+                delete this._services[""];
+            }
         }
-        return this._services[dbname][table];
-    }
-    getService(service, dbname = "") {
         if (!this._services[dbname]) {
             this._services[dbname] = {};
         }
-        let table = service.table;
-        if (!this._services[dbname][table]) {
+        return dbname;
+    }
+    getService(table, dbname = "") {
+        dbname = this._tryDef(dbname);
+        let tablename = "";
+        if (index_export_1.core.isString(table)) {
+            tablename = table;
+        }
+        else {
+            tablename = table.table;
+        }
+        if (!this._services[dbname][tablename]) {
             return null;
         }
-        return this._services[dbname][table];
+        return this._services[dbname][tablename];
     }
 }
 exports.MongoServiceManager = MongoServiceManager;

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

@@ -6,8 +6,8 @@ export declare class MongoServiceManager {
             [table: string]: MongoBaseService<MongoBaseModel>;
         };
     };
-    addService<T extends MongoBaseService<MongoBaseModel>>(service: T, dbname?: string): T;
-    getServiceByTable<T extends MongoBaseService<MongoBaseModel>>(table: string, dbname?: string): T;
-    getService<T extends MongoBaseService<MongoBaseModel>>(service: T, dbname?: string): T;
+    addService<T extends MongoBaseService<MongoBaseModel>>(service: T): T;
+    protected _tryDef(dbname: string): string;
+    getService<T extends MongoBaseService<MongoBaseModel>>(table: T | string, dbname?: string): T;
 }
 export declare let gMongoServiceMgr: MongoServiceManager;

package/package.json

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