@browserless.io/browserless 2.34.0 → 2.36.0

package/extensions/ublocklite/_locales/sr/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
-    "message": "Develop",
+    "message": "Развити",
     "description": "appears as tab name in dashboard. Inspired from 'Develop' menu in Safari, see https://developer.apple.com/documentation/safari-developer-tools/develop-menu"
   },
   "aboutPageName": {
@@ -36,7 +36,7 @@
     "description": "Label in the popup panel for the current filtering mode"
   },
   "popupLocalToolsLabel": {
-    "message": "On this website",
+    "message": "На овој веб страници",
     "description": "Label in the popup panel for the local tools section"
   },
   "popupTipReport": {
@@ -120,7 +120,7 @@
     "description": "First paragraph of 'Filter issues' section in Support pane"
   },
   "supportS5H": {
-    "message": "Troubleshooting information",
+    "message": "Информације о решавању проблема",
     "description": "Label of 'Troubleshooting information' section in 'Report a filter issue' page"
   },
   "supportS6P1S1": {
@@ -244,11 +244,11 @@
     "description": "Short description for a checkbox in the options page"
   },
   "developerModeLabel": {
-    "message": "Developer mode",
+    "message": "Режим за програмере",
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
-    "message": "Enables access to features suitable for technical users.",
+    "message": "Омогућава приступ функцијама погодним за техничке кориснике.",
     "description": "Short description for a checkbox in the options page"
   },
   "findListsPlaceholder": {
@@ -264,11 +264,11 @@
     "description": "Sentence used in the strict-blocked page"
   },
   "strictblockReasonSentence1": {
-    "message": "The page was blocked because of a matching filter in {{listname}}.",
+    "message": "Страница је блокирана због одговарајућег филтера у {{listname}}.",
     "description": "Text informing about what is causing the page to be blocked"
   },
   "strictblockRedirectSentence1": {
-    "message": "The blocked page wants to redirect to another site. If you choose to proceed, you will navigate directly to: {{url}}",
+    "message": "Блокирана страница жели да преусмери на други сајт. Ако одлучите да наставите, бићете директно на: {{url}}",
     "description": "Text warning about an incoming redirect"
   },
   "strictblockNoParamsPrompt": {
@@ -292,87 +292,87 @@
     "description": "A button to navigate to the blocked page"
   },
   "zapperTipEnter": {
-    "message": "Remove an element",
+    "message": "Уклоните елемент",
     "description": "Tooltip for the button used to enter zapper mode"
   },
   "zapperTipQuit": {
-    "message": "Exit element zapper mode",
+    "message": "Изађи из режима за затварање елемената",
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
-    "message": "Create a custom filter",
+    "message": "Направите прилагођени филтер",
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "Remove a custom filter",
+    "message": "Уклоните прилагођени филтер",
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
-    "message": "View:",
+    "message": "Приказ:",
     "description": "A label of a dropdown list"
   },
   "developOptionFilteringModeDetails": {
-    "message": "Filtering mode details",
+    "message": "Детаљи режима филтрирања",
     "description": "An option in a dropdown list"
   },
   "developOptionCustomDnrRules": {
-    "message": "Custom DNR rules",
+    "message": "Прилагођена правила за DNR",
     "description": "An option in a dropdown list"
   },
   "developOptionDnrRulesOf": {
-    "message": "DNR rules of …",
+    "message": "ДНР правила …",
     "description": "A section header in a dropdown list"
   },
   "developOptionDynamicRuleset": {
-    "message": "Dynamic ruleset",
+    "message": "Динамички скуп правила",
     "description": "An option in a dropdown list"
   },
   "developOptionSessionRuleset": {
-    "message": "Session ruleset",
+    "message": "Скуп правила сесије",
     "description": "An option in a dropdown list"
   },
   "saveButton": {
-    "message": "Save",
+    "message": "Сачувај",
     "description": "Text for buttons used to save changes"
   },
   "revertButton": {
-    "message": "Revert",
+    "message": "Врати",
     "description": "Text for buttons used to revert changes"
   },
   "importAndAppendButton": {
-    "message": "Import and append…",
+    "message": "Увези и додај…",
     "description": "Text for buttons used to import and append content"
   },
   "exportButton": {
-    "message": "Export…",
+    "message": "Извоз…",
     "description": "Text for buttons used to export content"
   },
   "dnrRulesWarning": {
-    "message": "Do not add content from untrusted sources",
+    "message": "Не додајте садржај из непоузданих извора",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {
-    "message": "Number of registered rules: {count}",
+    "message": "Број регистрованих правила: {count}",
     "description": "Short sentence to report the number of currently registered DNR rules"
   },
   "pickerSliderLabel": {
-    "message": "Move the slider to select the best match",
+    "message": "Померите клизач да бисте изабрали најбоље подударање",
     "description": "Label to describe the purpose of the slider"
   },
   "pickerPick": {
-    "message": "Pick",
+    "message": "Изаберите",
     "description": "Text for the button to re-enter element-picking mode"
   },
   "pickerPreview": {
-    "message": "Preview",
+    "message": "Прегледај",
     "description": "Text for the button to activate preview mode"
   },
   "pickerCreate": {
-    "message": "Create",
+    "message": "Креирај",
     "description": "Text for the button to create the filter"
   },
   "unpickerUsage": {
-    "message": "Select a filter below to highlight matching elements in the webpage. Click the trash can to remove a filter.",
+    "message": "Изаберите филтер испод да бисте истакли одговарајуће елементе на веб страници. Кликните на канту за смеће да бисте уклонили филтер.",
     "description": "Summary description on how to use the tool to remove custom filters"
   }
 }

