fix: Improved script inject to fix #1366

wppconnect-team · Oct 18, 2022 · 4f7bd6e · 4f7bd6e
1 parent 20328c7
commit 4f7bd6e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 55 deletions.
diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
@@ -125,10 +125,6 @@ export class HostLayer {
 
     let clear = !hasUserDataDir || (hasUserDataDir && !isValidToken);
 
-    this.page.on('load', () => {
-      this.log('verbose', 'Page loaded', { type: 'page' });
-      this.afterPageLoad();
-    });
     this.page.on('close', () => {
       this.cancelAutoClose();
       this.log('verbose', 'Page Closed', { type: 'page' });
@@ -140,6 +136,11 @@ export class HostLayer {
       clear,
       this.options.whatsappVersion
     );
+
+    this.page.on('load', () => {
+      this.log('verbose', 'Page loaded', { type: 'page' });
+      this.afterPageLoad();
+    });
   }
 
   protected async afterPageLoad() {
@@ -164,22 +165,26 @@ export class HostLayer {
     await injectApi(this.page, this.onLoadingScreen)
       .then(() => {
         this.log('verbose', 'wapi.js injected');
-        this.getWAVersion()
-          .then((version) => {
-            this.log('info', `WhatsApp WEB version: ${version}`);
-          })
-          .catch(() => null);
-        this.getWAJSVersion()
-          .then((version) => {
-            this.log('info', `WA-JS version: ${version}`);
-          })
-          .catch(() => null);
+        this.afterPageScriptInjected();
       })
       .catch((e) => {
         this.log('verbose', 'wapi.js failed');
       });
   }
 
+  protected async afterPageScriptInjected() {
+    this.getWAVersion()
+      .then((version) => {
+        this.log('info', `WhatsApp WEB version: ${version}`);
+      })
+      .catch(() => null);
+    this.getWAJSVersion()
+      .then((version) => {
+        this.log('info', `WA-JS version: ${version}`);
+      })
+      .catch(() => null);
+  }
+
   protected tryAutoClose() {
     if (this.autoCloseInterval) {
       this.cancelAutoClose();

diff --git a/src/api/layers/listener.layer.ts b/src/api/layers/listener.layer.ts
@@ -73,8 +73,8 @@ export class ListenerLayer extends ProfileLayer {
     };
   }
 
-  protected async afterPageLoad() {
-    await super.afterPageLoad();
+  protected async afterPageScriptInjected() {
+    await super.afterPageScriptInjected();
 
     const functions = [
       ...Object.values(ExposedFn),

diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -186,23 +186,13 @@ export async function injectApi(
     path: require.resolve('@wppconnect/wa-js'),
   });
 
-  await page
-    .waitForFunction(
-      () => {
-        return typeof window.WPP !== 'undefined' && window.WPP.isReady;
-      },
-      {
-        timeout: 60000,
-      }
-    )
-    .catch(() => false);
-
   await page
     .evaluate(() => {
       WPP.chat.defaultSendMessageOptions.createChat = true;
       WPP.conn.setKeepAlive(true);
     })
     .catch(() => false);
+
   await page.addScriptTag({
     path: require.resolve(
       path.join(__dirname, '../../dist/lib/wapi', 'wapi.js')
@@ -211,11 +201,12 @@ export async function injectApi(
 
   await onLoadingScreen(page, onLoadingScreenCallBack);
   // Make sure WAPI is initialized
-  return await page
+  await page
     .waitForFunction(() => {
       return (
         typeof window.WAPI !== 'undefined' &&
-        typeof window.Store !== 'undefined'
+        typeof window.Store !== 'undefined' &&
+        window.WPP.isReady
       );
     })
     .catch(() => false);

diff --git a/src/lib/wapi/wapi.js b/src/lib/wapi/wapi.js
@@ -128,26 +128,33 @@ import {
 import { getBusinessProfilesProducts, getOrderbyMsg } from './business';
 import { storeObjects } from './store/store-objects';
 
-window['webpackJsonp'] = window['webpackJsonp'] || [];
-window['webpackChunkbuild'] = window['webpackChunkbuild'] || [];
+const readyPromise = new Promise((resolve) => {
+  if (WPP.isReady) {
+    resolve();
+    return;
+  }
+  WPP.webpack.onReady(resolve);
+});
 
 if (typeof window.Store === 'undefined') {
   window.Store = {};
   window.Store.promises = {};
 
-  for (const store of storeObjects) {
-    window.Store.promises[store.id] = Promise.resolve(
-      WPP.webpack.search(store.conditions)
-    )
-      .then(store.conditions)
-      .then((m) => {
-        if (store.id === 'Store') {
-          window.Store = Object.assign({}, window.Store, m);
-        } else {
-          window.Store[store.id] = m;
-        }
-      });
-  }
+  readyPromise.then(() => {
+    for (const store of storeObjects) {
+      window.Store.promises[store.id] = Promise.resolve(
+        WPP.webpack.search(store.conditions)
+      )
+        .then(store.conditions)
+        .then((m) => {
+          if (store.id === 'Store') {
+            window.Store = Object.assign({}, window.Store, m);
+          } else {
+            window.Store[store.id] = m;
+          }
+        });
+    }
+  });
 }
 
 if (typeof window.WAPI === 'undefined') {
@@ -449,15 +456,15 @@ if (typeof window.WAPI === 'undefined') {
     return await WPP.conn.logout();
   };
 
-  addOnStreamChange();
-  addOnStateChange();
-  initNewMessagesListener();
-  addNewMessagesListener();
-  allNewMessagesListener();
-  addOnNewAcks();
-  addOnAddedToGroup();
-  addOnLiveLocation();
-  addOnParticipantsChange();
-  addOnNotificationMessage();
-  addOnPresenceChanged();
+  readyPromise.then(addOnStreamChange);
+  readyPromise.then(addOnStateChange);
+  readyPromise.then(initNewMessagesListener);
+  readyPromise.then(addNewMessagesListener);
+  readyPromise.then(allNewMessagesListener);
+  readyPromise.then(addOnNewAcks);
+  readyPromise.then(addOnAddedToGroup);
+  readyPromise.then(addOnLiveLocation);
+  readyPromise.then(addOnParticipantsChange);
+  readyPromise.then(addOnNotificationMessage);
+  readyPromise.then(addOnPresenceChanged);
 }