1919 Home: https://github.com/gorhill/uBlock
2020*/
2121
22- /* globals browser */
23-
24- 'use strict' ;
22+ import * as s14e from './s14e-serializer.js' ;
23+ import * as sfp from './static-filtering-parser.js' ;
2524
26- /******************************************************************************/
25+ import {
26+ domainFromHostname ,
27+ domainFromURI ,
28+ entityFromDomain ,
29+ hostnameFromURI ,
30+ isNetworkURI ,
31+ } from './uri-utils.js' ;
2732
28- import publicSuffixList from '../lib/publicsuffixlist/publicsuffixlist.js' ;
29- import punycode from '../lib/punycode.js' ;
33+ import {
34+ permanentFirewall ,
35+ permanentSwitches ,
36+ permanentURLFiltering ,
37+ sessionFirewall ,
38+ sessionSwitches ,
39+ sessionURLFiltering ,
40+ } from './filtering-engines.js' ;
3041
31- import { filteringBehaviorChanged } from './broadcast.js' ;
3242import cacheStorage from './cachestorage.js' ;
3343import cosmeticFilteringEngine from './cosmetic-filtering.js' ;
44+ import { denseBase64 } from './base64-custom.js' ;
45+ import { dnrRulesetFromRawLists } from './static-dnr-filtering.js' ;
46+ import { filteringBehaviorChanged } from './broadcast.js' ;
3447import htmlFilteringEngine from './html-filtering.js' ;
48+ import { i18n$ } from './i18n.js' ;
49+ import io from './assets.js' ;
3550import logger from './logger.js' ;
3651import lz4Codec from './lz4.js' ;
37- import io from './assets.js' ;
52+ import publicSuffixList from '../lib/publicsuffixlist/publicsuffixlist.js' ;
53+ import punycode from '../lib/punycode.js' ;
54+ import { redirectEngine } from './redirect-engine.js' ;
3855import scriptletFilteringEngine from './scriptlet-filtering.js' ;
3956import staticFilteringReverseLookup from './reverselookup.js' ;
4057import staticNetFilteringEngine from './static-net-filtering.js' ;
41- import µb from './background.js' ;
4258import webRequest from './traffic.js' ;
43- import { denseBase64 } from './base64-custom.js' ;
44- import { dnrRulesetFromRawLists } from './static-dnr-filtering.js' ;
45- import { i18n$ } from './i18n.js' ;
46- import { redirectEngine } from './redirect-engine.js' ;
47- import * as sfp from './static-filtering-parser.js' ;
48- import * as s14e from './s14e-serializer.js' ;
49-
50- import {
51- permanentFirewall ,
52- sessionFirewall ,
53- permanentSwitches ,
54- sessionSwitches ,
55- permanentURLFiltering ,
56- sessionURLFiltering ,
57- } from './filtering-engines.js' ;
58-
59- import {
60- domainFromHostname ,
61- domainFromURI ,
62- entityFromDomain ,
63- hostnameFromURI ,
64- isNetworkURI ,
65- } from './uri-utils.js' ;
59+ import µb from './background.js' ;
6660
6761/******************************************************************************/
6862
63+ const hasOwnProperty = ( o , p ) =>
64+ Object . prototype . hasOwnProperty . call ( o , p ) ;
65+
6966// https://github.com/uBlockOrigin/uBlock-issues/issues/710
7067// Listeners have a name and a "privileged" status.
7168// The nameless default handler is always deemed "privileged".
@@ -807,7 +804,7 @@ const onMessage = function(request, sender, callback) {
807804 } ) ;
808805 break ;
809806
810- case 'shouldRenderNoscriptTags' :
807+ case 'shouldRenderNoscriptTags' : {
811808 if ( pageStore === null ) { break ; }
812809 const fctxt = µb . filteringContext . fromTabId ( sender . tabId ) ;
813810 if ( pageStore . filterScripting ( fctxt , undefined ) ) {
@@ -818,7 +815,7 @@ const onMessage = function(request, sender, callback) {
818815 } ) ;
819816 }
820817 break ;
821-
818+ }
822819 case 'retrieveGenericCosmeticSelectors' :
823820 request . tabId = sender . tabId ;
824821 request . frameId = sender . frameId ;
@@ -1098,7 +1095,7 @@ const restoreUserData = async function(request) {
10981095 // Discard unknown setting or setting with default value.
10991096 for ( const key in hiddenSettings ) {
11001097 if (
1101- µb . hiddenSettingsDefault . hasOwnProperty ( key ) === false ||
1098+ hasOwnProperty ( µb . hiddenSettingsDefault , key ) === false ||
11021099 hiddenSettings [ key ] === µb . hiddenSettingsDefault [ key ]
11031100 ) {
11041101 delete hiddenSettings [ key ] ;
@@ -1128,7 +1125,7 @@ const restoreUserData = async function(request) {
11281125 } ) ;
11291126 µb . saveUserFilters ( userData . userFilters ) ;
11301127 if ( Array . isArray ( userData . selectedFilterLists ) ) {
1131- await µb . saveSelectedFilterLists ( userData . selectedFilterLists ) ;
1128+ await µb . saveSelectedFilterLists ( userData . selectedFilterLists ) ;
11321129 }
11331130
11341131 vAPI . app . restart ( ) ;
@@ -1150,7 +1147,7 @@ const resetUserData = async function() {
11501147// Filter lists
11511148const prepListEntries = function ( entries ) {
11521149 for ( const k in entries ) {
1153- if ( entries . hasOwnProperty ( k ) === false ) { continue ; }
1150+ if ( hasOwnProperty ( entries , k ) === false ) { continue ; }
11541151 const entry = entries [ k ] ;
11551152 if ( typeof entry . supportURL === 'string' && entry . supportURL !== '' ) {
11561153 entry . supportName = hostnameFromURI ( entry . supportURL ) ;
@@ -1338,7 +1335,7 @@ const getSupportData = async function() {
13381335 let addedListset = { } ;
13391336 let removedListset = { } ;
13401337 for ( const listKey in lists ) {
1341- if ( lists . hasOwnProperty ( listKey ) === false ) { continue ; }
1338+ if ( hasOwnProperty ( lists , listKey ) === false ) { continue ; }
13421339 const list = lists [ listKey ] ;
13431340 if ( list . content !== 'filters' ) { continue ; }
13441341 const used = µb . selectedFilterLists . includes ( listKey ) ;
@@ -1755,7 +1752,7 @@ const onMessage = (request, sender, callback) => {
17551752 // Sync
17561753 let response ;
17571754 switch ( request . what ) {
1758- case 'getInspectorArgs' :
1755+ case 'getInspectorArgs' : {
17591756 const bc = new globalThis . BroadcastChannel ( 'contentInspectorChannel' ) ;
17601757 bc . postMessage ( {
17611758 what : 'contentInspectorChannel' ,
@@ -1768,6 +1765,7 @@ const onMessage = (request, sender, callback) => {
17681765 ) ,
17691766 } ;
17701767 break ;
1768+ }
17711769 default :
17721770 return vAPI . messaging . UNHANDLED ;
17731771 }
@@ -2004,6 +2002,12 @@ const onMessage = function(request, sender, callback) {
20042002 response = staticNetFilteringEngine . dump ( ) ;
20052003 break ;
20062004
2005+ case 'snfeQuery' :
2006+ response = staticNetFilteringEngine . test (
2007+ Object . assign ( { redirectEngine } , request . query )
2008+ ) ;
2009+ break ;
2010+
20072011 case 'cfeDump' :
20082012 response = cosmeticFilteringEngine . dump ( ) ;
20092013 break ;
@@ -2181,7 +2185,7 @@ const onMessage = function(request, sender, callback) {
21812185 }
21822186 break ;
21832187
2184- case 'subscribeTo' :
2188+ case 'subscribeTo' : {
21852189 // https://github.com/uBlockOrigin/uBlock-issues/issues/1797
21862190 if ( / ^ ( f i l e | h t t p s ? ) : \/ \/ / . test ( request . location ) === false ) { break ; }
21872191 const url = encodeURIComponent ( request . location ) ;
@@ -2194,8 +2198,8 @@ const onMessage = function(request, sender, callback) {
21942198 select : true ,
21952199 } ) ;
21962200 break ;
2197-
2198- case 'updateLists' :
2201+ }
2202+ case 'updateLists' : {
21992203 const listkeys = request . listkeys . split ( ',' ) . filter ( s => s !== '' ) ;
22002204 if ( listkeys . length === 0 ) { return ; }
22012205 if ( listkeys . includes ( 'all' ) ) {
@@ -2211,7 +2215,7 @@ const onMessage = function(request, sender, callback) {
22112215 } ) ;
22122216 µb . scheduleAssetUpdater ( { now : true , fetchDelay : 100 , auto : request . auto } ) ;
22132217 break ;
2214-
2218+ }
22152219 default :
22162220 return vAPI . messaging . UNHANDLED ;
22172221 }
0 commit comments