From c4b807906968269f6be4bd9994b3302389b7949c Mon Sep 17 00:00:00 2001 From: RIZWAN AHMAD Date: Sun, 10 Nov 2024 12:31:22 +0530 Subject: [PATCH] #216 #145 v3.3 Fixed bug and improvements --- .../WhatsApp Monitor/background.js | 72 +++++----- .../images/icons/csv_download.jpg | Bin 9117 -> 1362 bytes .../WhatsApp Monitor/inject_wp.js | 15 ++- .../WhatsApp Monitor/js/server.js | 2 +- Chrome-Extension/WhatsApp Monitor/main.js | 2 +- .../WhatsApp Monitor/manifest.json | 8 +- Chrome-Extension/WhatsApp Monitor/online.js | 126 +++++++++++++----- Chrome-Extension/WhatsApp Monitor/popup.html | 77 +---------- Chrome-Extension/WhatsApp Monitor/popup.js | 8 +- Chrome-Extension/WhatsApp Monitor/protobuf.js | 19 ++- Chrome-Extension/WhatsApp Monitor/wapi.js | 30 +++-- .../WhatsApp Monitor/websocket.js | 11 +- 12 files changed, 188 insertions(+), 182 deletions(-) diff --git a/Chrome-Extension/WhatsApp Monitor/background.js b/Chrome-Extension/WhatsApp Monitor/background.js index 60aea32..08b6f3e 100644 --- a/Chrome-Extension/WhatsApp Monitor/background.js +++ b/Chrome-Extension/WhatsApp Monitor/background.js @@ -1,40 +1,44 @@ - // background.js +// background.js +chrome.runtime.onInstalled.addListener(() => { - chrome.runtime.onInstalled.addListener(() => { - console.log("Extension installed and background script running."); - const manifest = chrome.runtime.getManifest(); - const serverUrl = manifest.SERVER_URL; // Access your custom field - console.log('Server URL:', serverUrl); // Outputs: https://example.com/api + chrome.tabs.create({ url: 'https://github.com/rizwansoaib/whatsapp-monitor/tree/master' }); - // Store the value using chrome.storage API if needed - chrome.storage.local.set({ serverUrl }); + chrome.notifications.create('notificationId', { + type: 'basic', + iconUrl: 'images/icons/128.png', + title: 'TrackWapp Notification', + message: 'Notification are Enabled and Working', + priority: 2 }); +}); - chrome.runtime.onMessage.addListener((message, sender, sendResponse) => { - if (message.action === "open_popup") { - chrome.action.setPopup({popup: "popup.html"}, () => { - chrome.action.openPopup(); - }); - } - }); - /* - - chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { - if (changeInfo.status === 'complete' && tab.url.includes("*://web.whatsapp.com/*")) { - chrome.scripting.executeScript( - { - target: {tabId: tab.id}, - files: ['websocket.js'], - // function: () => {}, // files or function, both do not work. - }); - } - }); - // Load the server URL if present - chrome.storage.local.get(['serverUrl'], (result) => { - if (result.serverUrl) { - document.getElementById('serverUrl').value = result.serverUrl; - } - }); +chrome.power.requestKeepAwake('system'); +chrome.power.requestKeepAwake('display'); + + +chrome.runtime.setUninstallURL('https://htmlpreview.github.io/?https://github.com/rizwansoaib/whatsapp-monitor/blob/master/Chrome-Extension/uninstall.html'); + +chrome.runtime.onMessage.addListener((message, sender, sendResponse) => { + if (message.action === "open_popup") { + chrome.action.setPopup({popup: "popup.html"}, () => { + chrome.action.openPopup(); + }); + } else if (message.action === 'showNotification') { + + + chrome.notifications.create('notificationId', { + type: 'basic', + iconUrl: 'images/icons/128.png', + title: 'TrackWapp Notification', + message: `📱${message.user} is Online in WhatsApp`, + priority: 2 + }); + + // Automatically delete the notification after 30 seconds + setTimeout(() => { + chrome.notifications.clear('notificationId'); + }, 10000); - */ \ No newline at end of file + } +}); diff --git a/Chrome-Extension/WhatsApp Monitor/images/icons/csv_download.jpg b/Chrome-Extension/WhatsApp Monitor/images/icons/csv_download.jpg index e6dca6429be6e29b04a0e45c1b22fa91208c7d50..0fc078e7adbd7779297c543b4c6314e6e1dfdfba 100644 GIT binary patch delta 1217 zcmV;y1U~znN74$A6_Hhse?S000|6oc0uccN5dr_i02}}S0R;g80RR910000000007 z00IL91_c2K|HJ?}5C8!J0|N*M1p@^D00000009C600a>Q1`-DoAtEtBQDGDn7gceT zvC&g+ zuU@0nAR7UulM}l$e;sTDAoibZd}RFu!tFlU_{sVSf%bA1aw*4G;prbbXCr@-$JhNr(gKbW97!Co*VG8Qg?fole*$g^wz5dl;TT&zo|!m?i6Jy9RX7OSWqnv}=RRit0EA&IX~aufNK>i_LV-b1-B^V{Zsc-g z8vCuuomb}Uxp$Q=Wbp(VDMOE}K0;bqa<0t=RQSfM4ec}=1vtbrb`$T;IP*_58gW>v zqI6apX3EYbe-0TL#)(UcLfcrVG}vP{+#6a`afd@1?8Ki=WBgLksSdWWO$T9zPss#Y z%`(zLQ1vJV!NwhUoIsVAL#jcVuADoCH2&3#mV50@$T2$U*Op3>qx)(5LgXlM+A$CV z3C^}l49z8$8$vLqs-W6W{Edc5)r#>o^Evp;4d0qnf5gL&D{9nL1Wb^t72t2?U*nB5 z(5XOqAF|~Z!al@iSyhJISIpnzfqrwGA1_VKYWiOZxi_a=l?=4o!A+njolq&K#yLYF z7I|>CFBHjIKqWbpR0FWmv9xsWa!B_kU6j{7;A=drIB^_2E22COl$xbP9w5>UJ%UMh z{NI;Hf4nZiB)k4^%cI^q>D!3PXcjJ#YE4PrVP{Ab3N+zZG3P-`fYsa~mie@!J7{ZyrW3_3}f(R*edT+&r8q=X7G zprwSB5Rz#?1|z3^2RONI*lM)PGg7aaY58+jUftk%MHJ6o=72)%nMc$#XAtm6S2|WT zx?&*lG_v9&>R4`4(*ygRAh(ET5z;lB)>f37>WUQTsM-G7xl3^nqpXQvP6j#gbBIWbK3(15UWM$#F@my2;T*itsym9~iLe zEfvn^(9_A*N|KWB2?+qz1Oq}z-=}EODHM9j_4gFNm>%%D%JugYznC8Ii6=z1g9&ZL zIOB=NQsZyXVo(GVT2uvM(L9l#rz}D6-`@R=)A-r>}FMp%z4=DmpWZ fco3d+tX{C}HCd{9Zf*XPXiRB!-N0}hp%eev=#3Ci literal 9117 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 j1XTsfjW(me`uFeVcazpRaf { + chrome.scripting.executeScript( + { + target: {tabId: tab.id}, + files: ['websocket.js'], + // function: () => {}, // files or function, both do not work. + }) +}) + + +chrome.tabs.query({active: true, currentWindow: true}).then(([tab]) => { + chrome.scripting.executeScript( + { + target: {tabId: tab.id}, + files: ['protobuf.js'], + // function: () => {}, // files or function, both do not work. + }) +}) + + + + +chrome.tabs.query({active: true, currentWindow: true}).then(([tab]) => { + chrome.scripting.executeScript( + { + target: {tabId: tab.id}, + files: ['main.js'], + // function: () => {}, // files or function, both do not work. + }) +}) +} + +//setTimeout(run_script_delay,20000); @@ -334,40 +424,10 @@ chrome.storage.sync.get('numarray', function (data) { -/* -chrome.tabs.query({active: true, currentWindow: true}).then(([tab]) => { - chrome.scripting.executeScript( - { - target: {tabId: tab.id}, - files: ['websocket.js'], - // function: () => {}, // files or function, both do not work. - }) -}) - - -chrome.tabs.query({active: true, currentWindow: true}).then(([tab]) => { - chrome.scripting.executeScript( - { - target: {tabId: tab.id}, - files: ['protobuf.js'], - // function: () => {}, // files or function, both do not work. - }) -}) - - -chrome.tabs.query({active: true, currentWindow: true}).then(([tab]) => { - chrome.scripting.executeScript( - { - target: {tabId: tab.id}, - files: ['main.js'], - // function: () => {}, // files or function, both do not work. - }) -}) - */ diff --git a/Chrome-Extension/WhatsApp Monitor/popup.html b/Chrome-Extension/WhatsApp Monitor/popup.html index c0be597..e1a7227 100644 --- a/Chrome-Extension/WhatsApp Monitor/popup.html +++ b/Chrome-Extension/WhatsApp Monitor/popup.html @@ -2,78 +2,7 @@ - Online Monitor @@ -110,7 +39,7 @@ - +

