@browserless.io/browserless 2.0.0-beta-5 → 2.0.0-beta-7

package/extensions/ublock/js/codemirror/ubo-static-filtering.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2018-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
@@ -699,9 +699,12 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
     const includeset = new Set();
     let errorCount = 0;
 
+    const ifendifSet = new Set();
+    let ifendifSetChanged = false;
+
     const extractMarkerDetails = (doc, lineHandle) => {
         if ( astParser.isUnsupported() ) {
-            return { value: 'error', msg: 'Unsupported filter syntax' };
+            return { lint: 'error', msg: 'Unsupported filter syntax' };
         }
         if ( astParser.hasError() ) {
             let msg = 'Invalid filter';
@@ -739,7 +742,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
                     }
                     break;
             }
-            return { value: 'error', msg };
+            return { lint: 'error', msg };
         }
         if ( astParser.astType !== sfp.AST_TYPE_COMMENT ) { return; }
         if ( astParser.astTypeFlavor !== sfp.AST_TYPE_COMMENT_PREPARSER ) {
@@ -747,15 +750,23 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
             for ( const include of includeset ) {
                 if ( astParser.raw.endsWith(include) === false ) { continue; }
                 includeset.delete(include);
-                return { value: 'include-end' };
+                return { lint: 'include-end' };
             }
             return;
         }
         if ( /^\s*!#if \S+/.test(astParser.raw) ) {
-            return { value: 'if-start' };
+            return {
+                lint: 'if-start',
+                data: {
+                    state: sfp.utils.preparser.evaluateExpr(
+                        astParser.getTypeString(sfp.NODE_TYPE_PREPARSE_DIRECTIVE_IF_VALUE),
+                        preparseDirectiveEnv
+                    ) ? 'y' : 'n'
+                }
+            };
         }
         if ( /^\s*!#endif\b/.test(astParser.raw) ) {
-            return { value: 'if-end' };
+            return { lint: 'if-end' };
         }
         const match = /^\s*!#include\s*(\S+)/.exec(astParser.raw);
         if ( match === null ) { return; }
@@ -765,7 +776,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
         const includeToken = `/${match[1]}`;
         if ( nextLineHandle.text.endsWith(includeToken) === false ) { return; }
         includeset.add(includeToken);
-        return { value: 'include-start' };
+        return { lint: 'include-start' };
     };
 
     const extractMarker = lineHandle => {
@@ -779,7 +790,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
         'error': {
             node: null,
             html: [
-                '<div class="CodeMirror-lintmarker" data-lint="error">&nbsp;',
+                '<div class="CodeMirror-lintmarker" data-lint="error" data-error="y">&nbsp;',
                   '<span class="msg"></span>',
                 '</div>',
             ],
@@ -787,10 +798,11 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
         'if-start': {
             node: null,
             html: [
-                '<div class="CodeMirror-lintmarker" data-lint="if" data-fold="start">&nbsp;',
+                '<div class="CodeMirror-lintmarker" data-lint="if" data-fold="start" data-state="">&nbsp;',
                   '<svg viewBox="0 0 100 100">',
                     '<polygon points="0,0 100,0 50,100" />',
                   '</svg>',
+                  '<span class="msg">Mismatched if-endif directive</span>',
                 '</div>',
             ],
         },
@@ -801,6 +813,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
                   '<svg viewBox="0 0 100 100">',
                     '<polygon points="50,0 100,100 0,100" />',
                   '</svg>',
+                  '<span class="msg">Mismatched if-endif directive</span>',
                 '</div>',
             ],
         },
@@ -826,41 +839,98 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
         },
     };
 
