exodus-framework 2.0.64 → 2.0.66

package/lib/middlewares/access.js

@@ -19,7 +19,7 @@ class AccessMiddleware extends _controller.default {
     };
   };
   getConnection = async (req, res, next) => {
-    const account = req.auth.account;
+    const account = req.auth?.account;
     const envToken = req.header('X-Exodus-Environment-Token');
     const connUuid = req.header('X-Exodus-Connection');
     if (account && account.type != 'ADMINISTRATOR') {

package/lib/models/Connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.d.ts","sourceRoot":"","sources":["../../src/models/Connection.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,uBAAuB,EACvB,KAAK,EACN,MAAM,WAAW,CAAC;AAEnB,qBAAa,UAAW,SAAQ,KAAK,CACnC,eAAe,CAAC,UAAU,CAAC,EAC3B,uBAAuB,CAAC,UAAU,CAAC,CACpC;IACS,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CACvD"}
+{"version":3,"file":"Connection.d.ts","sourceRoot":"","sources":["../../src/models/Connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,uBAAuB,EACvB,KAAK,EACN,MAAM,WAAW,CAAC;AAGnB,qBAAa,UAAW,SAAQ,KAAK,CACnC,eAAe,CAAC,UAAU,CAAC,EAC3B,uBAAuB,CAAC,UAAU,CAAC,CACpC;IACS,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CACvD"}

package/lib/models/Connection.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Connection = void 0;
-var _database = require("../utils/database");
 var _sequelize = require("sequelize");
+var _database = require("../utils/database");
 class Connection extends _sequelize.Model {}
 exports.Connection = Connection;
 Connection.init({

package/lib/services/sequelize.d.ts

@@ -1,11 +1,12 @@
+import { Model, ModelStatic, Sequelize } from 'sequelize';
 import Service from '../app/service';
-import { ModelStatic, Sequelize } from 'sequelize';
 import { IService } from '../contracts/service';
 declare class SequelizeService extends Service implements IService {
     serviceDB: Sequelize;
     masterDB: Sequelize;
     models: ModelStatic<any>[];
     connections: Map<string, Sequelize>;
+    initializedModels: Map<string, typeof Model<any, any>>;
     constructor();
     init(): Promise<void>;
     connectMainDatabase(): Promise<unknown>;
@@ -16,6 +17,9 @@ declare class SequelizeService extends Service implements IService {
     getDB(uuid: string, name: string): Promise<Sequelize>;
     initDB(uuid: string, name: string): Promise<unknown>;
     registerModels(models: ModelStatic<any>[]): void;
+    getModel<M extends typeof Model<any, any>>(model: typeof Model<any, any> & {
+        initialize: (connection: Sequelize) => M;
+    }, conn_uuid: string, envToken: string): Promise<M>;
 }
 export default SequelizeService;
 //# sourceMappingURL=sequelize.d.ts.map

package/lib/services/sequelize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAIrC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAWhD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAM9B,IAAI;IAMJ,mBAAmB;IA4BzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAKhC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8CvC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAahD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;IAMjD,IAAI;IAMJ,mBAAmB;IA4BzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAKhC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8CvC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;IAInC,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM;CAiBnB;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _sequelize = require("sequelize");
+var _app = require("../app");
 var _service = _interopRequireDefault(require("../app/service"));
 var _Connection = require("../models/Connection");
 var _database = require("../utils/database");
 var _logger = _interopRequireDefault(require("../utils/logger"));
-var _sequelize = require("sequelize");
 var _error = require("./error");
-var _app = require("../app");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Serviço de gerênciamento do banco de dados
@@ -24,6 +24,7 @@ class SequelizeService extends _service.default {
   masterDB;
   models;
   connections;
+  initializedModels;
 
   //# Initialization
   constructor() {
@@ -191,5 +192,19 @@ class SequelizeService extends _service.default {
   registerModels(models) {
     this.models = models;
   }
+  async getModel(model, conn_uuid, envToken) {
+    const connection = await this.getDB(conn_uuid, envToken);
+    const query = `${envToken}@${conn_uuid}`;
+    const cache = this.initializedModels.get(query);
+    if (cache) {
+      return cache;
+    }
+    if (connection) {
+      const m = model.initialize(connection);
+      this.initializedModels.set(query, m);
+      return m;
+    }
+    return null;
+  }
 }
 var _default = exports.default = SequelizeService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",