fix: Migrated State store to WA-JS

wppconnect-team · Nov 28, 2021 · e040978 · e040978
1 parent afdb3b4
commit e040978
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 59 deletions.
diff --git a/src/api/helpers/index.ts b/src/api/helpers/index.ts
@@ -21,5 +21,4 @@ export { downloadFileToBase64 } from './download-file';
 export { stickerSelect, resizeImg } from './select-sticker';
 export { scrapeImg } from './scrape-img-qr';
 export { scrapeLogin } from './scrape-login';
-export { scrapeDesconnected } from './scrape-desconnect';
 export { evaluateAndReturn } from './evaluate-and-return';
diff --git a/src/api/helpers/scrape-desconnect.ts b/src/api/helpers/scrape-desconnect.ts
diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
@@ -405,7 +405,7 @@ export class HostLayer {
   public async getConnectionState(): Promise<SocketState> {
     return await evaluateAndReturn(this.page, () => {
       //@ts-ignore
-      return Store.State.default.state;
+      return WPP.whatsapp.State.state as SocketState;
     });
   }
 

diff --git a/src/lib/wapi/functions/phoneWatchdog.js b/src/lib/wapi/functions/phoneWatchdog.js
@@ -23,30 +23,28 @@ async function sendPing() {
     // Check only if the interface is in CHAT and not disconnected
     if (
       window.Store.Stream.mode !== 'MAIN' ||
-      window.Store.State.default.state === 'TIMEOUT'
+      WPP.whatsapp.State.state === 'TIMEOUT'
     ) {
       return;
     }
 
     // Start phoneWatchdog if ping fails
     if (!pong) {
-      window.Store.State.default.phoneWatchdog.activate();
-      window.Store.State.default.phoneWatchdog.poke(250);
+      WPP.whatsapp.State.phoneWatchdog.activate();
+      WPP.whatsapp.State.phoneWatchdog.poke(250);
       return;
     }
 
     // Reset ping state
     pong = false;
 
     // Send a ping request
-    return window.Store.State.default
-      .sendBasic({
-        tag: window.Store.State.default.tag('ping'),
-        data: ['admin', 'test'],
-      })
-      .then(() => {
-        pong = true;
-      });
+    return WPP.whatsapp.State.sendBasic({
+      tag: WPP.whatsapp.State.tag('ping'),
+      data: ['admin', 'test'],
+    }).then(() => {
+      pong = true;
+    });
   });
 }
 

diff --git a/src/lib/wapi/globals.d.ts b/src/lib/wapi/globals.d.ts
@@ -23,3 +23,9 @@ declare global {
   }
   const WPP: typeof wajs;
 }
+
+declare global {
+  interface Window {
+    Store: any;
+  }
+}
diff --git a/src/lib/wapi/listeners/add-on-state-change.js b/src/lib/wapi/listeners/add-on-state-change.js
@@ -18,12 +18,12 @@
 export function addOnStateChange() {
   let initialized = false;
   let getData = () => {
-    return window.Store.State.default.state;
+    return WPP.whatsapp.State.state;
   };
 
   window.WAPI.onStateChange = function (callback) {
     window.WAPI.waitForStore('State', () => {
-      window.Store.State.default.on('change:state', () => callback(getData()));
+      WPP.whatsapp.State.on('change:state', () => callback(getData()));
       if (!initialized) {
         initialized = true;
         callback(getData());
@@ -36,11 +36,11 @@ export function addOnStateChange() {
 export function addOnStreamChange() {
   let initialized = false;
   let getData = () => {
-    return window.Store.State.default.stream;
+    return WPP.whatsapp.State.stream;
   };
   window.WAPI.onStreamChange = function (callback) {
     window.WAPI.waitForStore('State', () => {
-      window.Store.State.default.on('change:stream', () => callback(getData()));
+      WPP.whatsapp.State.on('change:stream', () => callback(getData()));
       if (!initialized) {
         initialized = true;
         callback(getData());

diff --git a/src/lib/wapi/store/store-objects.js b/src/lib/wapi/store/store-objects.js
@@ -45,10 +45,6 @@ export const storeObjects = [
     conditions: (module) =>
       module.default && module.default.killServiceWorker ? module : null,
   },
-  {
-    id: 'State',
-    conditions: (module) => (module.STATE && module.STREAM ? module : null),
-  },
   {
     id: 'WapDelete',
     conditions: (module) =>

diff --git a/src/lib/wapi/wapi.js b/src/lib/wapi/wapi.js
@@ -494,7 +494,7 @@ if (typeof window.WAPI === 'undefined') {
   };
 
   window.WAPI.takeOver = async function () {
-    await Store.State.default.takeover();
+    await WPP.whatsapp.State.takeover();
     return true;
   };