From 0817c2589fc3b5763afcecdc962345ae776e7003 Mon Sep 17 00:00:00 2001
From: Gabriel Pastori <58153955+gabrielpastori1@users.noreply.github.com>
Date: Sun, 29 Oct 2023 12:49:26 -0300
Subject: [PATCH] expand try catch for all function

---
 src/whatsapp/services/typebot.service.ts | 92 ++++++++++++------------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/src/whatsapp/services/typebot.service.ts b/src/whatsapp/services/typebot.service.ts
index f9a07de3..6a8052e4 100644
--- a/src/whatsapp/services/typebot.service.ts
+++ b/src/whatsapp/services/typebot.service.ts
@@ -157,29 +157,28 @@ export class TypebotService {
         },
       };
 
-      let request: any;
       try {
-        request = await axios.post(data.url + '/api/v1/sendMessage', reqData);
+        const request = await axios.post(data.url + '/api/v1/sendMessage', reqData);
+
+        await this.sendWAMessage(
+          instance,
+          remoteJid,
+          request.data.messages,
+          request.data.input,
+          request.data.clientSideActions,
+        );
+
+        this.waMonitor.waInstances[instance.instanceName].sendDataWebhook(Events.TYPEBOT_START, {
+          remoteJid: remoteJid,
+          url: url,
+          typebot: typebot,
+          variables: variables,
+          sessionId: id,
+        });
       } catch (error) {
         this.logger.error(error);
         return;
       }
-
-      await this.sendWAMessage(
-        instance,
-        remoteJid,
-        request.data.messages,
-        request.data.input,
-        request.data.clientSideActions,
-      );
-
-      this.waMonitor.waInstances[instance.instanceName].sendDataWebhook(Events.TYPEBOT_START, {
-        remoteJid: remoteJid,
-        url: url,
-        typebot: typebot,
-        variables: variables,
-        sessionId: id,
-      });
     }
 
     return {
@@ -255,7 +254,7 @@ export class TypebotService {
       return;
     }
 
-    if (request.data.sessionId) {
+    if (request?.data?.sessionId) {
       data.sessions.push({
         remoteJid: data.remoteJid,
         sessionId: `${id}-${request.data.sessionId}`,
@@ -519,22 +518,21 @@ export class TypebotService {
             sessionId: data.sessionId,
           };
 
-          let request: any;
           try {
-            request = await axios.post(url + '/api/v1/sendMessage', reqData);
+            const request = await axios.post(url + '/api/v1/sendMessage', reqData);
+
+            console.log('request', request);
+            await this.sendWAMessage(
+              instance,
+              remoteJid,
+              request.data.messages,
+              request.data.input,
+              request.data.clientSideActions,
+            );
           } catch (error) {
             this.logger.error(error);
             return;
           }
-
-          console.log('request', request);
-          await this.sendWAMessage(
-            instance,
-            remoteJid,
-            request.data.messages,
-            request.data.input,
-            request.data.clientSideActions,
-          );
         }
 
         return;
@@ -608,19 +606,19 @@ export class TypebotService {
         let request: any;
         try {
           request = await axios.post(url + '/api/v1/sendMessage', reqData);
+
+          console.log('request', request);
+          await this.sendWAMessage(
+            instance,
+            remoteJid,
+            request.data.messages,
+            request.data.input,
+            request.data.clientSideActions,
+          );
         } catch (error) {
           this.logger.error(error);
           return;
         }
-
-        console.log('request', request);
-        await this.sendWAMessage(
-          instance,
-          remoteJid,
-          request.data.messages,
-          request.data.input,
-          request.data.clientSideActions,
-        );
       }
       return;
     }
@@ -691,19 +689,19 @@ export class TypebotService {
     let request: any;
     try {
       request = await axios.post(url + '/api/v1/sendMessage', reqData);
+
+      await this.sendWAMessage(
+        instance,
+        remoteJid,
+        request.data.messages,
+        request.data.input,
+        request.data.clientSideActions,
+      );
     } catch (error) {
       this.logger.error(error);
       return;
     }
 
-    await this.sendWAMessage(
-      instance,
-      remoteJid,
-      request.data.messages,
-      request.data.input,
-      request.data.clientSideActions,
-    );
-
     return;
   }
 }