From 7e57d20ebf4826c0f7ddf71be2f16e1e3d58ce51 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Fri, 28 Mar 2025 07:48:50 -0300 Subject: [PATCH] fix(services): remove unnecessary comments and improve URL configuration in GBCoreService and GBMinService --- packages/core.gbapp/services/GBCoreService.ts | 14 +++++++------- packages/core.gbapp/services/GBMinService.ts | 7 ++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index b558c37c6..be4aaac69 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -129,12 +129,12 @@ export class GBCoreService implements IGBCoreService { let password: string | undefined; let storage: string | undefined; - // Validar o dialeto + if (!['mssql', 'postgres', 'sqlite'].includes(this.dialect)) { throw new Error(`Unknown or unsupported dialect: ${this.dialect}.`); } - // Configurações específicas para cada dialeto + if (this.dialect === 'mssql' || this.dialect === 'postgres') { host = GBConfigService.get('STORAGE_SERVER'); database = GBConfigService.get('STORAGE_NAME'); @@ -159,7 +159,7 @@ export class GBCoreService implements IGBCoreService { } } - // Configuração de logging + const logging: boolean | Function = GBConfigService.get('STORAGE_LOGGING') === 'true' ? (str: string): void => { @@ -167,14 +167,14 @@ export class GBCoreService implements IGBCoreService { } : false; - // Configuração de encrypt (específico para MSSQL) + const encrypt: boolean = GBConfigService.get('STORAGE_ENCRYPT') === 'true'; - // Configuração do pool + const acquireStr = GBConfigService.get('STORAGE_ACQUIRE_TIMEOUT'); const acquire = acquireStr ? parseInt(acquireStr, 10) : 10000; // Valor padrão de 10 segundos - // Configuração do Sequelize + const sequelizeOptions: SequelizeOptions = { define: { freezeTableName: true, @@ -201,7 +201,7 @@ export class GBCoreService implements IGBCoreService { }, }; - // Inicializar o Sequelize + this.sequelize = new Sequelize(database, username, password, sequelizeOptions); } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 81084bf6e..eb561e98f 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -731,7 +731,12 @@ export class GBMinService { }; if (GBConfigService.get('GB_MODE') !== 'legacy') { - config['domain'] = `http://localhost:${GBConfigService.get('PORT')}/directline/${botId}`; + const url = + process.env.BOT_URL || + `http://localhost:${GBConfigService.get('PORT')}`; + + config['domain'] = urlJoin(url, 'directline', botId); + } else { const webchatTokenContainer = await this.getWebchatToken(instance); config['conversationId'] = webchatTokenContainer.conversationId;