From 9c5eb4bfd1a7328d678881bdcc155d9660b7e580 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <contato@agenciadgcode.com>
Date: Sat, 3 Aug 2024 13:36:31 -0300
Subject: [PATCH] fix: Session is now individual per instance and remoteJid

Changes made:
- Added `instanceId` to sessions in DifyService, OpenaiService, and TypebotService to ensure that sessions are individual per instance and remoteJid.
- Decreased delay time in BaileysStartupService from 2000ms to 1000ms.

The bug fix ensures that sessions are unique per instance and remoteJid, which improves the overall functionality of the application. The delay time reduction in BaileysStartupService speeds up the pairing code request process.

The modified files are DifyService, OpenaiService, TypebotService, and BaileysStartupService.
---
 src/api/integrations/dify/services/dify.service.ts       | 1 +
 src/api/integrations/openai/services/openai.service.ts   | 1 +
 src/api/integrations/typebot/services/typebot.service.ts | 1 +
 src/api/services/channels/whatsapp.baileys.service.ts    | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/api/integrations/dify/services/dify.service.ts b/src/api/integrations/dify/services/dify.service.ts
index a78e3552..ffe3312e 100644
--- a/src/api/integrations/dify/services/dify.service.ts
+++ b/src/api/integrations/dify/services/dify.service.ts
@@ -896,6 +896,7 @@ export class DifyService {
       const session = await this.prismaRepository.difySession.findFirst({
         where: {
           remoteJid: remoteJid,
+          instanceId: instance.instanceId,
         },
       });
 
diff --git a/src/api/integrations/openai/services/openai.service.ts b/src/api/integrations/openai/services/openai.service.ts
index f5850cd7..21b14a44 100644
--- a/src/api/integrations/openai/services/openai.service.ts
+++ b/src/api/integrations/openai/services/openai.service.ts
@@ -1094,6 +1094,7 @@ export class OpenaiService {
       const session = await this.prismaRepository.openaiSession.findFirst({
         where: {
           remoteJid: remoteJid,
+          instanceId: instance.instanceId,
         },
       });
 
diff --git a/src/api/integrations/typebot/services/typebot.service.ts b/src/api/integrations/typebot/services/typebot.service.ts
index 7fcb1696..fd8ce1c8 100644
--- a/src/api/integrations/typebot/services/typebot.service.ts
+++ b/src/api/integrations/typebot/services/typebot.service.ts
@@ -1474,6 +1474,7 @@ export class TypebotService {
       const session = await this.prismaRepository.typebotSession.findFirst({
         where: {
           remoteJid: remoteJid,
+          instanceId: instance.instanceId,
         },
       });
 
diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/services/channels/whatsapp.baileys.service.ts
index 7507b83c..714deea4 100644
--- a/src/api/services/channels/whatsapp.baileys.service.ts
+++ b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -320,7 +320,7 @@ export class BaileysStartupService extends ChannelStartupService {
       };
 
       if (this.phoneNumber) {
-        await delay(2000);
+        await delay(1000);
         this.instance.qrcode.pairingCode = await this.client.requestPairingCode(this.phoneNumber);
       } else {
         this.instance.qrcode.pairingCode = null;