From 0791d78e2882807931cad0c200f05cb535ab70f7 Mon Sep 17 00:00:00 2001
From: Judson Cairo <judsonjuniorr@gmail.com>
Date: Wed, 14 Feb 2024 15:27:34 -0300
Subject: [PATCH 1/3] Improve proxy error handling

---
 src/whatsapp/controllers/proxy.controller.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/whatsapp/controllers/proxy.controller.ts b/src/whatsapp/controllers/proxy.controller.ts
index 0dc79a3a..da01e457 100644
--- a/src/whatsapp/controllers/proxy.controller.ts
+++ b/src/whatsapp/controllers/proxy.controller.ts
@@ -26,11 +26,11 @@ export class ProxyController {
     }
 
     if (data.proxy) {
-      logger.verbose('proxy enabled');
       const testProxy = await this.testProxy(data.proxy);
       if (!testProxy) {
         throw new BadRequestException('Invalid proxy');
       }
+      logger.verbose('proxy enabled');
     }
 
     return this.proxyService.create(instance, data);
@@ -54,8 +54,8 @@ export class ProxyController {
         httpsAgent: makeProxyAgent(proxy),
       });
 
-      logger.verbose('testProxy response: ' + response.data);
-      return response.data !== serverIp.data;
+      logger.verbose('[testProxy] from IP: ' + response?.data + ' To IP: ' + serverIp?.data);
+      return response?.data !== serverIp?.data;
     } catch (error) {
       let errorMessage = error;
       if (axios.isAxiosError(error) && error.response.data) {

From 5ce96369cfea493cc5cbf253ffaaa8ae313f43fd Mon Sep 17 00:00:00 2001
From: Judson Cairo <judsonjuniorr@gmail.com>
Date: Wed, 14 Feb 2024 16:05:52 -0300
Subject: [PATCH 2/3] Refactor testProxy error handling and logging

---
 src/whatsapp/controllers/proxy.controller.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/whatsapp/controllers/proxy.controller.ts b/src/whatsapp/controllers/proxy.controller.ts
index da01e457..49d2a3f9 100644
--- a/src/whatsapp/controllers/proxy.controller.ts
+++ b/src/whatsapp/controllers/proxy.controller.ts
@@ -57,11 +57,12 @@ export class ProxyController {
       logger.verbose('[testProxy] from IP: ' + response?.data + ' To IP: ' + serverIp?.data);
       return response?.data !== serverIp?.data;
     } catch (error) {
-      let errorMessage = error;
-      if (axios.isAxiosError(error) && error.response.data) {
-        errorMessage = error.response.data;
+      if (axios.isAxiosError(error) && error.response?.data) {
+        logger.error('testProxy error: ' + error.response.data);
+      } else {
+        logger.error('testProxy error: ');
+        logger.verbose(error);
       }
-      logger.error('testProxy error: ' + errorMessage);
       return false;
     }
   }

From 1dd0f319fc8b61eaf91c4ea1b3ef25c7a44102f6 Mon Sep 17 00:00:00 2001
From: Judson Cairo <judsonjuniorr@gmail.com>
Date: Wed, 14 Feb 2024 16:08:32 -0300
Subject: [PATCH 3/3] Fix error handling in testProxy method

---
 src/whatsapp/controllers/proxy.controller.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/whatsapp/controllers/proxy.controller.ts b/src/whatsapp/controllers/proxy.controller.ts
index 49d2a3f9..d826d8c4 100644
--- a/src/whatsapp/controllers/proxy.controller.ts
+++ b/src/whatsapp/controllers/proxy.controller.ts
@@ -59,6 +59,9 @@ export class ProxyController {
     } catch (error) {
       if (axios.isAxiosError(error) && error.response?.data) {
         logger.error('testProxy error: ' + error.response.data);
+      } else if (axios.isAxiosError(error)) {
+        logger.error('testProxy error: ');
+        logger.verbose(error.cause ?? error.message);
       } else {
         logger.error('testProxy error: ');
         logger.verbose(error);