@browserless.io/browserless 2.23.0 → 2.24.0-beta-2

package/extensions/ublock/js/i18n.js

@@ -19,8 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
 /******************************************************************************/
 
 const i18n =
@@ -168,14 +166,14 @@ if ( isBackgroundProcess !== true ) {
         const re = /\{\{\w+\}\}/g;
         let textout = '';
         for (;;) {
-            let match = re.exec(textin);
+            const match = re.exec(textin);
             if ( match === null ) {
                 textout += textin;
                 break;
             }
             textout += textin.slice(0, match.index);
             let prop = match[0].slice(2, -2);
-            if ( dict.hasOwnProperty(prop) ) {
+            if ( Object.prototype.hasOwnProperty.call(dict, prop) ) {
                 textout += dict[prop].replace(/</g, '&lt;')
                                      .replace(/>/g, '&gt;');
             } else {

package/extensions/ublock/js/pagestore.js

@@ -925,8 +925,11 @@ const PageStore = class {
     }
 
     redirectBlockedRequest(fctxt) {
-        const directives = staticNetFilteringEngine.redirectRequest(redirectEngine, fctxt);
-        if ( directives === undefined ) { return; }
+        const directives = staticNetFilteringEngine.redirectRequest(redirectEngine, fctxt) || [];
+        if ( this.urlSkippableResources.has(fctxt.itype) ) {
+            staticNetFilteringEngine.urlSkip(fctxt, true, directives);
+        }
+        if ( directives.length === 0 ) { return; }
         if ( logger.enabled !== true ) { return; }
         fctxt.pushFilters(directives.map(a => a.logData()));
         if ( fctxt.redirectURL === undefined ) { return; }
@@ -942,6 +945,9 @@ const PageStore = class {
         if ( staticNetFilteringEngine.hasQuery(fctxt) ) {
             staticNetFilteringEngine.filterQuery(fctxt, directives);
         }
+        if ( this.urlSkippableResources.has(fctxt.itype) ) {
+            staticNetFilteringEngine.urlSkip(fctxt, false, directives);
+        }
         if ( directives.length === 0 ) { return; }
         if ( logger.enabled !== true ) { return; }
         fctxt.pushFilters(directives.map(a => a.logData()));
@@ -952,8 +958,8 @@ const PageStore = class {
         });
     }
 
-    skipMainDocument(fctxt) {
-        const directives = staticNetFilteringEngine.urlSkip(fctxt);
+    skipMainDocument(fctxt, blocked) {
+        const directives = staticNetFilteringEngine.urlSkip(fctxt, blocked);
         if ( directives === undefined ) { return; }
         if ( logger.enabled !== true ) { return; }
         fctxt.pushFilters(directives.map(a => a.logData()));
@@ -1019,48 +1025,51 @@ const PageStore = class {
     }
 
     // The caller is responsible to check whether filtering is enabled or not.
-    filterLargeMediaElement(fctxt, size) {
+    filterLargeMediaElement(fctxt, headers) {
         fctxt.filter = undefined;
-
-        if ( this.allowLargeMediaElementsUntil === 0 ) {
+        if ( this.allowLargeMediaElementsUntil === 0 ) { return 0; }
+        if ( sessionSwitches.evaluateZ('no-large-media', fctxt.getTabHostname() ) !== true ) {
+            this.allowLargeMediaElementsUntil = 0;
             return 0;
         }
-        // Disregard large media elements previously allowed: for example, to
-        // seek inside a previously allowed audio/video.
-        if (
-            this.allowLargeMediaElementsRegex instanceof RegExp &&
-            this.allowLargeMediaElementsRegex.test(fctxt.url)
-        ) {
+        // XHR-based streaming is never blocked but we want to prevent autoplay
+        if ( fctxt.itype === fctxt.XMLHTTPREQUEST ) {
+            const ctype = headers.contentType;
+            if ( ctype.startsWith('audio/') || ctype.startsWith('video/') ) {
+                this.largeMediaTimer.on(500);
+            }
             return 0;
         }
         if ( Date.now() < this.allowLargeMediaElementsUntil ) {
-            const sources = this.allowLargeMediaElementsRegex instanceof RegExp
-                ? [ this.allowLargeMediaElementsRegex.source ]
-                : [];
-            sources.push('^' + µb.escapeRegex(fctxt.url));
-            this.allowLargeMediaElementsRegex = new RegExp(sources.join('|'));
+            if ( fctxt.itype === fctxt.MEDIA ) {
+                const sources = this.allowLargeMediaElementsRegex instanceof RegExp
+                    ? [ this.allowLargeMediaElementsRegex.source ]
+                    : [];
+                sources.push('^' + µb.escapeRegex(fctxt.url));
+                this.allowLargeMediaElementsRegex = new RegExp(sources.join('|'));
+            }
             return 0;
         }
+        // Disregard large media elements previously allowed: for example, to
+        // seek inside a previously allowed audio/video.
         if (
-            sessionSwitches.evaluateZ(
-                'no-large-media',
-                fctxt.getTabHostname()
-            ) !== true
+            this.allowLargeMediaElementsRegex instanceof RegExp &&
+            this.allowLargeMediaElementsRegex.test(fctxt.url)
         ) {
-            this.allowLargeMediaElementsUntil = 0;
             return 0;
         }
-        if ( (size >>> 10) < µb.userSettings.largeMediaSize ) {
-            return 0;
+        // Regardless of whether a media is blocked, we want to prevent autoplay
+        if ( fctxt.itype === fctxt.MEDIA ) {
+            this.largeMediaTimer.on(500);
         }
-
+        const size = headers.contentLength;
+        if ( isNaN(size) ) { return 0; }
+        if ( (size >>> 10) < µb.userSettings.largeMediaSize ) { return 0; }
         this.largeMediaCount += 1;
         this.largeMediaTimer.on(500);
-
         if ( logger.enabled ) {
             fctxt.filter = sessionSwitches.toLogData();
         }
-
         return 1;
     }
 
@@ -1129,22 +1138,31 @@ const PageStore = class {
         response.blockedResources =
             this.netFilteringCache.lookupAllBlocked(fctxt.getDocHostname());
     }
-};
-
-PageStore.prototype.cacheableResults = new Set([
-    µb.FilteringContext.SUB_FRAME,
-]);
 
-PageStore.prototype.collapsibleResources = new Set([
-    µb.FilteringContext.IMAGE,
-    µb.FilteringContext.MEDIA,
-    µb.FilteringContext.OBJECT,
-    µb.FilteringContext.SUB_FRAME,
-]);
-
-// To mitigate memory churning
-PageStore.junkyard = [];
-PageStore.junkyardMax = 10;
+    cacheableResults = new Set([
+        µb.FilteringContext.SUB_FRAME
+    ]);
+
+    collapsibleResources = new Set([
+        µb.FilteringContext.IMAGE,
+        µb.FilteringContext.MEDIA,
+        µb.FilteringContext.OBJECT,
+        µb.FilteringContext.SUB_FRAME,
+    ]);
+
+    urlSkippableResources = new Set([
+        µb.FilteringContext.IMAGE,
+        µb.FilteringContext.MAIN_FRAME,
+        µb.FilteringContext.MEDIA,
+        µb.FilteringContext.OBJECT,
+        µb.FilteringContext.OTHER,
+        µb.FilteringContext.SUB_FRAME,
+    ]);
+
+    // To mitigate memory churning
+    static junkyard = [];
+    static junkyardMax = 10;
+};
 
 /******************************************************************************/
 

package/extensions/ublock/js/s14e-serializer.js

@@ -249,8 +249,29 @@ const toArrayBufferViewConstructor = {
 
 /******************************************************************************/
 
-const textDecoder = new TextDecoder();
-const textEncoder = new TextEncoder();
+const textCodec = {
+    decoder: null,
+    encoder: null,
+    decode(...args) {
+        if ( this.decoder === null ) {
+            this.decoder = new globalThis.TextDecoder();
+        }
+        return this.decoder.decode(...args);
+    },
+    encode(...args) {
+        if ( this.encoder === null ) {
+            this.encoder = new globalThis.TextEncoder();
+        }
+        return this.encoder.encode(...args);
+    },
+    encodeInto(...args) {
+        if ( this.encoder === null ) {
+            this.encoder = new globalThis.TextEncoder();
+        }
+        return this.encoder.encodeInto(...args);
+    },
+};
+
 const isInteger = Number.isInteger;
 
 const writeRefs = new Map();
@@ -269,7 +290,7 @@ const uint8InputFromAsciiStr = s => {
     if ( uint8Input === null || uint8Input.length < s.length ) {
         uint8Input = new Uint8Array(s.length + 0x03FF & ~0x03FF);
     }
-    textEncoder.encodeInto(s, uint8Input);
+    textCodec.encodeInto(s, uint8Input);
     return uint8Input;
 };
 
@@ -407,7 +428,7 @@ const denseArrayBufferToStr = (arrbuf, details) => {
             }
         }
     }
-    return textDecoder.decode(output);
+    return textCodec.decode(output);
 };
 
 const BASE88_POW1 = NUMSAFECHARS;
@@ -489,7 +510,7 @@ const sparseArrayBufferToStr = (arrbuf, details) => {
             uint8out[j++] = SEPARATORCHARCODE;
         }
     }
-    return textDecoder.decode(uint8out);
+    return textCodec.decode(uint8out);
 };
 
 const sparseArrayBufferFromStr = (sparseStr, arrbuf) => {
@@ -1060,7 +1081,7 @@ export const serialize = (data, options = {}) => {
     writeBuffer.length = 0;
     if ( shouldCompress(s, options) === false ) { return s; }
     const lz4Util = new LZ4BlockJS();
-    const uint8ArrayBefore = textEncoder.encode(s);
+    const uint8ArrayBefore = textCodec.encode(s);
     const uint8ArrayAfter = lz4Util.encode(uint8ArrayBefore, 0);
     const lz4 = {
         size: uint8ArrayBefore.length,
@@ -1076,32 +1097,36 @@ export const serialize = (data, options = {}) => {
     return ratio <= 0.85 ? t : s;
 };
 
-export const deserialize = s => {
-    if ( s.startsWith(MAGICLZ4PREFIX) ) {
-        refCounter = 1;
-        readStr = s;
-        readEnd = s.length;
-        readPtr = MAGICLZ4PREFIX.length;
-        const lz4 = _deserialize();
-        readRefs.clear();
-        readStr = '';
-        const lz4Util = new LZ4BlockJS();
-        const uint8ArrayAfter = lz4Util.decode(lz4.data, 0, lz4.size);
-        s = textDecoder.decode(new Uint8Array(uint8ArrayAfter));
-    }
-    if ( s.startsWith(MAGICPREFIX) === false ) { return; }
+const deserializeById = (blockid, s) => {
     refCounter = 1;
     readStr = s;
     readEnd = s.length;
-    readPtr = MAGICPREFIX.length;
+    readPtr = blockid.length;
     const data = _deserialize();
     readRefs.clear();
     readStr = '';
-    uint8Input = null;
     if ( readPtr === FAILMARK ) { return; }
     return data;
 };
 
+export const deserialize = s => {
+    if ( s.startsWith(MAGICLZ4PREFIX) ) {
+        const lz4 = deserializeById(MAGICLZ4PREFIX, s);
+        if ( lz4 ) {
+            const lz4Util = new LZ4BlockJS();
+            const uint8ArrayAfter = lz4Util.decode(lz4.data, 0, lz4.size);
+            if ( uint8ArrayAfter ) {
+                s = textCodec.decode(new Uint8Array(uint8ArrayAfter));
+            }
+        }
+    }
+    const data = s.startsWith(MAGICPREFIX)
+        ? deserializeById(MAGICPREFIX, s)
+        : undefined;
+    uint8Input = null;
+    return data;
+};
+
 export const isSerialized = s =>
     typeof s === 'string' &&
         (s.startsWith(MAGICLZ4PREFIX) || s.startsWith(MAGICPREFIX));

package/extensions/ublock/js/scriptlet-filtering.js

@@ -176,25 +176,28 @@ const onScriptletMessageInjector = (( ) => {
         '(',
         function(name) {
             if ( self.uBO_bcSecret ) { return; }
-            const bcSecret = new self.BroadcastChannel(name);
-            bcSecret.onmessage = ev => {
-                const msg = ev.data;
-                switch ( typeof msg ) {
-                case 'string':
-                    if ( msg !== 'areyouready?' ) { break; }
-                    bcSecret.postMessage('iamready!');
-                    break;
-                case 'object':
-                    if ( self.vAPI && self.vAPI.messaging ) {
-                        self.vAPI.messaging.send('contentscript', msg);
-                    } else {
-                        console.log(`[uBO][${msg.type}]${msg.text}`);
+            try {
+                const bcSecret = new self.BroadcastChannel(name);
+                bcSecret.onmessage = ev => {
+                    const msg = ev.data;
+                    switch ( typeof msg ) {
+                    case 'string':
+                        if ( msg !== 'areyouready?' ) { break; }
+                        bcSecret.postMessage('iamready!');
+                        break;
+                    case 'object':
+                        if ( self.vAPI && self.vAPI.messaging ) {
+                            self.vAPI.messaging.send('contentscript', msg);
+                        } else {
+                            console.log(`[uBO][${msg.type}]${msg.text}`);
+                        }
+                        break;
                     }
-                    break;
-                }
-            };
-            bcSecret.postMessage('iamready!');
-            self.uBO_bcSecret = bcSecret;
+                };
+                bcSecret.postMessage('iamready!');
+                self.uBO_bcSecret = bcSecret;
+            } catch(_) {
+            }
         }.toString(),
         ')(',
             'bcSecret-slot',

package/extensions/ublock/js/scriptlets/load-large-media-interactive.js

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
 (( ) => {
 
 /******************************************************************************/
@@ -32,8 +28,6 @@ if ( typeof vAPI !== 'object' || vAPI.loadAllLargeMedia instanceof Function ) {
     return;
 }
 
-/******************************************************************************/
-
 const largeMediaElementAttribute = 'data-' + vAPI.sessionId;
 const largeMediaElementSelector =
     ':root   audio[' + largeMediaElementAttribute + '],\n' +
@@ -41,25 +35,19 @@ const largeMediaElementSelector =
     ':root picture[' + largeMediaElementAttribute + '],\n' +
     ':root   video[' + largeMediaElementAttribute + ']';
 
-/******************************************************************************/
+const isMediaElement = elem =>
+    (/^(?:audio|img|picture|video)$/.test(elem.localName));
 
-const isMediaElement = function(elem) {
-    return /^(?:audio|img|picture|video)$/.test(elem.localName);
-};
+const isPlayableMediaElement = elem =>
+    (/^(?:audio|video)$/.test(elem.localName));
 
 /******************************************************************************/
 
 const mediaNotLoaded = function(elem) {
     switch ( elem.localName ) {
     case 'audio':
-    case 'video': {
-        const src = elem.src || '';
-        if ( src.startsWith('blob:') ) {
-            elem.autoplay = false;
-            elem.pause();
-        }
+    case 'video':
         return elem.readyState === 0 || elem.error !== null;
-    }
     case 'img': {
         if ( elem.naturalWidth !== 0 || elem.naturalHeight !== 0 ) {
             break;
@@ -103,44 +91,41 @@ const surveyMissingMediaElements = function() {
     return largeMediaElementCount;
 };
 
-if ( surveyMissingMediaElements() === 0 ) { return; }
-
-// Insert CSS to highlight blocked media elements.
-if ( vAPI.largeMediaElementStyleSheet === undefined ) {
-    vAPI.largeMediaElementStyleSheet = [
-        largeMediaElementSelector + ' {',
-            'border: 2px dotted red !important;',
-            'box-sizing: border-box !important;',
-            'cursor: zoom-in !important;',
-            'display: inline-block;',
-            'filter: none !important;',
-            'font-size: 1rem !important;',
-            'min-height: 1em !important;',
-            'min-width: 1em !important;',
-            'opacity: 1 !important;',
-            'outline: none !important;',
-            'transform: none !important;',
-            'visibility: visible !important;',
-            'z-index: 2147483647',
-        '}',
-    ].join('\n');
-    vAPI.userStylesheet.add(vAPI.largeMediaElementStyleSheet);
-    vAPI.userStylesheet.apply();
+if ( surveyMissingMediaElements() ) {
+    // Insert CSS to highlight blocked media elements.
+    if ( vAPI.largeMediaElementStyleSheet === undefined ) {
+        vAPI.largeMediaElementStyleSheet = [
+            largeMediaElementSelector + ' {',
+                'border: 2px dotted red !important;',
+                'box-sizing: border-box !important;',
+                'cursor: zoom-in !important;',
+                'display: inline-block;',
+                'filter: none !important;',
+                'font-size: 1rem !important;',
+                'min-height: 1em !important;',
+                'min-width: 1em !important;',
+                'opacity: 1 !important;',
+                'outline: none !important;',
+                'transform: none !important;',
+                'visibility: visible !important;',
+                'z-index: 2147483647',
+            '}',
+        ].join('\n');
+        vAPI.userStylesheet.add(vAPI.largeMediaElementStyleSheet);
+        vAPI.userStylesheet.apply();
+    }
 }
 
 /******************************************************************************/
 
 const loadMedia = async function(elem) {
     const src = elem.getAttribute('src') || '';
+    if ( src === '' ) { return; }
     elem.removeAttribute('src');
-
     await vAPI.messaging.send('scriptlets', {
         what: 'temporarilyAllowLargeMediaElement',
     });
-
-    if ( src !== '' ) {
-        elem.setAttribute('src', src);
-    }
+    elem.setAttribute('src', src);
     elem.load();
 };
 
@@ -148,14 +133,21 @@ const loadMedia = async function(elem) {
 
 const loadImage = async function(elem) {
     const src = elem.getAttribute('src') || '';
-    elem.removeAttribute('src');
-
+    const srcset = src === '' && elem.getAttribute('srcset') || '';
+    if ( src === '' && srcset === '' ) { return; }
+    if ( src !== '' ) {
+        elem.removeAttribute('src');
+    }
+    if ( srcset !== '' ) {
+        elem.removeAttribute('srcset');
+    }
     await vAPI.messaging.send('scriptlets', {
         what: 'temporarilyAllowLargeMediaElement',
     });
-
     if ( src !== '' ) {
         elem.setAttribute('src', src);
+    } else if ( srcset !== '' ) {
+        elem.setAttribute('srcset', srcset);
     }
 };
 
@@ -258,6 +250,27 @@ document.addEventListener('error', onLoadError, true);
 
 /******************************************************************************/
 
+const autoPausedMedia = new WeakMap();
+
+for ( const elem of document.querySelectorAll('audio,video') ) {
+    elem.setAttribute('autoplay', 'false');
+}
+
+const preventAutoplay = function(ev) {
+    const elem = ev.target;
+    if ( isPlayableMediaElement(elem) === false ) { return; }
+    const currentSrc = elem.getAttribute('src') || '';
+    const pausedSrc = autoPausedMedia.get(elem);
+    if ( pausedSrc === currentSrc ) { return; }
+    autoPausedMedia.set(elem, currentSrc);
+    elem.setAttribute('autoplay', 'false');
+    elem.pause();
+};
+
+document.addEventListener('timeupdate', preventAutoplay, true);
+
+/******************************************************************************/
+
 vAPI.loadAllLargeMedia = function() {
     document.removeEventListener('click', onMouseClick, true);
     document.removeEventListener('loadeddata', onLoadedData, true);

package/extensions/ublock/js/scriptlets/should-inject-contentscript.js

@@ -19,8 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
 // If content scripts are already injected, we need to respond with `false`,
 // to "should inject content scripts?"
 //
@@ -31,7 +29,7 @@
     try {
         const status = vAPI.uBO !== true;
         if ( status === false && vAPI.bootstrap ) {
-            self.requestIdleCallback(( ) => vAPI && vAPI.bootstrap());
+            self.requestIdleCallback(( ) => vAPI?.bootstrap?.());
         }
         return status;
     } catch(ex) {

package/extensions/ublock/js/static-dnr-filtering.js

@@ -19,12 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
-import staticNetFilteringEngine from './static-net-filtering.js';
-import { LineIterator } from './text-utils.js';
 import * as sfp from './static-filtering-parser.js';
 
 import {
@@ -32,6 +26,9 @@ import {
     CompiledListWriter,
 } from './static-filtering-io.js';
 
+import { LineIterator } from './text-utils.js';
+import staticNetFilteringEngine from './static-net-filtering.js';
+
 /******************************************************************************/
 
 // http://www.cse.yorku.ca/~oz/hash.html#djb2
@@ -47,13 +44,15 @@ const hashFromStr = (type, s) => {
     return hash & 0xFFFFFF;
 };
 
+const isRegex = hn => hn.startsWith('/') && hn.endsWith('/');
+
 /******************************************************************************/
 
 // Copied from cosmetic-filter.js for the time being to avoid unwanted
 // dependencies
 
 const rePlainSelector = /^[#.][\w\\-]+/;
-const rePlainSelectorEx = /^[^#.\[(]+([#.][\w-]+)|([#.][\w-]+)$/;
+const rePlainSelectorEx = /^[^#.[(]+([#.][\w-]+)|([#.][\w-]+)$/;
 const rePlainSelectorEscaped = /^[#.](?:\\[0-9A-Fa-f]+ |\\.|\w|-)+/;
 const reEscapeSequence = /\\([0-9A-Fa-f]+ |.)/g;
 
@@ -106,6 +105,7 @@ function addExtendedToDNR(context, parser) {
         for ( const { hn, not, bad } of parser.getExtFilterDomainIterator() ) {
             if ( bad ) { continue; }
             if ( exception ) { continue; }
+            if ( isRegex(hn) ) { continue; }
             let details = context.scriptletFilters.get(argsToken);
             if ( details === undefined ) {
                 context.scriptletFilters.set(argsToken, details = { args });
@@ -163,6 +163,7 @@ function addExtendedToDNR(context, parser) {
         };
         for ( const { hn, not, bad } of parser.getExtFilterDomainIterator() ) {
             if ( bad ) { continue; }
+            if ( isRegex(hn) ) { continue; }
             if ( not ) {
                 if ( rule.condition.excludedInitiatorDomains === undefined ) {
                     rule.condition.excludedInitiatorDomains = [];
@@ -235,6 +236,7 @@ function addExtendedToDNR(context, parser) {
     }
     for ( const { hn, not, bad } of parser.getExtFilterDomainIterator() ) {
         if ( bad ) { continue; }
+        if ( isRegex(hn) ) { continue; }
         let { compiled, exception, raw } = parser.result;
         if ( exception ) { continue; }
         let rejected;