exodus-framework 2.0.9151 → 2.0.9791

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

@@ -1 +1 @@
-{"version":3,"file":"rabitmq.d.ts","sourceRoot":"","sources":["../../src/services/rabitmq.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGtD,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AAUtB,cAAM,eAAgB,SAAQ,OAAO;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,oBAAoB,CAA0D;IAEtF,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAEf,oBAAoB;IAcpB,cAAc;IAMd,sBAAsB;IAMtB,WAAW;IAKX,OAAO;IA+BP,eAAe;IAM5B,OAAO,CAAC,iBAAiB;IAYnB,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAoBzF,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IA4BjD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,wBAAwB;IAI/C,aAAa,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACvD,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAY9B,cAAc,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC;IAW7D,YAAY,CACjB,CAAC,SAAS,MAAM,oBAAoB,EACpC,CAAC,SAAS,MAAM,oBAAoB,EACpC,IAAI,EAAE;QACN,IAAI,EAAE;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAA;SAAE,CAAC;QAClD,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,CAAC;YACT,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACpC,SAAS,EAAE,MAAM,IAAI,CAAC;YACtB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;KACH;CAkBF;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"rabitmq.d.ts","sourceRoot":"","sources":["../../src/services/rabitmq.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGtD,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AAUtB,cAAM,eAAgB,SAAQ,OAAO;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,oBAAoB,CAA0D;IAEtF,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAEf,oBAAoB;IAcpB,cAAc;IAMd,sBAAsB;IAMtB,WAAW;IAKX,OAAO;IA+BP,eAAe;IAM5B,OAAO,CAAC,iBAAiB;IAYnB,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACpD,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC7B,aAAa,CAAC,EAAE,MAAM;IAqBlB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IA+BjD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,wBAAwB;IAI/C,aAAa,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACvD,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAY9B,cAAc,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC;IAW7D,YAAY,CACjB,CAAC,SAAS,MAAM,oBAAoB,EACpC,CAAC,SAAS,MAAM,oBAAoB,EACpC,IAAI,EAAE;QACN,IAAI,EAAE;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAA;SAAE,CAAC;QAClD,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,CAAC;YACT,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACpC,SAAS,EAAE,MAAM,IAAI,CAAC;YACtB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;KACH;CAwBF;AAED,eAAe,eAAe,CAAC"}

package/lib/services/rabitmq.js

@@ -102,7 +102,7 @@ class RabbitMQService extends _service.default {
   }
 
   //# Common
-  async sendToQueue(topic, data) {
+  async sendToQueue(topic, data, transactionId) {
     try {
       if (!this.isConnected) {
         this.log('RabbitMQ is not connected. Message not sent.');
@@ -111,7 +111,8 @@ class RabbitMQService extends _service.default {
       const messageId = (0, _crypto.randomUUID)();
       const packeg = Buffer.from(JSON.stringify({
         data,
-        serviceId: _app.Core.settings.getAppication().appId
+        serviceId: _app.Core.settings.getAppication().appId,
+        transactionId
       }));
       this.channel.publish(this.exchangeName, topic, packeg, {
         messageId,
@@ -132,15 +133,18 @@ class RabbitMQService extends _service.default {
       const topic = msg.fields.routingKey;
       const content = JSON.parse(msg.content.toString());
       const callBack = this.mainRouter[topic];
-      if (callBack) await callBack(content.data, () => {}, content.serviceId, msg.properties.messageId);
+      if (callBack) await callBack(content.data, () => {}, content.serviceId, content.transactionId);
       this.channel.ack(msg); //# the next function is temporary and not confirm ack
 
       if (this.eventCustomListeners.has(topic)) {
         const cb = this.eventCustomListeners.get(topic);
-        cb(content.data, () => {}, content.serviceId, msg.properties.messageId);
+        cb(content.data, () => {}, content.serviceId, content.transactionId);
       }
     } catch (error) {
-      this.channel.nack(msg, false, true); // Reenfileira para nova tentativa
+      setTimeout(() => {
+        this.channel.nack(msg, false, true); // Reenfileira para nova tentativa
+        this.log(`Message requeue: ${msg.fields.routingKey}`, 'info');
+      }, 3000);
       new _app.ErrorHandler('Error on parsing message from queue', error);
     }
   }
@@ -163,17 +167,21 @@ class RabbitMQService extends _service.default {
     const timeout = data.listen.timeout || 5000;
     const send = data.send;
     const listen = data.listen;
+    const sendtransactionId = (0, _crypto.randomUUID)();
     this.onTransaction(listen.topic, (data, ack, serviceId, transactionId) => {
+      ack(); // !auto ack because rabbit app crash
+      if (sendtransactionId != transactionId) {
+        return;
+      }
       this.offTransaction(listen.topic);
       clearTimeout(fnTimeout);
-      ack(); // !auto ack because rabbit app crash
       listen.callback(data, ack, serviceId, transactionId);
     });
     const fnTimeout = setTimeout(() => {
       this.offTransaction(listen.topic);
       listen.onTimeout();
     }, timeout);
-    this.sendToQueue(send.topic, send.data);
+    this.sendToQueue(send.topic, send.data, sendtransactionId);
   }
 }
 var _default = exports.default = RabbitMQService;

package/lib/services/security.js

@@ -10,8 +10,7 @@ var _nodeJose = require("node-jose");
 var _path = _interopRequireDefault(require("path"));
 var _app = require("../app");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 class SecurityService extends _app.Service {
   privateKey;
   publicKey;

package/lib/services/sequelize.d.ts

@@ -5,7 +5,6 @@ import { EnvDBHost } from '../models';
 import { StaticServiceModel } from '../contracts';
 declare class SequelizeService extends Service {
     serviceDB: Sequelize;
-    masterDB: Sequelize;
     models: StaticServiceModel<any>[];
     connections: Map<string, Sequelize>;
     initializedModels: Map<string, ModelStatic<any>>;

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,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAKpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUlD,cAAM,gBAAiB,SAAQ,OAAO;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAS;IAGtB,aAAa;IAkBb,OAAO;IAaP,WAAW;IAMX,gBAAgB;IA+BhB,KAAK,CAAC,QAAQ,EAAE,MAAM;IAe7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8BhC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAsBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IA6BvB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IAkBpE,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA2CpD,cAAc,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;IA4BY,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EACjD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;WAWZ,cAAc,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE;IAGjD,UAAU;CAOxB;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAIpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAalD,cAAM,gBAAiB,SAAQ,OAAO;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAS;IAGtB,aAAa;IAiBb,OAAO;IAaP,WAAW;IAMX,gBAAgB;IAyBhB,KAAK,CAAC,QAAQ,EAAE,MAAM;IAa7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8BhC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAsBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IA2BvB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IAkBpE,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA2CpD,cAAc,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;IA4BY,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EACjD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;WAWZ,cAAc,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE;IAGjD,UAAU;CAOxB;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -13,16 +13,18 @@ var _database = require("../utils/database");
 var _logger = _interopRequireDefault(require("../utils/logger"));
 var _security = _interopRequireDefault(require("./security"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 /**
  * Serviço de gerênciamento do banco de dados
  *
  * @class SequelizeService
  * @extends {Service}
+ * @deprecated Use {@link DatabaseService}
  * @implements {IService}
  */
 class SequelizeService extends _service.default {
   serviceDB;
-  masterDB;
   models;
   connections;
   initializedModels;
@@ -36,8 +38,7 @@ class SequelizeService extends _service.default {
   async onServiceInit() {
     await super.onServiceInit();
     if (!this.models) throw new Error('Models are requireds! Call registerModels(modelsArray)');
-    this.serviceDB = _database.serviceDB;
-    this.masterDB = _database.masterDB;
+    this.serviceDB = _database.mainDb;
     this.connections = new Map();
     this.initializedModels = new Map();
     this.initializingdModels = new Map();
@@ -65,13 +66,6 @@ class SequelizeService extends _service.default {
     if (this.isReconnecting) return false;
     this.log(`⌛️ Connecting Sequelize to database: ${this.currentStartAttempts}/${this.maxStartAttempts}`);
     try {
-      if (!this.isMasterConnected) {
-        await this.masterDB.sync({
-          force: false
-        });
-        this.isMasterConnected = true;
-        this.log('✅ Connected master database sucessfully', 'success');
-      }
       if (!this.isServiceConnected) {
         await this.serviceDB.sync({
           force: false
@@ -91,10 +85,8 @@ class SequelizeService extends _service.default {
   // #Database
   async getDB(tenantId) {
     /* master or service */
-    if (tenantId == _app.Core.settings.getDatabase().service.database) {
-      return _database.serviceDB;
-    } else if (tenantId == _app.Core.settings.getDatabase().master.database) {
-      return _database.masterDB;
+    if (tenantId == _app.Core.settings.getDatabase().main.database) {
+      return _database.mainDb;
     }
     const relation = await this.getRelation(tenantId);
     if (!relation) return false;
@@ -107,7 +99,7 @@ class SequelizeService extends _service.default {
       this.log('Database host information not found: ' + hostUuid);
       return false;
     }
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
+    const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
     const connection = await this.createConnection(hostUuid);
     if (connection) {
       try {
@@ -135,7 +127,7 @@ class SequelizeService extends _service.default {
       this.log('Database host information not found: ' + hostUuid);
       return false;
     }
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
+    const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
     const connection = await this.createConnection(hostUuid);
     if (connection) {
       try {
@@ -150,7 +142,7 @@ class SequelizeService extends _service.default {
     return false;
   }
   async deleteDB(hostUuid, name) {
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
+    const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
     const connection = await this.createConnection(hostUuid);
     if (connection) {
       try {
@@ -167,10 +159,8 @@ class SequelizeService extends _service.default {
   }
   async initDB(tenantId) {
     let connection = false;
-    if (tenantId == _app.Core.settings.getDatabase().service.database) {
-      connection = _database.serviceDB;
-    } else if (tenantId == _app.Core.settings.getDatabase().master.database) {
-      connection = _database.masterDB;
+    if (tenantId == _app.Core.settings.getDatabase().main.database) {
+      connection = _database.mainDb;
     } else {
       const relation = await this.getRelation(tenantId);
       if (!relation) return false;
@@ -202,7 +192,7 @@ class SequelizeService extends _service.default {
     }));
   }
   getDBName(envToken) {
-    return `${_app.Core.settings.getDatabase().service.database}_${envToken}`;
+    return `${_app.Core.settings.getDatabase().main.database}_${envToken}`;
   }
 
   //#Connection

package/lib/services/socket.js

@@ -53,7 +53,7 @@ class SocketIOService extends _service.default {
       return handler;
     }));
     clientsH.forEach(handler => handler.onConnect());
-    const onAny = (event, ...args) => clientsH.forEach(handler => handler.onEvent(event, ...args));
+    const onAny = (event, ...args) => clientsH.forEach(handler => handler.onEvent(event, args));
     socket.onAny(onAny);
     eventsH.forEach(handlers => {
       handlers.forEach(handler => handler.onConnect(request));

package/lib/tasks/queue/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGxE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAItD,KAAK,CAAC,GAAG;IACP,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;IAC1E,IAAI,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;CAC9D,CAAC;AAEF,cAAM,oBAAqB,SAAQ,SAAS,CAAC,CAAC,CAAC;IAC7C,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAcrD,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC;IAiBvE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC;IAgB/E,MAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC;CA4BzE;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIxE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,KAAK,CAAC,GAAG;IACP,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;IAC1E,IAAI,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;CAC9D,CAAC;AAEF,cAAM,oBAAqB,SAAQ,SAAS,CAAC,CAAC,CAAC;IAC7C,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAcrD,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC;IAiBvE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC;IAgB/E,MAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC;CA4BzE;AAED,eAAe,oBAAoB,CAAC"}

package/lib/tasks/queue/environment.js

@@ -7,10 +7,9 @@ exports.default = void 0;
 var _app = require("../../app");
 var _core = require("../../contracts/core");
 var _models = require("../../models");
+var _services = require("../../services");
 var _queue = require("../../services/task/queue");
 var _utils = require("../../utils");
-var _sequelize = _interopRequireDefault(require("../../services/sequelize"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class EnvironmentSyncQueue extends _queue.QueueTask {
   getName() {
     return 'Environment Sync Queue';
@@ -34,7 +33,7 @@ class EnvironmentSyncQueue extends _queue.QueueTask {
     try {
       const db = data.database;
       const token = data.envToken;
-      await _sequelize.default.singleton().createDB(db, token);
+      await _services.DatabaseService.getService().createDB(db, token);
       await _models.EnvDBHost.create({
         envUuid: data.uuid,
         hostUuid: data.database,
@@ -78,10 +77,10 @@ class EnvironmentSyncQueue extends _queue.QueueTask {
             envToken: env.envToken
           });
         }
-        if (!(await _sequelize.default.singleton().hasDB(env.database, env.envToken))) {
+        if (!(await _services.DatabaseService.getService().hasDB(env.database, env.envToken))) {
           (0, _utils.logger)().info(env, `Sincronizando novo banco de dados ${env.uuid}`);
           this.log(`Sincronizando novo banco de dados ${env.uuid}`, 'info');
-          await _sequelize.default.singleton().createDB(env.database, env.envToken);
+          await _services.DatabaseService.getService().createDB(env.database, env.envToken);
         }
       } catch (error) {
         new _app.ErrorHandler('Houve um erro ao tentar sincronizar um novo ambiente/relação ou banco de dados', error);

package/lib/tasks/schedule/restart.js

@@ -9,7 +9,7 @@ class ServiceRestartTaskSchedule extends _services.ScheduleTask {
   async onTaskInit() {
     await super.onTaskInit();
     this.name = 'Tarefa de Agendamento do Restart';
-    this.cron = '0 0 0 * * * ';
+    this.cron = '0 1 0 * * *';
   }
   async onMasterExecute() {
     this.log('Executando reinício agendado...', 'danger');

package/lib/utils/database.d.ts

@@ -1,6 +1,5 @@
 import { Sequelize, WhereOptions } from 'sequelize';
 import { IRequestFilterCondition, LogicalCondition } from '../contracts';
-export declare const serviceDB: Sequelize;
-export declare const masterDB: Sequelize;
+export declare const mainDb: Sequelize;
 export declare function processFilters<D>(filters?: Partial<Record<keyof D, IRequestFilterCondition<D>> | LogicalCondition<D>>): WhereOptions<D>;
 //# sourceMappingURL=database.d.ts.map

package/lib/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEzE,eAAO,MAAM,SAAS,WAWpB,CAAC;AAEH,eAAO,MAAM,QAAQ,WAWnB,CAAC;AAgFH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEzE,eAAO,MAAM,MAAM,WASjB,CAAC;AA8FH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB"}

package/lib/utils/database.js

@@ -3,36 +3,38 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.masterDB = void 0;
+exports.mainDb = void 0;
 exports.processFilters = processFilters;
-exports.serviceDB = void 0;
 var _sequelize = require("sequelize");
 var _core = _interopRequireDefault(require("../app/core"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const serviceDB = exports.serviceDB = new _sequelize.Sequelize({
-  database: _core.default.settings.getDatabase().service.database,
-  dialect: _core.default.settings.getDatabase().master.dialect,
-  username: _core.default.settings.getDatabase().master.username,
-  password: _core.default.settings.getDatabase().master.password,
-  pool: _core.default.settings.getDatabase().service.pool,
+const mainDb = exports.mainDb = new _sequelize.Sequelize({
+  database: _core.default.settings.getDatabase().main.database,
+  dialect: _core.default.settings.getDatabase().main.dialect,
+  username: _core.default.settings.getDatabase().main.username,
+  password: _core.default.settings.getDatabase().main.password,
+  pool: _core.default.settings.getDatabase().main.pool,
   define: {
     timestamps: true
   },
   timezone: '-03:00',
   logging: _core.default.settings.getDatabase().service.log
 });
-const masterDB = exports.masterDB = new _sequelize.Sequelize({
-  database: _core.default.settings.getDatabase().master.database,
-  dialect: _core.default.settings.getDatabase().master.dialect,
-  username: _core.default.settings.getDatabase().master.username,
-  password: _core.default.settings.getDatabase().master.password,
-  pool: _core.default.settings.getDatabase().master.pool,
+
+//!nunca foi usado
+/* export const masterDB = new Sequelize({
+  database: Core.settings.getDatabase().master.database,
+  dialect: Core.settings.getDatabase().master.dialect,
+  username: Core.settings.getDatabase().master.username,
+  password: Core.settings.getDatabase().master.password,
+  pool: Core.settings.getDatabase().master.pool,
   define: {
     timestamps: true
   },
   timezone: '-03:00',
-  logging: _core.default.settings.getDatabase().service.log
-});
+  logging: Core.settings.getDatabase().service.log
+}); */
+
 function processCondition(cond) {
   if ('or' in cond) {
     return {

package/lib/utils/logger.d.ts

@@ -1,4 +1,6 @@
 import { Logger } from 'pino';
 declare const logger: () => Logger<never>;
+export declare function zipFolder(sourceDir: string, zipFilePath: string): Promise<void>;
+export declare function compressOldLogs(): void;
 export default logger;
 //# sourceMappingURL=logger.d.ts.map

package/lib/utils/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AA4C9B,QAAA,MAAM,MAAM,qBAMX,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAGA,OAAa,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAyDpC,QAAA,MAAM,MAAM,qBAMX,CAAC;AAOF,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCrF;AAED,wBAAgB,eAAe,SAW9B;AAED,eAAe,MAAM,CAAC"}

package/lib/utils/logger.js

@@ -3,12 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.compressOldLogs = compressOldLogs;
 exports.default = void 0;
+exports.zipFolder = zipFolder;
 var _dateFns = require("date-fns");
 var _fs = require("fs");
 var _path = _interopRequireDefault(require("path"));
-var _pinoMultiStream = _interopRequireDefault(require("pino-multi-stream"));
+var _pino = _interopRequireDefault(require("pino"));
 var _core = _interopRequireDefault(require("../app/core"));
+var _archiver = _interopRequireDefault(require("archiver"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let loggerInstance = null;
 const createLogger = () => {
@@ -34,13 +37,18 @@ const createLogger = () => {
   }, {
     level: 'trace',
     stream: (0, _fs.createWriteStream)(basePath + '/trace' + _core.default.settings.getLogger().fileformat)
+  }, {
+    level: 'debug',
+    stream: (0, _fs.createWriteStream)(basePath + '/debug' + _core.default.settings.getLogger().fileformat)
   }];
   _core.default.settings.getLogger().console ?? streams.push({
     stream: process.stdout
   });
-  return (0, _pinoMultiStream.default)({
-    streams
-  });
+  return (0, _pino.default)({
+    level: _core.default.settings.getLogger().level,
+    // Define o nível de log
+    timestamp: _pino.default.stdTimeFunctions.isoTime
+  }, _pino.default.multistream(streams));
 };
 const logger = () => {
   if (!loggerInstance) {
@@ -48,4 +56,49 @@ const logger = () => {
   }
   return loggerInstance;
 };
+
+/**
+ * Compacta uma pasta em um arquivo zip.
+ * @param sourceDir Caminho da pasta a ser compactada.
+ * @param zipFilePath Caminho de saída do arquivo zip.
+ */
+async function zipFolder(sourceDir, zipFilePath) {
+  return new Promise((resolve, reject) => {
+    const output = (0, _fs.createWriteStream)(zipFilePath);
+    const archive = (0, _archiver.default)('zip', {
+      zlib: {
+        level: 9
+      } // nível de compressão
+    });
+    output.on('close', () => {
+      console.log(`✔ Arquivo zip criado com sucesso: ${zipFilePath} (${archive.pointer()} bytes)`);
+      resolve();
+    });
+    output.on('end', () => {
+      console.log('🟡 Arquivo de saída foi fechado.');
+    });
+    archive.on('warning', err => {
+      if (err.code === 'ENOENT') {
+        console.warn('Aviso:', err);
+      } else {
+        reject(err);
+      }
+    });
+    archive.on('error', err => {
+      reject(err);
+    });
+    archive.pipe(output);
+    archive.directory(sourceDir, false); // false = não inclui o caminho completo
+    archive.finalize();
+  });
+}
+function compressOldLogs() {
+  const logDir = _core.default.settings.getLogger().path;
+  const zipFilePath = _path.default.join(logDir, `logs-${(0, _dateFns.format)(new Date(), 'dd-MM-yyyy')}.zip`);
+  zipFolder(logDir, zipFilePath).then(() => {
+    logger().info(`✔ Logs antigos compactados em: ${zipFilePath}`);
+  }).catch(err => {
+    logger().error('❌ Erro ao compactar logs antigos:', err);
+  });
+}
 var _default = exports.default = logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.9151",
+  "version": "2.0.9791",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",
@@ -27,6 +27,7 @@
     "@sequelize/core": "^7.0.0-alpha.37",
     "@types/node-jose": "^1.1.13",
     "amqplib": "^0.10.4",
+    "archiver": "^7.0.1",
     "axios": "^1.7.5",
     "bullmq": "^5.12.11",
     "cors": "^2.8.5",
@@ -37,6 +38,7 @@
     "express-jwt": "^8.4.1",
     "express-requests-logger": "^4.0.1",
     "fs": "^0.0.1-security",
+    "install": "^0.13.0",
     "lodash": "^4.17.21",
     "mariadb": "^3.3.1",
     "multer": "^1.4.5-lts.1",
@@ -44,6 +46,7 @@
     "node-cache": "^5.1.2",
     "node-jose": "^2.2.0",
     "node-schedule": "^2.1.1",
+    "npm": "^11.3.0",
     "pino": "^9.3.2",
     "pino-http": "^10.2.0",
     "pino-multi-stream": "^6.0.0",
@@ -61,6 +64,7 @@
     "@babel/preset-typescript": "^7.24.7",
     "@babel/register": "^7.24.6",
     "@types/amqplib": "^0.10.5",
+    "@types/archiver": "^6.0.3",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/express-requests-logger": "^4.0.0",
@@ -85,6 +89,6 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.5.4",
-    "vitest": "^2.0.5"
+    "vitest": "^3.1.3"
   }
-}
+}