@ -109,71 +109,86 @@ vAPI.contentscriptEndInjected = true;
// https://github.com/gorhill/uMatrix/issues/45
var collapser = ( function ( ) {
var timer = null ;
var requestId = 1 ;
var newRequests = [ ] ;
var pendingRequests = { } ;
var pendingRequestCount = 0 ;
var srcProps = {
'img' : 'src'
var resquestIdGenerator = 1 ,
processTimer ,
toProcess = [ ] ,
toFilter = [ ] ,
toCollapse = new Map ( ) ,
cachedBlockedMap ,
cachedBlockedMapHash ,
cachedBlockedMapTimer ,
reURLPlaceholder = /\{\{url\}\}/g ;
var src1stProps = {
'embed' : 'src' ,
'iframe' : 'src' ,
'img' : 'src' ,
'object' : 'data'
} ;
var reURLplaceholder = /\{\{url\}\}/g ;
var PendingRequest = function ( target ) {
this . id = requestId ++ ;
this . target = target ;
pendingRequests [ this . id ] = this ;
pendingRequestCount += 1 ;
var src2ndProps = {
'img' : 'srcset'
} ;
// Because a while ago I have observed constructors are faster than
// literal object instanciations.
var BouncingRequest = function ( id , tagName , url ) {
this . id = id ;
this . tagName = tagName ;
this . url = url ;
this . blocked = false ;
var tagToTypeMap = {
embed : 'media' ,
iframe : 'frame' ,
img : 'image' ,
object : 'media'
} ;
var cachedBlockedSetClear = function ( ) {
cachedBlockedMap =
cachedBlockedMapHash =
cachedBlockedMapTimer = undefined ;
} ;
// https://github.com/chrisaljoudi/uBlock/issues/174
// Do not remove fragment from src URL
var onProcessed = function ( response ) {
if ( ! response ) {
if ( ! response ) { // This happens if uBO is disabled or restarted.
toCollapse . clear ( ) ;
return ;
}
var requests = response . requests ;
if ( requests === null || Array . isArray ( requests ) === false ) {
return ;
var targets = toCollapse . get ( response . id ) ;
if ( targets === undefined ) { return ; }
toCollapse . delete ( response . id ) ;
if ( cachedBlockedMapHash !== response . hash ) {
cachedBlockedMap = new Map ( response . blockedResources ) ;
cachedBlockedMapHash = response . hash ;
if ( cachedBlockedMapTimer !== undefined ) {
clearTimeout ( cachedBlockedMapTimer ) ;
}
var collapse = response . collapse ;
var placeholders = response . placeholders ;
var i = requests . length ;
var request , entry , target , tagName , docurl , replaced ;
while ( i -- ) {
request = requests [ i ] ;
if ( pendingRequests . hasOwnProperty ( request . id ) === false ) {
continue ;
cachedBlockedMapTimer = vAPI . setTimeout ( cachedBlockedSetClear , 30000 ) ;
}
entry = pendingRequests [ request . id ] ;
delete pendingRequests [ request . id ] ;
pendingRequestCount -= 1 ;
// Not blocked
if ( ! request . blocked ) {
continue ;
if ( cachedBlockedMap === undefined || cachedBlockedMap . size === 0 ) {
return ;
}
target = entry . target ;
var placeholders = response . placeholders ,
tag , prop , src , collapsed , docurl , replaced ;
// No placeholders
if ( collapse ) {
for ( var target of targets ) {
tag = target . localName ;
prop = src1stProps [ tag ] ;
if ( prop === undefined ) { continue ; }
src = target [ prop ] ;
if ( typeof src !== 'string' || src . length === 0 ) {
prop = src2ndProps [ tag ] ;
if ( prop === undefined ) { continue ; }
src = target [ prop ] ;
if ( typeof src !== 'string' || src . length === 0 ) { continue ; }
}
collapsed = cachedBlockedMap . get ( tagToTypeMap [ tag ] + ' ' + src ) ;
if ( collapsed === undefined ) { continue ; }
if ( collapsed ) {
target . style . setProperty ( 'display' , 'none' , 'important' ) ;
target . hidden = true ;
continue ;
}
tagName = target . localName ;
// Special case: iframe
if ( tagName === 'iframe' ) {
docurl = 'data:text/html,' + encodeURIComponent ( placeholders . iframe . replace ( reURLplaceholder , request . url ) ) ;
if ( tag === 'iframe' ) {
docurl =
'data:text/html,' +
encodeURIComponent (
placeholders . iframe . replace ( reURLPlaceholder , src )
) ;
replaced = false ;
// Using contentWindow.location prevent tainting browser
// history -- i.e. breaking back button (seen on Chromium).
@ -189,148 +204,125 @@ var collapser = (function() {
}
continue ;
}
// Everything else
target . setAttribute ( srcProps [ tagName ] , placeholders [ tagName ] ) ;
target . setAttribute ( src1stProps [ tag ] , placeholders [ tag ] ) ;
target . style . setProperty ( 'border' , placeholders . border , 'important' ) ;
target . style . setProperty ( 'background' , placeholders . background , 'important' ) ;
}
// Renew map: I believe that even if all properties are deleted, an
// object will still use more memory than a brand new one.
if ( pendingRequestCount === 0 ) {
pendingRequests = { } ;
}
} ;
var send = function ( ) {
timer = null ;
vAPI . messaging . send ( 'contentscript.js' , {
what : 'evaluateURLs' ,
requests : newRequests
} , onProcessed ) ;
newRequests = [ ] ;
processTimer = undefined ;
toCollapse . set ( resquestIdGenerator , toProcess ) ;
var msg = {
what : 'lookupBlockedCollapsibles' ,
id : resquestIdGenerator ,
toFilter : toFilter ,
hash : cachedBlockedMapHash
} ;
vAPI . messaging . send ( 'contentscript.js' , msg , onProcessed ) ;
toProcess = [ ] ;
toFilter = [ ] ;
resquestIdGenerator += 1 ;
} ;
var process = function ( delay ) {
if ( newRequests . length === 0 ) {
return ;
}
if ( toProcess . length === 0 ) { return ; }
if ( delay === 0 ) {
clearTimeout ( timer ) ;
if ( processTimer !== undefined ) {
clearTimeout ( processTimer ) ;
}
send ( ) ;
} else if ( timer === null ) {
timer = vAPI . setTimeout ( send , delay || 50 ) ;
} else if ( processTimer === undefined ) {
processTimer = vAPI . setTimeout ( send , delay || 47 ) ;
}
} ;
var add = function ( target ) {
toProcess . push ( target ) ;
} ;
var addMany = function ( targets ) {
var i = targets . length ;
while ( i -- ) {
toProcess . push ( targets [ i ] ) ;
}
} ;
var iframeSourceModified = function ( mutations ) {
var i = mutations . length ;
while ( i -- ) {
addFrameNode ( mutations [ i ] . target , true ) ;
addI Frame ( mutations [ i ] . target , true ) ;
}
process ( ) ;
} ;
var iframeSourceObserver = null ;
var iframeSourceObserver ;
var iframeSourceObserverOptions = {
attributes : true ,
attributeFilter : [ 'src' ]
} ;
var addFrameNod e = function ( iframe , dontObserve ) {
var addI Frame = function ( iframe , dontObserve ) {
// https://github.com/gorhill/uBlock/issues/162
// Be prepared to deal with possible change of src attribute.
if ( dontObserve !== true ) {
if ( iframeSourceObserver === null ) {
if ( iframeSourceObserver === undefined ) {
iframeSourceObserver = new MutationObserver ( iframeSourceModified ) ;
}
iframeSourceObserver . observe ( iframe , iframeSourceObserverOptions ) ;
}
// https://github.com/chrisaljoudi/uBlock/issues/174
// Do not remove fragment from src URL
var src = iframe . src ;
if ( src . lastIndexOf ( 'http' , 0 ) !== 0 ) {
return ;
}
var req = new PendingRequest ( iframe ) ;
newRequests . push ( new BouncingRequest ( req . id , 'iframe' , src ) ) ;
} ;
var addNode = function ( target ) {
var tagName = target . localName ;
if ( tagName === 'iframe' ) {
addFrameNode ( target ) ;
return ;
}
var prop = srcProps [ tagName ] ;
if ( prop === undefined ) {
return ;
}
// https://github.com/chrisaljoudi/uBlock/issues/174
// Do not remove fragment from src URL
var src = target [ prop ] ;
if ( typeof src !== 'string' || src === '' ) {
return ;
}
if ( src . lastIndexOf ( 'http' , 0 ) !== 0 ) {
return ;
}
var req = new PendingRequest ( target ) ;
newRequests . push ( new BouncingRequest ( req . id , tagName , src ) ) ;
if ( src === '' || typeof src !== 'string' ) { return ; }
if ( src . startsWith ( 'http' ) === false ) { return ; }
toFilter . push ( { type : 'frame' , url : iframe . src } ) ;
add ( iframe ) ;
} ;
var addNodes = function ( nodes ) {
var node ;
var i = nodes . length ;
var addIFrames = function ( iframes ) {
var i = iframes . length ;
while ( i -- ) {
node = nodes [ i ] ;
if ( node . nodeType === 1 ) {
addNode ( node ) ;
}
addIFrame ( iframes [ i ] ) ;
}
} ;
var addBranches = function ( branches ) {
var root ;
var i = branches . length ;
var addNodeList = function ( nodeList ) {
var node ,
i = nodeList . length ;
while ( i -- ) {
root = branches [ i ] ;
if ( root . nodeType === 1 ) {
addNode ( root ) ;
// blocked images will be reported by onResourceFailed
addNodes ( root . querySelectorAll ( 'iframe' ) ) ;
node = nodeList [ i ] ;
if ( node . nodeType !== 1 ) { continue ; }
if ( node . localName === 'iframe' ) {
addIFrame ( node ) ;
}
if ( node . childElementCount !== 0 ) {
addIFrames ( node . querySelectorAll ( 'iframe' ) ) ;
}
}
} ;
// Listener to collapse blocked resources.
// - Future requests not blocked yet
// - Elements dynamically added to the page
// - Elements which resource URL changes
var onResourceFailed = function ( ev ) {
addNode ( ev . target ) ;
if ( tagToTypeMap [ ev . target . localName ] !== undefined ) {
add ( ev . target ) ;
process ( ) ;
}
} ;
document . addEventListener ( 'error' , onResourceFailed , true ) ;
vAPI . shutdown . add ( function ( ) {
if ( timer !== null ) {
clearTimeout ( timer ) ;
timer = null ;
}
if ( iframeSourceObserver !== null ) {
document . removeEventListener ( 'error' , onResourceFailed , true ) ;
if ( iframeSourceObserver !== undefined ) {
iframeSourceObserver . disconnect ( ) ;
iframeSourceObserver = null ;
iframeSourceObserver = undefined ;
}
if ( processTimer !== undefined ) {
clearTimeout ( processTimer ) ;
processTimer = undefined ;
}
document . removeEventListener ( 'error' , onResourceFailed , true ) ;
newRequests = [ ] ;
pendingRequests = { } ;
pendingRequestCount = 0 ;
} ) ;
return {
addNodes : addNodes ,
addBranches : addBranches ,
addMany : addMany ,
addIFrames : addIFrames ,
addNodeList : addNodeList ,
process : process
} ;
} ) ( ) ;
@ -345,10 +337,6 @@ var hasInlineScript = function(nodeList, summary) {
if ( node . nodeType !== 1 ) {
continue ;
}
if ( typeof node . localName !== 'string' ) {
continue ;
}
if ( node . localName === 'script' ) {
text = node . textContent . trim ( ) ;
if ( text === '' ) {
@ -357,7 +345,6 @@ var hasInlineScript = function(nodeList, summary) {
summary . inlineScript = true ;
break ;
}
if ( node . localName === 'a' && node . href . lastIndexOf ( 'javascript' , 0 ) === 0 ) {
summary . inlineScript = true ;
break ;
@ -368,8 +355,6 @@ var hasInlineScript = function(nodeList, summary) {
}
} ;
/******************************************************************************/
var nodeListsAddedHandler = function ( nodeLists ) {
var i = nodeLists . length ;
if ( i === 0 ) {
@ -385,7 +370,7 @@ var nodeListsAddedHandler = function(nodeLists) {
if ( summary . inlineScript === false ) {
hasInlineScript ( nodeLists [ i ] , summary ) ;
}
collapser . addBranches ( nodeLists [ i ] ) ;
collapser . addNodeList ( nodeLists [ i ] ) ;
}
if ( summary . mustReport ) {
vAPI . messaging . send ( 'contentscript.js' , summary ) ;
@ -415,7 +400,8 @@ var nodeListsAddedHandler = function(nodeLists) {
vAPI . messaging . send ( 'contentscript.js' , summary ) ;
collapser . addNodes ( document . querySelectorAll ( 'iframe,img' ) ) ;
collapser . addMany ( document . querySelectorAll ( 'img' ) ) ;
collapser . addIFrames ( document . querySelectorAll ( 'iframe' ) ) ;
collapser . process ( ) ;
} ) ( ) ;
@ -427,6 +413,9 @@ var nodeListsAddedHandler = function(nodeLists) {
// Added node lists will be cumulated here before being processed
( function ( ) {
// This fixes http://acid3.acidtests.org/
if ( ! document . body ) { return ; }
var addedNodeLists = [ ] ;
var addedNodeListsTimer = null ;
@ -439,28 +428,19 @@ var nodeListsAddedHandler = function(nodeLists) {
// https://github.com/gorhill/uBlock/issues/205
// Do not handle added node directly from within mutation observer.
var treeMutationObservedHandlerAsync = function ( mutations ) {
var iMutation = mutations . length ;
var nodeList ;
var iMutation = mutations . length ,
nodeList ;
while ( iMutation -- ) {
nodeList = mutations [ iMutation ] . addedNodes ;
if ( nodeList . length !== 0 ) {
addedNodeLists . push ( nodeList ) ;
}
}
// I arbitrarily chose 250 ms for now:
// I have to compromise between the overhead of processing too few
// nodes too often and the delay of many nodes less often. There is nothing
// time critical here.
if ( addedNodeListsTimer === null ) {
addedNodeListsTimer = vAPI . setTimeout ( treeMutationObservedHandler , 250 ) ;
addedNodeListsTimer = vAPI . setTimeout ( treeMutationObservedHandler , 47 ) ;
}
} ;
// This fixes http://acid3.acidtests.org/
if ( ! document . body ) {
return ;
}
// https://github.com/gorhill/httpswitchboard/issues/176
var treeObserver = new MutationObserver ( treeMutationObservedHandlerAsync ) ;
treeObserver . observe ( document . body , {
gorhill
7 years ago