package/extensions/ublocklite/_locales/th/messages.json

@@ -68,7 +68,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupMalware": {
-    "message": "Malware protection, security",
+    "message": "การป้องกันมัลแวร์ ความปลอดภัย",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupAnnoyances": {

package/extensions/ublocklite/_locales/tr/messages.json

@@ -248,7 +248,7 @@
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
-    "message": "Teknik kullanıcılara uygun özelliklere erişime izin ver",
+    "message": "Teknik kullanıcılara uygun özelliklere erişime izin ver.",
     "description": "Short description for a checkbox in the options page"
   },
   "findListsPlaceholder": {

package/extensions/ublocklite/_locales/vi/messages.json

@@ -344,7 +344,7 @@
     "description": "Text for buttons used to import and append content"
   },
   "exportButton": {
-    "message": "Xuất...",
+    "message": "Xuất…",
     "description": "Text for buttons used to export content"
   },
   "dnrRulesWarning": {

package/extensions/ublocklite/css/common.css

@@ -80,7 +80,7 @@ button {
     appearance: none;
     -moz-appearance: none;
     -webkit-appearance: none;
-    border: 0;
+    border: var(--button-border-size) solid var(--ink-1);
     border-radius: var(--button-border-radius);
     background-color: var(--button-surface);
     color: var(--button-ink);
@@ -193,7 +193,7 @@ label:hover .checkbox:not([disabled]) {
     height: 100%;
     margin: 0;
     min-width: var(--checkbox-size);
-    opacity: 0;
+    opacity: var(--native-control-opacity);
     position: absolute;
     width: 100%;
     }
@@ -204,6 +204,7 @@ label:hover .checkbox:not([disabled]) {
     box-sizing: border-box;
     fill: none;
     height: 100%;
+    opacity: calc(1 - var(--native-control-opacity));
     pointer-events: none;
     position: absolute;
     stroke: none;
@@ -242,7 +243,7 @@ label:hover .checkbox:not([disabled]) {
     height: 100%;
     margin: 0;
     min-width: var(--checkbox-size);
-    opacity: 0;
+    opacity: var(--native-control-opacity);
     position: absolute;
     width: 100%;
     }
@@ -250,6 +251,7 @@ label:hover .checkbox:not([disabled]) {
     background-color: transparent;
     box-sizing: border-box;
     height: 100%;
+    opacity: calc(1 - var(--native-control-opacity));
     pointer-events: none;
     position: absolute;
     width: 100%;

package/extensions/ublocklite/css/default.css

@@ -408,8 +408,11 @@
     --fieldset-header-surface: transparent;
     --fieldset-header-ink: var(--ink-2);
 
+    --native-control-opacity: 0;
+
     --button-ink: var(--ink-1);
     --button-surface: rgb(var(--button-surface-rgb));
+    --button-border-size: 0;
     --button-border-radius: 5px;
     --button-preferred-ink: var(--accent-ink-1);
     --button-preferred-surface: var(--accent-surface-1);
@@ -460,6 +463,13 @@
     --popup-ruleset-tool-shadow: transparent;
 }
 
+@media (prefers-contrast: more) {
+    :root {
+        --native-control-opacity: 1;
+        --button-border-size: 1px;
+    }
+}
+
 /*
  * Rule colors
  * */

package/extensions/ublocklite/css/unpicker-ui.css

@@ -29,6 +29,7 @@
 
 #ubol-unpicker #customFilters {
     font-family: monospace;
+    overflow: auto;
 }
 #ubol-unpicker .customFilter {
     display: flex;

package/extensions/ublocklite/js/background.js

@@ -186,12 +186,14 @@ function onMessage(request, sender, callback) {
 
     case 'insertCSS': {
         if ( frameId === false ) { return false; }
+        // https://bugs.webkit.org/show_bug.cgi?id=262491
+        if ( frameId !== 0 && webextFlavor === 'safari' ) { return false; }
         browser.scripting.insertCSS({
             css: request.css,
             origin: 'USER',
             target: { tabId, frameIds: [ frameId ] },
         }).catch(reason => {
-            ubolErr(reason);
+            ubolErr(`insertCSS/${reason}`);
         });
         return false;
     }
@@ -203,7 +205,7 @@ function onMessage(request, sender, callback) {
             origin: 'USER',
             target: { tabId, frameIds: [ frameId ] },
         }).catch(reason => {
-            ubolErr(reason);
+            ubolErr(`removeCSS/${reason}`);
         });
         return false;
     }
@@ -242,7 +244,7 @@ function onMessage(request, sender, callback) {
             target: { tabId, frameIds: [ frameId ] },
             injectImmediately: true,
         }).catch(reason => {
-            ubolErr(reason);
+            ubolErr(`executeScript/${reason}`);
         }).then(( ) => {
             callback();
         });

