Skip to content

🧹 Simplify cross-browser messaging logic #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmuench wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −58
Open

🧹 Simplify cross-browser messaging logic #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions popup/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,31 +102,7 @@ document.addEventListener("DOMContentLoaded", async () => {
return false;
};

const sendMessageToTab = (tabId, message) => {
if (browserAPI.tabs && typeof browserAPI.tabs.sendMessage === "function") {
return browserAPI.tabs.sendMessage(tabId, message);
}
if (typeof browser !== "undefined" && browser.tabs?.sendMessage) {
return browser.tabs.sendMessage(tabId, message);
}
if (typeof chrome !== "undefined" && chrome.tabs?.sendMessage) {
return new Promise((resolve, reject) => {
try {
chrome.tabs.sendMessage(tabId, message, (response) => {
const error = chrome.runtime?.lastError;
if (error) {
reject(new Error(error.message));
} else {
resolve(response);
}
});
} catch (error) {
reject(error);
}
});
}
throw new Error("tabs.sendMessage API is unavailable");
};
const sendMessageToTab = window.sendMessageToTab;

const updateCaptureButtonState = (webhookId) => {
const button = captureButtonMap.get(webhookId);
Expand Down
69 changes: 36 additions & 33 deletions utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,35 @@ const getBrowserAPI = () => {
}
};

/**
* Sends a message to a specific tab, handling cross-browser differences.
* @param {number} tabId - The ID of the tab to send the message to.
* @param {Object} message - The message object to send.
* @returns {Promise<any>} A promise that resolves with the response from the tab.
*/
async function sendMessageToTab(tabId, message) {
const browserAPI = getBrowserAPI();
if (browserAPI.tabs && typeof browserAPI.tabs.sendMessage === "function") {
return browserAPI.tabs.sendMessage(tabId, message);
}
if (typeof browser !== "undefined" && typeof browser.tabs?.sendMessage === "function") {
return browser.tabs.sendMessage(tabId, message);
}
if (typeof chrome !== "undefined" && typeof chrome.tabs?.sendMessage === "function") {
return new Promise((resolve, reject) => {
chrome.tabs.sendMessage(tabId, message, (response) => {
const error = chrome.runtime?.lastError;
if (error) {
reject(new Error(error.message));
} else {
resolve(response);
}
});
});
}
throw new Error("tabs.sendMessage API is unavailable");
}

/**
* Replaces i18n placeholders in the HTML document.
* It targets elements with the 'data-i18n' attribute,
Expand Down Expand Up @@ -177,39 +206,12 @@ async function sendWebhook(webhook, isTest = false) {
}
}

const canSendMessage =
typeof browserAPI.tabs?.sendMessage === "function" ||
(typeof browser !== "undefined" && typeof browser.tabs?.sendMessage === "function") ||
(typeof chrome !== "undefined" && typeof chrome.tabs?.sendMessage === "function");

if (selectors.length > 0 && canSendMessage) {
if (selectors.length > 0) {
try {
let response;
if (browserAPI.tabs && typeof browserAPI.tabs.sendMessage === "function") {
response = await browserAPI.tabs.sendMessage(activeTab.id, {
type: "GET_SELECTOR_CONTENT",
selectors,
});
} else if (typeof browser !== "undefined" && typeof browser.tabs?.sendMessage === "function") {
response = await browser.tabs.sendMessage(activeTab.id, {
type: "GET_SELECTOR_CONTENT",
selectors,
});
} else if (typeof chrome !== "undefined" && typeof chrome.tabs?.sendMessage === "function") {
response = await new Promise((resolve, reject) => {
chrome.tabs.sendMessage(activeTab.id, {
type: "GET_SELECTOR_CONTENT",
selectors,
}, (res) => {
const err = chrome.runtime?.lastError;
if (err) {
reject(new Error(err.message));
} else {
resolve(res);
}
});
});
}
const response = await sendMessageToTab(activeTab.id, {
type: "GET_SELECTOR_CONTENT",
selectors,
});
if (response && Array.isArray(response.selectorContent)) {
selectorContent = response.selectorContent.map((value) =>
typeof value === "string" ? value.trim() : ""
Expand Down Expand Up @@ -363,9 +365,10 @@ async function sendWebhook(webhook, isTest = false) {
}

if (typeof module !== 'undefined' && module.exports) {
module.exports = { replaceI18nPlaceholders, getBrowserAPI, sendWebhook };
module.exports = { replaceI18nPlaceholders, getBrowserAPI, sendMessageToTab, sendWebhook };
} else {
window.replaceI18nPlaceholders = replaceI18nPlaceholders;
window.getBrowserAPI = getBrowserAPI;
window.sendMessageToTab = sendMessageToTab;
window.sendWebhook = sendWebhook;
}
Loading