@browserless.io/browserless 2.33.0 → 2.34.0-beta-0

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

@@ -4,11 +4,11 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "ตัวบล็อกเนื้อหาที่ไม่ต้องขออนุญาต บล็อกโฆษณา ตัวติดตาม ตัวขุด และอื่น ๆ ทันทีหลังจากติดตั้ง",
+    "message": "ตัวบล็อกเนื้อหาที่มีประสิทธิภาพ บล็อกโฆษณา ตัวติดตาม ตัวขุดเหมือง และอื่นๆ ทันทีที่ติดตั้ง",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {
-    "message": "{{ruleCount}} เงื่อนไข, แปลงมาจาก {{filterCount}} ตัวกรองเครือข่าย",
+    "message": "{{ruleCount}} กฎ แปลงจาก {{filterCount}} ตัวกรองเครือข่าย",
     "description": "Appears aside each filter list in the _3rd-party filters_ pane"
   },
   "dashboardName": {
@@ -20,11 +20,11 @@
     "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": {
-    "message": "เกี่ยวกับเรา",
+    "message": "เกี่ยวกับ",
     "description": "appears as tab name in dashboard"
   },
   "aboutPrivacyPolicy": {
@@ -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": {
@@ -108,7 +108,7 @@
     "description": "Link text to uBO's own filter lists repo"
   },
   "aboutDependencies": {
-    "message": "External dependencies (GPLv3-compatible):",
+    "message": "การพึ่งพิงภายนอก (เข้ากันได้กับ GPLv3):",
     "description": "Shown in the About pane"
   },
   "supportS6H": {
@@ -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": {
@@ -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": "กฎ DNR ของ…",
     "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/tr/messages.json

@@ -364,7 +364,7 @@
     "description": "Text for the button to re-enter element-picking mode"
   },
   "pickerPreview": {
-    "message": "Önizle",
+    "message": "Ön İzle",
     "description": "Text for the button to activate preview mode"
   },
   "pickerCreate": {

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

@@ -304,31 +304,31 @@
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "Видалити власний фільтр",
+    "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": "Правила DNR для…",
     "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": {
@@ -348,7 +348,7 @@
     "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": {
@@ -356,7 +356,7 @@
     "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": {
@@ -372,7 +372,7 @@
     "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/vi/messages.json

@@ -36,7 +36,7 @@
     "description": "Label in the popup panel for the current filtering mode"
   },
   "popupLocalToolsLabel": {
-    "message": "On this website",
+    "message": "Trên trang web này",
     "description": "Label in the popup panel for the local tools section"
   },
   "popupTipReport": {
@@ -300,11 +300,11 @@
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
-    "message": "Create a custom filter",
+    "message": "Tạo một bộ lọc tùy chỉnh",
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "Remove a custom filter",
+    "message": "Xóa một bộ lọc tuỳ chỉnh",
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
@@ -356,23 +356,23 @@
     "description": "Short sentence to report the number of currently registered DNR rules"
   },
   "pickerSliderLabel": {
-    "message": "Move the slider to select the best match",
+    "message": "Di chuyển thanh trượt để chọn kết quả phù hợp nhất",
     "description": "Label to describe the purpose of the slider"
   },
   "pickerPick": {
-    "message": "Pick",
+    "message": "Chọn",
     "description": "Text for the button to re-enter element-picking mode"
   },
   "pickerPreview": {
-    "message": "Preview",
+    "message": "Xem trước",
     "description": "Text for the button to activate preview mode"
   },
   "pickerCreate": {
-    "message": "Create",
+    "message": "Tạo",
     "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": "Chọn một bộ lọc bên dưới để đánh dấu các phần tử phù hợp trong trang web. Nhấp vào thùng rác để xóa bộ lọc.",
     "description": "Summary description on how to use the tool to remove custom filters"
   }
 }

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

@@ -76,7 +76,7 @@
 #ubol-picker #candidateFilters {
     font-family: monospace;
     font-size: small;
-    max-height: min(20em, 40vh);
+    max-height: min(20em, 30vh);
     min-height: 6em;
     overflow-y: auto;
     word-break: break-all;

package/extensions/ublocklite/css/report.css

@@ -1,11 +1,3 @@
-:root .safari {
-    display: none;
-}
-
-:root.safari .safari {
-    display: initial;
-}
-
 .warning {
     color: var(--info2-ink);
 }

package/extensions/ublocklite/js/background.js

@@ -37,7 +37,8 @@ import {
     injectCustomFilters,
     removeCustomFilter,
     selectorsFromCustomFilters,
-    uninjectCustomFilters,
+    startCustomFilters,
+    terminateCustomFilters,
 } from './filter-manager.js';
 
 import {
@@ -199,6 +200,20 @@ function onMessage(request, sender, callback) {
         return false;
     }
 
+    case 'startCustomFilters':
+        if ( frameId === false ) { return false; }
+        startCustomFilters(tabId, frameId).then(( ) => {
+            callback();
+        });
+        return true;
+
+    case 'terminateCustomFilters':
+        if ( frameId === false ) { return false; }
+        terminateCustomFilters(tabId, frameId).then(( ) => {
+            callback();
+        });
+        return true;
+
     case 'injectCustomFilters':
         if ( frameId === false ) { return false; }
         injectCustomFilters(tabId, frameId, request.hostname).then(selectors => {
@@ -206,9 +221,14 @@ function onMessage(request, sender, callback) {
         });
         return true;
 
-    case 'uninjectCustomFilters':
-        if ( frameId === false ) { return false; }
-        uninjectCustomFilters(tabId, frameId, request.hostname).then(( ) => {
+    case 'injectCSSProceduralAPI':
+        browser.scripting.executeScript({
+            files: [ '/js/scripting/css-procedural-api.js' ],
+            target: { tabId, frameIds: [ frameId ] },
+            injectImmediately: true,
+        }).catch(reason => {
+            console.log(reason);
+        }).then(( ) => {
             callback();
         });
         return true;
@@ -321,7 +341,7 @@ function onMessage(request, sender, callback) {
     case 'popupPanelData': {
         Promise.all([
             hasBroadHostPermissions(),
-            getFilteringMode(request.normalHostname),
+            getFilteringMode(request.hostname),
             adminReadEx('disabledFeatures'),
             hasCustomFilters(request.hostname),
         ]).then(results => {
@@ -492,7 +512,11 @@ function onCommand(command, tab) {
     case 'enter-picker-mode': {
         if ( browser.scripting === undefined ) { return; }
         browser.scripting.executeScript({
-            files: [ '/js/scripting/tool-overlay.js', '/js/scripting/picker.js' ],
+            files: [
+                '/js/scripting/css-procedural-api.js',
+                '/js/scripting/tool-overlay.js',
+                '/js/scripting/picker.js',
+            ],
             target: { tabId: tab.id },
         });
         break;

package/extensions/ublocklite/js/debug.js

@@ -19,7 +19,7 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-import { INITIATOR_DOMAINS, dnr } from './ext-compat.js';
+import { dnr, normalizeDNRRules } from './ext-compat.js';
 import { browser } from './ext.js';
 
 /******************************************************************************/
@@ -62,7 +62,11 @@ const getRuleset = async rulesetId => {
     } else {
         const response = await fetch(`/rulesets/main/${rulesetId}.json`).catch(( ) => undefined);
         if ( response === undefined ) { return; }
-        rules = await response.json().catch(( ) => undefined);
+        rules = await response.json().catch(( ) =>
+            undefined
+        ).then(rules =>
+            normalizeDNRRules(rules)
+        );
     }
     if ( Array.isArray(rules) === false ) { return; }
     const ruleset = new Map();
@@ -72,8 +76,8 @@ const getRuleset = async rulesetId => {
             if ( condition.requestDomains ) {
                 condition.requestDomains = pruneLongLists(condition.requestDomains);
             }
-            if ( condition[INITIATOR_DOMAINS] ) {
-                condition[INITIATOR_DOMAINS] = pruneLongLists(condition[INITIATOR_DOMAINS]);
+            if ( condition.initiatorDomains ) {
+                condition.initiatorDomains = pruneLongLists(condition.initiatorDomains);
             }
         }
         const ruleId = rule.id;

package/extensions/ublocklite/js/develop.js

@@ -508,7 +508,7 @@ class Editor {
             }
         }
         view.dispatch({
-            selection: { anchor: from, head: to+1 }
+            selection: { anchor: from, head: Math.min(to+1, doc.length) }
         });
         view.focus();
         return true;

package/extensions/ublocklite/js/ext-compat.js

@@ -21,8 +21,6 @@
 
 export const webext = self.browser || self.chrome;
 export const dnr = webext.declarativeNetRequest || {};
-export const INITIATOR_DOMAINS = 'initiatorDomains';
-export const EXCLUDED_INITIATOR_DOMAINS = 'excludedInitiatorDomains';
 
 /******************************************************************************/
 
@@ -36,6 +34,15 @@ const isSameRules = (a, b) => {
 
 /******************************************************************************/
 
+export function normalizeDNRRules(rules, ruleIds) {
+    if ( Array.isArray(rules) === false ) { return rules; }
+    return Array.isArray(ruleIds)
+        ? rules.filter(rule => ruleIds.includes(rule.id))
+        : rules;
+}
+
+/******************************************************************************/
+
 dnr.setAllowAllRules = async function(id, allowed, notAllowed, reverse, priority) {
     const [
         beforeDynamicRules,

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

@@ -144,11 +144,10 @@ export function renderFilterLists(rulesetData) {
             .replace('{{filterCount}}', renderNumber(stats.filterCount));
         const fromAdmin = isAdminRuleset(ruleset.id);
         dom.cl.toggle(listEntry, 'fromAdmin', fromAdmin);
-        const disabled = stats.ruleCount === 0 || fromAdmin;
         dom.attr(
             qs$(listEntry, '.input.checkbox input'),
             'disabled',
-            disabled ? '' : null
+            fromAdmin ? '' : null
         );
     };
 

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

@@ -50,7 +50,9 @@ export async function selectorsFromCustomFilters(hostname) {
     for ( let i = 0; i < promises.length; i++ ) {
         const selectors = results[i];
         if ( selectors === undefined ) { continue; }
-        selectors.forEach(selector => { out.push(selector.slice(1)); });
+        selectors.forEach(selector => {
+            out.push(selector.startsWith('0') ? selector.slice(1) : selector);
+        });
     }
     return out.sort();
 }
@@ -64,38 +66,71 @@ export async function hasCustomFilters(hostname) {
 
 /******************************************************************************/
 
-export async function injectCustomFilters(tabId, frameId, hostname) {
-    const selectors = await selectorsFromCustomFilters(hostname);
-    if ( selectors.length === 0 ) { return; }
-    await browser.scripting.insertCSS({
-        css: `${selectors.join(',\n')}{display:none!important;}`,
-        origin: 'USER',
+async function getAllCustomFilterKeys() {
+    const storageKeys = await localKeys() || [];
+    return storageKeys.filter(a => a.startsWith('site.'));
+}
+
+/******************************************************************************/
+
+export function startCustomFilters(tabId, frameId) {
+    return browser.scripting.executeScript({
+        files: [ '/js/scripting/css-user.js' ],
         target: { tabId, frameIds: [ frameId ] },
+        injectImmediately: true,
     }).catch(reason => {
         console.log(reason);
-    });
-    return selectors;
+    })
+}
+
+export function terminateCustomFilters(tabId, frameId) {
+    return browser.scripting.executeScript({
+        files: [ '/js/scripting/css-user-terminate.js' ],
+        target: { tabId, frameIds: [ frameId ] },
+        injectImmediately: true,
+    }).catch(reason => {
+        console.log(reason);
+    })
 }
 
 /******************************************************************************/
 
-export async function uninjectCustomFilters(tabId, frameId, hostname) {
+export async function injectCustomFilters(tabId, frameId, hostname) {
     const selectors = await selectorsFromCustomFilters(hostname);
     if ( selectors.length === 0 ) { return; }
-    return browser.scripting.removeCSS({
-        css: `${selectors.join(',\n')}{display:none!important;}`,
-        origin: 'USER',
-        target: { tabId, frameIds: [ frameId ] },
-    }).catch(reason => {
-        console.log(reason);
-    });
+    const promises = [];
+    const plainSelectors = selectors.filter(a => a.startsWith('{') === false);
+    if ( plainSelectors.length !== 0 ) {
+        promises.push(
+            browser.scripting.insertCSS({
+                css: `${plainSelectors.join(',\n')}{display:none!important;}`,
+                origin: 'USER',
+                target: { tabId, frameIds: [ frameId ] },
+            }).catch(reason => {
+                console.log(reason);
+            })
+        );
+    }
+    const proceduralSelectors = selectors.filter(a => a.startsWith('{'));
+    if ( proceduralSelectors.length !== 0 ) {
+        promises.push(
+            browser.scripting.executeScript({
+                files: [ '/js/scripting/css-procedural-api.js' ],
+                target: { tabId, frameIds: [ frameId ] },
+                injectImmediately: true,
+            }).catch(reason => {
+                console.log(reason);
+            })
+        );
+    }
+    await Promise.all(promises);
+    return { plainSelectors, proceduralSelectors };
 }
 
 /******************************************************************************/
 
 export async function registerCustomFilters(context) {
-    const storageKeys = await localKeys() || [];
-    const siteKeys = storageKeys.filter(a => a.startsWith('site.'));
+    const siteKeys = await getAllCustomFilterKeys();
     if ( siteKeys.length === 0 ) { return; }
 
     const { none } = context.filteringModeDetails;
@@ -133,9 +168,8 @@ export async function registerCustomFilters(context) {
 export async function addCustomFilter(hostname, selector) {
     const key = `site.${hostname}`;
     const selectors = await localRead(key) || [];
-    const filter = `0${selector}`;
-    if ( selectors.includes(filter) ) { return false; }
-    selectors.push(filter);
+    if ( selectors.includes(selector) ) { return false; }
+    selectors.push(selector);
     selectors.sort();
     await localWrite(key, selectors);
     return true;
@@ -147,7 +181,7 @@ export async function removeCustomFilter(hostname, selector) {
     const key = `site.${hostname}`;
     const selectors = await localRead(key);
     if ( selectors === undefined ) { return false; }
-    const i = selectors.indexOf(`0${selector}`);
+    const i = selectors.indexOf(selector);
     if ( i === -1 ) { return false; }
     selectors.splice(i, 1);
     await selectors.length !== 0