refactor(openai): improve service initialization and streamline audio transcription handling

- Updated OpenaiService and related classes to enhance the initialization process by ensuring the correct order of parameters.
- Simplified audio message handling by consolidating transcription logic and improving error handling.
- Refactored the OpenaiController to utilize the new structure, ensuring better integration with the base chatbot framework.
- Enhanced logging for better traceability during audio processing and API interactions.

src/api/integrations/channel/evolution/evolution.channel.service.ts

@@ -165,11 +165,7 @@ export class EvolutionStartupService extends ChannelStartupService {
             openAiDefaultSettings.speechToText &&
             received?.message?.audioMessage
           ) {
-            messageRaw.message.speechToText = await this.openaiService.speechToText(
+            messageRaw.message.speechToText = await this.openaiService.speechToText(received);
-              openAiDefaultSettings.OpenaiCreds,
-              received,
-              this.client.updateMediaMessage,
-            );
           }
         }
 

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

@@ -501,16 +501,12 @@ export class BusinessStartupService extends ChannelStartupService {
             openAiDefaultSettings.speechToText &&
             audioMessage
           ) {
-            messageRaw.message.speechToText = await this.openaiService.speechToText(
+            messageRaw.message.speechToText = await this.openaiService.speechToText({
-              openAiDefaultSettings.OpenaiCreds,
+              message: {
-              {
+                mediaUrl: messageRaw.message.mediaUrl,
-                message: {
+                ...messageRaw,
-                  mediaUrl: messageRaw.message.mediaUrl,
-                  ...messageRaw,
-                },
               },
-              () => {},
+            });
-            );
           }
         }
 

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

@@ -1298,11 +1298,7 @@ export class BaileysStartupService extends ChannelStartupService {
             });
 
             if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
-              messageRaw.message.speechToText = await this.openaiService.speechToText(
+              messageRaw.message.speechToText = await this.openaiService.speechToText(received);
-                openAiDefaultSettings.OpenaiCreds,
-                received,
-                this.client.updateMediaMessage,
-              );
             }
           }
 
@@ -2297,11 +2293,7 @@ export class BaileysStartupService extends ChannelStartupService {
         });
 
         if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
-          messageRaw.message.speechToText = await this.openaiService.speechToText(
+          messageRaw.message.speechToText = await this.openaiService.speechToText(messageRaw);
-            openAiDefaultSettings.OpenaiCreds,
-            messageRaw,
-            this.client.updateMediaMessage,
-          );
         }
       }
 

src/api/integrations/chatbot/base-chatbot.controller.ts

@@ -47,18 +47,21 @@ export interface BaseBotData {
   [key: string]: any;
 }
 
-export abstract class BaseChatbotController<BotType = any, BotData extends BaseChatbotDto = BaseChatbotDto> extends ChatbotController implements ChatbotControllerInterface {
+export abstract class BaseChatbotController<BotType = any, BotData extends BaseChatbotDto = BaseChatbotDto>
+  extends ChatbotController
+  implements ChatbotControllerInterface
+{
   public readonly logger: Logger;
-  
+
   integrationEnabled: boolean;
   botRepository: any;
   settingsRepository: any;
   sessionRepository: any;
   userMessageDebounce: { [key: string]: { message: string; timeoutId: NodeJS.Timeout } } = {};
-  
+
   // Name of the integration, to be set by the derived class
   protected abstract readonly integrationName: string;
-  
+
   // Method to process bot-specific logic
   protected abstract processBot(
     waInstance: any,
@@ -70,16 +73,13 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
     pushName?: string,
     msg?: any,
   ): Promise<void>;
-  
+
   // Method to get the fallback bot ID from settings
   protected abstract getFallbackBotId(settings: any): string | undefined;
-  
+
-  constructor(
+  constructor(prismaRepository: PrismaRepository, waMonitor: WAMonitoringService) {
-    prismaRepository: PrismaRepository,
-    waMonitor: WAMonitoringService,
-  ) {
     super(prismaRepository, waMonitor);
-    
+
     this.sessionRepository = this.prismaRepository.integrationSession;
   }
 
@@ -161,7 +161,9 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
     });
 
     if (checkTriggerAll && data.triggerType === 'all') {
-      throw new Error(`You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`);
+      throw new Error(
+        `You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`,
+      );
     }
 
     // Check for trigger keyword duplicates
@@ -309,7 +311,7 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
 
       // Get the name of the fallback field for this integration type
       const fallbackFieldName = this.getFallbackFieldName();
-      
+
       const settingsData = {
         expire: data.expire,
         keywordFinish: data.keywordFinish,
@@ -336,20 +338,25 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
         // Map the specific fallback field to a generic 'fallbackId' in the response
         return {
           ...settings,
-          fallbackId: settings[fallbackFieldName]
+          fallbackId: settings[fallbackFieldName],
         };
       } else {
         const settings = await this.settingsRepository.create({
           data: {
             ...settingsData,
             instanceId: instanceId,
+            Instance: {
+              connect: {
+                id: instanceId,
+              },
+            },
           },
         });
 
         // Map the specific fallback field to a generic 'fallbackId' in the response
         return {
           ...settings,
-          fallbackId: settings[fallbackFieldName]
+          fallbackId: settings[fallbackFieldName],
         };
       }
     } catch (error) {
@@ -631,7 +638,9 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
         });
 
         if (checkTriggerAll) {
-          throw new Error(`You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`);
+          throw new Error(
+            `You already have a ${this.integrationName} with an "All" trigger, you cannot have more bots while it is active`,
+          );
         }
       }
 
