Merge remote-tracking branch 'refs/remotes/evo/develop'

# Conflicts:
#	prisma/mysql-schema.prisma
#	src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

.env.example

@@ -26,7 +26,7 @@ DEL_INSTANCE=false
 
 # Provider: postgresql | mysql
 DATABASE_PROVIDER=postgresql
-DATABASE_CONNECTION_URI='postgresql://user:pass@localhost:5432/evolution?schema=public'
+DATABASE_CONNECTION_URI='postgresql://user:pass@postgres:5432/evolution?schema=public'
 # Client name for the database connection
 # It is used to separate an API installation from another that uses the same database.
 DATABASE_CONNECTION_CLIENT_NAME=evolution_exchange

docker-compose.yaml

@@ -34,12 +34,15 @@ services:
     image: postgres:15
     networks:
       - evolution-net
-    command: ["postgres", "-c", "max_connections=1000"]
+    command: ["postgres", "-c", "max_connections=1000", "-c", "listen_addresses=*"]
     restart: always
     ports:
       - 5432:5432
     environment:
-      - POSTGRES_PASSWORD=PASSWORD
+      - POSTGRES_USER=user
+      - POSTGRES_PASSWORD=pass
+      - POSTGRES_DB=evolution
+      - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
       - postgres_data:/var/lib/postgresql/data
     expose:

local_install.sh

@@ -0,0 +1,150 @@
+#!/bin/bash
+
+# Definir cores para melhor legibilidade
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Função para log
+log() {
+    echo -e "${GREEN}[INFO]${NC} $1"
+}
+log_error() {
+    echo -e "${RED}[ERROR]${NC} $1"
+}
+log_warning() {
+    echo -e "${YELLOW}[WARNING]${NC} $1"
+}
+
+# Verificar se está rodando como root
+if [ "$(id -u)" = "0" ]; then
+    log_error "Este script não deve ser executado como root"
+    exit 1
+fi
+
+# Verificar sistema operacional
+OS="$(uname -s)"
+case "${OS}" in
+    Linux*)     
+        if [ ! -x "$(command -v curl)" ]; then
+            log_warning "Curl não está instalado. Tentando instalar..."
+            if [ -x "$(command -v apt-get)" ]; then
+                sudo apt-get update && sudo apt-get install -y curl
+            elif [ -x "$(command -v yum)" ]; then
+                sudo yum install -y curl
+            else
+                log_error "Não foi possível instalar curl automaticamente. Por favor, instale manualmente."
+                exit 1
+            fi
+        fi
+        ;;
+    Darwin*)    
+        if [ ! -x "$(command -v curl)" ]; then
+            log_error "Curl não está instalado. Por favor, instale o Xcode Command Line Tools."
+            exit 1
+        fi
+        ;;
+    *)          
+        log_error "Sistema operacional não suportado: ${OS}"
+        exit 1
+        ;;
+esac
+
+# Verificar conexão com a internet antes de prosseguir
+if ! ping -c 1 8.8.8.8 &> /dev/null; then
+    log_error "Sem conexão com a internet. Por favor, verifique sua conexão."
+    exit 1
+fi
+
+# Adicionar verificação de espaço em disco
+REQUIRED_SPACE=1000000 # 1GB em KB
+AVAILABLE_SPACE=$(df -k . | awk 'NR==2 {print $4}')
+if [ $AVAILABLE_SPACE -lt $REQUIRED_SPACE ]; then
+    log_error "Espaço em disco insuficiente. Necessário pelo menos 1GB livre."
+    exit 1
+fi
+
+# Adicionar tratamento de erro para comandos npm
+npm_install_with_retry() {
+    local max_attempts=3
+    local attempt=1
+    
+    while [ $attempt -le $max_attempts ]; do
+        log "Tentativa $attempt de $max_attempts para npm install"
+        if npm install; then
+            return 0
+        fi
+        attempt=$((attempt + 1))
+        [ $attempt -le $max_attempts ] && log_warning "Falha na instalação. Tentando novamente em 5 segundos..." && sleep 5
+    done
+    
+    log_error "Falha ao executar npm install após $max_attempts tentativas"
+    return 1
+}
+
+# Adicionar timeout para comandos
+execute_with_timeout() {
+    timeout 300 $@ || log_error "Comando excedeu o tempo limite de 5 minutos: $@"
+}
+
+# Verificar se o NVM já está instalado
+if [ -d "$HOME/.nvm" ]; then
+    log "NVM já está instalado."
+else
+    log "Instalando NVM..."
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+fi
+
+# Carregar o NVM no ambiente atual
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+
+# Verificar se a versão do Node.js já está instalada
+if command -v node >/dev/null 2>&1 && [ "$(node -v)" = "v20.10.0" ]; then
+    log "Node.js v20.10.0 já está instalado."
+else
+    log "Instalando Node.js v20.10.0..."
+    nvm install v20.10.0
+fi
+
+nvm use v20.10.0
+
+# Verificar as versões instaladas
+log "Verificando as versões instaladas:"
+log "Node.js: $(node -v)"
+log "npm: $(npm -v)"
+
+# Instala dependências do projeto
+log "Instalando dependências do projeto..."
+rm -rf node_modules
+npm install
+
+# Deploy do banco de dados
+log "Deploy do banco de dados..."
+npm run db:generate
+npm run db:deploy
+
+# Iniciar o projeto
+log "Iniciando o projeto..."
+if [ "$1" = "-dev" ]; then
+    npm run dev:server
+else
+    npm run build
+    npm run start:prod
+fi
+
+log "Instalação concluída com sucesso!"
+
+# Criar arquivo de log
+LOGFILE="./installation_log_$(date +%Y%m%d_%H%M%S).log"
+exec 1> >(tee -a "$LOGFILE")
+exec 2>&1
+
+# Adicionar trap para limpeza em caso de interrupção
+cleanup() {
+    log "Limpando recursos temporários..."
+    # Adicione comandos de limpeza aqui
+}
+trap cleanup EXIT

