@browserless.io/browserless 2.12.0-beta-3 → 2.12.0-beta-6

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

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals browser */
-
-'use strict';
-
 /******************************************************************************/
 /******************************************************************************/
 
@@ -31,7 +27,7 @@
 /******************************************************************************/
 
 if ( typeof vAPI !== 'object' ) { return; }
-if ( typeof vAPI === null ) { return; }
+if ( vAPI === null ) { return; }
 if ( vAPI.domFilterer instanceof Object === false ) { return; }
 
 if ( vAPI.inspectorFrame ) { return; }

package/extensions/ublock/js/scriptlets/epicker.js

@@ -19,19 +19,12 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* global CSS */
-
-'use strict';
-
-/******************************************************************************/
-/******************************************************************************/
-
 (async ( ) => {
 
 /******************************************************************************/
 
 if ( typeof vAPI !== 'object' ) { return; }
-if ( typeof vAPI === null ) { return; }
+if ( vAPI === null ) { return; }
 
 if ( vAPI.pickerFrame ) { return; }
 vAPI.pickerFrame = true;
@@ -902,6 +895,7 @@ const onOptimizeCandidates = function(details) {
         if ( r !== 0 ) { return r; }
         return a.selector.length - b.selector.length;
     });
+
     pickerFramePort.postMessage({
         what: 'candidatesOptimized',
         candidates: results.map(a => a.selector),
@@ -1163,59 +1157,59 @@ vAPI.shutdown.add(quitPicker);
 
 const onDialogMessage = function(msg) {
     switch ( msg.what ) {
-        case 'start':
-            startPicker();
-            if ( pickerFramePort === null ) { break; }
-            if ( targetElements.length === 0 ) {
-                highlightElements([], true);
-            }
-            break;
-        case 'optimizeCandidates':
-            onOptimizeCandidates(msg);
-            break;
-        case 'dialogCreate':
-            filterToDOMInterface.queryAll(msg);
-            filterToDOMInterface.preview(true, true);
-            quitPicker();
-            break;
-        case 'dialogSetFilter': {
-            const resultset = filterToDOMInterface.queryAll(msg) || [];
-            highlightElements(resultset.map(a => a.elem), true);
-            if ( msg.filter === '!' ) { break; }
-            pickerFramePort.postMessage({
-                what: 'resultsetDetails',
-                count: resultset.length,
-                opt: resultset.length !== 0 ? resultset[0].opt : undefined,
-            });
-            break;
+    case 'start':
+        startPicker();
+        if ( pickerFramePort === null ) { break; }
+        if ( targetElements.length === 0 ) {
+            highlightElements([], true);
         }
-        case 'quitPicker':
-            filterToDOMInterface.preview(false);
+        break;
+    case 'optimizeCandidates':
+        onOptimizeCandidates(msg);
+        break;
+    case 'dialogCreate':
+        filterToDOMInterface.queryAll(msg);
+        filterToDOMInterface.preview(true, true);
+        quitPicker();
+        break;
+    case 'dialogSetFilter': {
+        const resultset = filterToDOMInterface.queryAll(msg) || [];
+        highlightElements(resultset.map(a => a.elem), true);
+        if ( msg.filter === '!' ) { break; }
+        pickerFramePort.postMessage({
+            what: 'resultsetDetails',
+            count: resultset.length,
+            opt: resultset.length !== 0 ? resultset[0].opt : undefined,
+        });
+        break;
+    }
+    case 'quitPicker':
+        filterToDOMInterface.preview(false);
+        quitPicker();
+        break;
+    case 'highlightElementAtPoint':
+        highlightElementAtPoint(msg.mx, msg.my);
+        break;
+    case 'unhighlight':
+        highlightElements([]);
+        break;
+    case 'filterElementAtPoint':
+        filterElementAtPoint(msg.mx, msg.my, msg.broad);
+        break;
+    case 'zapElementAtPoint':
+        zapElementAtPoint(msg.mx, msg.my, msg.options);
+        if ( msg.options.highlight !== true && msg.options.stay !== true ) {
             quitPicker();
-            break;
-        case 'highlightElementAtPoint':
-            highlightElementAtPoint(msg.mx, msg.my);
-            break;
-        case 'unhighlight':
-            highlightElements([]);
-            break;
-        case 'filterElementAtPoint':
-            filterElementAtPoint(msg.mx, msg.my, msg.broad);
-            break;
-        case 'zapElementAtPoint':
-            zapElementAtPoint(msg.mx, msg.my, msg.options);
-            if ( msg.options.highlight !== true && msg.options.stay !== true ) {
-                quitPicker();
-            }
-            break;
-        case 'togglePreview':
-            filterToDOMInterface.preview(msg.state);
-            if ( msg.state === false ) {
-                highlightElements(targetElements, true);
-            }
-            break;
-        default:
-            break;
+        }
+        break;
+    case 'togglePreview':
+        filterToDOMInterface.preview(msg.state);
+        if ( msg.state === false ) {
+            highlightElements(targetElements, true);
+        }
+        break;
+    default:
+        break;
     }
 };
 

package/extensions/ublock/js/start.js

@@ -45,7 +45,6 @@ import { filteringBehaviorChanged } from './broadcast.js';
 import cacheStorage from './cachestorage.js';
 import { ubolog } from './console.js';
 import contextMenu from './contextmenu.js';
-import lz4Codec from './lz4.js';
 import { redirectEngine } from './redirect-engine.js';
 import staticFilteringReverseLookup from './reverselookup.js';
 import staticExtFilteringEngine from './static-ext-filtering.js';
@@ -490,13 +489,6 @@ await initializeTabs();
 // Start network observers.
 webRequest.start();
 
-// Ensure that the resources allocated for decompression purpose (likely
-// large buffers) are garbage-collectable immediately after launch.
-// Otherwise I have observed that it may take quite a while before the
-// garbage collection of these resources kicks in. Relinquishing as soon
-// as possible ensure minimal memory usage baseline.
-lz4Codec.relinquish();
-
 // Force an update of the context menu according to the currently
 // active tab.
 contextMenu.update();

package/extensions/ublock/js/storage.js

@@ -38,7 +38,6 @@ import cosmeticFilteringEngine from './cosmetic-filtering.js';
 import { hostnameFromURI } from './uri-utils.js';
 import io from './assets.js';
 import logger from './logger.js';
-import lz4Codec from './lz4.js';
 import publicSuffixList from '../lib/publicsuffixlist/publicsuffixlist.js';
 import punycode from '../lib/punycode.js';
 import { redirectEngine } from './redirect-engine.js';
@@ -605,14 +604,10 @@ onBroadcast(msg => {
         this.hiddenSettings.autoCommentFilterTemplate.indexOf('{{') !== -1
     ) {
         const d = new Date();
-        // Date in YYYY-MM-DD format - https://stackoverflow.com/a/50130338
-        const ISO8601Date = new Date(d.getTime() +
-            (d.getTimezoneOffset()*60000)).toISOString().split('T')[0];
         const url = new URL(options.docURL);
-        comment =
-            '! ' +
+        comment = '! ' +
             this.hiddenSettings.autoCommentFilterTemplate
-                .replace('{{date}}', ISO8601Date)
+                .replace('{{date}}', d.toLocaleDateString(undefined, { dateStyle: 'medium' }))
                 .replace('{{time}}', d.toLocaleTimeString())
                 .replace('{{hostname}}', url.hostname)
                 .replace('{{origin}}', url.origin)
@@ -932,7 +927,6 @@ onBroadcast(msg => {
         });
 
         µb.selfieManager.destroy();
-        lz4Codec.relinquish();
         µb.compiledFormatChanged = false;
 
         loadingPromise = undefined;
@@ -1328,7 +1322,6 @@ onBroadcast(msg => {
                 staticNetFilteringEngine.toSelfie()
             ),
         ]);
-        lz4Codec.relinquish();
         µb.selfieIsInvalid = false;
         ubolog('Filtering engine selfie created');
     };

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

@@ -22,14 +22,10 @@
 
 // For background page
 
-/* globals browser */
-
-'use strict';
-
 /******************************************************************************/
 
-import webext from './webext.js';
 import { ubolog } from './console.js';
+import webext from './webext.js';
 
 /******************************************************************************/
 
@@ -47,6 +43,9 @@ if ( vAPI.canWASM === false ) {
 
 vAPI.supportsUserStylesheets = vAPI.webextFlavor.soup.has('user_stylesheet');
 
+const hasOwnProperty = (o, p) =>
+    Object.prototype.hasOwnProperty.call(o, p);
+
 /******************************************************************************/
 
 vAPI.app = {
@@ -191,9 +190,9 @@ vAPI.browserSettings = (( ) => {
 
         set: function(details) {
             for ( const setting in details ) {
-                if ( details.hasOwnProperty(setting) === false ) { continue; }
+                if ( hasOwnProperty(details, setting) === false ) { continue; }
                 switch ( setting ) {
-                case 'prefetching':
+                case 'prefetching': {
                     const enabled = !!details[setting];
                     if ( enabled ) {
                         bp.network.networkPredictionEnabled.clear({
@@ -209,9 +208,9 @@ vAPI.browserSettings = (( ) => {
                         vAPI.prefetching(enabled);
                     }
                     break;
-
-                case 'hyperlinkAuditing':
-                    if ( !!details[setting] ) {
+                }
+                case 'hyperlinkAuditing': {
+                    if ( details[setting] ) {
                         bp.websites.hyperlinkAuditingEnabled.clear({
                             scope: 'regular',
                         });
@@ -222,7 +221,7 @@ vAPI.browserSettings = (( ) => {
                         });
                     }
                     break;
-
+                }
                 case 'webrtcIPAddress': {
                     // https://github.com/uBlockOrigin/uBlock-issues/issues/1928
                     // https://www.reddit.com/r/uBlockOrigin/comments/sl7p74/
@@ -314,7 +313,7 @@ vAPI.Tabs = class {
             }
             this.onRemovedHandler(tabId, details);
         });
-     }
+    }
 
     async executeScript(...args) {
         let result;
@@ -869,8 +868,8 @@ if ( webext.browserAction instanceof Object ) {
         const hasUnprocessedRequest = vAPI.net && vAPI.net.hasUnprocessedRequest(tabId);
         const { parts, state } = details;
         const { badge, color } = hasUnprocessedRequest
-                ? { badge: '!', color: '#FC0' }
-                : details;
+            ? { badge: '!', color: '#FC0' }
+            : details;
 
         if ( browserAction.setIcon !== undefined ) {
             if ( parts === undefined || (parts & 0b0001) !== 0 ) {
@@ -1029,7 +1028,7 @@ vAPI.messaging = {
             });
             break;
         }
-        case 'userCSS':
+        case 'userCSS': {
             if ( tabId === undefined ) { break; }
             const promises = [];
             if ( msg.add ) {
@@ -1060,6 +1059,9 @@ vAPI.messaging = {
             });
             break;
         }
+        default:
+            break;
+        }
     },
 
     // Use a wrapper to avoid closure and to allow reuse.
@@ -1217,7 +1219,7 @@ vAPI.Net = class {
         {
             const wrrt = browser.webRequest.ResourceType;
             for ( const typeKey in wrrt ) {
-                if ( wrrt.hasOwnProperty(typeKey) ) {
+                if ( hasOwnProperty(wrrt, typeKey) ) {
                     this.validTypes.add(wrrt[typeKey]);
                 }
             }
@@ -1520,10 +1522,7 @@ vAPI.localStorage = {
         if ( this.cache instanceof Promise ) { return this.cache; }
         if ( this.cache instanceof Object ) { return this.cache; }
         this.cache = vAPI.storage.get('localStorage').then(bin => {
-            this.cache = bin instanceof Object &&
-                bin.localStorage instanceof Object
-                    ? bin.localStorage
-                    : {};
+            this.cache = bin && bin.localStorage || {};
         });
         return this.cache;
     },

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

@@ -22,19 +22,14 @@
 
 // For background page or non-background pages
 
-/* global browser */
-
-'use strict';
-
-/******************************************************************************/
 /******************************************************************************/
 
 vAPI.T0 = Date.now();
 
-/******************************************************************************/
-
 vAPI.setTimeout = vAPI.setTimeout || self.setTimeout.bind(self);
 
+/******************************************************************************/
+
 vAPI.defer = {
     create(callback) {
         return new this.Client(callback);

package/extensions/ublock/js/vapi.js

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/* global HTMLDocument, XMLDocument */
-
 // For background page, auxiliary pages, and content scripts.
 
 /******************************************************************************/

package/extensions/ublock/js/webext.js

@@ -24,29 +24,37 @@
 
 const promisifyNoFail = function(thisArg, fnName, outFn = r => r) {
     const fn = thisArg[fnName];
-    return function() {
+    return function(...args) {
         return new Promise(resolve => {
-            fn.call(thisArg, ...arguments, function() {
-                if ( chrome.runtime.lastError instanceof Object ) {
-                    void chrome.runtime.lastError.message;
-                }
-                resolve(outFn(...arguments));
-            });
+            try {
+                fn.call(thisArg, ...args, function(...args) {
+                    void chrome.runtime.lastError;
+                    resolve(outFn(...args));
+                });
+            } catch(ex) {
+                console.error(ex);
+                resolve(outFn());
+            }
         });
     };
 };
 
 const promisify = function(thisArg, fnName) {
     const fn = thisArg[fnName];
-    return function() {
+    return function(...args) {
         return new Promise((resolve, reject) => {
-            fn.call(thisArg, ...arguments, function() {
-                const lastError = chrome.runtime.lastError;
-                if ( lastError instanceof Object ) {
-                    return reject(lastError.message);
-                }
-                resolve(...arguments);
-            });
+            try {
+                fn.call(thisArg, ...args, function(...args) {
+                    const lastError = chrome.runtime.lastError;
+                    if ( lastError instanceof Object ) {
+                        return reject(lastError.message);
+                    }
+                    resolve(...args);
+                });
+            } catch(ex) {
+                console.error(ex);
+                resolve();
+            }
         });
     };
 };

package/extensions/ublock/logger-ui.html

@@ -20,13 +20,16 @@
             <option value="0" data-i18n="logAll">
             <option value="-1" data-i18n="logBehindTheScene">
             <option value="_" data-i18n="loggerCurrentTab">
-        </select>
+        </select>&ensp;
         <button id="refresh" class="iconified notext disabled needdom" data-i18n-title="loggerReloadTip" type="button"><span class="fa-icon">refresh</span><span class="hover"></span></button>
         <button id="showdom" class="iconified notext disabled needdom" data-i18n-title="loggerDomInspectorTip" type="button"><span class="fa-icon">code</span><span class="hover"></span></button>
         <button id="showpopup" class="iconified notext disabled needdom" data-i18n-title="loggerPopupPanelTip" type="button"><span class="fa-icon"><svg><use href="/img/ublock-defs.svg#ubo-solid"></use></svg></span><span class="hover"></span></button>
     </div>
     <div>
-        <a id="info" class="button fa-icon" href="https://github.com/gorhill/uBlock/wiki/The-logger" target="_blank" data-i18n-title="loggerInfoTip">info-circle</a>
+        <button class="logConsole iconified notext" title="Show/hide console" type="button"><span class="fa-icon">terminal</span><span class="hover"></span></button>
+    </div>
+    <div>
+        <a class="wikilink fa-icon" href="https://github.com/gorhill/uBlock/wiki/The-logger" target="_blank" data-i18n-title="loggerInfoTip">book</a>
     </div>
 </div>
 
@@ -51,7 +54,7 @@
                 <button class="iconified notext vCompactToggler"><span class="fa-icon">double-angle-up</span><span class="hover"></span></button>
                 <button id="clean" class="iconified notext disabled"><span class="fa-icon">times</span><span class="hover"></span></button>
                 <button id="clear" class="iconified notext disabled" data-i18n-title="loggerClearTip"><span class="fa-icon">eraser</span><span class="hover"></span></button>
-                <button id="pause" class="iconified notext"><span class="fa-icon" data-i18n-title="loggerPauseTip">pause-circle-o</span><span class="fa-icon" data-i18n-title="loggerUnpauseTip">play-circle-o</span><span class="hover"></span></button>
+                <button id="pause" class="iconified notext"><span class="fa-icon" data-i18n-title="loggerPauseTip">pause-circle-o</span><span class="fa-icon" data-i18n-title="loggerUnpauseTip">play-circle-o</span><span class="hover"></span></button>&ensp;
                 <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">
@@ -83,9 +86,6 @@
                     </span>
                 </span>
             </div>
-            <div>
-                <button id="logLevel" class="iconified notext" title="Toggle verbose mode" type="button"><span class="fa-icon">volume-up</span><span class="hover"></span></button>
-            </div>
             <div>
                 <button id="loggerStats" class="iconified notext" style="display: none;"><span class="fa-icon">bar-chart</span><span class="hover"></span></button>
                 <button id="loggerExport" class="iconified notext"><span class="fa-icon">clipboard</span><span class="hover"></span></button>
@@ -104,7 +104,18 @@
                 </div>
             </div>
         </div>
-        <div class="entryTools" style="right:10%;top:20%"></div>
+    </div>
+    <div class="entryTools inspector"></div>
+    <div id="infoInspector" class="inspector">
+        <div class="permatoolbar">
+            <div>
+                <button id="clearConsole" class="iconified notext"><span class="fa-icon">eraser</span><span class="hover"></span></button>
+                <button id="logLevel" class="iconified notext" title="Toggle verbose mode" type="button"><span class="fa-icon">volume-up</span><span class="hover"></span></button>&ensp;
+                <input type="search" placeholder="Filter output" spellcheck="false">
+            </div>
+        </div>
+        <div class="vscrollable">
+        </div>
     </div>
     <iframe id="popupContainer"></iframe>
 </div>
@@ -120,17 +131,15 @@
     <div id="logEntryTemplate"><div class="fields"><span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span></div></div>
 
     <div class="netFilteringDialog" data-pane="details">
-        <div class="dialogControls">
-            <div class="moveBand"></div>
-            <div class="closeButton"><svg viewBox="0 0 64 64"><path d="M 16 16 L 48 48 M 16 48 L 48 16" /></div>
-        </div>
         <div class="hide preview"><span>click to preview</span></div>
         <div class="headers">
-            &ensp;
-            <span class="header details" data-pane="details" data-i18n="loggerEntryDetailsHeader"></span>
-            <span class="header dynamic" data-pane="dynamic" data-i18n="loggerURLFilteringHeader"></span>
-            <span class="header static" data-pane="static" data-i18n="loggerStaticFilteringHeader"></span>
+            <span>
+                <span class="header details" data-pane="details" data-i18n="loggerEntryDetailsHeader"></span>
+                <span class="header dynamic" data-pane="dynamic" data-i18n="loggerURLFilteringHeader"></span>
+                <span class="header static" data-pane="static" data-i18n="loggerStaticFilteringHeader"></span>
+            </span>
             <span class="tools"><span class="fa-icon picker">eye-dropper</span><span class="fa-icon reload">refresh</span></span>
+            <span class="closeButton"><svg viewBox="0 0 64 64"><path d="M 16 16 L 48 48 M 16 48 L 48 16" /></span>
         </div>
         <div class="panes">
             <div class="pane details" data-pane="details">

package/extensions/ublock/manifest.json

@@ -61,8 +61,7 @@
         "https://filterlists.com/*",
         "https://forums.lanik.us/*",
         "https://github.com/*",
-        "https://*.github.io/*",
-        "https://*.letsblock.it/*"
+        "https://*.github.io/*"
       ],
       "run_at": "document_idle"
     },
@@ -112,7 +111,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "1.57.2",
+  "version": "1.58.0",
   "web_accessible_resources": [
     "/web_accessible_resources/*"
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.12.0-beta-3",
+  "version": "2.12.0-beta-6",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -57,7 +57,7 @@
     "gradient-string": "^2.0.0",
     "http-proxy": "^1.18.1",
     "lighthouse": "^12.0.0",
-    "micromatch": "^4.0.4",
+    "micromatch": "^4.0.7",
     "playwright-1.40": "npm:playwright-core@1.40.1",
     "playwright-1.41": "npm:playwright-core@1.41.2",
     "playwright-1.42": "npm:playwright-core@1.42.1",
@@ -79,8 +79,8 @@
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.12.12",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "assert": "^2.0.0",
     "chai": "^5.1.1",
     "cross-env": "^7.0.3",

package/src/browserless.ts

@@ -119,15 +119,15 @@ export class Browserless extends EventEmitter {
       new Router(this.config, this.browserManager, this.limiter, this.Logger);
   }
 
-  protected loadPwVersions = async (): Promise<void> => {
+  protected async loadPwVersions(): Promise<void> {
     const { playwrightVersions } = JSON.parse(
       (await fs.readFile('package.json')).toString(),
     );
 
     this.config.setPwVersions(playwrightVersions);
-  };
+  }
 
-  protected saveMetrics = async (): Promise<void> => {
+  protected async saveMetrics(): Promise<void> {
     const metricsPath = this.config.getMetricsJSONPath();
     const { cpu, memory } = await this.monitoring.getMachineStats();
     const metrics = await this.metrics.get();
@@ -163,9 +163,9 @@ export class Browserless extends EventEmitter {
         false,
       );
     }
-  };
+  }
 
-  public setMetricsSaveInterval = (interval: number) => {
+  public setMetricsSaveInterval(interval: number) {
     if (interval <= 0) {
       return console.warn(
         `Interval value of "${interval}" must be greater than 1. Ignoring`,
@@ -178,7 +178,7 @@ export class Browserless extends EventEmitter {
       this.saveMetrics,
       this.metricsSaveInterval,
     );
-  };
+  }
 
   protected routeIsDisabled(route: routeInstances) {
     return this.disabledRouteNames.some((name) => name === route.name);