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] Avoid race condition

Browse source
This commit is contained in:
Raymond Hill 2025-10-15 12:44:48 -04:00
parent 19db28c810
commit 5e2b85d53d
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,7 @@ const ALL_REALMS = NORMAL_REALM | PRIVATE_REALM;
let seenRealms = 0b00;
async function forceEnableRulesets(windowId) {
await seenRealmsReady;
if ( seenRealms === ALL_REALMS ) { return; }
if ( windowId === windows.WINDOW_ID_NONE ) { return; }
const details = await windows.get(windowId, { windowTypes: [ 'normal' ] });
@ -205,7 +206,7 @@ async function forceEnableRulesets(windowId) {
const currentRealm = incognito ? PRIVATE_REALM : NORMAL_REALM;
if ( (seenRealms & currentRealm) !== 0 ) { return; }
seenRealms |= currentRealm;
webext.storage.session.set({ __seenRealms: seenRealms });
webext.storage.session.set({ 'safari.seenRealms': seenRealms });
const ids = await nativeDNR.getEnabledRulesets();
if ( ids.length === 0 ) { return; }
nativeDNR.updateEnabledRulesets({
@ -216,8 +217,8 @@ async function forceEnableRulesets(windowId) {
windows.onFocusChanged.addListener(forceEnableRulesets);
webext.storage.session.get('__seenRealms').then(bin => {
seenRealms |= bin?.__seenRealms ?? 0;
const seenRealmsReady = webext.storage.session.get('safari.seenRealms').then(bin => {
seenRealms |= bin?.['safari.seenRealms'] ?? 0;
}).catch(( ) => {
});