package.json

@@ -13,8 +13,10 @@
     "lint": "eslint --fix --ext .ts src",
     "db:generate": "node runWithProvider.js \"npx prisma generate --schema ./prisma/DATABASE_PROVIDER-schema.prisma\"",
     "db:deploy": "node runWithProvider.js \"rm -rf ./prisma/migrations && cp -r ./prisma/DATABASE_PROVIDER-migrations ./prisma/migrations && npx prisma migrate deploy --schema ./prisma/DATABASE_PROVIDER-schema.prisma\"",
+    "db:deploy:win": "node runWithProvider.js \"xcopy /E /I prisma\\DATABASE_PROVIDER-migrations prisma\\migrations && npx prisma migrate deploy --schema prisma\\DATABASE_PROVIDER-schema.prisma\"",
     "db:studio": "node runWithProvider.js \"npx prisma studio --schema ./prisma/DATABASE_PROVIDER-schema.prisma\"",
-    "db:migrate:dev": "node runWithProvider.js \"rm -rf ./prisma/migrations && cp -r ./prisma/DATABASE_PROVIDER-migrations ./prisma/migrations && npx prisma migrate dev --schema ./prisma/DATABASE_PROVIDER-schema.prisma && cp -r ./prisma/migrations/* ./prisma/DATABASE_PROVIDER-migrations\""
+    "db:migrate:dev": "node runWithProvider.js \"rm -rf ./prisma/migrations && cp -r ./prisma/DATABASE_PROVIDER-migrations ./prisma/migrations && npx prisma migrate dev --schema ./prisma/DATABASE_PROVIDER-schema.prisma && cp -r ./prisma/migrations/* ./prisma/DATABASE_PROVIDER-migrations\"",
+    "db:migrate:dev:win": "node runWithProvider.js \"xcopy /E /I prisma\\DATABASE_PROVIDER-migrations prisma\\migrations && npx prisma migrate dev --schema prisma\\DATABASE_PROVIDER-schema.prisma\""
   },
   "repository": {
     "type": "git",

prisma/mysql-migrations/20241108101333_fix_message_status_as_string/migration.sql

@@ -0,0 +1,232 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `createdAt` on the `Chat` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Chat` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Chatwoot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Chatwoot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Contact` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Contact` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Dify` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Dify` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `DifySetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `DifySetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `EvolutionBot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `EvolutionBot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `EvolutionBotSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `EvolutionBotSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Flowise` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Flowise` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `FlowiseSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `FlowiseSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `disconnectionAt` on the `Instance` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Instance` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Instance` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `IntegrationSession` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `IntegrationSession` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `IsOnWhatsapp` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `IsOnWhatsapp` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Label` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Label` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Media` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `OpenaiBot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `OpenaiBot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `OpenaiCreds` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `OpenaiCreds` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `OpenaiSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `OpenaiSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Proxy` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Proxy` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Rabbitmq` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Rabbitmq` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Session` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Setting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Setting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Sqs` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Sqs` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Template` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Template` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Typebot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Typebot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `TypebotSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `TypebotSetting` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Webhook` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Webhook` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `createdAt` on the `Websocket` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+  - You are about to alter the column `updatedAt` on the `Websocket` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
+
+*/
+-- AlterTable
+ALTER TABLE `Chat` ADD COLUMN `unreadMessages` INTEGER NOT NULL DEFAULT 0,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NULL;
+
+-- AlterTable
+ALTER TABLE `Chatwoot` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Contact` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NULL;
+
+-- AlterTable
+ALTER TABLE `Dify` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `DifySetting` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `EvolutionBot` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `EvolutionBotSetting` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Flowise` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `FlowiseSetting` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Instance` MODIFY `disconnectionAt` TIMESTAMP NULL,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NULL;
+
+-- AlterTable
+ALTER TABLE `IntegrationSession` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `IsOnWhatsapp` MODIFY `createdAt` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Label` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Media` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE `Message` MODIFY `status` VARCHAR(30) NULL;
+
+-- AlterTable
+ALTER TABLE `OpenaiBot` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `OpenaiCreds` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `OpenaiSetting` ADD COLUMN `splitMessages` BOOLEAN NULL DEFAULT false,
+    ADD COLUMN `timePerChar` INTEGER NULL DEFAULT 50,
+    MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Proxy` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Rabbitmq` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Session` MODIFY `createdAt` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE `Setting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Sqs` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Template` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Typebot` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NULL;
+
+-- AlterTable
+ALTER TABLE `TypebotSetting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Webhook` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Websocket` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- CreateTable
+CREATE TABLE `Pusher` (
+    `id` VARCHAR(191) NOT NULL,
+    `enabled` BOOLEAN NOT NULL DEFAULT false,
+    `appId` VARCHAR(100) NOT NULL,
+    `key` VARCHAR(100) NOT NULL,
+    `secret` VARCHAR(100) NOT NULL,
+    `cluster` VARCHAR(100) NOT NULL,
+    `useTLS` BOOLEAN NOT NULL DEFAULT false,
+    `events` JSON NOT NULL,
+    `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+    `updatedAt` TIMESTAMP NOT NULL,
+    `instanceId` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `Pusher_instanceId_key`(`instanceId`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateIndex
+CREATE INDEX `Chat_remoteJid_idx` ON `Chat`(`remoteJid`);
+
+-- CreateIndex
+CREATE INDEX `Contact_remoteJid_idx` ON `Contact`(`remoteJid`);
+
+-- CreateIndex
+CREATE INDEX `Setting_instanceId_idx` ON `Setting`(`instanceId`);
+
+-- CreateIndex
+CREATE INDEX `Webhook_instanceId_idx` ON `Webhook`(`instanceId`);
+
+-- AddForeignKey
+ALTER TABLE `Pusher` ADD CONSTRAINT `Pusher_instanceId_fkey` FOREIGN KEY (`instanceId`) REFERENCES `Instance`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- RenameIndex
+ALTER TABLE `Chat` RENAME INDEX `Chat_instanceId_fkey` TO `Chat_instanceId_idx`;
+
+-- RenameIndex
+ALTER TABLE `Contact` RENAME INDEX `Contact_instanceId_fkey` TO `Contact_instanceId_idx`;
+
+-- RenameIndex
+ALTER TABLE `Message` RENAME INDEX `Message_instanceId_fkey` TO `Message_instanceId_idx`;
+
+-- RenameIndex
+ALTER TABLE `MessageUpdate` RENAME INDEX `MessageUpdate_instanceId_fkey` TO `MessageUpdate_instanceId_idx`;
+
+-- RenameIndex
+ALTER TABLE `MessageUpdate` RENAME INDEX `MessageUpdate_messageId_fkey` TO `MessageUpdate_messageId_idx`;

prisma/mysql-schema.prisma

@@ -127,7 +127,7 @@ model Chat {
   unreadMessages Int       @default(0)
   @@index([instanceId])
   @@index([remoteJid])
-  @@unique([remoteJid, instanceId])
+  @@unique([instanceId, remoteJid])
 }
 
 model Contact {

runWithProvider.js

@@ -1,19 +1,31 @@
 const dotenv = require('dotenv');
 const { execSync } = require('child_process');
+const { existsSync } = require('fs');
+
 dotenv.config();
 
 const { DATABASE_PROVIDER } = process.env;
-const databaseProviderDefault = DATABASE_PROVIDER ?? "postgresql"
+const databaseProviderDefault = DATABASE_PROVIDER ?? 'postgresql';
 
 if (!DATABASE_PROVIDER) {
-  console.error(`DATABASE_PROVIDER is not set in the .env file, using default: ${databaseProviderDefault}`);
+  console.warn(`DATABASE_PROVIDER is not set in the .env file, using default: ${databaseProviderDefault}`);
-  // process.exit(1);
 }
 
-const command = process.argv
+let command = process.argv
   .slice(2)
   .join(' ')
-  .replace(/\DATABASE_PROVIDER/g, databaseProviderDefault);
+  .replace(/DATABASE_PROVIDER/g, databaseProviderDefault);
+
+if (command.includes('rmdir') && existsSync('prisma\\migrations')) {
+  try {
+    execSync('rmdir /S /Q prisma\\migrations', { stdio: 'inherit' });
+  } catch (error) {
+    console.error(`Error removing directory: prisma\\migrations`);
+    process.exit(1);
+  }
+} else if (command.includes('rmdir')) {
+  console.warn(`Directory 'prisma\\migrations' does not exist, skipping removal.`);
+}
 
 try {
   execSync(command, { stdio: 'inherit' });

src/api/integrations/channel/meta/whatsapp.business.service.ts

@@ -70,6 +70,13 @@ export class BusinessStartupService extends ChannelStartupService {
     await this.closeClient();
   }
 
+  private isMediaMessage(message: any) {
+    return message.document ||
+      message.image ||
+      message.audio ||
+      message.video
+  }
+
   private async post(message: any, params: string) {
     try {
       let urlServer = this.configService.get<WaBusiness>('WA_BUSINESS').URL;
@@ -301,12 +308,7 @@ export class BusinessStartupService extends ChannelStartupService {
           remoteJid: this.phoneNumber,
           fromMe: received.messages[0].from === received.metadata.phone_number_id,
         };
-        if (
+        if (this.isMediaMessage(received?.messages[0])) {
-          received?.messages[0].document ||
-          received?.messages[0].image ||
-          received?.messages[0].audio ||
-          received?.messages[0].video
-        ) {
           messageRaw = {
             key,
             pushName,
@@ -339,7 +341,7 @@ export class BusinessStartupService extends ChannelStartupService {
                 ? 'audio'
                 : 'video';
 
-              const mimetype = result.headers['content-type'];
+              const mimetype = result.data?.mime_type || result.headers['content-type'];
 
               const contentDisposition = result.headers['content-disposition'];
               let fileName = `${message.messages[0].id}.${mimetype.split('/')[1]}`;
@@ -352,15 +354,19 @@ export class BusinessStartupService extends ChannelStartupService {
 
               const size = result.headers['content-length'] || buffer.data.byteLength;
 
-              const fullName = join(`${this.instance.id}`, received.key.remoteJid, mediaType, fileName);
+              const fullName = join(`${this.instance.id}`, key.remoteJid, mediaType, fileName);
 
               await s3Service.uploadFile(fullName, buffer.data, size, {
                 'Content-Type': mimetype,
               });
 
+              const createdMessage = await this.prismaRepository.message.create({
+                data: messageRaw,
+              });
+
               await this.prismaRepository.media.create({
                 data: {
-                  messageId: received.messages[0].id,
+                  messageId: createdMessage.id,
                   instanceId: this.instanceId,
                   type: mediaType,
                   fileName: fullName,
@@ -371,6 +377,7 @@ export class BusinessStartupService extends ChannelStartupService {
               const mediaUrl = await s3Service.getObjectUrl(fullName);
 
               messageRaw.message.mediaUrl = mediaUrl;
+              messageRaw.message.base64 = buffer.data.toString('base64');
             } catch (error) {
               this.logger.error(['Error on upload file to minio', error?.message, error?.stack]);
             }
@@ -458,16 +465,23 @@ export class BusinessStartupService extends ChannelStartupService {
             },
           });
 
+          const audioMessage = received?.messages[0]?.audio;
+
           if (
             openAiDefaultSettings &&
             openAiDefaultSettings.openaiCredsId &&
             openAiDefaultSettings.speechToText &&
-            received?.message?.audioMessage
+            audioMessage
           ) {
             messageRaw.message.speechToText = await this.openaiService.speechToText(
               openAiDefaultSettings.OpenaiCreds,
-              received,
+              {
-              this.client.updateMediaMessage,
+                message: {
+                  mediaUrl: messageRaw.message.mediaUrl,
+                  ...messageRaw,
+                }
+              },
+              () => {},
             );
           }
         }
@@ -497,9 +511,11 @@ export class BusinessStartupService extends ChannelStartupService {
           }
         }
 
+        if (!this.isMediaMessage(received?.messages[0])) {
           await this.prismaRepository.message.create({
             data: messageRaw,
           });
+        }
 
         const contact = await this.prismaRepository.contact.findFirst({
           where: { instanceId: this.instanceId, remoteJid: key.remoteJid },

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

@@ -1148,6 +1148,7 @@ export class BaileysStartupService extends ChannelStartupService {
 
             this.sendDataWebhook(Events.CHATS_UPSERT, [chatToInsert]);
             if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
+                try {
                   await this.prismaRepository.chat.update({
                 where: {
                   id: existingChat.id,
@@ -1155,6 +1156,10 @@ export class BaileysStartupService extends ChannelStartupService {
                     data: chatToInsert,
                   });
                 }
+                catch(error){
+                  console.log(`Chat insert record ignored: ${chatToInsert.remoteJid} - ${chatToInsert.instanceId}`);
+                }
+            }
           }
 
           const messageRaw = this.prepareMessage(received);
@@ -1487,6 +1492,7 @@ export class BaileysStartupService extends ChannelStartupService {
 
             this.sendDataWebhook(Events.CHATS_UPSERT, [chatToInsert]);
             if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
+              try {
                 await this.prismaRepository.chat.update({
                 where: {
                   id: existingChat.id,
@@ -1494,6 +1500,10 @@ export class BaileysStartupService extends ChannelStartupService {
                   data: chatToInsert,
                 });
               }
+              catch(error){
+                console.log(`Chat insert record ignored: ${chatToInsert.remoteJid} - ${chatToInsert.instanceId}`);
+              }
+            }
           }
         }
       }
@@ -4262,6 +4272,19 @@ export class BaileysStartupService extends ChannelStartupService {
       delete messageRaw.message.documentWithCaptionMessage;
     }
 
+    const quotedMessage = messageRaw?.contextInfo?.quotedMessage;
+    if (quotedMessage) {
+      if (quotedMessage.extendedTextMessage) {
+        quotedMessage.conversation = quotedMessage.extendedTextMessage.text;
+        delete quotedMessage.extendedTextMessage;
+      }
+
+      if (quotedMessage.documentWithCaptionMessage) {
+        quotedMessage.documentMessage = quotedMessage.documentWithCaptionMessage.message.documentMessage;
+        delete quotedMessage.documentWithCaptionMessage;
+      }
+    }
+
     return messageRaw;
   }
 

src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts

@@ -704,7 +704,7 @@ export class ChatwootService {
           conversation = contactConversations.payload.find((conversation) => conversation.inbox_id == filterInbox.id);
           this.logger.verbose(`Found conversation in reopenConversation mode: ${JSON.stringify(conversation)}`);
 
-          if (this.provider.conversationPending) {
+          if (this.provider.conversationPending && conversation.status !== 'open') {
             if (conversation) {
               await client.conversations.toggleStatus({
                 accountId: this.provider.accountId,
@@ -1970,11 +1970,21 @@ export class ChatwootService {
 
           if (body.key.remoteJid.includes('@g.us')) {
             const participantName = body.pushName;
+            const rawPhoneNumber = body.key.participant.split('@')[0];
+            const phoneMatch = rawPhoneNumber.match(/^(\d{2})(\d{2})(\d{4})(\d{4})$/);
+
+            let formattedPhoneNumber: string;
+
+            if (phoneMatch) {
+              formattedPhoneNumber = `+${phoneMatch[1]} (${phoneMatch[2]}) ${phoneMatch[3]}-${phoneMatch[4]}`;
+            } else {
+              formattedPhoneNumber = `+${rawPhoneNumber}`;
+            }
 
             let content: string;
 
             if (!body.key.fromMe) {
-              content = `**${participantName}:**\n\n${bodyMessage}`;
+              content = `**${formattedPhoneNumber} - ${participantName}:**\n\n${bodyMessage}`;
             } else {
               content = `${bodyMessage}`;
             }
@@ -2099,11 +2109,21 @@ export class ChatwootService {
 
         if (body.key.remoteJid.includes('@g.us')) {
           const participantName = body.pushName;
+          const rawPhoneNumber = body.key.participant.split('@')[0];
+          const phoneMatch = rawPhoneNumber.match(/^(\d{2})(\d{2})(\d{4})(\d{4})$/);
+
+          let formattedPhoneNumber: string;
+
+          if (phoneMatch) {
+            formattedPhoneNumber = `+${phoneMatch[1]} (${phoneMatch[2]}) ${phoneMatch[3]}-${phoneMatch[4]}`;
+          } else {
+            formattedPhoneNumber = `+${rawPhoneNumber}`;
+          }
 
           let content: string;
 
           if (!body.key.fromMe) {
-            content = `**${participantName}**\n\n${bodyMessage}`;
+            content = `**${formattedPhoneNumber} - ${participantName}:**\n\n${bodyMessage}`;
           } else {
             content = `${bodyMessage}`;
           }

src/api/integrations/chatbot/dify/services/dify.service.ts

@@ -428,8 +428,8 @@ export class DifyService {
               },
               false,
             );
-            textBuffer = '';
           }
+          textBuffer = '';
         }
 
         if (mediaType === 'audio') {

src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts

@@ -190,8 +190,8 @@ export class EvolutionBotService {
               },
               false,
             );
-            textBuffer = '';
           }
+          textBuffer = '';
         }
 
         if (mediaType === 'audio') {
@@ -274,8 +274,8 @@ export class EvolutionBotService {
           },
           false,
         );
-        textBuffer = '';
       }
+      textBuffer = '';
     }
 
     sendTelemetry('/message/sendText');

src/api/integrations/chatbot/flowise/services/flowise.service.ts

@@ -189,8 +189,8 @@ export class FlowiseService {
               },
               false,
             );
-            textBuffer = '';
           }
+          textBuffer = '';
         }
 
         if (mediaType === 'audio') {
@@ -273,8 +273,8 @@ export class FlowiseService {
           },
           false,
         );
-        textBuffer = '';
       }
+      textBuffer = '';
     }
 
     sendTelemetry('/message/sendText');

src/api/integrations/chatbot/openai/services/openai.service.ts

@@ -234,8 +234,8 @@ export class OpenaiService {
               },
               false,
             );
-            textBuffer = '';
           }
+          textBuffer = '';
         }
 
         if (mediaType === 'audio') {
@@ -318,8 +318,8 @@ export class OpenaiService {
           },
           false,
         );
-        textBuffer = '';
       }
+      textBuffer = '';
     }
 
     sendTelemetry('/message/sendText');

src/api/routes/instance.router.ts

@@ -12,6 +12,7 @@ export class InstanceRouter extends RouterBroker {
     super();
     this.router
       .post('/create', ...guards, async (req, res) => {
+        console.log('create instance', req.body);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceSchema,

src/utils/getConversationMessage.ts

@@ -17,7 +17,7 @@ const getTypeMessage = (msg: any) => {
       msg?.message?.viewOnceMessageV2?.message?.audioMessage?.url,
     listResponseMessage: msg?.message?.listResponseMessage?.title,
     responseRowId: msg?.message?.listResponseMessage?.singleSelectReply?.selectedRowId,
-    templateButtonReplyMessage: msg?.message?.templateButtonReplyMessage?.selectedId,
+    templateButtonReplyMessage: msg?.message?.templateButtonReplyMessage?.selectedId || msg?.message?.buttonsResponseMessage?.selectedButtonId,
     // Medias
     audioMessage: msg?.message?.speechToText
       ? msg?.message?.speechToText