fix: Fixed close method (#579)

wppconnect-team · Oct 21, 2021 · ef42485 · ef42485
1 parent ae2fbfb
commit ef42485
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/api/whatsapp.ts b/src/api/whatsapp.ts
@@ -162,22 +162,21 @@ export class Whatsapp extends BusinessLayer {
    * @internal
    */
   public async close() {
-    const closing = async (waPage: {
-      browser: () => any;
-      isClosed: () => any;
-      close: () => any;
-    }) => {
-      if (waPage) {
-        const browser = await waPage.browser();
-        const pid = browser.process() ? browser?.process().pid : null;
-        if (!waPage.isClosed()) await waPage.close();
-        if (browser) await browser.close();
-        if (pid) treekill(pid, 'SIGKILL');
-      }
-    };
+    const browser = this.page.browser();
+
+    if (!this.page.isClosed()) {
+      await this.page.close().catch(() => null);
+    }
+
+    await browser.close().catch(() => null);
+
     try {
-      await closing(this.page);
+      const process = browser.process();
+      if (process) {
+        treekill(process.pid, 'SIGKILL');
+      }
     } catch (error) {}
+
     return true;
   }