fix: Fixed session re-initialization

wppconnect-team · Oct 20, 2022 · b523416 · b523416
1 parent 62c9bf1
commit b523416
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 26 deletions.
diff --git a/src/api/whatsapp.ts b/src/api/whatsapp.ts
@@ -26,10 +26,11 @@ import treekill = require('tree-kill');
 import { evaluateAndReturn } from './helpers';
 
 export class Whatsapp extends BusinessLayer {
+  private connected: boolean | null = null;
+
   constructor(public page: Page, session?: string, options?: CreateConfig) {
     super(page, session, options);
 
-    let connected = false;
     let interval: any = null;
 
     const removeToken = async () => {
@@ -45,31 +46,24 @@ export class Whatsapp extends BusinessLayer {
 
     if (this.page) {
       this.page.on('close', async () => {
-        if (!connected) {
+        if (this.connected === false) {
           await removeToken();
         }
         clearInterval(interval);
       });
-
-      page
-        .evaluate(() => WPP.conn.isAuthenticated())
-        .then((isAuthenticated) => {
-          connected = isAuthenticated;
-        })
-        .catch(() => null);
     }
 
     interval = setInterval(async (state) => {
       const newConnected = await page
-        .evaluate(() => WPP.conn.isAuthenticated())
+        .evaluate(() => WAPI.isRegistered())
         .catch(() => null);
 
-      if (newConnected === null || newConnected === connected) {
+      if (newConnected === null || newConnected === this.connected) {
         return;
       }
 
       if (newConnected) {
-        connected = newConnected;
+        this.connected = newConnected;
         setTimeout(async () => {
           this.log('verbose', 'Updating session token', { type: 'token' });
           const tokenData = await this.getSessionTokenBrowser();
@@ -88,13 +82,13 @@ export class Whatsapp extends BusinessLayer {
           }
         }, 1000);
       } else {
-        if (!newConnected && connected) {
+        if (!newConnected && this.connected) {
           setTimeout(async () => {
             await page.evaluate(() => localStorage.clear());
             await page.reload();
           }, 1000);
         }
-        connected = newConnected;
+        this.connected = newConnected;
 
         setTimeout(async () => {
           await removeToken();
@@ -110,6 +104,15 @@ export class Whatsapp extends BusinessLayer {
     }, 1000);
   }
 
+  protected async afterPageScriptInjected() {
+    await super.afterPageScriptInjected();
+    this.page
+      .evaluate(() => WAPI.isRegistered())
+      .then((isAuthenticated) => {
+        this.connected = isAuthenticated;
+      })
+      .catch(() => null);
+  }
   /**
    * Decrypts message file
    * @param data Message object

diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts
@@ -67,7 +67,7 @@ export const getInterfaceStatus = async (
  * @param waPage
  */
 export const isAuthenticated = async (waPage: puppeteer.Page) => {
-  return await waPage.evaluate(() => WPP.conn.isAuthenticated());
+  return await waPage.evaluate(() => WAPI.isRegistered());
 };
 
 export const needsToScan = async (waPage: puppeteer.Page) => {

diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -102,17 +102,19 @@ export async function initWhatsapp(
     await setWhatsappVersion(page, version);
   }
 
-  log?.('verbose', `Loading WhatsApp WEB`);
-
-  const timeout = 10 * 1000;
-  page
-    .goto(puppeteerConfig.whatsappUrl, {
-      timeout,
-      waitUntil: 'domcontentloaded',
-    })
-    .catch(() => {});
+  setTimeout(() => {
+    log?.('verbose', `Loading WhatsApp WEB`);
+
+    const timeout = 10 * 1000;
+    page
+      .goto(puppeteerConfig.whatsappUrl, {
+        timeout,
+        waitUntil: 'domcontentloaded',
+      })
+      .catch(() => {});
 
-  log?.('verbose', `WhatsApp WEB loaded`);
+    log?.('verbose', `WhatsApp WEB loaded`);
+  }, 1000);
 
   return page;
 }

diff --git a/src/controllers/initializer.ts b/src/controllers/initializer.ts
@@ -242,7 +242,7 @@ export async function create(
 
       let waitLoginPromise = null;
       client.onStateChange(async (state) => {
-        const connected = await page.evaluate(() => WPP.conn.isAuthenticated());
+        const connected = await page.evaluate(() => WAPI.isRegistered());
         if (!connected) {
           await sleep(2000);
 

diff --git a/src/lib/wapi/wapi.js b/src/lib/wapi/wapi.js
@@ -456,6 +456,14 @@ if (typeof window.WAPI === 'undefined') {
     return await WPP.conn.logout();
   };
 
+  /**
+   * @todo Temporary fix while is not implemented on WA-JS
+   */
+  window.WAPI.isRegistered = function () {
+    const m = WPP.webpack.search((m) => m.isRegistered);
+    return m.isRegistered();
+  };
+
   readyPromise.then(addOnStreamChange);
   readyPromise.then(addOnStateChange);
   readyPromise.then(initNewMessagesListener);

diff --git a/src/types/WAPI.d.ts b/src/types/WAPI.d.ts
@@ -82,6 +82,7 @@ interface WAPI {
   getWAVersion: () => string;
   isConnected: () => boolean;
   isLoggedIn: () => boolean;
+  isRegistered: () => boolean;
   joinGroup: (groupId: string) => Promise<string | boolean>;
   killServiceWorker: () => boolean;
   leaveGroup: (groupId: string) => any;