fix: close and inject

orkestral · Apr 11, 2021 · 20e2f74 · 20e2f74
1 parent b822fce
commit 20e2f74
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 32 deletions.
diff --git a/src/api/helpers/closes-browser.ts b/src/api/helpers/closes-browser.ts
@@ -61,30 +61,32 @@ export async function checkingCloses(
   mergedOptions: CreateConfig,
   callStatus: (e: string) => void
 ) {
-  if (typeof browser !== 'string') {
-    let err: boolean;
-    do {
-      try {
-        await new Promise((r) => setTimeout(r, 2000));
-        if (
-          browser['isClose'] ||
-          (mergedOptions.browserWS && !browser.isConnected())
-        ) {
-          if (mergedOptions.browserWS) {
-            browser.disconnect();
-            callStatus && callStatus('serverClose');
+  new Promise(async (resolve, reject) => {
+    if (typeof browser !== 'string') {
+      let err: boolean;
+      do {
+        try {
+          await new Promise((r) => setTimeout(r, 2000));
+          if (
+            browser['isClose'] ||
+            (mergedOptions.browserWS && !browser.isConnected())
+          ) {
+            if (mergedOptions.browserWS) {
+              browser.disconnect();
+              callStatus && callStatus('serverClose');
+            }
+            if (browser['isClose']) {
+              browser.close().catch((e) => reject(e));
+              callStatus && callStatus('browserClose');
+            }
+            err = false;
+          } else {
+            throw 1;
           }
-          if (browser['isClose']) {
-            browser.close();
-            callStatus && callStatus('browserClose');
-          }
-          err = false;
-        } else {
-          throw 1;
+        } catch (e) {
+          err = true;
         }
-      } catch (e) {
-        err = true;
-      }
-    } while (err);
-  }
+      } while (err);
+    }
+  });
 }
diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
@@ -257,7 +257,7 @@ export class HostLayer {
 
     let authenticated = await isAuthenticated(this.page).catch(() => null);
 
-    if (typeof authenticated === 'object') {
+    if (typeof authenticated === 'object' && authenticated.type) {
       this.spin(`Error http: ${authenticated.type}`, 'fail');
       this.page.close();
       throw `Error http: ${authenticated.type}`;

diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts
@@ -60,7 +60,6 @@ import { existsSync, readFileSync } from 'fs';
 import { CreateConfig } from '../config/create-config';
 import { ScrapQrcode } from '../api/model/qrcode';
 import { tokenSession } from '../config/tokenSession.config';
-import { puppeteerConfig } from '../config/puppeteer.config';
 
 export const getInterfaceStatus = async (
   waPage: puppeteer.Page

diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -71,18 +71,21 @@ export async function initWhatsapp(
 ): Promise<false | Page> {
   const waPage: Page = await getWhatsappPage(browser);
   if (waPage != null) {
-    await waPage.setUserAgent(useragentOverride);
     try {
+      await waPage.setUserAgent(useragentOverride);
       await waPage.goto(puppeteerConfig.whatsappUrl, {
-        waitUntil: 'networkidle0',
+        waitUntil: 'domcontentloaded',
       });
+      // Auth with token
+      await auth_InjectToken(waPage, session, options, token);
+      await waPage.evaluate(() => {
+        window.location.reload();
+      });
+      return waPage;
     } catch {
-      waPage.close();
+      waPage.close().catch(() => {});
       return false;
     }
-    // Auth with token
-    await auth_InjectToken(waPage, session, options, token);
-    return waPage;
   }
 }
 

diff --git a/src/controllers/initializer.ts b/src/controllers/initializer.ts
@@ -238,6 +238,8 @@ export async function create(
 
     checkingCloses(browser, mergedOptions, (result) => {
       statusFind && statusFind(result, session);
+    }).catch(() => {
+      throw 'The client has been closed';
     });
 
     if (SessionTokenCkeck(browserSessionToken)) {