-    const markerFromTemplate = which => {
-        const template = markerTemplates[which];
+    const markerFromTemplate = details => {
+        const template = markerTemplates[details.lint];
         if ( template.node === null ) {
             const domParser = new DOMParser();
             const doc = domParser.parseFromString(template.html.join(''), 'text/html');
             template.node = document.adoptNode(qs$(doc, '.CodeMirror-lintmarker'));
         }
-        return template.node.cloneNode(true);
+        const node = template.node.cloneNode(true);
+        if ( details.data instanceof Object ) {
+            for ( const [ k, v ] of Object.entries(details.data) ) {
+                node.dataset[k] = `${v}`;
+            }
+        }
+        return node;
     };
 
     const addMarker = (doc, lineHandle, marker, details) => {
-        if ( marker !== null && marker.dataset.lint !== details.value ) {
+        if ( marker && marker.dataset.lint !== details.lint ) {
             doc.setGutterMarker(lineHandle, 'CodeMirror-lintgutter', null);
-            if ( marker.dataset.lint === 'error' ) {
+            if ( marker.dataset.error === 'y' ) {
                 errorCount -= 1;
             }
+            if ( marker.dataset.lint === 'if' ) {
+                ifendifSet.delete(lineHandle);
+                ifendifSetChanged = true;
+            }
             marker = null;
         }
         if ( marker === null ) {
-            marker = markerFromTemplate(details.value);
+            marker = markerFromTemplate(details);
             doc.setGutterMarker(lineHandle, 'CodeMirror-lintgutter', marker);
-            if ( details.value === 'error' ) {
+            if ( marker.dataset.error === 'y' ) {
                 errorCount += 1;
             }
+            if ( marker.dataset.lint === 'if' ) {
+                ifendifSet.add(lineHandle);
+                ifendifSetChanged = true;
+            }
         }
+        if ( typeof details.msg !== 'string' || details.msg === '' ) { return; }
         const msgElem = qs$(marker, '.msg');
         if ( msgElem === null ) { return; }
-        msgElem.textContent = details.msg || '';
+        msgElem.textContent = details.msg;
     };
 
     const removeMarker = (doc, lineHandle, marker) => {
         doc.setGutterMarker(lineHandle, 'CodeMirror-lintgutter', null);
-        if ( marker.dataset.lint === 'error' ) {
+        if ( marker.dataset.error === 'y' ) {
             errorCount -= 1;
         }
+        if ( marker.dataset.lint === 'if' ) {
+            ifendifSet.delete(lineHandle);
+            ifendifSetChanged = true;
+        }
+    };
+
+    // Analyze whether all if-endif are properly paired
+    const processIfendifs = ( ) => {
+        if ( ifendifSet.size === 0 ) { return; }
+        if ( ifendifSetChanged !== true ) { return; }
+        const sortFn = (a, b) => a.lineNo() - b.lineNo();
+        const sorted = Array.from(ifendifSet).sort(sortFn);
+        const bad = [];
+        const stack = [];
+        for ( const line of sorted ) {
+            const marker = extractMarker(line);
+            const fold = marker.dataset.fold;
+            if ( fold === 'start' ) {
+                stack.push(line);
+            } else if ( fold === 'end' ) {
+                if ( stack.length !== 0 ) {
+                    if ( marker.dataset.error === 'y' ) {
+                        marker.dataset.error = '';
+                        errorCount -= 1;
+                    }
+                    const ifstart = extractMarker(stack.pop());
+                    if ( ifstart.dataset.error === 'y' ) {
+                        ifstart.dataset.error = '';
+                        errorCount -= 1;
+                    }
+                } else {
+                    bad.push(line);
+                }
+            }
+        }
+        bad.push(...stack);
+        for ( const line of bad ) {
+            const marker = extractMarker(line);
+            marker.dataset.error = 'y';
+            errorCount += 1;
+        }
+        ifendifSetChanged = false;
     };
 
     const processDeletion = (doc, change) => {
@@ -868,10 +938,12 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
         doc.eachLine(from.line, to.line, lineHandle => {
             const marker = extractMarker(lineHandle);
             if ( marker === null ) { return; }
-            if ( marker.dataset.lint === 'error' ) {
+            if ( marker.dataset.error === 'y' ) {
+                marker.dataset.error = '';
                 errorCount -= 1;
-                marker.dataset.lint = 'void';
             }
+            ifendifSet.delete(lineHandle);
+            ifendifSetChanged = true;
         });
     };
 
@@ -881,10 +953,10 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
             astParser.parse(lineHandle.text);
             const markerDetails = extractMarkerDetails(doc, lineHandle);
             const marker = extractMarker(lineHandle);
-            if ( markerDetails === undefined && marker !== null ) {
-                removeMarker(doc, lineHandle, marker);
-            } else if ( markerDetails !== undefined ) {
+            if ( markerDetails !== undefined ) {
                 addMarker(doc, lineHandle, marker, markerDetails);
+            } else if ( marker !== null ) {
+                removeMarker(doc, lineHandle, marker);
             }
             from += 1;
             if ( (from & 0x0F) !== 0 ) { return; }
@@ -910,6 +982,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
             return processChangesetAsync(doc);
         }
         includeset.clear();
+        processIfendifs(doc);
         CodeMirror.signal(doc.getEditor(), 'linterDone', { errorCount });
     };
 
@@ -922,13 +995,14 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
     };
 
     const onChanges = (cm, changes) => {
+        if ( changes.length === 0 ) { return; }
         const doc = cm.getDoc();
         for ( const change of changes ) {
             const from = change.from.line;
             const to = from + change.text.length;
             changeset.push({ from, to });
-            processChangesetAsync(doc);
         }
+        processChangesetAsync(doc);
     };
 
     const onBeforeChanges = (cm, change) => {

package/extensions/ublock/js/commands.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2017-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/console.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2019-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/contentscript-extra.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/contentscript.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
@@ -1320,8 +1320,6 @@ vAPI.DOMFilterer = class {
             vAPI.userStylesheet.apply();
         }
 
-        // Library of resources is located at:
-        // https://github.com/gorhill/uBlock/blob/master/assets/ublock/resources.txt
         if ( scriptletDetails && typeof self.uBO_scriptletsInjected !== 'string' ) {
             self.uBO_scriptletsInjected = scriptletDetails.filters;
             if ( scriptletDetails.mainWorld ) {

package/extensions/ublock/js/contextmenu.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
@@ -23,10 +23,10 @@
 
 /******************************************************************************/
 
-import './utils.js';
 import logger from './logger.js';
 import µb from './background.js';
 
+import { MRUCache } from './mrucache.js';
 import { StaticExtFilteringHostnameDB } from './static-ext-filtering-db.js';
 
 /******************************************************************************/
@@ -244,13 +244,13 @@ const FilterContainer = function() {
         canonical: 'highGenericHideSimple',
         dict: new Set(),
         str: '',
-        mru: new µb.MRUCache(16)
+        mru: new MRUCache(16)
     };
     this.highlyGeneric.complex = {
         canonical: 'highGenericHideComplex',
         dict: new Set(),
         str: '',
-        mru: new µb.MRUCache(16)
+        mru: new MRUCache(16)
     };
 
     // Short-lived: content is valid only during one function call. These

package/extensions/ublock/js/dashboard-common.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/dashboard.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/devtools.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
@@ -134,7 +134,7 @@ dom.on('#console-unfold', 'click', ( ) => {
 dom.on('#snfe-dump', 'click', ev => {
     const button = ev.target;
     dom.attr(button, 'disabled', '');
-    vAPI.messaging.send('dashboard', {
+    vAPI.messaging.send('devTools', {
         what: 'snfeDump',
     }).then(result => {
         log(result);
@@ -145,7 +145,7 @@ dom.on('#snfe-dump', 'click', ev => {
 dom.on('#snfe-todnr', 'click', ev => {
     const button = ev.target;
     dom.attr(button, 'disabled', '');
-    vAPI.messaging.send('dashboard', {
+    vAPI.messaging.send('devTools', {
         what: 'snfeToDNR',
     }).then(result => {
         log(result);
@@ -153,6 +153,25 @@ dom.on('#snfe-todnr', 'click', ev => {
     });
 });
 
+dom.on('#cfe-dump', 'click', ev => {
+    const button = ev.target;
+    dom.attr(button, 'disabled', '');
+    vAPI.messaging.send('devTools', {
+        what: 'cfeDump',
+    }).then(result => {
+        log(result);
+        dom.attr(button, 'disabled', null);
+    });
+});
+
+dom.on('#purge-all-caches', 'click', ( ) => {
+    vAPI.messaging.send('devTools', {
+        what: 'purgeAllCaches'
+    }).then(result => {
+        log(result);
+    });
+});
+
 vAPI.messaging.send('dashboard', {
     what: 'getAppData',
 }).then(appData => {
@@ -161,7 +180,7 @@ vAPI.messaging.send('dashboard', {
     dom.on('#snfe-benchmark', 'click', ev => {
         const button = ev.target;
         dom.attr(button, 'disabled', '');
-        vAPI.messaging.send('dashboard', {
+        vAPI.messaging.send('devTools', {
             what: 'snfeBenchmark',
         }).then(result => {
             log(result);
@@ -170,15 +189,4 @@ vAPI.messaging.send('dashboard', {
     });
 });
 
-dom.on('#cfe-dump', 'click', ev => {
-    const button = ev.target;
-    dom.attr(button, 'disabled', '');
-    vAPI.messaging.send('dashboard', {
-        what: 'cfeDump',
-    }).then(result => {
-        log(result);
-        dom.attr(button, 'disabled', null);
-    });
-});
-
 /******************************************************************************/

package/extensions/ublock/js/diff-updater.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
@@ -191,7 +191,7 @@ async function fetchPatchDetailsFromCDNs(assetDetails) {
         const patchURL = resolveURL(patchPath, cdnURL);
         if ( patchURL === undefined ) { continue; }
         const response = await fetch(patchURL).catch(reason => {
-            console.error(reason);
+            console.error(reason, patchURL);
         });
         if ( response === undefined ) { continue; }
         if ( response.status === 404 ) { break; }
@@ -271,7 +271,7 @@ async function fetchAndApplyAllPatches(assetDetails) {
 const bc = new globalThis.BroadcastChannel('diffUpdater');
 
 bc.onmessage = ev => {
-    const message = ev.data;
+    const message = ev.data || {};
     switch ( message.what ) {
     case 'update':
         fetchAndApplyAllPatches(message).then(response => {

package/extensions/ublock/js/document-blocked.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2015-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/dom-inspector.js

@@ -0,0 +1,68 @@
+/*******************************************************************************
+
+    uBlock Origin - a comprehensive, efficient content blocker
+    Copyright (C) 2014-present Raymond Hill
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+    Home: https://github.com/gorhill/uBlock
+*/
+
+'use strict';
+
+/******************************************************************************/
+/******************************************************************************/
+
+const svgRoot = document.querySelector('svg');
+let inspectorContentPort;
+
+const shutdown = ( ) => {
+    inspectorContentPort.close();
+    inspectorContentPort.onmessage = inspectorContentPort.onmessageerror = null;
+    inspectorContentPort = undefined;
+};
+
+const contentInspectorChannel = ev => {
+    const msg = ev.data || {};
+    switch ( msg.what ) {
+        case 'quitInspector': {
+            shutdown();
+            break;
+        }
+        case 'svgPaths': {
+            const paths = svgRoot.children;
+            paths[0].setAttribute('d', msg.paths[0]);
+            paths[1].setAttribute('d', msg.paths[1]);
+            paths[2].setAttribute('d', msg.paths[2]);
+            paths[3].setAttribute('d', msg.paths[3]);
+            break;
+        }
+        default:
+            break;
+    }
+};
+
+// Wait for the content script to establish communication
+globalThis.addEventListener('message', ev => {
+    const msg = ev.data || {};
+    if ( msg.what !== 'startInspector' ) { return; }
+    if ( Array.isArray(ev.ports) === false ) { return; }
+    if ( ev.ports.length === 0 ) { return; }
+    inspectorContentPort = ev.ports[0];
+    inspectorContentPort.onmessage = contentInspectorChannel;
+    inspectorContentPort.onmessageerror = shutdown;
+    inspectorContentPort.postMessage({ what: 'startInspector' });
+}, { once: true });
+
+/******************************************************************************/

package/extensions/ublock/js/dom.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/dyna-rules.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify

package/extensions/ublock/js/dynamic-net-filtering.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-2018 Raymond Hill
 
     This program is free software: you can redistribute it and/or modify