diff --git a/Docker/.env.example b/Docker/.env.example index 392c6f3e..af8927d8 100644 --- a/Docker/.env.example +++ b/Docker/.env.example @@ -1,5 +1,3 @@ -SERVER_URL='' # ex.: http://localhost:3333 - CORS_ORIGIN='*' # Or separate by commas - ex.: 'yourdomain1.com, yourdomain2.com' CORS_METHODS='POST,GET,PUT,DELETE' CORS_CREDENTIALS=true diff --git a/Dockerfile b/Dockerfile index 497d1507..91c770c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,87 +13,88 @@ COPY ./package.json . ENV DOCKER_ENV=true -ENV SERVER_TYPE="http" -ENV SERVER_PORT=8080 -ENV SERVER_URL=$SERVER_URL - -ENV CORS_ORIGIN="*" -ENV CORS_METHODS="POST,GET,PUT,DELETE" +ENV CORS_ORIGIN=* +ENV CORS_METHODS=POST,GET,PUT,DELETE ENV CORS_CREDENTIALS=true -ENV LOG_LEVEL=$LOG_LEVEL -ENV LOG_COLOR=$LOG_COLOR +ENV LOG_LEVEL=ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS +ENV LOG_COLOR=true +ENV LOG_BAILEYS=error -ENV DEL_INSTANCE=$DEL_INSTANCE +ENV DEL_INSTANCE=false -ENV STORE_MESSAGES=$STORE_MESSAGE -ENV STORE_MESSAGE_UP=$STORE_MESSAGE_UP -ENV STORE_CONTACTS=$STORE_CONTACTS -ENV STORE_CHATS=$STORE_CHATS +ENV STORE_MESSAGES=true +ENV STORE_MESSAGE_UP=true +ENV STORE_CONTACTS=true +ENV STORE_CHATS=true -ENV CLEAN_STORE_CLEANING_INTERVAL=$CLEAN_STORE_CLEANING_INTERVAL -ENV CLEAN_STORE_MESSAGES=$CLEAN_STORE_MESSAGE -ENV CLEAN_STORE_MESSAGE_UP=$CLEAN_STORE_MESSAGE_UP -ENV CLEAN_STORE_CONTACTS=$CLEAN_STORE_CONTACTS -ENV CLEAN_STORE_CHATS=$CLEAN_STORE_CHATS +ENV CLEAN_STORE_CLEANING_INTERVAL=7200 +ENV CLEAN_STORE_MESSAGES=true +ENV CLEAN_STORE_MESSAGE_UP=true +ENV CLEAN_STORE_CONTACTS=true +ENV CLEAN_STORE_CHATS=true -ENV DATABASE_ENABLED=$DATABASE_ENABLED -ENV DATABASE_CONNECTION_URI=$DATABASE_CONNECTION_URI -ENV DATABASE_CONNECTION_DB_PREFIX_NAME=$DATABASE_CONNECTION_DB_PREFIX_NAME -ENV DATABASE_SAVE_DATA_INSTANCE=$DATABASE_SAVE_DATA_INSTANCE -ENV DATABASE_SAVE_DATA_NEW_MESSAGE=$DATABASE_SAVE_DATA_NEW_MESSAGE -ENV DATABASE_SAVE_MESSAGE_UPDATE=$DATABASE_SAVE_MESSAGE_UPDATE -ENV DATABASE_SAVE_DATA_CONTACTS=$DATABASE_SAVE_DATA_CONTACTS -ENV DATABASE_SAVE_DATA_CHATS=$DATABASE_SAVE_DATA_CHATS +ENV DATABASE_ENABLED=false +ENV DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true +ENV DATABASE_CONNECTION_DB_PREFIX_NAME=evolution -ENV REDIS_ENABLED=$REDIS_ENABLED -ENV REDIS_URI=$REDIS_URI -ENV REDIS_PREFIX_KEY=$REDIS_PREFIX_KEY +ENV DATABASE_SAVE_DATA_INSTANCE=false +ENV DATABASE_SAVE_DATA_NEW_MESSAGE=false +ENV DATABASE_SAVE_MESSAGE_UPDATE=false +ENV DATABASE_SAVE_DATA_CONTACTS=false +ENV DATABASE_SAVE_DATA_CHATS=false -ENV WEBHOOK_GLOBAL_URL=$WEBHOOK_GLOBAL_URL -ENV WEBHOOK_GLOBAL_ENABLED=$WEBHOOK_GLOBAL_ENABLED -ENV WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=$WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS +ENV REDIS_ENABLED=false +ENV REDIS_URI=redis://redis:6379 +ENV REDIS_PREFIX_KEY=evolution -ENV WEBHOOK_EVENTS_APPLICATION_STARTUP=$WEBHOOK_EVENTS_APPLICATION_STARTUP -ENV WEBHOOK_EVENTS_QRCODE_UPDATED=$WEBHOOK_EVENTS_QRCODE_UPDATED -ENV WEBHOOK_EVENTS_MESSAGES_SET=$WEBHOOK_EVENTS_MESSAGES_SET -ENV WEBHOOK_EVENTS_MESSAGES_UPSERT=$WEBHOOK_EVENTS_MESSAGES_UPSERT -ENV WEBHOOK_EVENTS_MESSAGES_UPDATE=$WEBHOOK_EVENTS_MESSAGES_UPDATE -ENV WEBHOOK_EVENTS_MESSAGES_DELETE=$WEBHOOK_EVENTS_MESSAGES_DELETE -ENV WEBHOOK_EVENTS_SEND_MESSAGE=$WEBHOOK_EVENTS_SEND_MESSAGE -ENV WEBHOOK_EVENTS_CONTACTS_SET=$WEBHOOK_EVENTS_CONTACTS_SET -ENV WEBHOOK_EVENTS_CONTACTS_UPSERT=$WEBHOOK_EVENTS_CONTACTS_UPSERT -ENV WEBHOOK_EVENTS_CONTACTS_UPDATE=$WEBHOOK_EVENTS_CONTACTS_UPDATE -ENV WEBHOOK_EVENTS_PRESENCE_UPDATE=$WEBHOOK_EVENTS_PRESENCE_UPDATE -ENV WEBHOOK_EVENTS_CHATS_SET=$WEBHOOK_EVENTS_CHATS_SET -ENV WEBHOOK_EVENTS_CHATS_UPSERT=$WEBHOOK_EVENTS_CHATS_UPSERT -ENV WEBHOOK_EVENTS_CHATS_UPDATE=$WEBHOOK_EVENTS_CHATS_UPDATE -ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=$WEBHOOK_EVENTS_CONNECTION_UPDATE -ENV WEBHOOK_EVENTS_GROUPS_UPSERT=$WEBHOOK_EVENTS_GROUPS_UPSERT -ENV WEBHOOK_EVENTS_GROUPS_UPDATE=$WEBHOOK_EVENTS_GROUPS_UPDATE -ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=$WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE +ENV WEBHOOK_GLOBAL_URL= +ENV WEBHOOK_GLOBAL_ENABLED=false -ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=$WEBHOOK_EVENTS_NEW_JWT_TOKEN +ENV WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=false -ENV CONFIG_SESSION_PHONE_CLIENT=$CONFIG_SESSION_PHONE_CLIENT -ENV CONFIG_SESSION_PHONE_NAME=$CONFIG_SESSION_PHONE_NAME +ENV WEBHOOK_EVENTS_APPLICATION_STARTUP=false +ENV WEBHOOK_EVENTS_QRCODE_UPDATED=true +ENV WEBHOOK_EVENTS_MESSAGES_SET=true +ENV WEBHOOK_EVENTS_MESSAGES_UPSERT=true +ENV WEBHOOK_EVENTS_MESSAGES_UPDATE=true +ENV WEBHOOK_EVENTS_MESSAGES_DELETE=true +ENV WEBHOOK_EVENTS_SEND_MESSAGE=true +ENV WEBHOOK_EVENTS_CONTACTS_SET=true +ENV WEBHOOK_EVENTS_CONTACTS_UPSERT=true +ENV WEBHOOK_EVENTS_CONTACTS_UPDATE=true +ENV WEBHOOK_EVENTS_PRESENCE_UPDATE=true +ENV WEBHOOK_EVENTS_CHATS_SET=true +ENV WEBHOOK_EVENTS_CHATS_UPSERT=true +ENV WEBHOOK_EVENTS_CHATS_UPDATE=true +ENV WEBHOOK_EVENTS_CHATS_DELETE=true +ENV WEBHOOK_EVENTS_GROUPS_UPSERT=true +ENV WEBHOOK_EVENTS_GROUPS_UPDATE=true +ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true +ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=true -ENV QRCODE_LIMIT=$QRCODE_LIMIT +ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false -ENV AUTHENTICATION_TYPE=$AUTHENTICATION_TYPE +ENV CONFIG_SESSION_PHONE_CLIENT=Evolution +ENV CONFIG_SESSION_PHONE_NAME=chrome -ENV AUTHENTICATION_API_KEY=$AUTHENTICATION_API_KEY -ENV AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=$AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES +ENV QRCODE_LIMIT=30 -ENV AUTHENTICATION_JWT_EXPIRIN_IN=$AUTHENTICATION_JWT_EXPIRIN_IN -ENV AUTHENTICATION_JWT_SECRET="L=0YWt]b2w[WF>#>:&E`" +ENV AUTHENTICATION_TYPE=apikey -ENV AUTHENTICATION_INSTANCE_NAME=$AUTHENTICATION_INSTANCE_NAME -ENV AUTHENTICATION_INSTANCE_WEBHOOK_URL=$AUTHENTICATION_INSTANCE_WEBHOOK_URL -ENV AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID=$AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID -ENV AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN=$AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN -ENV AUTHENTICATION_INSTANCE_CHATWOOT_URL=$AUTHENTICATION_INSTANCE_CHATWOOT_URL -ENV AUTHENTICATION_INSTANCE_MODE=$AUTHENTICATION_INSTANCE_MODE +ENV AUTHENTICATION_API_KEY=B6D711FCDE4D4FD5936544120E713976 +ENV AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true + +ENV AUTHENTICATION_JWT_EXPIRIN_IN=0 +ENV AUTHENTICATION_JWT_SECRET=L0YWtjb2w554WFqPG + +ENV AUTHENTICATION_INSTANCE_MODE=server + +ENV AUTHENTICATION_INSTANCE_NAME=evolution +ENV AUTHENTICATION_INSTANCE_WEBHOOK_URL= +ENV AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID=1 +ENV AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN=123456 +ENV AUTHENTICATION_INSTANCE_CHATWOOT_URL= RUN npm install diff --git a/src/config/env.config.ts b/src/config/env.config.ts index ac608ede..76149199 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -1,10 +1,9 @@ import { readFileSync } from 'fs'; import { load } from 'js-yaml'; import { join } from 'path'; -import { SRC_DIR } from './path.config'; import { isBooleanString } from 'class-validator'; -export type HttpServer = { TYPE: 'http' | 'https'; PORT: number; URL: string }; +export type HttpServer = { TYPE: 'http' | 'https'; PORT: number }; export type HttpMethods = 'POST' | 'GET' | 'PUT' | 'DELETE'; export type Cors = { @@ -174,7 +173,6 @@ export class ConfigService { SERVER: { TYPE: process.env.SERVER_TYPE as 'http' | 'https', PORT: Number.parseInt(process.env.SERVER_PORT), - URL: process.env.SERVER_URL, }, CORS: { ORIGIN: process.env.CORS_ORIGIN.split(','), diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index bd694790..98ad8d17 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -342,7 +342,6 @@ export class WAStartupService { public async sendDataWebhook(event: Events, data: T, local = true) { const webhookGlobal = this.configService.get('WEBHOOK'); - const urlServer = this.configService.get('SERVER').URL; const webhookLocal = this.localWebhook.events; const we = event.replace(/[\.-]/gm, '_').toUpperCase(); const transformedWe = we.replace(/_/gm, '-').toLowerCase(); @@ -367,7 +366,6 @@ export class WAStartupService { instance: this.instance.name, data, destination: this.localWebhook.url, - urlServer, }); } @@ -379,7 +377,6 @@ export class WAStartupService { instance: this.instance.name, data, destination: this.localWebhook.url, - urlServer, }); } } catch (error) { @@ -427,7 +424,6 @@ export class WAStartupService { instance: this.instance.name, data, destination: localUrl, - urlServer, }); } @@ -439,7 +435,6 @@ export class WAStartupService { instance: this.instance.name, data, destination: localUrl, - urlServer, }); } } catch (error) {