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][safari] Force-reload rulesets when new browsing realm is seen

Browse source 
Workaround for Safari-specific issue:
- https://github.com/uBlockOrigin/uBOL-home/issues/515
- https://bugs.webkit.org/show_bug.cgi?id=300236
This commit is contained in:
Raymond Hill 2025-10-12 12:11:57 -04:00
parent 6fb58f8599
commit 8cc18c1089
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
platform/mv3/safari/ext-compat.js
View file

@ -181,3 +181,43 @@ export const dnr = {
return nativeDNR.setExtensionActionOptions(...args);
},
};
/******************************************************************************/
// Workaround for:
// https://github.com/uBlockOrigin/uBOL-home/issues/515
// https://bugs.webkit.org/show_bug.cgi?id=300236
//
// For each realm, we will force-reload registered rulesets once.
const { windows } = webext;
const NORMAL_REALM = 0b01;
const PRIVATE_REALM = 0b10;
const ALL_REALMS = NORMAL_REALM | PRIVATE_REALM;
let seenRealms = 0b00;
async function forceEnableRulesets(windowId) {
if ( seenRealms === ALL_REALMS ) { return; }
if ( windowId === windows.WINDOW_ID_NONE ) { return; }
const details = await windows.get(windowId, { windowTypes: [ 'normal' ] });
const incognito = details?.incognito;
if ( typeof incognito !== 'boolean' ) { return; }
const currentRealm = incognito ? PRIVATE_REALM : NORMAL_REALM;
if ( (seenRealms & currentRealm) !== 0 ) { return; }
seenRealms |= currentRealm;
webext.storage.session.set({ __seenRealms: seenRealms });
const ids = await nativeDNR.getEnabledRulesets();
if ( ids.length === 0 ) { return; }
nativeDNR.updateEnabledRulesets({
disableRulesetIds: ids.slice(),
enableRulesetIds: ids.slice(),
});
}
windows.onFocusChanged.addListener(forceEnableRulesets);
webext.storage.session.get('__seenRealms').then(bin => {
seenRealms |= bin?.__seenRealms ?? 0;
}).catch(( ) => {
});