From f9fda6af75afc37295f71447bea634cfdb7a2d9d Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Tue, 19 Sep 2023 17:22:15 -0300 Subject: [PATCH] Update env.config.ts --- src/config/env.config.ts | 63 ++++++++++++---------------------------- 1 file changed, 18 insertions(+), 45 deletions(-) diff --git a/src/config/env.config.ts b/src/config/env.config.ts index 873c54ce..9c63b893 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -70,10 +70,6 @@ export type Websocket = { ENABLED: boolean; }; -export type Chatwoot = { - USE_REPLY_ID: boolean; -}; - export type EventsWebhook = { APPLICATION_STARTUP: boolean; QRCODE_UPDATED: boolean; @@ -96,11 +92,6 @@ export type EventsWebhook = { GROUP_PARTICIPANTS_UPDATE: boolean; CALL: boolean; NEW_JWT_TOKEN: boolean; - TYPEBOT_START: boolean; - TYPEBOT_CHANGE_STATUS: boolean; - CHAMA_AI_ACTION: boolean; - ERRORS: boolean; - ERRORS_WEBHOOK: string; }; export type ApiKey = { KEY: string }; @@ -143,7 +134,6 @@ export interface Env { QRCODE: QrCode; AUTHENTICATION: Auth; PRODUCTION?: Production; - CHATWOOT?: Chatwoot; } export type Key = keyof Env; @@ -176,17 +166,17 @@ export class ConfigService { return { SERVER: { TYPE: process.env.SERVER_TYPE as 'http' | 'https', - PORT: Number.parseInt(process.env.SERVER_PORT) || 8080, + PORT: Number.parseInt(process.env.SERVER_PORT), URL: process.env.SERVER_URL, }, CORS: { - ORIGIN: process.env.CORS_ORIGIN.split(',') || ['*'], - METHODS: (process.env.CORS_METHODS.split(',') as HttpMethods[]) || ['POST', 'GET', 'PUT', 'DELETE'], + ORIGIN: process.env.CORS_ORIGIN.split(','), + METHODS: process.env.CORS_METHODS.split(',') as HttpMethods[], CREDENTIALS: process.env?.CORS_CREDENTIALS === 'true', }, SSL_CONF: { - PRIVKEY: process.env?.SSL_CONF_PRIVKEY || '', - FULLCHAIN: process.env?.SSL_CONF_FULLCHAIN || '', + PRIVKEY: process.env?.SSL_CONF_PRIVKEY, + FULLCHAIN: process.env?.SSL_CONF_FULLCHAIN, }, STORE: { MESSAGES: process.env?.STORE_MESSAGES === 'true', @@ -205,8 +195,8 @@ export class ConfigService { }, DATABASE: { CONNECTION: { - URI: process.env.DATABASE_CONNECTION_URI || '', - DB_PREFIX_NAME: process.env.DATABASE_CONNECTION_DB_PREFIX_NAME || 'evolution', + URI: process.env.DATABASE_CONNECTION_URI, + DB_PREFIX_NAME: process.env.DATABASE_CONNECTION_DB_PREFIX_NAME, }, ENABLED: process.env?.DATABASE_ENABLED === 'true', SAVE_DATA: { @@ -219,36 +209,27 @@ export class ConfigService { }, REDIS: { ENABLED: process.env?.REDIS_ENABLED === 'true', - URI: process.env.REDIS_URI || '', - PREFIX_KEY: process.env.REDIS_PREFIX_KEY || 'evolution', + URI: process.env.REDIS_URI, + PREFIX_KEY: process.env.REDIS_PREFIX_KEY, }, RABBITMQ: { ENABLED: process.env?.RABBITMQ_ENABLED === 'true', - URI: process.env.RABBITMQ_URI || '', + URI: process.env.RABBITMQ_URI, }, WEBSOCKET: { ENABLED: process.env?.WEBSOCKET_ENABLED === 'true', }, LOG: { - LEVEL: (process.env?.LOG_LEVEL.split(',') as LogLevel[]) || [ - 'ERROR', - 'WARN', - 'DEBUG', - 'INFO', - 'LOG', - 'VERBOSE', - 'DARK', - 'WEBHOOKS', - ], + LEVEL: process.env?.LOG_LEVEL.split(',') as LogLevel[], COLOR: process.env?.LOG_COLOR === 'true', BAILEYS: (process.env?.LOG_BAILEYS as LogBaileys) || 'error', }, - DEL_INSTANCE: isBooleanString(process.env?.DEL_INSTANCE) - ? process.env.DEL_INSTANCE === 'true' + DEL_INSTANCE: process.env?.DEL_INSTANCE === 'true' + ? 5 : Number.parseInt(process.env.DEL_INSTANCE) || false, WEBHOOK: { GLOBAL: { - URL: process.env?.WEBHOOK_GLOBAL_URL || '', + URL: process.env?.WEBHOOK_GLOBAL_URL, ENABLED: process.env?.WEBHOOK_GLOBAL_ENABLED === 'true', WEBHOOK_BY_EVENTS: process.env?.WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS === 'true', }, @@ -274,37 +255,29 @@ export class ConfigService { GROUP_PARTICIPANTS_UPDATE: process.env?.WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true', CALL: process.env?.WEBHOOK_EVENTS_CALL === 'true', NEW_JWT_TOKEN: process.env?.WEBHOOK_EVENTS_NEW_JWT_TOKEN === 'true', - TYPEBOT_START: process.env?.WEBHOOK_EVENTS_TYPEBOT_START === 'true', - TYPEBOT_CHANGE_STATUS: process.env?.WEBHOOK_EVENTS_TYPEBOT_CHANGE_STATUS === 'true', - CHAMA_AI_ACTION: process.env?.WEBHOOK_EVENTS_CHAMA_AI_ACTION === 'true', - ERRORS: process.env?.WEBHOOK_EVENTS_ERRORS === 'true', - ERRORS_WEBHOOK: process.env?.WEBHOOK_EVENTS_ERRORS_WEBHOOK || '', }, }, CONFIG_SESSION_PHONE: { CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT || 'Evolution API', - NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'Chrome', + NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'chrome', }, QRCODE: { LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30, COLOR: process.env.QRCODE_COLOR || '#198754', }, AUTHENTICATION: { - TYPE: process.env.AUTHENTICATION_TYPE as 'apikey', + TYPE: process.env.AUTHENTICATION_TYPE as 'jwt', API_KEY: { - KEY: process.env.AUTHENTICATION_API_KEY || 'BQYHJGJHJ', + KEY: process.env.AUTHENTICATION_API_KEY, }, EXPOSE_IN_FETCH_INSTANCES: process.env?.AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES === 'true', JWT: { EXPIRIN_IN: Number.isInteger(process.env?.AUTHENTICATION_JWT_EXPIRIN_IN) ? Number.parseInt(process.env.AUTHENTICATION_JWT_EXPIRIN_IN) : 3600, - SECRET: process.env.AUTHENTICATION_JWT_SECRET || 'L=0YWt]b2w[WF>#>:&E`', + SECRET: process.env.AUTHENTICATION_JWT_SECRET, }, }, - CHATWOOT: { - USE_REPLY_ID: process.env?.USE_REPLY_ID === 'true', - }, }; } }