package/extensions/ublocklite/js/dnr-parser.js

@@ -515,7 +515,7 @@ export function rulesFromText(text) {
         if ( indices.length === 0 ) { continue; }
         const result = ruleFromLines(lines, indices);
         if ( result.bad ) {
-            bad.push(...result.bad);
+            bad.push(...result.bad.slice(4));
         } else if ( result.rule ) {
             rules.push(result.rule);
         }

package/extensions/ublocklite/js/fetch.js

@@ -27,7 +27,7 @@ function fetchJSON(path) {
     return fetch(`${path}.json`).then(response =>
         response.json()
     ).catch(reason => {
-        ubolErr(reason);
+        ubolErr(`fetchJSON/${reason}`);
     });
 }
 

package/extensions/ublocklite/js/filter-lists.js

@@ -94,10 +94,7 @@ function rulesetStats(rulesetId) {
     const rulesetDetails = rulesetMap.get(rulesetId);
     if ( rulesetDetails === undefined ) { return; }
     const { rules, filters } = rulesetDetails;
-    let ruleCount = rules.plain + rules.regex;
-    if ( cachedRulesetData.hasOmnipotence ) {
-        ruleCount += rules.removeparam + rules.redirect + rules.modifyHeaders;
-    }
+    const ruleCount = rules.plain + rules.regex;
     const filterCount = filters.accepted;
     return { ruleCount, filterCount };
 }

package/extensions/ublocklite/js/filter-manager.js

@@ -38,6 +38,10 @@ import { ubolErr } from './debug.js';
 
 /******************************************************************************/
 
+const perSitePendingIO = new Map();
+
+/******************************************************************************/
+
 export async function selectorsFromCustomFilters(hostname) {
     const promises = [];
     let hn = hostname;
@@ -81,7 +85,7 @@ export function startCustomFilters(tabId, frameId) {
         target: { tabId, frameIds: [ frameId ] },
         injectImmediately: true,
     }).catch(reason => {
-        ubolErr(reason);
+        ubolErr(`startCustomFilters/${reason}`);
     })
 }
 
