exodus-framework 2.1.1007 → 2.1.1009

package/lib/services/database.d.ts

@@ -27,9 +27,9 @@ declare class DatabaseService extends Service {
     createDB(hostId: string, name: string): Promise<boolean>;
     deleteDB(hostId: string, name: string): Promise<boolean>;
     hasDB(hostId: string, name: string): Promise<boolean>;
-    migrateServiceEntities(connection: Sequelize): Promise<void>;
-    migrateCoreEntities(connection: Sequelize): Promise<void>;
-    migrateMainEntities(): Promise<void>;
+    execTenantMigrates(connection: Sequelize): Promise<void>;
+    execCoreMigrates(connection: Sequelize): Promise<void>;
+    execServiceMigrate(): Promise<void>;
 }
 export default DatabaseService;
 //# sourceMappingURL=database.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAKpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAkBP,WAAW;YAMV,cAAc;IA6Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,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;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA+BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwBlC,sBAAsB,CAAC,UAAU,EAAE,SAAS;IAoB5C,mBAAmB,CAAC,UAAU,EAAE,SAAS;IAoBzC,mBAAmB;CAejC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAKpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAgCP,WAAW;YAMV,cAAc;IA6Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,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;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA+BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwBlC,kBAAkB,CAAC,UAAU,EAAE,SAAS;IAoBxC,gBAAgB,CAAC,UAAU,EAAE,SAAS;IAoBtC,kBAAkB;CAehC;AAED,eAAe,eAAe,CAAC"}

package/lib/services/database.js

@@ -33,9 +33,20 @@ class DatabaseService extends _app.Service {
       await _utils.mainDb.sync({
         alter: true
       });
-      await this.migrateMainEntities(); // migrar atualizações do serviço
-      await this.migrateServiceEntities(_utils.mainDb); //migrar atualizações do tenant para o serviço principal (este ainda é usado como serviço/tenant para supersu)
+      await this.execServiceMigrate(); // migrar atualizações do serviço
+      await this.execTenantMigrates(_utils.mainDb); //migrar atualizações do tenant para o serviço principal (este ainda é usado como serviço/tenant para supersu)
       this.log('✅ Connected service database sucessfully', 'success');
+      if (process.env.DB_INIT_WITH_MIGRATE === 'true') {
+        this.log('⌚ Migrando entidades do serviço...', 'warning');
+        const tenants = await this.getTenantIds();
+        for (const tenantId of tenants) {
+          const sequelize = await this.getConnection(tenantId);
+          if (sequelize) {
+            this.log(`⌚ Migrando entidades do tenant ${tenantId}...`, 'warning');
+            await this.execTenantMigrates(sequelize);
+          }
+        }
+      }
       return true;
     } catch (error) {
       _logger.default.logger().error(error, `Not connected Sequelize to database`);
@@ -68,8 +79,8 @@ class DatabaseService extends _app.Service {
     }
     const password = data.payload;
     const connection = await this.createConnection(address, port, database, dbHost.username, password, dbHost.dialect);
-    await this.migrateCoreEntities(connection);
-    await this.migrateServiceEntities(connection);
+    await this.execCoreMigrates(connection);
+    await this.execTenantMigrates(connection);
     this.connections.set(tenantId, connection);
     this.log(`Conexão para o tenant ${tenantId} foi criada com sucesso`, 'success');
   }