@@ -779,15 +788,15 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
       if (this.checkIgnoreJids(settings?.ignoreJids, remoteJid)) return;
 
       const session = await this.getSession(remoteJid, instance);
-      
+
       const content = getConversationMessage(msg);
-      
+
       // Get integration type
       const integrationType = this.getIntegrationType();
-      
+
       // Find a bot for this message
       let findBot: any = await this.findBotTrigger(this.botRepository, content, instance, session);
-      
+
       // If no bot is found, try to use fallback
       if (!findBot) {
         const fallback = await this.settingsRepository.findFirst({
@@ -798,7 +807,7 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
 
         // Get the fallback ID for this integration type
         const fallbackId = this.getFallbackBotId(fallback);
-        
+
         if (fallbackId) {
           const findFallback = await this.botRepository.findFirst({
             where: {
@@ -811,7 +820,7 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
           return;
         }
       }
-      
+
       // If we still don't have a bot, return
       if (!findBot) {
         return;
@@ -918,4 +927,4 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
       this.logger.error(error);
     }
   }
-} 
+}

src/api/integrations/chatbot/base-chatbot.dto.ts

@@ -39,4 +39,4 @@ export class BaseChatbotSettingDto {
   splitMessages?: boolean;
   timePerChar?: number;
   fallbackId?: string; // Unified fallback ID field for all integrations
-} 
+}

src/api/integrations/chatbot/base-chatbot.service.ts

@@ -1,10 +1,10 @@
 import { InstanceDto } from '@api/dto/instance.dto';
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
+import { Integration } from '@api/types/wa.types';
 import { ConfigService, Language } from '@config/env.config';
 import { Logger } from '@config/logger.config';
 import { IntegrationSession } from '@prisma/client';
-import { Integration } from '@api/types/wa.types';
 import axios from 'axios';
 import FormData from 'form-data';
 
@@ -17,7 +17,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
   protected readonly waMonitor: WAMonitoringService;
   protected readonly prismaRepository: PrismaRepository;
   protected readonly configService?: ConfigService;
-  
+
   constructor(
     waMonitor: WAMonitoringService,
     prismaRepository: PrismaRepository,
@@ -89,23 +89,23 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
         this.logger.error('No OpenAI API key set for Whisper transcription');
         return null;
       }
-      
+
       const lang = this.configService.get<Language>('LANGUAGE').includes('pt')
         ? 'pt'
         : this.configService.get<Language>('LANGUAGE');
-      
+
       const formData = new FormData();
       formData.append('file', audioBuffer, 'audio.ogg');
       formData.append('model', 'whisper-1');
       formData.append('language', lang);
-      
+
       const response = await axios.post('https://api.openai.com/v1/audio/transcriptions', formData, {
         headers: {
           ...formData.getHeaders(),
           Authorization: `Bearer ${apiKey}`,
         },
       });
-      
+
       return response?.data?.text || null;
     } catch (err) {
       this.logger.error(`Whisper transcription failed: ${err}`);
@@ -119,14 +119,16 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
   public async createNewSession(instance: InstanceDto | any, data: any, type: string) {
     try {
       // Extract pushName safely - if data.pushName is an object with a pushName property, use that
-      const pushNameValue = typeof data.pushName === 'object' && data.pushName?.pushName
+      const pushNameValue =
-        ? data.pushName.pushName
+        typeof data.pushName === 'object' && data.pushName?.pushName
-        : (typeof data.pushName === 'string' ? data.pushName : null);
+          ? data.pushName.pushName
-        
+          : typeof data.pushName === 'string'
+            ? data.pushName
+            : null;
+
       // Extract remoteJid safely
-      const remoteJidValue = typeof data.remoteJid === 'object' && data.remoteJid?.remoteJid
+      const remoteJidValue =
-        ? data.remoteJid.remoteJid
+        typeof data.remoteJid === 'object' && data.remoteJid?.remoteJid ? data.remoteJid.remoteJid : data.remoteJid;
-        : data.remoteJid;
 
       const session = await this.prismaRepository.integrationSession.create({
         data: {
@@ -203,18 +205,18 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
    * This handles common patterns like markdown links and formatting
    */
   protected async sendMessageWhatsApp(
-    instance: any, 
+    instance: any,
-    remoteJid: string, 
+    remoteJid: string,
-    message: string, 
+    message: string,
-    settings: SettingsType
+    settings: SettingsType,
   ): Promise<void> {
     if (!message) return;
-    
+
     const linkRegex = /(!?)\[(.*?)\]\((.*?)\)/g;
     let textBuffer = '';
     let lastIndex = 0;
     let match: RegExpExecArray | null;
-    
+
     const splitMessages = (settings as any)?.splitMessages ?? false;
     const timePerChar = (settings as any)?.timePerChar ?? 0;
     const minDelay = 1000;
@@ -224,18 +226,18 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
       const [fullMatch, exclamation, altText, url] = match;
       const mediaType = this.getMediaType(url);
       const beforeText = message.slice(lastIndex, match.index);
-      
+
       if (beforeText) {
         textBuffer += beforeText;
       }
-      
+
       if (mediaType) {
         // Send accumulated text before sending media
         if (textBuffer.trim()) {
           await this.sendFormattedText(instance, remoteJid, textBuffer.trim(), settings, splitMessages);
           textBuffer = '';
         }
-        
+
         // Handle sending the media
         try {
           switch (mediaType) {
@@ -249,7 +251,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
               break;
             case 'video':
               await instance.mediaMessage({
-                number: remoteJid.split('@')[0], 
+                number: remoteJid.split('@')[0],
                 delay: (settings as any)?.delayMessage || 1000,
                 caption: altText,
                 media: url,
@@ -280,48 +282,48 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
         // It's a regular link, keep it in the text
         textBuffer += `[${altText}](${url})`;
       }
-      
+
       lastIndex = match.index + fullMatch.length;
     }
-    
+
     // Add any remaining text after the last match
     if (lastIndex < message.length) {
       textBuffer += message.slice(lastIndex);
     }
-    
+
     // Send any remaining text
     if (textBuffer.trim()) {
       await this.sendFormattedText(instance, remoteJid, textBuffer.trim(), settings, splitMessages);
     }
   }
-  
+
   /**
    * Helper method to send formatted text with proper typing indicators and delays
    */
   private async sendFormattedText(
-    instance: any, 
+    instance: any,
-    remoteJid: string, 
+    remoteJid: string,
-    text: string, 
+    text: string,
-    settings: any, 
+    settings: any,
-    splitMessages: boolean
+    splitMessages: boolean,
   ): Promise<void> {
     const timePerChar = settings?.timePerChar ?? 0;
     const minDelay = 1000;
     const maxDelay = 20000;
-    
+
     if (splitMessages) {
       const multipleMessages = text.split('\n\n');
       for (let index = 0; index < multipleMessages.length; index++) {
         const message = multipleMessages[index];
         if (!message.trim()) continue;
-        
+
         const delay = Math.min(Math.max(message.length * timePerChar, minDelay), maxDelay);
-        
+
         if (instance.integration === Integration.WHATSAPP_BAILEYS) {
           await instance.client.presenceSubscribe(remoteJid);
           await instance.client.sendPresenceUpdate('composing', remoteJid);
         }
-        
+
         await new Promise<void>((resolve) => {
           setTimeout(async () => {
             await instance.textMessage(
@@ -335,19 +337,19 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
             resolve();
           }, delay);
         });
-        
+
         if (instance.integration === Integration.WHATSAPP_BAILEYS) {
           await instance.client.sendPresenceUpdate('paused', remoteJid);
         }
       }
     } else {
       const delay = Math.min(Math.max(text.length * timePerChar, minDelay), maxDelay);
-      
+
       if (instance.integration === Integration.WHATSAPP_BAILEYS) {
         await instance.client.presenceSubscribe(remoteJid);
         await instance.client.sendPresenceUpdate('composing', remoteJid);
       }
-      
+
       await new Promise<void>((resolve) => {
         setTimeout(async () => {
           await instance.textMessage(
@@ -361,7 +363,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
           resolve();
         }, delay);
       });
-      
+
       if (instance.integration === Integration.WHATSAPP_BAILEYS) {
         await instance.client.sendPresenceUpdate('paused', remoteJid);
       }
@@ -385,15 +387,18 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
     // Create a session if none exists
     if (!session) {
       // Extract pushName properly - if it's an object with pushName property, use that
-      const pushNameValue = typeof pushName === 'object' && pushName?.pushName
+      const pushNameValue =
-        ? pushName.pushName
+        typeof pushName === 'object' && pushName?.pushName
-        : (typeof pushName === 'string' ? pushName : null);
+          ? pushName.pushName
-        
+          : typeof pushName === 'string'
+            ? pushName
+            : null;
+
       session = (
         await this.createNewSession(
-          { 
+          {
-            instanceName: instance.instanceName, 
+            instanceName: instance.instanceName,
-            instanceId: instance.instanceId 
+            instanceId: instance.instanceId,
           },
           {
             remoteJid,
@@ -440,4 +445,4 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
     content: string,
     msg?: any,
   ): Promise<void>;
-} 
+}

src/api/integrations/chatbot/dify/controllers/dify.controller.ts

@@ -1,4 +1,3 @@
-
 import { InstanceDto } from '@api/dto/instance.dto';
 import { DifyDto } from '@api/integrations/chatbot/dify/dto/dify.dto';
 import { DifyService } from '@api/integrations/chatbot/dify/services/dify.service';

src/api/integrations/chatbot/dify/dto/dify.dto.ts

@@ -1,4 +1,5 @@
 import { $Enums, TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class DifyDto extends BaseChatbotDto {

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

@@ -2,21 +2,16 @@ import { InstanceDto } from '@api/dto/instance.dto';
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
 import { Integration } from '@api/types/wa.types';
+import { Auth, ConfigService, HttpServer } from '@config/env.config';
 import { Dify, DifySetting, IntegrationSession } from '@prisma/client';
 import { sendTelemetry } from '@utils/sendTelemetry';
 import axios from 'axios';
 import { downloadMediaMessage } from 'baileys';
 
 import { BaseChatbotService } from '../../base-chatbot.service';
-import { ConfigService, HttpServer } from '@config/env.config';
-import { Auth } from '@config/env.config';
 
 export class DifyService extends BaseChatbotService<Dify, DifySetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, configService: ConfigService, prismaRepository: PrismaRepository) {
-    waMonitor: WAMonitoringService,
-    configService: ConfigService,
-    prismaRepository: PrismaRepository,
-  ) {
     super(waMonitor, prismaRepository, 'DifyService', configService);
   }
 
@@ -73,7 +68,7 @@ export class DifyService extends BaseChatbotService<Dify, DifySetting> {
           ];
           payload.query = contentSplit[2] || content;
         }
-        
+
         // Handle audio messages
         if (this.isAudioMessage(content) && msg) {
           try {
@@ -151,7 +146,7 @@ export class DifyService extends BaseChatbotService<Dify, DifySetting> {
           ];
           payload.inputs.query = contentSplit[2] || content;
         }
-        
+
         // Handle audio messages
         if (this.isAudioMessage(content) && msg) {
           try {
@@ -229,7 +224,7 @@ export class DifyService extends BaseChatbotService<Dify, DifySetting> {
           ];
           payload.query = contentSplit[2] || content;
         }
-        
+
         // Handle audio messages
         if (this.isAudioMessage(content) && msg) {
           try {
@@ -554,16 +549,7 @@ export class DifyService extends BaseChatbotService<Dify, DifySetting> {
           data,
         );
 
-        await this.initNewSession(
+        await this.initNewSession(instance, remoteJid, dify, settings, createSession.session, content, pushName, msg);
-          instance,
-          remoteJid,
-          dify,
-          settings,
-          createSession.session,
-          content,
-          pushName,
-          msg,
-        );
 
         await sendTelemetry('/dify/session/start');
         return;

src/api/integrations/chatbot/evoai/dto/evoai.dto.ts

@@ -1,4 +1,5 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class EvoaiDto extends BaseChatbotDto {

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

@@ -11,11 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { BaseChatbotService } from '../../base-chatbot.service';
 
 export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, prismaRepository: PrismaRepository, configService: ConfigService) {
-    waMonitor: WAMonitoringService,
-    prismaRepository: PrismaRepository,
-    configService: ConfigService,
-  ) {
     super(waMonitor, prismaRepository, 'EvoaiService', configService);
   }
 
@@ -45,24 +41,24 @@ export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
   ): Promise<void> {
     try {
       this.logger.debug(`[EvoAI] Processing message with custom process method`);
-      
+
       // Check if this is an audio message that we should try to transcribe
       if (msg?.messageType === 'audioMessage' && msg?.message?.audioMessage) {
         this.logger.debug(`[EvoAI] Detected audio message, attempting transcription`);
-        
+
         try {
           // Download the audio using the whole msg object
           const mediaBuffer = await downloadMediaMessage(msg, 'buffer', {});
           this.logger.debug(`[EvoAI] Downloaded audio: ${mediaBuffer?.length || 0} bytes`);
-          
+
           // Transcribe with OpenAI's Whisper
           const transcribedText = await this.speechToText(mediaBuffer);
           this.logger.debug(`[EvoAI] Transcription result: ${transcribedText || 'FAILED'}`);
-          
+
           if (transcribedText) {
             // Use the transcribed text instead of the original content
             this.logger.debug(`[EvoAI] Using transcribed text: ${transcribedText}`);
-            
+
             // Call the parent process method with the transcribed text
             return super.process(instance, remoteJid, bot, session, settings, transcribedText, pushName, msg);
           }
@@ -70,7 +66,7 @@ export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
           this.logger.error(`[EvoAI] Audio transcription error: ${err}`);
         }
       }
-      
+
       // For non-audio messages or if transcription failed, proceed normally
       return super.process(instance, remoteJid, bot, session, settings, content, pushName, msg);
     } catch (error) {
@@ -91,7 +87,7 @@ export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
   ) {
     try {
       this.logger.debug(`[EvoAI] Sending message to bot with content: ${content}`);
-      
+
       const endpoint: string = evoai.agentUrl;
       const callId = `call-${uuidv4()}`;
       const taskId = `task-${uuidv4()}`;
@@ -108,13 +104,13 @@ export class EvoaiService extends BaseChatbotService<Evoai, EvoaiSetting> {
       if (this.isImageMessage(content) && msg) {
         const contentSplit = content.split('|');
         parts[0].text = contentSplit[2] || content;
-        
+
         try {
           // Download the image
           const mediaBuffer = await downloadMediaMessage(msg, 'buffer', {});
           const fileContent = Buffer.from(mediaBuffer).toString('base64');
           const fileName = contentSplit[2] || `${msg.key?.id || 'image'}.jpg`;
-          
+
           parts.push({
             type: 'file',
             file: {

src/api/integrations/chatbot/n8n/dto/n8n.dto.ts

@@ -1,4 +1,5 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
+
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class N8nDto extends BaseChatbotDto {

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

@@ -11,11 +11,7 @@ import { BaseChatbotService } from '../../base-chatbot.service';
 import { N8nDto } from '../dto/n8n.dto';
 
 export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
-  constructor(
+  constructor(waMonitor: WAMonitoringService, prismaRepository: PrismaRepository, configService: ConfigService) {
-    waMonitor: WAMonitoringService,
-    prismaRepository: PrismaRepository,
-    configService: ConfigService,
-  ) {
     super(waMonitor, prismaRepository, 'N8nService', configService);
   }
 
@@ -194,34 +190,34 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
     let textBuffer = '';
     let lastIndex = 0;
     let match: RegExpExecArray | null;
-    
+
     while ((match = linkRegex.exec(message)) !== null) {
       const [fullMatch, exclamation, altText, url] = match;
       const mediaType = this.getMediaType(url);
       const beforeText = message.slice(lastIndex, match.index);
-      
+
       if (beforeText) {
         textBuffer += beforeText;
       }
-      
+
       if (mediaType) {
         const splitMessages = settings.splitMessages ?? false;
         const timePerChar = settings.timePerChar ?? 0;
         const minDelay = 1000;
         const maxDelay = 20000;
-        
+
         if (textBuffer.trim()) {
           if (splitMessages) {
             const multipleMessages = textBuffer.trim().split('\n\n');
             for (let index = 0; index < multipleMessages.length; index++) {
               const message = multipleMessages[index];
               const delay = Math.min(Math.max(message.length * timePerChar, minDelay), maxDelay);
-              
+
               if (instance.integration === 'WHATSAPP_BAILEYS') {
                 await instance.client.presenceSubscribe(remoteJid);
                 await instance.client.sendPresenceUpdate('composing', remoteJid);
               }
-              
+
               await new Promise<void>((resolve) => {
                 setTimeout(async () => {
                   await instance.textMessage(
@@ -235,19 +231,19 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
                   resolve();
                 }, delay);
               });
-              
+
               if (instance.integration === 'WHATSAPP_BAILEYS') {
                 await instance.client.sendPresenceUpdate('paused', remoteJid);
               }
             }
           } else {
             const delay = Math.min(Math.max(textBuffer.length * timePerChar, minDelay), maxDelay);
-            
+
             if (instance.integration === 'WHATSAPP_BAILEYS') {
               await instance.client.presenceSubscribe(remoteJid);
               await instance.client.sendPresenceUpdate('composing', remoteJid);
             }
-            
+
             await new Promise<void>((resolve) => {
               setTimeout(async () => {
                 await instance.textMessage(
@@ -261,15 +257,15 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
                 resolve();
               }, delay);
             });
-            
+
             if (instance.integration === 'WHATSAPP_BAILEYS') {
               await instance.client.sendPresenceUpdate('paused', remoteJid);
             }
           }
         }
-        
+
         textBuffer = '';
-        
+
         if (mediaType === 'image') {
           await instance.mediaMessage({
             number: remoteJid.split('@')[0],
@@ -306,32 +302,32 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
       } else {
         textBuffer += `[${altText}](${url})`;
       }
-      
+
       lastIndex = match.index + fullMatch.length;
     }
-    
+
     const remainingText = message.slice(lastIndex);
     if (remainingText) {
       textBuffer += remainingText;
     }
-    
+
     if (textBuffer.trim()) {
       const splitMessages = settings.splitMessages ?? false;
       const timePerChar = settings.timePerChar ?? 0;
       const minDelay = 1000;
       const maxDelay = 20000;
-      
+
       if (splitMessages) {
         const multipleMessages = textBuffer.trim().split('\n\n');
         for (let index = 0; index < multipleMessages.length; index++) {
           const message = multipleMessages[index];
           const delay = Math.min(Math.max(message.length * timePerChar, minDelay), maxDelay);
-          
+
           if (instance.integration === 'WHATSAPP_BAILEYS') {
             await instance.client.presenceSubscribe(remoteJid);
             await instance.client.sendPresenceUpdate('composing', remoteJid);
           }
-          
+
           await new Promise<void>((resolve) => {
             setTimeout(async () => {
               await instance.textMessage(
@@ -345,19 +341,19 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
               resolve();
             }, delay);
           });
-          
+
           if (instance.integration === 'WHATSAPP_BAILEYS') {
             await instance.client.sendPresenceUpdate('paused', remoteJid);
           }
         }
       } else {
         const delay = Math.min(Math.max(textBuffer.length * timePerChar, minDelay), maxDelay);
-        
+
         if (instance.integration === 'WHATSAPP_BAILEYS') {
           await instance.client.presenceSubscribe(remoteJid);
           await instance.client.sendPresenceUpdate('composing', remoteJid);
         }
-        
+
         await new Promise<void>((resolve) => {
           setTimeout(async () => {
             await instance.textMessage(
@@ -371,7 +367,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
             resolve();
           }, delay);
         });
-        
+
         if (instance.integration === 'WHATSAPP_BAILEYS') {
           await instance.client.sendPresenceUpdate('paused', remoteJid);
         }
@@ -443,16 +439,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
           data,
         );
 
-        await this.initNewSession(
+        await this.initNewSession(instance, remoteJid, n8n, settings, createSession.session, content, pushName, msg);
-          instance,
-          remoteJid,
-          n8n,
-          settings,
-          createSession.session,
-          content,
-          pushName,
-          msg,
-        );
 
         await sendTelemetry('/n8n/session/start');
         return;

src/api/integrations/chatbot/openai/dto/openai.dto.ts

@@ -1,15 +1,15 @@
 import { TriggerOperator, TriggerType } from '@prisma/client';
 
+import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
+
 export class OpenaiCredsDto {
   name: string;
   apiKey: string;
 }
 
-export class OpenaiDto {
+export class OpenaiDto extends BaseChatbotDto {
-  enabled?: boolean;
-  description?: string;
   openaiCredsId: string;
-  botType?: string;
+  botType: string;
   assistantId?: string;
   functionUrl?: string;
   model?: string;
@@ -17,35 +17,10 @@ export class OpenaiDto {
   assistantMessages?: string[];
   userMessages?: string[];
   maxTokens?: number;
-  expire?: number;
-  keywordFinish?: string;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
-  triggerType?: TriggerType;
-  triggerOperator?: TriggerOperator;
-  triggerValue?: string;
-  ignoreJids?: any;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }
 
-export class OpenaiSettingDto {
+export class OpenaiSettingDto extends BaseChatbotSettingDto {
   openaiCredsId?: string;
-  expire?: number;
-  keywordFinish?: string;
-  delayMessage?: number;
-  unknownMessage?: string;
-  listeningFromMe?: boolean;
-  stopBotFromMe?: boolean;
-  keepOpen?: boolean;
-  debounceTime?: number;
   openaiIdFallback?: string;
-  ignoreJids?: any;
   speechToText?: boolean;
-  splitMessages?: boolean;
-  timePerChar?: number;
 }

src/api/server.module.ts

@@ -119,7 +119,7 @@ export const baileysController = new BaileysController(waMonitor);
 const typebotService = new TypebotService(waMonitor, configService, prismaRepository);
 export const typebotController = new TypebotController(typebotService, prismaRepository, waMonitor);
 
-const openaiService = new OpenaiService(waMonitor, configService, prismaRepository);
+const openaiService = new OpenaiService(waMonitor, prismaRepository, configService);
 export const openaiController = new OpenaiController(openaiService, prismaRepository, waMonitor);
 
 const difyService = new DifyService(waMonitor, configService, prismaRepository);

src/api/services/channel.service.ts

@@ -47,7 +47,7 @@ export class ChannelStartupService {
 
   public typebotService = new TypebotService(waMonitor, this.configService, this.prismaRepository);
 
-  public openaiService = new OpenaiService(waMonitor, this.configService, this.prismaRepository);
+  public openaiService = new OpenaiService(waMonitor, this.prismaRepository, this.configService);
 
   public difyService = new DifyService(waMonitor, this.configService, this.prismaRepository);