Merge branch 'qr-codes-not-being-extracted'

orkestral · Nov 10, 2024 · daed3d3 · daed3d3
2 parents 97a8206 + a21267d
commit daed3d3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/app.js b/app.js
@@ -7,6 +7,7 @@ try {
       session: 'sessionName_0001',
       headless: false,
       devtools: true,
+      useChrome: false,
     })
     .then((client) => start(client))
     .catch(async (err) => {
@@ -27,6 +28,11 @@ async function start(client) {
   console.log(JSON.stringify(pid, null, 2));
 
   console.log(await client.isLoggedIn());
+  const hostData = await client.getHost();
+  if(hostData && hostData.id) {
+    console.log(hostData.id);
+  }
+
 
   let lastMessageId = "";
 
@@ -48,6 +54,16 @@ async function start(client) {
     }
   });
 
+  client.onStateChange((state) => {
+    console.log("State change: " + client.session);
+    console.log("State change: " + state);
+  })
+
+  client.onStreamChange((stream) => {
+    console.log("Stream change: " + client.session);
+    console.log("Stream change: " + stream);
+  })
+
   client.onMessageEdit((message) => {
     console.log('EDIT!');
     console.log(message);

diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
@@ -347,6 +347,13 @@ export class HostLayer {
     return await this.page.evaluate(() => WAPI.isLoggedIn());
   }
 
+  /**
+   * Retrieves information about the host including who is logged in
+   */
+  public async getHost() {
+    return await this.page.evaluate(() => WAPI.getHost());
+  }
+
   /**
    * Retrieves Battery Level
    */

diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts
@@ -13,16 +13,21 @@ export const getInterfaceStatus = async (waPage: puppeteer.Page) => {
         if (erroHTTP && erroHTTP[0].innerText.includes('HTTP ERROR 429')) {
           return { type: erroHTTP[0].innerText };
         }
-        const elLoginWrapper = document.querySelector(
+        const elLoginWrapper1 = document.querySelector(
           'body > div > div > .landing-wrapper'
         );
         const elLoginWrapper2 = document.querySelector(
           'body > div > div > div > .landing-wrapper'
         );
+        const elLoginWrapper3 = document.querySelector(
+          'body > div > div > div > div > div > .x1lliihq'
+        );
+
         const elQRCodeCanvas = document.querySelector('canvas');
         if (
-          (elLoginWrapper && elQRCodeCanvas) ||
-          (elLoginWrapper2 && elQRCodeCanvas)
+          (elLoginWrapper1 && elQRCodeCanvas) ||
+          (elLoginWrapper2 && elQRCodeCanvas) ||
+          (elLoginWrapper3 && elQRCodeCanvas)
         ) {
           return 'UNPAIRED';
         }