fix: delete instance cleanup on baileys failure

Author: antonio-abrantes

src/api/controllers/instance.controller.ts

@@ -345,7 +345,7 @@ export class InstanceController {
       };
     } catch (error) {
       this.logger.error(error);
-      return { error: true, message: error.toString() };
+      return { error: true, message: error?.message ?? String(error) };
     }
   }
 
@@ -392,7 +392,7 @@ export class InstanceController {
       };
     } catch (error) {
       this.logger.error(error);
-      return { error: true, message: error.toString() };
+      return { error: true, message: error?.message ?? String(error) };
     }
   }
 
@@ -453,47 +453,41 @@ export class InstanceController {
 
       return { status: 'SUCCESS', error: false, response: { message: 'Instance logged out' } };
     } catch (error) {
-      throw new InternalServerErrorException(error.toString());
+      throw new InternalServerErrorException(error?.message ?? String(error));
     }
   }
 
   public async deleteInstance({ instanceName }: InstanceDto) {
     const { instance } = await this.connectionState({ instanceName });
+
+    const waInstances = this.waMonitor.waInstances[instanceName];
+
     try {
-      const waInstances = this.waMonitor.waInstances[instanceName];
       if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED) waInstances?.clearCacheChatwoot();
+    } catch (error) {
+      this.logger.warn(`clearCacheChatwoot failed for "${instanceName}": ${error?.message ?? String(error)}`);
+    }
 
-      if (instance.state === 'connecting' || instance.state === 'open') {
-        try {
-          await this.logout({ instanceName });
-        } catch (error) {
-          // logout can throw "Connection Closed" when the underlying Baileys
-          // socket is already dead but waInstances[name] still exists. We
-          // must continue to the remove.instance emit below — that is the
-          // only path that purges the in-memory entry and runs cleaningUp().
-          // Without this catch, the stale entry persists until the entire
-          // process restarts.
-          this.logger.warn({
-            message: 'logout failed during deleteInstance — proceeding with cleanup',
-            instanceName,
-            error,
-          });
-        }
-      }
-
+    if (instance.state === 'connecting' || instance.state === 'open') {
       try {
-        waInstances?.sendDataWebhook(Events.INSTANCE_DELETE, {
-          instanceName,
-          instanceId: waInstances.instanceId,
-        });
+        await this.logout({ instanceName });
       } catch (error) {
-        this.logger.error(error);
+        this.logger.warn(
+          `Logout failed for "${instanceName}": ${error?.message ?? String(error)}. Continuing cleanup.`,
+        );
       }
+    }
 
-      this.eventEmitter.emit('remove.instance', instanceName, 'inner');
-      return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
+    try {
+      waInstances?.sendDataWebhook(Events.INSTANCE_DELETE, {
+        instanceName,
+        instanceId: waInstances?.instanceId,
+      });
     } catch (error) {
-      throw new BadRequestException(error.toString());
+      this.logger.error(error);
     }
+
+    this.eventEmitter.emit('remove.instance', instanceName, 'inner');
+    return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
   }
 }

src/api/services/monitor.service.ts

@@ -397,20 +397,29 @@ export class WAMonitoringService {
     this.eventEmitter.on('remove.instance', async (instanceName: string) => {
       try {
         await this.waInstances[instanceName]?.sendDataWebhook(Events.REMOVE_INSTANCE, null);
+      } catch (error) {
+        this.logger.warn(
+          `sendDataWebhook REMOVE_INSTANCE failed for "${instanceName}": ${error?.message ?? String(error)}`,
+        );
+      }
 
-        this.clearDelInstanceTime(instanceName);
+      this.clearDelInstanceTime(instanceName);
 
-        this.cleaningUp(instanceName);
-        this.cleaningStoreData(instanceName);
-      } finally {
-        this.logger.warn(`Instance "${instanceName}" - REMOVED`);
+      try {
+        await this.cleaningUp(instanceName);
+      } catch (error) {
+        this.logger.warn(`cleaningUp failed for "${instanceName}": ${error?.message ?? String(error)}`);
       }
 
       try {
-        delete this.waInstances[instanceName];
+        await this.cleaningStoreData(instanceName);
       } catch (error) {
-        this.logger.error(error);
+        this.logger.warn(`cleaningStoreData failed for "${instanceName}": ${error?.message ?? String(error)}`);
       }
+
+      delete this.waInstances[instanceName];
+
+      this.logger.warn(`Instance "${instanceName}" - REMOVED`);
     });
     this.eventEmitter.on('logout.instance', async (instanceName: string) => {
       try {