Member ${nameOrAddress} has requested that you regenerate the group's secret key. Group: ${groupName}
` - }) - return true + messageText: `Member ${nameOrAddress} has requested that you regenerate the group's secret key. Group: ${groupName}
`, + }); + return true; } -async function getChatHeads(){ +async function getChatHeads() { const wallet = await getSaveWallet(); const address = wallet.address0; - const key = `chatheads-${address}` + const key = `chatheads-${address}`; const res = await chrome.storage.local.get([key]); -if (res?.[key]) { - const parsedData = JSON.parse(res[key]) - return parsedData; -} else { - throw new Error("No Chatheads saved"); -} + if (res?.[key]) { + const parsedData = JSON.parse(res[key]); + return parsedData; + } else { + throw new Error("No Chatheads saved"); + } } -async function getChatHeadsDirect(){ +async function getChatHeadsDirect() { const wallet = await getSaveWallet(); const address = wallet.address0; - const key = `chatheads-direct-${address}` + const key = `chatheads-direct-${address}`; const res = await chrome.storage.local.get([key]); -if (res?.[key]) { - const parsedData = JSON.parse(res[key]) - return parsedData; -} else { - throw new Error("No Chatheads saved"); -} + if (res?.[key]) { + const parsedData = JSON.parse(res[key]); + return parsedData; + } else { + throw new Error("No Chatheads saved"); + } } chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { if (request) { @@ -2603,7 +2724,6 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { case "userInfo": getUserInfo() .then((name) => { - sendResponse(name); }) .catch((error) => { @@ -2654,10 +2774,10 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { { const { receiver, password, amount } = request.payload; sendCoin({ receiver, password, amount }) - .then(({res}) => { - if(!res?.success){ + .then(({ res }) => { + if (!res?.success) { sendResponse({ error: res?.data?.message }); - return + return; } sendResponse(true); }) @@ -2668,7 +2788,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { } break; - case "inviteToGroup": + case "inviteToGroup": { const { groupId, qortalAddress, inviteTime } = request.payload; inviteToGroup({ groupId, qortalAddress, inviteTime }) @@ -2682,7 +2802,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { } break; - case "saveTempPublish": + case "saveTempPublish": { const { data, key } = request.payload; saveTempPublish({ data, key }) @@ -2693,12 +2813,11 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { sendResponse({ error: error.message }); console.error(error.message); }); - return true + return true; } break; - case "getTempPublish": + case "getTempPublish": { - getTempPublish() .then((res) => { sendResponse(res); @@ -2708,13 +2827,207 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { console.error(error.message); }); } - + break; - - case "createGroup": + + case "createGroup": { - const { groupName, groupDescription, groupType, groupApprovalThreshold, minBlock, maxBlock } = request.payload; - createGroup({ groupName, groupDescription, groupType, groupApprovalThreshold, minBlock, maxBlock }) + const { + groupName, + groupDescription, + groupType, + groupApprovalThreshold, + minBlock, + maxBlock, + } = request.payload; + createGroup({ + groupName, + groupDescription, + groupType, + groupApprovalThreshold, + minBlock, + maxBlock, + }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "cancelInvitationToGroup": + { + const { groupId, qortalAddress } = request.payload; + cancelInvitationToGroup({ groupId, qortalAddress }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "leaveGroup": + { + const { groupId } = request.payload; + leaveGroup({ groupId }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "joinGroup": + { + const { groupId } = request.payload; + joinGroup({ groupId }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + + case "kickFromGroup": + { + const { groupId, qortalAddress, rBanReason } = request.payload; + kickFromGroup({ groupId, qortalAddress, rBanReason }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "banFromGroup": + { + const { groupId, qortalAddress, rBanReason, rBanTime } = + request.payload; + banFromGroup({ groupId, qortalAddress, rBanReason, rBanTime }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "addDataPublishes": + { + const { data, groupId, type } = request.payload; + addDataPublishes(data, groupId, type) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + break; + case "getDataPublishes": + { + const { groupId, type } = request.payload; + getDataPublishes(groupId, type) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + break; + case "addUserSettings": + { + const { keyValue } = request.payload; + addUserSettings({keyValue}) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + break; + case "getUserSettings": + { + const { key } = request.payload; + getUserSettings({key}) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + break; + case "cancelBan": + { + const { groupId, qortalAddress } = request.payload; + cancelBan({ groupId, qortalAddress }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "registerName": + { + const { name } = request.payload; + registerName({ name }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "makeAdmin": + { + const { groupId, qortalAddress } = request.payload; + makeAdmin({ groupId, qortalAddress }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + } + + break; + case "removeAdmin": + { + const { groupId, qortalAddress } = request.payload; + removeAdmin({ groupId, qortalAddress }) .then((res) => { sendResponse(res); }) @@ -2725,162 +3038,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { } break; - case "cancelInvitationToGroup": - { - const { groupId, qortalAddress } = request.payload; - cancelInvitationToGroup({ groupId, qortalAddress }) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "leaveGroup": - { - const { groupId } = request.payload; - leaveGroup({ groupId }) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "joinGroup": - { - const { groupId } = request.payload; - joinGroup({ groupId }) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - - case "kickFromGroup": - { - const { groupId, qortalAddress, rBanReason } = request.payload; - kickFromGroup({ groupId, qortalAddress, rBanReason }) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "banFromGroup": - { - const { groupId, qortalAddress, rBanReason, rBanTime } = request.payload; - banFromGroup({ groupId, qortalAddress, rBanReason, rBanTime }) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "addDataPublishes": - { - const { data, groupId, type } = request.payload; - addDataPublishes(data, groupId, type) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - break; - case "getDataPublishes": - { - const { groupId, type } = request.payload; - getDataPublishes(groupId, type) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - break; - case "cancelBan": - { - const { groupId, qortalAddress } = request.payload; - cancelBan({ groupId, qortalAddress}) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "registerName": - { - const { name } = request.payload; - registerName({ name}) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "makeAdmin": - { - const { groupId, qortalAddress } = request.payload; - makeAdmin({ groupId, qortalAddress}) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "removeAdmin": - { - const { groupId, qortalAddress } = request.payload; - removeAdmin({ groupId, qortalAddress}) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - } - - break; - case "oauth": { const { nodeBaseUrl, senderAddress, senderPublicKey, timestamp } = request.payload; @@ -2902,11 +3060,10 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "setChatHeads": { - const { data} = - request.payload; + const { data } = request.payload; - setChatHeads({ - data + setChatHeads({ + data, }) .then((res) => { sendResponse(res); @@ -2919,10 +3076,8 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "getChatHeads": { - - getChatHeads() + getChatHeads() .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -2933,32 +3088,29 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "notification": { - const notificationId = 'chat_notification_' + Date.now(); // Create a unique ID + const notificationId = "chat_notification_" + Date.now(); // Create a unique ID - const { } = - request.payload; - chrome.notifications.create(notificationId, { - type: 'basic', - iconUrl: 'qort.png', // Add an appropriate icon for chat notifications - title: 'New Group Message!', - message: 'You have received a new message from one of your groups', - priority: 2, // Use the maximum priority to ensure it's noticeable - // buttons: [ - // { title: 'Go to group' } - // ] - }); - // Set a timeout to clear the notification after 'timeout' milliseconds - setTimeout(() => { - chrome.notifications.clear(notificationId); - }, 3000); - sendResponse(true) + const {} = request.payload; + chrome.notifications.create(notificationId, { + type: "basic", + iconUrl: "qort.png", // Add an appropriate icon for chat notifications + title: "New Group Message!", + message: "You have received a new message from one of your groups", + priority: 2, // Use the maximum priority to ensure it's noticeable + // buttons: [ + // { title: 'Go to group' } + // ] + }); + // Set a timeout to clear the notification after 'timeout' milliseconds + setTimeout(() => { + chrome.notifications.clear(notificationId); + }, 3000); + sendResponse(true); break; } case "addTimestampEnterChat": { - - const { groupId, timestamp } = - request.payload; - addTimestampEnterChat({groupId, timestamp}) + const { groupId, timestamp } = request.payload; + addTimestampEnterChat({ groupId, timestamp }) .then((res) => { sendResponse(res); }) @@ -2971,48 +3123,46 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { case "setApiKey": { const { payload } = request; - - + // Save the apiKey in chrome.storage.local for persistence chrome.storage.local.set({ apiKey: payload }, () => { - - sendResponse(true) + sendResponse(true); }); - return true + return true; break; } case "getApiKey": { getApiKeyFromStorage() - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - return true + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + return true; break; } case "notifyAdminRegenerateSecretKey": { - const { groupName, adminAddress } = - request.payload; - notifyAdminRegenerateSecretKey({groupName, adminAddress}) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); + const { groupName, adminAddress } = request.payload; + notifyAdminRegenerateSecretKey({ groupName, adminAddress }) + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); break; } - case "addGroupNotificationTimestamp": { - - const { groupId, timestamp } = - request.payload; - addTimestampGroupAnnouncement({groupId, timestamp, seenTimestamp: true}) + const { groupId, timestamp } = request.payload; + addTimestampGroupAnnouncement({ + groupId, + timestamp, + seenTimestamp: true, + }) .then((res) => { sendResponse(res); }) @@ -3023,30 +3173,20 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "clearAllNotifications": { - - ; - clearAllNotifications() - .then((res) => { - - }) - .catch((error) => { - - }); + clearAllNotifications() + .then((res) => {}) + .catch((error) => {}); break; } case "setGroupData": { - - const { groupId, + const { groupId, secretKeyData, secretKeyResource, admins } = + request.payload; + setGroupData({ + groupId, secretKeyData, secretKeyResource, - admins} = - request.payload; - setGroupData({ - groupId, - secretKeyData, - secretKeyResource, - admins - }) + admins, + }) .then((res) => { sendResponse(res); }) @@ -3057,20 +3197,20 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "getGroupDataSingle": { - const {groupId} = request.payload + const { groupId } = request.payload; getGroupDataSingle(groupId) - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - return true + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + return true; break; } case "getTimestampEnterChat": { - getTimestampEnterChat() + getTimestampEnterChat() .then((res) => { sendResponse(res); }) @@ -3082,15 +3222,15 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { } case "getGroupNotificationTimestamp": { getTimestampGroupAnnouncement() - .then((res) => { - sendResponse(res); - }) - .catch((error) => { - sendResponse({ error: error.message }); - console.error(error.message); - }); - break; - } + .then((res) => { + sendResponse(res); + }) + .catch((error) => { + sendResponse({ error: error.message }); + console.error(error.message); + }); + break; + } case "authentication": { getSaveWallet() @@ -3098,7 +3238,9 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { sendResponse(true); }) .catch((error) => { - const popupUrl = chrome.runtime.getURL("index.html?secondary=true"); + const popupUrl = chrome.runtime.getURL( + "index.html?secondary=true" + ); chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, @@ -3133,16 +3275,21 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const topPosition = (primaryDisplay.bounds.height - windowHeight) / 2; - chrome.windows.create({ - url: chrome.runtime.getURL("index.html?secondary=true"), - type: "popup", - width: windowWidth, - height: windowHeight, - left: leftPosition, - top: 0, - } , () => { - removeDuplicateWindow(popupUrl) - }); + chrome.windows.create( + { + url: chrome.runtime.getURL( + "index.html?secondary=true" + ), + type: "popup", + width: windowWidth, + height: windowHeight, + left: leftPosition, + top: 0, + }, + () => { + removeDuplicateWindow(popupUrl); + } + ); }); } @@ -3189,7 +3336,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { error: "User has not authenticated, try again.", }); clearInterval(intervalId); // Stop checking due to timeout - + // Handle timeout situation if needed } }; @@ -3202,12 +3349,12 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; case "buyOrder": { - const { qortalAtAddress, hostname } = request.payload; getTradeInfo(qortalAtAddress) .then((crosschainAtInfo) => { - - const popupUrl = chrome.runtime.getURL("index.html?secondary=true") + const popupUrl = chrome.runtime.getURL( + "index.html?secondary=true" + ); chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, @@ -3242,16 +3389,21 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const topPosition = (primaryDisplay.bounds.height - windowHeight) / 2; - chrome.windows.create({ - url: chrome.runtime.getURL("index.html?secondary=true"), - type: "popup", - width: windowWidth, - height: windowHeight, - left: leftPosition, - top: 0, - }, () => { - removeDuplicateWindow(popupUrl) - }); + chrome.windows.create( + { + url: chrome.runtime.getURL( + "index.html?secondary=true" + ), + type: "popup", + width: windowWidth, + height: windowHeight, + left: leftPosition, + top: 0, + }, + () => { + removeDuplicateWindow(popupUrl); + } + ); }); } @@ -3285,7 +3437,6 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; case "connection": { - const { hostname } = request.payload; connection(hostname) @@ -3296,7 +3447,9 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { ) { sendResponse(true); } else { - const popupUrl = chrome.runtime.getURL("index.html?secondary=true"); + const popupUrl = chrome.runtime.getURL( + "index.html?secondary=true" + ); chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, (windows) => { @@ -3308,19 +3461,16 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { (tab) => tab.url && tab.url.startsWith(popupUrl) ) ); - + if (existingPopup) { // If the popup exists but is minimized or not focused, focus it chrome.windows.update(existingPopup.id, { focused: true, state: "normal", }); - } else { - - + } else { // No existing popup found, create a new one chrome.system.display.getInfo((displays) => { - // Assuming the primary display is the first one (adjust logic as needed) const primaryDisplay = displays[0]; const screenWidth = primaryDisplay.bounds.width; @@ -3334,16 +3484,19 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const topPosition = (primaryDisplay.bounds.height - windowHeight) / 2; - chrome.windows.create({ + chrome.windows.create( + { url: popupUrl, type: "popup", width: windowWidth, height: windowHeight, left: leftPosition, top: 0, - }, () => { - removeDuplicateWindow(popupUrl) - }); + }, + () => { + removeDuplicateWindow(popupUrl); + } + ); }); } @@ -3411,16 +3564,19 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const topPosition = (primaryDisplay.bounds.height - windowHeight) / 2; - chrome.windows.create({ - url: chrome.runtime.getURL("index.html?secondary=true"), - type: "popup", - width: windowWidth, - height: windowHeight, - left: leftPosition, - top: 0, - }, () => { - removeDuplicateWindow(popupUrl) - }); + chrome.windows.create( + { + url: chrome.runtime.getURL("index.html?secondary=true"), + type: "popup", + width: windowWidth, + height: windowHeight, + left: leftPosition, + top: 0, + }, + () => { + removeDuplicateWindow(popupUrl); + } + ); }); } @@ -3544,10 +3700,10 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { previousData, previousNumber, }) - .then(({data, numberOfMembers}) => { + .then(({ data, numberOfMembers }) => { sendResponse(data); - - if(!previousData){ + + if (!previousData) { // first secret key of the group sendChatGroup({ groupId, @@ -3557,11 +3713,11 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { }) .then(() => {}) .catch((error) => { - console.error('1',error.message); + console.error("1", error.message); }); - return + return; } - sendChatNotification(data, groupId, previousData, numberOfMembers) + sendChatNotification(data, groupId, previousData, numberOfMembers); }) .catch((error) => { console.error(error.message); @@ -3574,27 +3730,27 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const { encryptedData, identifier } = request.payload; publishGroupEncryptedResource({ - encryptedData, identifier + encryptedData, + identifier, }) .then((data) => { sendResponse(data); - }) .catch((error) => { console.error(error.message); sendResponse({ error: error.message }); }); - return true + return true; break; } case "handleActiveGroupDataFromSocket": { const { groups, directs } = request.payload; handleActiveGroupDataFromSocket({ - groups, directs + groups, + directs, }) .then((data) => { sendResponse(true); - }) .catch((error) => { console.error(error.message); @@ -3606,9 +3762,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { case "getThreadActivity": { checkThreads(true) .then((data) => { - sendResponse(data); - }) .catch((error) => { console.error(error.message); @@ -3618,14 +3772,12 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } - case "updateThreadActivity": { const { threadId, qortalName, groupId, thread } = request.payload; - updateThreadActivity({threadId, qortalName, groupId, thread}) + updateThreadActivity({ threadId, qortalName, groupId, thread }) .then(() => { sendResponse(true); - }) .catch((error) => { console.error(error.message); @@ -3653,7 +3805,6 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { encryptSingle({ data64: data, secretKeyObject: secretKeyObject }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3668,7 +3819,6 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { decryptSingleFunc({ messages: data, secretKeyObject, skipDecodeBase64 }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3679,24 +3829,27 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "pauseAllQueues": { - pauseAllQueues() - sendResponse(res); + pauseAllQueues(); + sendResponse(true); break; - break; + } case "resumeAllQueues": { - resumeAllQueues() - sendResponse(res); + resumeAllQueues(); + sendResponse(true); break; } case "decryptSingleForPublishes": { const { data, secretKeyObject, skipDecodeBase64 } = request.payload; - decryptSingleForPublishes({ messages: data, secretKeyObject, skipDecodeBase64 }) + decryptSingleForPublishes({ + messages: data, + secretKeyObject, + skipDecodeBase64, + }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3706,13 +3859,12 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } - + case "decryptDirect": { const { data, involvingAddress } = request.payload; decryptDirectFunc({ messages: data, involvingAddress }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3722,7 +3874,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } - + case "sendChatGroup": { const { groupId, @@ -3733,7 +3885,6 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { sendChatGroup({ groupId, typeMessage, chatReference, messageText }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3750,12 +3901,18 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { chatReference = undefined, messageText, publicKeyOfRecipient, - address + address, } = request.payload; - sendChatDirect({ directTo, chatReference, messageText, typeMessage, publicKeyOfRecipient, address }) + sendChatDirect({ + directTo, + chatReference, + messageText, + typeMessage, + publicKeyOfRecipient, + address, + }) .then((res) => { - sendResponse(res); }) .catch((error) => { @@ -3766,11 +3923,9 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { break; } case "setupGroupWebsocket": { - - checkNewMessages() - checkThreads() - - + checkNewMessages(); + checkThreads(); + // if(socket){ // if(groups){ // console.log('hasgroups1') @@ -3794,7 +3949,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { // listenForNewGroupAnnouncements() // listenForThreadUpdates() // }, 200); - sendResponse(true) + sendResponse(true); break; } @@ -3802,39 +3957,47 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { case "logout": { try { - const logoutFunc = async()=> { - forceCloseWebSocket() - clearAllQueues() - if(interval){ - // for announcement notification - clearInterval(interval) - } + const logoutFunc = async () => { + forceCloseWebSocket(); + clearAllQueues(); + if (interval) { + // for announcement notification + clearInterval(interval); + } - const wallet = await getSaveWallet(); - const address = wallet.address0; - const key1 = `tempPublish-${address}` - const key2 = `group-data-${address}` - const key3 = `${address}-publishData` - chrome.storage.local.remove(["keyPair", "walletInfo", "apiKey", "active-groups-directs", key1, key2, key3], () => { - if (chrome.runtime.lastError) { - // Handle error - console.error(chrome.runtime.lastError.message); - } else { - chrome.tabs.query({}, function (tabs) { - tabs.forEach((tab) => { - chrome.tabs.sendMessage(tab.id, { type: "LOGOUT" }); - }); - }); - // Data removed successfully - sendResponse(true); - } - }); - } - logoutFunc() - } catch (error) { - - } - + const wallet = await getSaveWallet(); + const address = wallet.address0; + const key1 = `tempPublish-${address}`; + const key2 = `group-data-${address}`; + const key3 = `${address}-publishData`; + chrome.storage.local.remove( + [ + "keyPair", + "walletInfo", + "apiKey", + "active-groups-directs", + key1, + key2, + key3, + ], + () => { + if (chrome.runtime.lastError) { + // Handle error + console.error(chrome.runtime.lastError.message); + } else { + chrome.tabs.query({}, function (tabs) { + tabs.forEach((tab) => { + chrome.tabs.sendMessage(tab.id, { type: "LOGOUT" }); + }); + }); + // Data removed successfully + sendResponse(true); + } + } + ); + }; + logoutFunc(); + } catch (error) {} } break; @@ -3847,17 +4010,20 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { const saveWindowBounds = (windowId) => { chrome.windows.get(windowId, (window) => { const { top, left, width, height } = window; - chrome.storage.local.set({ - windowBounds: { top, left, width, height } - }, () => { - console.log('Window bounds saved:', { top, left, width, height }); - }); + chrome.storage.local.set( + { + windowBounds: { top, left, width, height }, + }, + () => { + console.log("Window bounds saved:", { top, left, width, height }); + } + ); }); }; // Function to restore window position and size const restoreWindowBounds = (callback) => { - chrome.storage.local.get('windowBounds', (data) => { + chrome.storage.local.get("windowBounds", (data) => { if (data.windowBounds) { callback(data.windowBounds); } else { @@ -3871,22 +4037,37 @@ chrome.action?.onClicked?.addListener((tab) => { chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, (windows) => { + console.log("windows", windows); // Attempt to find an existing popup window that has a tab with the correct URL - const existingPopup = windows.find( - (w) => - { - - return w.tabs && - w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)); - } - ); + const existingPopup = windows.find((w) => { + return ( + w.tabs && + w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)) + ); + }); if (existingPopup) { + console.log("Focusing existing popup window", existingPopup.id); // If the popup exists but is minimized or not focused, focus it - chrome.windows.update(existingPopup.id, { - focused: true, - state: "normal", - }); + + if (isMobile) { + const correctTab = existingPopup.tabs.find( + (tab) => tab.url && tab.url.startsWith(popupUrl) + ); + if (correctTab) { + chrome.tabs.update(correctTab.id, { active: true }); + chrome.windows.update(existingPopup.id, { + focused: true, + state: "normal", + }); + } + } else { + chrome.windows.update(existingPopup.id, { + focused: true, + state: "normal", + }); + } } else { + console.log("No existing popup, creating new window..."); // No existing popup found, restore the saved bounds or create a new one restoreWindowBounds((savedBounds) => { chrome.system.display.getInfo((displays) => { @@ -3896,31 +4077,31 @@ chrome.action?.onClicked?.addListener((tab) => { const screenHeight = primaryDisplay.bounds.height; // Create a new window that uses the saved bounds if available - chrome.windows.create({ - url: chrome.runtime.getURL("index.html?main=true"), - type: "popup", - width: savedBounds ? savedBounds.width : screenWidth, - height: savedBounds ? savedBounds.height : screenHeight, - left: savedBounds ? savedBounds.left : 0, - top: savedBounds ? savedBounds.top : 0, - }, (newWindow) => { - + chrome.windows.create( + { + url: chrome.runtime.getURL("index.html?main=true"), + type: "popup", + width: savedBounds ? savedBounds.width : screenWidth, + height: savedBounds ? savedBounds.height : screenHeight, + left: savedBounds ? savedBounds.left : 0, + top: savedBounds ? savedBounds.top : 0, + }, + (newWindow) => { + // Listen for changes in the window's size or position and save them + chrome.windows.onBoundsChanged.addListener((window) => { + if (window.id === newWindow.id) { + saveWindowBounds(newWindow.id); + } + }); - // Listen for changes in the window's size or position and save them - chrome.windows.onBoundsChanged.addListener((window) => { - if (window.id === newWindow.id) { - saveWindowBounds(newWindow.id); - } - }); - - // Save the final window bounds when the window is closed - chrome.windows.onRemoved.addListener((windowId) => { - if (windowId === newWindow.id) { - - saveWindowBounds(windowId); // Save the position/size before it’s closed - } - }); - }); + // Save the final window bounds when the window is closed + chrome.windows.onRemoved.addListener((windowId) => { + if (windowId === newWindow.id) { + saveWindowBounds(windowId); // Save the position/size before it’s closed + } + }); + } + ); }); }); } @@ -3940,9 +4121,8 @@ chrome.action?.onClicked?.addListener((tab) => { ); }); -const checkGroupList = async() => { +const checkGroupList = async () => { try { - const wallet = await getSaveWallet(); const address = wallet.address0; const url = await createEndpoint(`/chat/active/${address}`); @@ -3953,73 +4133,73 @@ const checkGroupList = async() => { }, }); const data = await response.json(); - - const filteredGroups = data.groups?.filter(item => item?.groupId !== 0) || []; - const sortedGroups = filteredGroups.sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0)); - const sortedDirects = (data?.direct || []).filter(item => - item?.name !== 'extension-proxy' && item?.address !== 'QSMMGSgysEuqDCuLw3S4cHrQkBrh3vP3VH' - ).sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0)); + + const filteredGroups = + data.groups?.filter((item) => item?.groupId !== 0) || []; + const sortedGroups = filteredGroups.sort( + (a, b) => (b.timestamp || 0) - (a.timestamp || 0) + ); + const sortedDirects = (data?.direct || []) + .filter( + (item) => + item?.name !== "extension-proxy" && + item?.address !== "QSMMGSgysEuqDCuLw3S4cHrQkBrh3vP3VH" + ) + .sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0)); handleActiveGroupDataFromSocket({ groups: sortedGroups, - directs: sortedDirects - }) + directs: sortedDirects, + }); } catch (error) { - console.error(error) + console.error(error); } finally { } -} +}; -const checkActiveChatsForNotifications = async ()=> { +const checkActiveChatsForNotifications = async () => { try { - - const popupUrl = chrome.runtime.getURL("index.html?main=true"); chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, (windows) => { // Attempt to find an existing popup window that has a tab with the correct URL - const existingPopup = windows.find( - (w) => { - - return w.tabs && w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)); - } - ); - + const existingPopup = windows.find((w) => { + return ( + w.tabs && + w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)) + ); + }); + if (existingPopup) { - } else { - checkGroupList() - + checkGroupList(); } - - } ); - } catch (error) { - - } -} -chrome.notifications?.onClicked?.addListener( (notificationId) => { - + } catch (error) {} +}; +chrome.notifications?.onClicked?.addListener((notificationId) => { const popupUrl = chrome.runtime.getURL("index.html?main=true"); - const isDirect = notificationId.includes('_type=direct_'); - const isGroup = notificationId.includes('_type=group_'); - const isGroupAnnouncement = notificationId.includes('_type=group-announcement_'); - const isNewThreadPost = notificationId.includes('_type=thread-post_'); + const isDirect = notificationId.includes("_type=direct_"); + const isGroup = notificationId.includes("_type=group_"); + const isGroupAnnouncement = notificationId.includes( + "_type=group-announcement_" + ); + const isNewThreadPost = notificationId.includes("_type=thread-post_"); - let isExisting = false + let isExisting = false; chrome.windows.getAll( { populate: true, windowTypes: ["popup"] }, async (windows) => { // Attempt to find an existing popup window that has a tab with the correct URL - const existingPopup = windows.find( - (w) => { - - return w.tabs && w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)); - } - ); + const existingPopup = windows.find((w) => { + return ( + w.tabs && + w.tabs.some((tab) => tab.url && tab.url.startsWith(popupUrl)) + ); + }); if (existingPopup) { // If the popup exists but is minimized or not focused, focus it @@ -4027,7 +4207,7 @@ chrome.notifications?.onClicked?.addListener( (notificationId) => { focused: true, state: "normal", }); - isExisting = true + isExisting = true; } else { // No existing popup found, restore saved bounds or create a new one restoreWindowBounds((savedBounds) => { @@ -4038,84 +4218,91 @@ chrome.notifications?.onClicked?.addListener( (notificationId) => { const screenHeight = primaryDisplay.bounds.height; // Create a new window that takes up the full screen or uses saved bounds - chrome.windows.create({ - url: chrome.runtime.getURL("index.html?main=true"), - type: "popup", - width: savedBounds ? savedBounds.width : screenWidth, - height: savedBounds ? savedBounds.height : screenHeight, - left: savedBounds ? savedBounds.left : 0, - top: savedBounds ? savedBounds.top : 0, - }, (newWindow) => { - + chrome.windows.create( + { + url: chrome.runtime.getURL("index.html?main=true"), + type: "popup", + width: savedBounds ? savedBounds.width : screenWidth, + height: savedBounds ? savedBounds.height : screenHeight, + left: savedBounds ? savedBounds.left : 0, + top: savedBounds ? savedBounds.top : 0, + }, + (newWindow) => { + // Listen for changes in the window's size or position and save them + chrome.windows.onBoundsChanged.addListener((window) => { + if (window.id === newWindow.id) { + saveWindowBounds(newWindow.id); + } + }); - // Listen for changes in the window's size or position and save them - chrome.windows.onBoundsChanged.addListener((window) => { - if (window.id === newWindow.id) { - saveWindowBounds(newWindow.id); - } - }); - - // Save the final window bounds when the window is closed - chrome.windows.onRemoved.addListener((windowId) => { - if (windowId === newWindow.id) { - - saveWindowBounds(windowId); // Save the position/size before it’s closed - } - }); - }); + // Save the final window bounds when the window is closed + chrome.windows.onRemoved.addListener((windowId) => { + if (windowId === newWindow.id) { + saveWindowBounds(windowId); // Save the position/size before it’s closed + } + }); + } + ); }); }); } - const activeData = await getStoredData('active-groups-directs') || { groups: [], directs: [] }; - setTimeout(() => { - - - chrome.runtime.sendMessage({ - action: "SET_GROUPS", - payload: activeData?.groups || [], - }); - chrome.runtime.sendMessage({ - action: "SET_DIRECTS", - payload: activeData?.directs || [], - }); - }, isExisting ? 100 : 1000); + const activeData = (await getStoredData("active-groups-directs")) || { + groups: [], + directs: [], + }; + setTimeout( + () => { + chrome.runtime.sendMessage({ + action: "SET_GROUPS", + payload: activeData?.groups || [], + }); + chrome.runtime.sendMessage({ + action: "SET_DIRECTS", + payload: activeData?.directs || [], + }); + }, + isExisting ? 100 : 1000 + ); const interactionId = Date.now().toString(); // Simple example; consider a better unique ID - setTimeout(() => { - chrome.runtime.sendMessage({ - action: "INITIATE_MAIN", - payload: {}, - }); + setTimeout( + () => { + chrome.runtime.sendMessage({ + action: "INITIATE_MAIN", + payload: {}, + }); - // Handle different types of notifications - if (isDirect) { - const fromValue = notificationId.split('_from=')[1]; - chrome.runtime.sendMessage({ - action: "NOTIFICATION_OPEN_DIRECT", - payload: { from: fromValue }, - }); - } else if (isGroup) { - const fromValue = notificationId.split('_from=')[1]; - chrome.runtime.sendMessage({ - action: "NOTIFICATION_OPEN_GROUP", - payload: { from: fromValue }, - }); - } else if (isGroupAnnouncement) { - const fromValue = notificationId.split('_from=')[1]; - chrome.runtime.sendMessage({ - action: "NOTIFICATION_OPEN_ANNOUNCEMENT_GROUP", - payload: { from: fromValue }, - }); - } else if (isNewThreadPost) { - const dataValue = notificationId.split('_data=')[1]; - const dataParsed = JSON.parse(dataValue); - - chrome.runtime.sendMessage({ - action: "NOTIFICATION_OPEN_THREAD_NEW_POST", - payload: { data: dataParsed }, - }); - } - }, isExisting ? 400 : 3000); + // Handle different types of notifications + if (isDirect) { + const fromValue = notificationId.split("_from=")[1]; + chrome.runtime.sendMessage({ + action: "NOTIFICATION_OPEN_DIRECT", + payload: { from: fromValue }, + }); + } else if (isGroup) { + const fromValue = notificationId.split("_from=")[1]; + chrome.runtime.sendMessage({ + action: "NOTIFICATION_OPEN_GROUP", + payload: { from: fromValue }, + }); + } else if (isGroupAnnouncement) { + const fromValue = notificationId.split("_from=")[1]; + chrome.runtime.sendMessage({ + action: "NOTIFICATION_OPEN_ANNOUNCEMENT_GROUP", + payload: { from: fromValue }, + }); + } else if (isNewThreadPost) { + const dataValue = notificationId.split("_data=")[1]; + const dataParsed = JSON.parse(dataValue); + + chrome.runtime.sendMessage({ + action: "NOTIFICATION_OPEN_THREAD_NEW_POST", + payload: { data: dataParsed }, + }); + } + }, + isExisting ? 400 : 3000 + ); // Store sendResponse callback with the interaction ID pendingResponses.set(interactionId, sendResponse); @@ -4133,14 +4320,16 @@ chrome.runtime?.onStartup.addListener(() => { chrome.runtime?.onInstalled.addListener((details) => { if (details.reason === chrome.runtime.OnInstalledReason.INSTALL) { - console.log('Extension Installed'); + console.log("Extension Installed"); // Perform tasks that should only happen on extension installation // Example: Initialize WebSocket, set default settings, etc. } else if (details.reason === chrome.runtime.OnInstalledReason.UPDATE) { - console.log('Extension Updated'); + console.log("Extension Updated"); // Handle the update logic here (e.g., migrate settings) - } else if (details.reason === chrome.runtime.OnInstalledReason.CHROME_UPDATE) { - console.log('Chrome updated'); + } else if ( + details.reason === chrome.runtime.OnInstalledReason.CHROME_UPDATE + ) { + console.log("Chrome updated"); // Optional: Handle Chrome-specific updates if necessary } @@ -4159,20 +4348,15 @@ chrome.alarms?.get("checkForNotifications", (existingAlarm) => { }); chrome.alarms?.onAlarm.addListener(async (alarm) => { - try { - - if (alarm.name === "checkForNotifications") { + try { + if (alarm.name === "checkForNotifications") { // initWebsocketMessageGroup(address); const wallet = await getSaveWallet(); const address = wallet.address0; - if(!address) return - checkActiveChatsForNotifications() - checkNewMessages() - checkThreads() - - } - } catch (error) { - - } + if (!address) return; + checkActiveChatsForNotifications(); + checkNewMessages(); + checkThreads(); + } + } catch (error) {} }); - diff --git a/src/components/Chat/AnnouncementDiscussion.tsx b/src/components/Chat/AnnouncementDiscussion.tsx index 9c3c1b8..923c159 100644 --- a/src/components/Chat/AnnouncementDiscussion.tsx +++ b/src/components/Chat/AnnouncementDiscussion.tsx @@ -10,7 +10,7 @@ import { decryptPublishes, getTempPublish, saveTempPublish } from "./GroupAnnoun import { AnnouncementList } from "./AnnouncementList"; import { Spacer } from "../../common/Spacer"; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; -import { getBaseApiReact, isMobile, pauseAllQueues, resumeAllQueues } from "../../App"; +import { getArbitraryEndpointReact, getBaseApiReact, isMobile, pauseAllQueues, resumeAllQueues } from "../../App"; const tempKey = 'accouncement-comment' @@ -55,6 +55,7 @@ export const AnnouncementDiscussion = ({ const res = await fetch( `${getBaseApiReact()}/arbitrary/DOCUMENT/${name}/${identifier}?encoding=base64` ); + if(!res?.ok) return const data = await res.text(); const response = await decryptPublishes([{ data }], secretKey); @@ -179,7 +180,7 @@ export const AnnouncementDiscussion = ({ // dispatch(setIsLoadingGlobal(true)) const identifier = `cm-${selectedAnnouncement.identifier}`; - const url = `${getBaseApiReact()}/arbitrary/resources/search?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${offset}&reverse=true`; + const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${offset}&reverse=true&prefix=true`; const response = await fetch(url, { method: "GET", headers: { @@ -209,7 +210,7 @@ export const AnnouncementDiscussion = ({ const offset = comments.length const identifier = `cm-${selectedAnnouncement.identifier}`; - const url = `${getBaseApiReact()}/arbitrary/resources/search?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${offset}&reverse=true&prefix=true`; + const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${offset}&reverse=true&prefix=true`; const response = await fetch(url, { method: "GET", headers: { diff --git a/src/components/Chat/AnnouncementItem.tsx b/src/components/Chat/AnnouncementItem.tsx index fa175e4..758a451 100644 --- a/src/components/Chat/AnnouncementItem.tsx +++ b/src/components/Chat/AnnouncementItem.tsx @@ -9,7 +9,7 @@ import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; import { getBaseApi } from "../../background"; import { requestQueueCommentCount } from "./GroupAnnouncements"; import { CustomLoader } from "../../common/CustomLoader"; -import { getBaseApiReact } from "../../App"; +import { getArbitraryEndpointReact, getBaseApiReact } from "../../App"; import { WrapperUserAction } from "../WrapperUserAction"; export const AnnouncementItem = ({ message, messageData, setSelectedAnnouncement, disableComment, myName }) => { @@ -21,7 +21,7 @@ export const AnnouncementItem = ({ message, messageData, setSelectedAnnouncement // dispatch(setIsLoadingGlobal(true)) const identifier = `cm-${message.identifier}`; - const url = `${getBaseApiReact()}/arbitrary/resources/search?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=0&includemetadata=false&offset=${offset}&reverse=true&prefix=true`; + const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=0&includemetadata=false&offset=${offset}&reverse=true&prefix=true`; const response = await requestQueueCommentCount.enqueue(() => { return fetch(url, { diff --git a/src/components/Chat/ChatDirect.tsx b/src/components/Chat/ChatDirect.tsx index f935eff..da49ba4 100644 --- a/src/components/Chat/ChatDirect.tsx +++ b/src/components/Chat/ChatDirect.tsx @@ -326,7 +326,7 @@ const clearEditorContent = () => { } } -console.log('isFocusedParent', isFocusedParent) + return (