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

Do not rely on vAPI presence in logger broadcast code

Browse source 
Related feedback:
https://github.com/uBlockOrigin/uBlock-issues/discussions/3096#discussioncomment-8339494
This commit is contained in:
Raymond Hill 2024-02-02 09:15:09 -05:00
parent 605c830312
commit b0122bb9fc
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/js/scriptlet-filtering.js
View file

@ -175,9 +175,7 @@ const onScriptletMessageInjector = (( ) => {
const parts = [ const parts = [
'(', '(',
function(name) { function(name) {
if ( typeof vAPI !== 'object' ) { return; } if ( self.uBO_bcSecret ) { return; }
if ( vAPI === null ) { return; }
if ( vAPI.bcSecret ) { return; }
const bcSecret = new self.BroadcastChannel(name); const bcSecret = new self.BroadcastChannel(name);
bcSecret.onmessage = ev => { bcSecret.onmessage = ev => {
const msg = ev.data; const msg = ev.data;
@ -189,14 +187,12 @@ const onScriptletMessageInjector = (( ) => {
case 'object': case 'object':
if ( self.vAPI && self.vAPI.messaging ) { if ( self.vAPI && self.vAPI.messaging ) {
self.vAPI.messaging.send('contentscript', msg); self.vAPI.messaging.send('contentscript', msg);
} else {
bcSecret.onmessage = null;
} }
break; break;
} }
}; };
bcSecret.postMessage('iamready!'); bcSecret.postMessage('iamready!');
vAPI.bcSecret = bcSecret; self.uBO_bcSecret = bcSecret;
}.toString(), }.toString(),
')(', ')(',
'bcSecret-slot', 'bcSecret-slot',

5
src/js/scriptlets/scriptlet-loglevel-1.js
View file

@ -24,9 +24,8 @@
/******************************************************************************/ /******************************************************************************/
(( ) => { (( ) => {
if ( typeof vAPI !== 'object' || vAPI === null ) { return; } if ( self.uBO_bcSecret instanceof self.BroadcastChannel === false ) { return; }
if ( vAPI.bcSecret instanceof self.BroadcastChannel === false ) { return; } self.uBO_bcSecret.postMessage('setScriptletLogLevelToOne');
vAPI.bcSecret.postMessage('setScriptletLogLevelToOne');
})(); })();

5
src/js/scriptlets/scriptlet-loglevel-2.js
View file

@ -24,9 +24,8 @@
/******************************************************************************/ /******************************************************************************/
(( ) => { (( ) => {
if ( typeof vAPI !== 'object' || vAPI === null ) { return; } if ( self.uBO_bcSecret instanceof self.BroadcastChannel === false ) { return; }
if ( vAPI.bcSecret instanceof self.BroadcastChannel === false ) { return; } self.uBO_bcSecret.postMessage('setScriptletLogLevelToTwo');
vAPI.bcSecret.postMessage('setScriptletLogLevelToTwo');
})(); })();