Please Open Chat on WhatsApp Web at least once to start monitoring

@@ -193,7 +122,7 @@

-
+

@@ -239,7 +168,7 @@

diff --git a/Chrome-Extension/WhatsApp Monitor/popup.js b/Chrome-Extension/WhatsApp Monitor/popup.js index 34a5113..cdfd72f 100644 --- a/Chrome-Extension/WhatsApp Monitor/popup.js +++ b/Chrome-Extension/WhatsApp Monitor/popup.js @@ -48,10 +48,10 @@ update_numarrray(); function start(mnkey,save_interval) { - b.innerText='Cancel'; + //b.innerText='Cancel'; //console.log(b.innerText); - b.className="btn-danger"; + //b.className="btn-danger"; //alert("stop set"); @@ -201,8 +201,8 @@ function get() //alert(b.innerText); console.log("nkey val popup.js",mnkey); - if(b.innerText=='OK'){start(mnkey,save_interval);} - else{stop();b.innerText='OK';b.className="btn-success";} + if(b.innerText=='save'){start(mnkey,save_interval);} + else{stop();b.innerText='save';b.className="btn-success";} } diff --git a/Chrome-Extension/WhatsApp Monitor/protobuf.js b/Chrome-Extension/WhatsApp Monitor/protobuf.js index 2ae3e2a..1d088b6 100644 --- a/Chrome-Extension/WhatsApp Monitor/protobuf.js +++ b/Chrome-Extension/WhatsApp Monitor/protobuf.js @@ -1,22 +1,19 @@ -var os = document.createElement('script'); - //s.src = chrome.extension.getURL('pagescript.js'); - os.src = chrome.runtime.getURL('inject_wp.js'); - /* -window.onload = function() { - setTimeout(function() { - os.src = chrome.runtime.getURL('inject_wp.js'); - }, 10000); // 10000 milliseconds = 10 seconds -}; -*/ +setTimeout(function(){ + var os = document.createElement('script'); + + os.src = chrome.runtime.getURL('inject_wp.js'); (document.head || document.documentElement).appendChild(os); + console.log("Protobuf connecting"); + +},20000); -console.log("Protobuf connecting") + diff --git a/Chrome-Extension/WhatsApp Monitor/wapi.js b/Chrome-Extension/WhatsApp Monitor/wapi.js index 99d0c6f..bfcf107 100644 --- a/Chrome-Extension/WhatsApp Monitor/wapi.js +++ b/Chrome-Extension/WhatsApp Monitor/wapi.js @@ -1,5 +1,5 @@ //Version_JS;Version_TInjectMin;Version_CEF4Min; -//3.0.1.0;1.0.0.9;78.3.0 +//3.0.2.0;1.0.0.9;78.3.0 function getAllGroupContacts(Contacts) { SetConsoleMessage("GetAllGroupContacts", JSON.stringify(Contacts)); @@ -157,7 +157,7 @@ const newMakeStore = () => { { id: "State", conditions: (module) => (module.STATE && module.STREAM) ? module : null }, { id: "_Presence", conditions: (module) => (module.setPresenceAvailable && module.setPresenceUnavailable) ? module : null }, { id: "WapDelete", conditions: (module) => (module.sendConversationDelete && module.sendConversationDelete.length == 2) ? module : null }, - { id: 'FindChat', conditions: (module) => (module && module.findChat) ? module : null}, + { id: 'FindChat', conditions: (module) => (module && module.findOrCreateLatestChat) ? module : null}, { id: "WapQuery", conditions: (module) => (module.queryExist) ? module : ((module.default && module.default.queryExist) ? module.default : null) },//Mike 28/10/2022 { id: "WapQueryMD", conditions: (module) => (module.queryExists && module.queryPhoneExists) || (module.queryWidExists && module.queryPhoneExists) ? module : null}, //MD Mike 09/11/2021 { id: 'Perfil', conditions: (module) => module.__esModule === true && module.setPushname && !module.getComposeContents ? module : null}, @@ -304,7 +304,7 @@ const oldMakeStore = () => { { id: "State", conditions: (module) => (module.STATE && module.STREAM) ? module : null }, { id: "_Presence", conditions: (module) => (module.setPresenceAvailable && module.setPresenceUnavailable) ? module : null }, { id: "WapDelete", conditions: (module) => (module.sendConversationDelete && module.sendConversationDelete.length == 2) ? module : null }, - { id: 'FindChat', conditions: (module) => (module && module.findChat) ? module : null}, + { id: 'FindChat', conditions: (module) => (module && module.findOrCreateLatestChat) ? module : null}, { id: "WapQuery", conditions: (module) => (module.queryExist) ? module : ((module.default && module.default.queryExist) ? module.default : null) },//Mike 28/10/2022 { id: "WapQueryMD", conditions: (module) => (module.queryExists && module.queryPhoneExists) || (module.queryWidExists && module.queryPhoneExists) ? module : null}, //MD Mike 09/11/2021 { id: 'Perfil', conditions: (module) => module.__esModule === true && module.setPushname && !module.getComposeContents ? module : null}, @@ -451,14 +451,20 @@ const oldMakeStore = () => { const chooseFunction = () => { - versionString = (Debug || {}).VERSION; + versionString = (Debug || {}).VERSION; versionNumber = parseFloat(versionString); comparisonNumber = 2.3; return (versionNumber >= comparisonNumber) ? newMakeStore() : oldMakeStore() } + + + chooseFunction(); - + + + + window.WAPI = {}; window._WAPI = {}; @@ -844,7 +850,7 @@ window.WAPI.getChat = function (id) { } window.WAPI.getChatByName = function(name, done) { - const found = window.Store.FindChat.findChat((chat) => chat.name === name); + const found = window.Store.FindChat.findOrCreateLatestChat((chat) => chat.name === name); if (done !== undefined) done(found); return found; }; @@ -906,7 +912,7 @@ window.WAPI.sendLinkWithAutoPreview = async function (chatId, url, text) { const linkPreview = await Store.WapQuery.queryLinkPreview(url) let queue = await Store.Contact.get(chatId); - const contact = await Store.FindChat.findChat(idUser) + const contact = await Store.FindChat.findOrCreateLatestChat(idUser) const newChat = await Object.assign(queue, contact); @@ -1780,7 +1786,7 @@ window.WAPI.sendImage = function(imgBase64, chatid, filename, caption) { }); - return Store.FindChat.findChat(idUser).then((chat) => { + return Store.FindChat.findOrCreateLatestChat(idUser).then((chat) => { var mediaBlob = window.WAPI.base64ImageToFile(imgBase64, filename); var mc = new Store.MediaCollection(chat); @@ -1801,7 +1807,7 @@ window.WAPI.sendMessageToID = function(chatid, msgText) { console.log(idUser) - const teste = Store.FindChat.findChat(idUser) + const teste = Store.FindChat.findOrCreateLatestChat(idUser) .then(chatid => { console.log(teste) var mc = new Store.SendTextMsgToChat(chatid, msgText); @@ -1927,7 +1933,7 @@ window.WAPI.sendVCard = async function (chatId, contactNumber, contactName) { let queue = Store.Chat.get(chatId) - const chat = await Store.FindChat.findChat(idUser) + const chat = await Store.FindChat.findOrCreateLatestChat(idUser) const newchat = Object.assign(chat, queue); @@ -2058,7 +2064,7 @@ window.WAPI.sendMessageToID2 = function(id, msgText) { window.Store.WapQuery.queryExist(id).then(function(e) { if (e.status === 200) { - window.Store.FindChat.findChat(e.jid).then((chat) => { + window.Store.FindChat.findOrCreateLatestChat(e.jid).then((chat) => { try { window.Store.SendTextMsgToChat(chat, msgText); return true; @@ -2300,7 +2306,7 @@ window.WAPI.sendMessageOptions = async function (chatId, content, options = {}) let queue = Store.Chat.get(chatId) - const newChat = await Store.FindChat.findChat(idUser) + const newChat = await Store.FindChat.findOrCreateLatestChat(idUser) const chat = Object.assign(newChat, queue); diff --git a/Chrome-Extension/WhatsApp Monitor/websocket.js b/Chrome-Extension/WhatsApp Monitor/websocket.js index b70e568..e0b3ad6 100644 --- a/Chrome-Extension/WhatsApp Monitor/websocket.js +++ b/Chrome-Extension/WhatsApp Monitor/websocket.js @@ -1,26 +1,29 @@ - if(document.head != null) { + + + setTimeout(function(){if(document.head != null) { //clearInterval(clear) var s = document.createElement('script'); s.src = chrome.runtime.getURL('wapi.js'); - + s.onload = function() { //this.remove(); }; (document.head || document.documentElement).appendChild(s); - } + console.log("websockets started"); + }},20000); + -console.log("websockets started")