wanhose/cookie-dialog-monster
wanhose/cookie-dialog-monster
2
5
Fork 0
Code Issues 304 Pull Requests Releases 18 Wiki Activity

fix(browser-extension): browser.webRequest.onErrorOccurred listener

Browse Source
This commit is contained in:
wanhose 2024-10-05 12:30:42 +02:00
parent 5681cbcc04
commit 8368706525
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/browser-extension/src/scripts/background.js
View File

@ -44,7 +44,35 @@ const storage = browser.storage.local;
const suppressLastError = () => void browser.runtime.lastError; const suppressLastError = () => void browser.runtime.lastError;
/** /**
* @description Map match to pattern format * @description Calculate current hostname
* @param {string} url
* @returns {string}
*/
function getHostname(url) {
return new URL(url).hostname.split('.').slice(-3).join('.').replace('www.', '');
}
/**
* @description Format number to avoid errors
* @param {number} [value]
* @returns {string | null}
*/
function formatNumber(value) {
if (value) {
if (value >= 1e6) {
return `${Math.floor(value / 1e6)}M`;
} else if (value >= 1e3) {
return `${Math.floor(value / 1e3)}K`;
} else {
return value.toString();
}
}
return null;
}
/**
* @description Convert match string to pattern string
* @param {string} match * @param {string} match
* @returns {string} * @returns {string}
*/ */
@ -182,7 +210,7 @@ browser.runtime.onMessage.addListener((message, sender, callback) => {
case 'SET_BADGE': case 'SET_BADGE':
if (isPage && tabId !== undefined) { if (isPage && tabId !== undefined) {
browser.action.setBadgeBackgroundColor({ color: '#6b7280' }); browser.action.setBadgeBackgroundColor({ color: '#6b7280' });
browser.action.setBadgeText({ tabId, text: message.value ? `${message.value}` : null }); browser.action.setBadgeText({ tabId, text: formatNumber(message.value) });
} }
break; break;
case 'SET_HOSTNAME_STATE': case 'SET_HOSTNAME_STATE':
@ -257,9 +285,8 @@ browser.webRequest.onBeforeRequest.addListener(
return; return;
} }
const hostname = new URL(url).hostname.split('.').slice(-3).join('.').replace('www.', ''); const hostname = getHostname(url);
const { data, ...store } = await storage.get(['data', hostname]); const { data, [hostname]: state = { enabled: true } } = await storage.get(['data', hostname]);
const state = store[hostname] ?? { enabled: true };
if (data?.rules?.length) { if (data?.rules?.length) {
const rules = data.rules.map((rule) => ({ const rules = data.rules.map((rule) => ({
@ -284,17 +311,12 @@ browser.webRequest.onErrorOccurred.addListener(
async (details) => { async (details) => {
const { error, tabId, url } = details; const { error, tabId, url } = details;
if (tabId > -1) { if (error === 'net::ERR_BLOCKED_BY_CLIENT' && tabId > -1) {
const hostname = new URL(url).hostname.split('.').slice(-3).join('.').replace('www.', ''); const hostname = getHostname(url);
const { data, ...store } = await storage.get(['data', hostname]); const { [hostname]: state = { enabled: true } } = await storage.get(hostname);
const state = store[hostname] ?? { enabled: true };
if (error === 'net::ERR_BLOCKED_BY_CLIENT' && state.enabled) { if (state.enabled) {
const sessionRules = await browser.declarativeNetRequest.getSessionRules(); await browser.tabs.sendMessage(tabId, { type: 'INCREASE_ACTIONS_COUNT' });
if (sessionRules.some((rule) => new RegExp(rule.condition.urlFilter).test(url))) {
await browser.tabs.sendMessage(tabId, { type: 'INCREASE_ACTIONS_COUNT' });
}
} }
} }
}, },