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

package/extensions/ublock/js/utils.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
@@ -84,48 +84,6 @@ import µb from './background.js';
 
 /******************************************************************************/
 
-µb.MRUCache = class {
-    constructor(size) {
-        this.size = size;
-        this.array = [];
-        this.map = new Map();
-        this.resetTime = Date.now();
-    }
-    add(key, value) {
-        const found = this.map.has(key);
-        this.map.set(key, value);
-        if ( !found ) {
-            if ( this.array.length === this.size ) {
-                this.map.delete(this.array.pop());
-            }
-            this.array.unshift(key);
-        }
-    }
-    remove(key) {
-        if ( this.map.has(key) ) {
-            this.array.splice(this.array.indexOf(key), 1);
-        }
-    }
-    lookup(key) {
-        const value = this.map.get(key);
-        if ( value !== undefined && this.array[0] !== key ) {
-            let i = this.array.indexOf(key);
-            do {
-                this.array[i] = this.array[i-1];
-            } while ( --i );
-            this.array[0] = key;
-        }
-        return value;
-    }
-    reset() {
-        this.array = [];
-        this.map.clear();
-        this.resetTime = Date.now();
-    }
-};
-
-/******************************************************************************/
-
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
 
 µb.escapeRegex = function(s) {
@@ -134,36 +92,6 @@ import µb from './background.js';
 
 /******************************************************************************/
 
-µb.fireEvent = function(name, details = undefined) {
-    if (
-        self instanceof Object &&
-        self.dispatchEvent instanceof Function &&
-        self.CustomEvent instanceof Function
-    ) {
-        self.dispatchEvent(new CustomEvent(name, { detail: details }));
-    }
-};
-
-µb.onEvent = function(name, fn) {
-    if (
-        self instanceof Object &&
-        self.addEventListener instanceof Function
-    ) {
-        self.addEventListener(name, fn);
-    }
-};
-
-/******************************************************************************/
-
-µb.filteringBehaviorChanged = function(details = {}) {
-    if ( typeof details.direction !== 'number' || details.direction >= 0 ) {
-        vAPI.net.handlerBehaviorChanged();
-    }
-    this.fireEvent('filteringBehaviorChanged', details);
-};
-
-/******************************************************************************/
-
 // TODO: properly compare arrays
 
 µb.getModifiedSettings = function(edit, orig = {}) {

package/extensions/ublock/js/vapi-background-ext.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/vapi-background.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-2015 The uBlock Origin authors
     Copyright (C) 2014-present Raymond Hill
 
@@ -87,26 +87,83 @@ vAPI.app = {
     },
 };
 
-/******************************************************************************/
-/******************************************************************************/
+/*******************************************************************************
+ * 
+ * https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/storage/session
+ * 
+ * Session (in-memory) storage is promise-based in all browsers, no need for
+ * a webext polyfill. However, not all browsers supports it in MV2.
+ * 
+ * */
+
+vAPI.sessionStorage = {
+    get() {
+        return Promise.resolve({});
+    },
+    set() {
+        return Promise.resolve();
+    },
+    remove() {
+        return Promise.resolve();
+    },
+    clear() {
+        return Promise.resolve();
+    },
+    implemented: false,
+};
+
+/*******************************************************************************
+ * 
+ * Data written to and read from storage.local will be mirrored to in-memory
+ * storage.session.
+ * 
+ * Data read from storage.local will be first fetched from storage.session,
+ * then if not available, read from storage.local.
+ * 
+ * */
 
 vAPI.storage = {
-    get(...args) {
-        return webext.storage.local.get(...args).catch(reason => {
-            console.log(reason);
+    get(key, ...args) {
+        if ( vAPI.sessionStorage.implemented !== true ) {
+            return webext.storage.local.get(key, ...args).catch(reason => {
+                console.log(reason);
+            });
+        }
+        return vAPI.sessionStorage.get(key, ...args).then(bin => {
+            const size = Object.keys(bin).length;
+            if ( size === 1 && typeof key === 'string' && bin[key] === null ) {
+                return {};
+            }
+            if ( size !== 0 ) { return bin; }
+            return webext.storage.local.get(key, ...args).then(bin => {
+                if ( bin instanceof Object === false ) { return bin; }
+                // Mirror empty result as null value in order to prevent
+                // from falling back to storage.local when there is no need.
+                const tomirror = Object.assign({}, bin);
+                if ( typeof key === 'string' && Object.keys(bin).length === 0 ) {
+                    Object.assign(tomirror, { [key]: null });
+                }
+                vAPI.sessionStorage.set(tomirror);
+                return bin;
+            }).catch(reason => {
+                console.log(reason);
+            });
         });
     },
     set(...args) {
+        vAPI.sessionStorage.set(...args);
         return webext.storage.local.set(...args).catch(reason => {
             console.log(reason);
         });
     },
     remove(...args) {
+        vAPI.sessionStorage.remove(...args);
         return webext.storage.local.remove(...args).catch(reason => {
             console.log(reason);
         });
     },
     clear(...args) {
+        vAPI.sessionStorage.clear(...args);
         return webext.storage.local.clear(...args).catch(reason => {
             console.log(reason);
         });
@@ -967,71 +1024,11 @@ vAPI.messaging = {
         }
     },
 
-    broadcast: function(message) {
-        const messageWrapper = { broadcast: true, msg: message };
-        for ( const { port } of this.ports.values() ) {
-            try {
-                port.postMessage(messageWrapper);
-            } catch(ex) {
-                this.onPortDisconnect(port);
-            }
-        }
-        if ( this.defaultHandler ) {
-            this.defaultHandler(message, null, ( ) => { });
-        }
-    },
-
     onFrameworkMessage: function(request, port, callback) {
         const portDetails = this.ports.get(port.name) || {};
         const tabId = portDetails.tabId;
         const msg = request.msg;
         switch ( msg.what ) {
-        case 'connectionAccepted':
-        case 'connectionRefused': {
-            const toPort = this.ports.get(msg.fromToken);
-            if ( toPort !== undefined ) {
-                msg.tabId = tabId;
-                toPort.port.postMessage(request);
-            } else {
-                msg.what = 'connectionBroken';
-                port.postMessage(request);
-            }
-            break;
-        }
-        case 'connectionRequested':
-            msg.tabId = tabId;
-            for ( const { port: toPort } of this.ports.values() ) {
-                if ( toPort === port ) { continue; }
-                try {
-                    toPort.postMessage(request);
-                } catch (ex) {
-                    this.onPortDisconnect(toPort);
-                }
-            }
-            break;
-        case 'connectionBroken':
-        case 'connectionCheck':
-        case 'connectionMessage': {
-            const toPort = this.ports.get(
-                port.name === msg.fromToken ? msg.toToken : msg.fromToken
-            );
-            if ( toPort !== undefined ) {
-                msg.tabId = tabId;
-                toPort.port.postMessage(request);
-            } else {
-                msg.what = 'connectionBroken';
-                port.postMessage(request);
-            }
-            break;
-        }
-        case 'extendClient':
-            vAPI.tabs.executeScript(tabId, {
-                file: '/js/vapi-client-extra.js',
-                frameId: portDetails.frameId,
-            }).then(( ) => {
-                callback();
-            });
-            break;
         case 'localStorage': {
             if ( portDetails.privileged !== true ) { break; }
             const args = msg.args || [];
@@ -1178,16 +1175,15 @@ vAPI.messaging = {
     const shortSecrets = [];
     let lastShortSecretTime = 0;
 
-    // Long secrets are meant to be used multiple times, but for at most a few
-    // minutes. The realm is one value out of 36^18 = over 10^28 values.
-    const longSecrets = [ '', '' ];
-    let lastLongSecretTimeSlice = 0;
+    // Long secrets are valid until revoked or uBO restarts. The realm is one
+    // value out of 36^18 = over 10^28 values.
+    const longSecrets = new Set();
 
     const guard = details => {
         const match = reSecret.exec(details.url);
         if ( match === null ) { return { cancel: true }; }
         const secret = match[1];
-        if ( longSecrets.includes(secret) ) { return; }
+        if ( longSecrets.has(secret) ) { return; }
         const pos = shortSecrets.indexOf(secret);
         if ( pos === -1 ) { return { cancel: true }; }
         shortSecrets.splice(pos, 1);
@@ -1215,14 +1211,13 @@ vAPI.messaging = {
             shortSecrets.push(secret);
             return secret;
         },
-        long: ( ) => {
-            const timeSlice = Date.now() >>> 19; // Changes every ~9 minutes
-            if ( timeSlice !== lastLongSecretTimeSlice ) {
-                longSecrets[1] = longSecrets[0];
-                longSecrets[0] = `${generateSecret()}${generateSecret()}${generateSecret()}`;
-                lastLongSecretTimeSlice = timeSlice;
+        long: previous => {
+            if ( previous !== undefined ) {
+                longSecrets.delete(previous);
             }
-            return longSecrets[0];
+            const secret = `${generateSecret()}${generateSecret()}${generateSecret()}`;
+            longSecrets.add(secret);
+            return secret;
         },
     };
 }
@@ -1482,14 +1477,14 @@ vAPI.adminStorage = (( ) => {
             store = await webext.storage.managed.get();
         } catch(ex) {
         }
-        webext.storage.local.set({ cachedManagedStorage: store || {} });
+        vAPI.storage.set({ cachedManagedStorage: store || {} });
     };
 
     return {
         get: async function(key) {
             let bin;
             try {
-                bin = await webext.storage.local.get('cachedManagedStorage') || {};
+                bin = await vAPI.storage.get('cachedManagedStorage') || {};
                 if ( Object.keys(bin).length === 0 ) {
                     bin = await webext.storage.managed.get() || {};
                 } else {
@@ -1537,7 +1532,7 @@ vAPI.localStorage = {
     start: async function() {
         if ( this.cache instanceof Promise ) { return this.cache; }
         if ( this.cache instanceof Object ) { return this.cache; }
-        this.cache = webext.storage.local.get('localStorage').then(bin => {
+        this.cache = vAPI.storage.get('localStorage').then(bin => {
             this.cache = bin instanceof Object &&
                 bin.localStorage instanceof Object
                     ? bin.localStorage
@@ -1547,7 +1542,7 @@ vAPI.localStorage = {
     },
     clear: function() {
         this.cache = {};
-        return webext.storage.local.set({ localStorage: this.cache });
+        return vAPI.storage.set({ localStorage: this.cache });
     },
     getItem: function(key) {
         if ( this.cache instanceof Object === false ) {
@@ -1569,7 +1564,7 @@ vAPI.localStorage = {
         await this.start();
         if ( value === this.cache[key] ) { return; }
         this.cache[key] = value;
-        return webext.storage.local.set({ localStorage: this.cache });
+        return vAPI.storage.set({ localStorage: this.cache });
     },
     cache: undefined,
 };
@@ -1800,3 +1795,17 @@ vAPI.cloud = (( ) => {
 })();
 
 /******************************************************************************/
+/******************************************************************************/
+
+vAPI.alarms = browser.alarms || {
+    create() {
+    },
+    clear() {
+    },
+    onAlarm: {
+        addListener() {
+        }
+    }
+};
+
+/******************************************************************************/

package/extensions/ublock/js/vapi-client.js

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-2015 The uBlock Origin authors
     Copyright (C) 2014-present Raymond Hill
 
@@ -22,6 +22,8 @@
 
 // For non-background page
 
+/* globals browser */
+
 'use strict';
 
 /******************************************************************************/
@@ -81,8 +83,6 @@ vAPI.messaging = {
     port: null,
     portTimer: null,
     portTimerDelay: 10000,
-    extended: undefined,
-    extensions: [],
     msgIdGenerator: 1,
     pending: new Map(),
     shuttingDown: false,
@@ -125,23 +125,11 @@ vAPI.messaging = {
                 return;
             }
         }
-
-        // Unhandled messages
-        this.extensions.every(ext => ext.canProcessMessage(details) !== true);
     },
     messageListenerBound: null,
 
     canDestroyPort: function() {
-        return this.pending.size === 0 && (
-            this.extensions.length === 0 ||
-            this.extensions.every(e => e.canDestroyPort())
-        );
-    },
-
-    mustDestroyPort: function() {
-        if ( this.extensions.length === 0 ) { return; }
-        this.extensions.forEach(e => e.mustDestroyPort());
-        this.extensions.length = 0;
+        return this.pending.size === 0;
     },
 
     portPoller: function() {
@@ -166,7 +154,6 @@ vAPI.messaging = {
             port.onDisconnect.removeListener(this.disconnectListenerBound);
             this.port = null;
         }
-        this.mustDestroyPort();
         // service pending callbacks
         if ( this.pending.size !== 0 ) {
             const pending = this.pending;
@@ -230,22 +217,6 @@ vAPI.messaging = {
         port.postMessage({ channel, msgId, msg });
         return promise;
     },
-
-    // Dynamically extend capabilities.
-    //
-    // https://github.com/uBlockOrigin/uBlock-issues/issues/1571
-    //   Don't use `self` to access `vAPI`.
-    extend: function() {
-        if ( this.extended === undefined ) {
-            this.extended = vAPI.messaging.send('vapi', {
-                what: 'extendClient'
-            }).then(( ) =>
-                typeof vAPI === 'object' && this.extensions.length !== 0
-            ).catch(( ) => {
-            });
-        }
-        return this.extended;
-    },
 };
 
 vAPI.shutdown.add(( ) => {

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a browser extension to block requests.
+    uBlock Origin - a comprehensive, efficient content blocker
     Copyright (C) 2014-2015 The uBlock Origin authors
     Copyright (C) 2014-present Raymond Hill
 
@@ -178,38 +178,24 @@ vAPI.webextFlavor = {
         soup.add('mobile');
     }
 
-    // Asynchronous
-    if (
-        browser instanceof Object &&
-        typeof browser.runtime.getBrowserInfo === 'function'
-    ) {
-        browser.runtime.getBrowserInfo().then(info => {
-            flavor.major = parseInt(info.version, 10) || flavor.major;
-            soup.add(info.vendor.toLowerCase())
-                .add(info.name.toLowerCase());
-            if ( flavor.major >= 121 && soup.has('mobile') === false ) {
-                soup.add('native_css_has');
-            }
-            dispatch();
-        });
-        if ( browser.runtime.getURL('').startsWith('moz-extension://') ) {
-            soup.add('firefox')
-                .add('user_stylesheet')
-                .add('html_filtering');
-            flavor.major = 115;
-        }
-        return;
+    if ( CSS.supports('selector(a:has(b))') ) {
+        soup.add('native_css_has');
     }
 
-    // Synchronous -- order of tests is important
-    const match = /\bChrom(?:e|ium)\/([\d.]+)/.exec(ua);
-    if ( match !== null ) {
-        soup.add('chromium')
-            .add('user_stylesheet');
-        flavor.major = parseInt(match[1], 10) || 0;
-        if ( flavor.major >= 105 ) {
-            soup.add('native_css_has');
+    // Order of tests is important
+    if ( browser.runtime.getURL('').startsWith('moz-extension://') ) {
+        soup.add('firefox')
+            .add('user_stylesheet')
+            .add('html_filtering');
+        const match = /Firefox\/(\d+)/.exec(ua);
+        flavor.major = match && parseInt(match[1], 10) || 115;
+    } else {
+        const match = /\bChrom(?:e|ium)\/(\d+)/.exec(ua);
+        if ( match !== null ) {
+            soup.add('chromium')
+                .add('user_stylesheet');
         }
+        flavor.major = match && parseInt(match[1], 10) || 120;
     }
 
     // Don't starve potential listeners

package/extensions/ublock/js/vapi.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/wasm/biditrie.wat

@@ -1,5 +1,5 @@
 ;;
-;; 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/wasm/hntrie.wat

@@ -1,5 +1,5 @@
 ;;
-;; 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

package/extensions/ublock/js/webext.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/whitelist.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

package/extensions/ublock/logger-ui.html

@@ -34,6 +34,7 @@
     <div id="domInspector" class="inspector hCompact">
         <div class="permatoolbar">
             <div>
+                <button class="iconified notext vExpandToggler"><span class="fa-icon">double-angle-up</span><span class="hover"></span></button>
                 <button class="iconified notext vCompactToggler"><span class="fa-icon">double-angle-up</span><span class="hover"></span></button>
                 <button class="iconified notext hCompactToggler"><span class="fa-icon">double-angle-left</span><span class="hover"></span></button>
                 <button class="iconified notext revert disabled"><span class="fa-icon">eraser</span><span class="hover"></span></button>
@@ -54,7 +55,7 @@
                 <span id="filterExprGroup">
                     <button id="filterButton" class="iconified notext" data-i18n-title="loggerRowFiltererButtonTip"><span class="fa-icon">filter</span><span class="hover"></span></button>
                     <span id="filterInput">
-                        <input type="search" placeholder="logFilterPrompt">
+                        <input type="search" placeholder="logFilterPrompt" spellcheck="false">
                         <span id="filterExprButton" class="button fa-icon expanded" data-i18n-title="loggerRowFiltererBuiltinTip">angle-up</span>
                         <div id="filterExprPicker">
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\t--\t|\t<<\t|\t##" data-i18n="loggerRowFiltererBuiltinBlocked"></span><span data-filtex="\t\+\+\t|\t\*\*\t|\t#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span><span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urltransform)=|\t\<\<\t" data-i18n="loggerRowFiltererBuiltinModified"></span></div>
@@ -222,7 +223,6 @@
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
-<script src="js/vapi-client-extra.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/logger-ui.js" type="module"></script>

package/extensions/ublock/manifest.json

@@ -108,7 +108,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "1.54.0",
+  "version": "1.55.0",
   "web_accessible_resources": [
     "/web_accessible_resources/*"
   ]

package/extensions/ublock/support.html

@@ -121,7 +121,6 @@
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
-<script src="js/vapi-client-extra.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>

package/extensions/ublock/web_accessible_resources/dom-inspector.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html id="ublock0-inspector">
+
+<head>
+<meta charset="utf-8">
+<meta name="color-scheme" content="light dark">
+<title>uBlock Origin Inspector</title>
+<link rel="stylesheet" href="../css/dom-inspector.css">
+</head>
+
+<body>
+<svg>
+    <path d></path>
+    <path d></path>
+    <path d></path>
+    <path d></path>
+</svg>
+
+<script src="../js/vapi.js"></script>
+<script src="../js/vapi-common.js"></script>
+<script src="../js/vapi-client.js"></script>
+<script src="../js/dom-inspector.js" type="module"></script>
+
+</body>
+</html>

package/extensions/ublock/web_accessible_resources/epicker-ui.html

@@ -67,7 +67,6 @@
 <script src="../js/vapi.js"></script>
 <script src="../js/vapi-common.js"></script>
 <script src="../js/vapi-client.js"></script>
-<script src="../js/vapi-client-extra.js"></script>
 <script src="../js/theme.js" type="module"></script>
 <script src="../js/i18n.js" type="module"></script>
 <script src="../js/epicker-ui.js" type="module"></script>

package/extensions/ublock/web_accessible_resources/googletagservices_gpt.js

@@ -68,6 +68,7 @@
         disableInitialLoad: noopfn,
         display: noopfn,
         enableAsyncRendering: noopfn,
+        enableLazyLoad: noopfn,
         enableSingleRequest: noopfn,
         enableSyncRendering: noopfn,
         enableVideoAds: noopfn,