@@ -188,8 +199,8 @@ class DatabaseService extends _app.Service {
           await connection.query(`CREATE DATABASE ${dbQueryName};`);
           this.log(`Database "${dbQueryName}" has been created.`);
           await connection.query(`USE ${dbQueryName};`);
-          await this.migrateCoreEntities(connection);
-          await this.migrateServiceEntities(connection);
+          await this.execCoreMigrates(connection);
+          await this.execTenantMigrates(connection);
           return true;
         } else {
           this.log(`Database "${dbQueryName}" already exists.`);
@@ -244,7 +255,7 @@ class DatabaseService extends _app.Service {
    * @param {Sequelize} connection
    * @memberof DatabaseService
    */
-  async migrateServiceEntities(connection) {
+  async execTenantMigrates(connection) {
     const migrations = _app.Core.settings.getDatabase().migrationsPath;
     const umzung = new _umzug.Umzug({
       migrations: {
@@ -265,7 +276,7 @@ class DatabaseService extends _app.Service {
    * @param {Sequelize} connection
    * @memberof DatabaseService
    */
-  async migrateCoreEntities(connection) {
+  async execCoreMigrates(connection) {
     const migrations = _path.default.resolve(__dirname, '../models/migrations');
     const umzung = new _umzug.Umzug({
       migrations: {
@@ -285,7 +296,7 @@ class DatabaseService extends _app.Service {
    *
    * @memberof DatabaseService
    */
-  async migrateMainEntities() {
+  async execServiceMigrate() {
     const path = `${_app.Core.settings.getDatabase().migrationsPath}/main`;
     (0, _fs.mkdirSync)(path, {
       recursive: true

package/lib/services/logger.d.ts

@@ -2,17 +2,17 @@ import { Logger } from 'pino';
 import Managed from '../app/classes/managed';
 declare class LoggerService extends Managed {
     private static loggerInstance;
-    private path;
+    private static path;
     onInit(): Promise<void>;
     onMasterInit(): Promise<void>;
     private createLogger;
-    reservedFileLog(title: string, filename: string, ...args: any[]): Promise<void>;
+    static reservedFileLog(title: string, filename: string, ...args: any[]): Promise<void>;
     static logger(): Logger<never>;
     private compressLogFolder;
     private backupLogs;
     private cleanBackupLogs;
-    private toObject;
-    private writeToLog;
+    private static toObject;
+    private static writeToLog;
 }
 export default LoggerService;
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/services/logger.ts"],"names":[],"mappings":"AAEA,OAAa,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAQ7C,cAAM,aAAc,SAAQ,OAAO;IACjC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAgB;IAC7C,OAAO,CAAC,IAAI,CAAS;IAER,MAAM;IAON,YAAY;YAOX,YAAY;IA2Db,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;WAO9D,MAAM;YAIN,iBAAiB;YA2BjB,UAAU;YA2BV,eAAe;IAyB7B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;CAOnB;AACD,eAAe,aAAa,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/services/logger.ts"],"names":[],"mappings":"AAEA,OAAa,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAQ7C,cAAM,aAAc,SAAQ,OAAO;IACjC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAgB;IAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAS;IAEf,MAAM;IAON,YAAY;YAOX,YAAY;WA2DN,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;WAOrE,MAAM;YAIN,iBAAiB;YA2BjB,UAAU;YA2BV,eAAe;IAyB7B,OAAO,CAAC,MAAM,CAAC,QAAQ;IAIvB,OAAO,CAAC,MAAM,CAAC,UAAU;CAO1B;AACD,eAAe,aAAa,CAAC"}

package/lib/services/logger.js

@@ -18,7 +18,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class LoggerService extends _managed.default {
   static loggerInstance;
-  path;
+  static path;
   async onInit() {
     super.onInit();
     if (!LoggerService.loggerInstance) {
@@ -34,8 +34,8 @@ class LoggerService extends _managed.default {
     await this.cleanBackupLogs();
   }
   async createLogger() {
-    this.path = _path.default.resolve(_core.default.settings.getLogger().path, (0, _dateFns.format)(_exodus.default.getStartedAt(), 'dd-MM-yyyy'), (0, _dateFns.format)(_exodus.default.getStartedAt(), 'HH_mm'));
-    await (0, _promises.mkdir)(this.path, {
+    LoggerService.path = _path.default.resolve(_core.default.settings.getLogger().path, (0, _dateFns.format)(_exodus.default.getStartedAt(), 'dd-MM-yyyy'), (0, _dateFns.format)(_exodus.default.getStartedAt(), 'HH_mm'));
+    await (0, _promises.mkdir)(LoggerService.path, {
       recursive: true
     });
     const isDev = process.argv.includes('--dev');
@@ -43,42 +43,42 @@ class LoggerService extends _managed.default {
       level: 'info',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'info.json'),
+        destination: _path.default.join(LoggerService.path, 'info.json'),
         level: 'info'
       }
     }, {
       level: 'error',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'error.json'),
+        destination: _path.default.join(LoggerService.path, 'error.json'),
         level: 'error'
       }
     }, {
       level: 'debug',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'debug.json'),
+        destination: _path.default.join(LoggerService.path, 'debug.json'),
         level: 'debug'
       }
     }, {
       level: 'warn',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'warn.json'),
+        destination: _path.default.join(LoggerService.path, 'warn.json'),
         level: 'warn'
       }
     }, {
       level: 'fatal',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'fatal.json'),
+        destination: _path.default.join(LoggerService.path, 'fatal.json'),
         level: 'fatal'
       }
     }, {
       level: 'trace',
       target: '../utils/logger-transport' + (isDev ? '.ts' : '.js'),
       options: {
-        destination: _path.default.join(this.path, 'trace.json'),
+        destination: _path.default.join(LoggerService.path, 'trace.json'),
         level: 'trace'
       }
     }];
@@ -99,10 +99,10 @@ class LoggerService extends _managed.default {
       targets
     }));
   }
-  async reservedFileLog(title, filename, ...args) {
+  static async reservedFileLog(title, filename, ...args) {
     if (args.length < 1) return;
-    const obj = this.toObject(args);
-    this.writeToLog(filename, title, JSON.stringify(obj, null, 2));
+    const obj = LoggerService.toObject(args);
+    LoggerService.writeToLog(filename, title, JSON.stringify(obj, null, 2));
   }
   static logger() {
     return LoggerService.loggerInstance;
@@ -180,14 +180,14 @@ class LoggerService extends _managed.default {
     }
     this.log(`🗑️  Limpeza de ${count} backups concluída`, 'success');
   }
-  toObject(data) {
+  static toObject(data) {
     return JSON.parse(JSON.stringify(data, null, 2));
   }
-  writeToLog(filename, message, data) {
+  static writeToLog(filename, message, data) {
     const date = new Date();
     const logMessage = `[${(0, _dateFns.format)(date, 'HH:mm:ss')}][${message}]: ${data}\n`;
-    console.log('salvando', `${this.path}/${filename}.log`);
-    fs.appendFileSync(`${this.path}/${filename}.log`, logMessage);
+    console.log('salvando', `${LoggerService.path}/${filename}.log`);
+    fs.appendFileSync(`${LoggerService.path}/${filename}.log`, logMessage);
   }
 }
 var _default = exports.default = LoggerService;

package/package.json

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