@@ -91,7 +95,7 @@ export function terminateCustomFilters(tabId, frameId) {
         target: { tabId, frameIds: [ frameId ] },
         injectImmediately: true,
     }).catch(reason => {
-        ubolErr(reason);
+        ubolErr(`terminateCustomFilters/${reason}`);
     })
 }
 
@@ -109,7 +113,7 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
                 origin: 'USER',
                 target: { tabId, frameIds: [ frameId ] },
             }).catch(reason => {
-                ubolErr(reason);
+                ubolErr(`injectCustomFilters/insertCSS/${reason}`);
             })
         );
     }
@@ -121,7 +125,7 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
                 target: { tabId, frameIds: [ frameId ] },
                 injectImmediately: true,
             }).catch(reason => {
-                ubolErr(reason);
+                ubolErr(`injectCustomFilters/executeScript/${reason}`);
             })
         );
     }
@@ -132,6 +136,9 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
 /******************************************************************************/
 
 export async function registerCustomFilters(context) {
+    if ( perSitePendingIO.size !== 0 ) {
+        await Promise.all(Array.from(perSitePendingIO.values()));
+    }
     const siteKeys = await getAllCustomFilterKeys();
     if ( siteKeys.length === 0 ) { return; }
 
@@ -168,6 +175,20 @@ export async function registerCustomFilters(context) {
 /******************************************************************************/
 
 export async function addCustomFilter(hostname, selector) {
+    const pending = perSitePendingIO.get(hostname);
+    const promise = pending
+        ? pending.then(( ) => addCustomFilterByHostname(hostname, selector))
+        : addCustomFilterByHostname(hostname, selector);
+    perSitePendingIO.set(hostname, promise);
+    promise.then(( ) => {
+        if ( promise !== perSitePendingIO.get(hostname) ) { return; }
+        perSitePendingIO.delete(hostname);
+    });
+    return promise;
+}
+
+async function addCustomFilterByHostname(hostname, selector) {
+    if ( hostname === '' ) { return false; }
     const key = `site.${hostname}`;
     const selectors = await localRead(key) || [];
     if ( selectors.includes(selector) ) { return false; }
@@ -183,9 +204,7 @@ export async function removeCustomFilter(hostname, selector) {
     const promises = [];
     let hn = hostname;
     while ( hn !== '' ) {
-        promises.push(
-            removeCustomFilterByKey(`site.${hn}`, selector).catch(( ) => false)
-        );
+        promises.push(removeCustomFilterByHostname(hn, selector));
         const pos = hn.indexOf('.');
         if ( pos === -1 ) { break; }
         hn = hn.slice(pos + 1);
@@ -194,11 +213,28 @@ export async function removeCustomFilter(hostname, selector) {
     return results.some(a => a);
 }
 
+async function removeCustomFilterByHostname(hostname, selector) {
+    const pending = perSitePendingIO.get(hostname);
+    const key = `site.${hostname}`;
+    const promise = pending
+        ? pending.then(( ) => removeCustomFilterByKey(key, selector))
+        : removeCustomFilterByKey(key, selector);
+    perSitePendingIO.set(hostname, promise);
+    promise.then(( ) => {
+        if ( promise !== perSitePendingIO.get(hostname) ) { return; }
+        perSitePendingIO.delete(hostname);
+    });
+    return promise;
+}
+
 async function removeCustomFilterByKey(key, selector) {
     const selectors = await localRead(key);
     if ( selectors === undefined ) { return false; }
-    const i = selectors.indexOf(selector);
-    if ( i === -1 ) { return false; }
+    let i = selectors.indexOf(selector);
+    if ( i === -1 ) {
+        i = selectors.indexOf(`0${selector}`);
+        if ( i === -1 ) { return false; }
+    }
     selectors.splice(i, 1);
     if ( selectors.length !== 0 ) {
         await localWrite(key, selectors);

package/extensions/ublocklite/js/popup.js

@@ -340,8 +340,6 @@ async function init() {
 
     dom.cl.toggle('#gotoUnpicker', 'enabled', popupPanelData.hasCustomFilters);
 
-    dom.cl.remove(dom.body, 'loading');
-
     return true;
 }
 
@@ -350,6 +348,8 @@ async function tryInit() {
         await init();
     } catch {
         setTimeout(tryInit, 100);
+    } finally {
+        dom.cl.remove(dom.body, 'loading');
     }
 }