prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mv3] Fix unremovable custom filters created using older versions

Browse source 
Related issue:
https://github.com/uBlockOrigin/uBOL-home/issues/435
This commit is contained in:
Raymond Hill 2025-08-14 14:56:26 -04:00
parent 718b3cdb97
commit d54c4a7052
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
platform/mv3/extension/js/filter-manager.js
View file

@ -38,6 +38,10 @@ import { ubolErr } from './debug.js';
/******************************************************************************/
const perSitePendingIO = new Map();
/******************************************************************************/
export async function selectorsFromCustomFilters(hostname) {
const promises = [];
let hn = hostname;
@ -132,6 +136,9 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
/******************************************************************************/
export async function registerCustomFilters(context) {
if ( perSitePendingIO.size !== 0 ) {
await Promise.all(Array.from(perSitePendingIO.values()));
}
const siteKeys = await getAllCustomFilterKeys();
if ( siteKeys.length === 0 ) { return; }
@ -168,6 +175,20 @@ export async function registerCustomFilters(context) {
/******************************************************************************/
export async function addCustomFilter(hostname, selector) {
const pending = perSitePendingIO.get(hostname);
const promise = pending
? pending.then(( ) => addCustomFilterByHostname(hostname, selector))
: addCustomFilterByHostname(hostname, selector);
perSitePendingIO.set(hostname, promise);
promise.then(( ) => {
if ( promise !== perSitePendingIO.get(hostname) ) { return; }
perSitePendingIO.delete(hostname);
});
return promise;
}
async function addCustomFilterByHostname(hostname, selector) {
if ( hostname === '' ) { return false; }
const key = `site.${hostname}`;
const selectors = await localRead(key) || [];
if ( selectors.includes(selector) ) { return false; }
@ -183,9 +204,7 @@ export async function removeCustomFilter(hostname, selector) {
const promises = [];
let hn = hostname;
while ( hn !== '' ) {
promises.push(
removeCustomFilterByKey(`site.${hn}`, selector).catch(( ) => false)
);
promises.push(removeCustomFilterByHostname(hn, selector));
const pos = hn.indexOf('.');
if ( pos === -1 ) { break; }
hn = hn.slice(pos + 1);
@ -194,11 +213,28 @@ export async function removeCustomFilter(hostname, selector) {
return results.some(a => a);
}
async function removeCustomFilterByHostname(hostname, selector) {
const pending = perSitePendingIO.get(hostname);
const key = `site.${hostname}`;
const promise = pending
? pending.then(( ) => removeCustomFilterByKey(key, selector))
: removeCustomFilterByKey(key, selector);
perSitePendingIO.set(hostname, promise);
promise.then(( ) => {
if ( promise !== perSitePendingIO.get(hostname) ) { return; }
perSitePendingIO.delete(hostname);
});
return promise;
}
async function removeCustomFilterByKey(key, selector) {
const selectors = await localRead(key);
if ( selectors === undefined ) { return false; }
const i = selectors.indexOf(selector);
if ( i === -1 ) { return false; }
let i = selectors.indexOf(selector);
if ( i === -1 ) {
i = selectors.indexOf(`0${selector}`);
if ( i === -1 ) { return false; }
}
selectors.splice(i, 1);
if ( selectors.length !== 0 ) {
await localWrite(key, selectors);