@browserless.io/browserless 2.31.0 → 2.31.1-beta-2

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

@@ -76,7 +76,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupRegions": {
-    "message": "Rexións, linguaxes",
+    "message": "Rexións, linguas",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "aboutChangelog": {
@@ -204,7 +204,7 @@
     "description": "This describes the 'basic' filtering mode"
   },
   "optimalFilteringModeDescription": {
-    "message": "Filtrado avanzado da rede e filtrado extendido específico usando listas de filtrado seleccionadas.\n\nRequire permisos máis amplos para ler e modificar datos en todas as webs.",
+    "message": "Filtrado avanzado da rede e filtrado estendido específico usando listas de filtrado seleccionadas.\n\nRequire permisos máis amplos para ler e modificar datos en todas as webs.",
     "description": "This describes the 'optimal' filtering mode"
   },
   "completeFilteringModeDescription": {
@@ -316,7 +316,7 @@
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {
-    "message": "Number of registered rules: {count}",
+    "message": "Número de regras rexistradas: {count}",
     "description": "Short sentence to report the number of currently registered DNR rules"
   }
 }

package/extensions/ublocklite/_locales/ka/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": {
@@ -240,11 +240,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": {
@@ -296,27 +296,27 @@
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "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"
   },
   "dnrRulesSummary": {
-    "message": "Enter your own DNR rules below. <b>Do not add content from untrusted sources.</b>",
+    "message": "შეიყვანეთ საკუთარი DNR-წესები ქვემოთ. <b>ნუ დაამატებთ შიგთავსს არასანდო წყაროებიდან.</b>",
     "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"
   }
 }

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

@@ -244,7 +244,7 @@
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
-    "message": "Mundëson qasjen në funksione të përshtatshme për përdorues teknik.",
+    "message": "Mundëson qasjen në funksione të përshtatshme për përdoruesit teknikë.",
     "description": "Short description for a checkbox in the options page"
   },
   "findListsPlaceholder": {
@@ -304,11 +304,11 @@
     "description": "Text for buttons used to revert changes"
   },
   "importAndAppendButton": {
-    "message": "Importim e shtim",
+    "message": "Importoj dhe shtoj…",
     "description": "Text for buttons used to import and append content"
   },
   "exportButton": {
-    "message": "Eksportim",
+    "message": "Eksportoj…",
     "description": "Text for buttons used to export content"
   },
   "dnrRulesSummary": {
@@ -316,7 +316,7 @@
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {
-    "message": "Numrat e regullave të rregjistruara: {count}",
+    "message": "Numri i rregullave të regjistruara: {count}",
     "description": "Short sentence to report the number of currently registered DNR rules"
   }
 }

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

@@ -312,11 +312,11 @@
     "description": "Text for buttons used to export content"
   },
   "dnrRulesSummary": {
-    "message": "Enter your own DNR rules below. <b>Do not add content from untrusted sources.</b>",
+    "message": "在下面输入您自己的DNR规则<b> 不要添加来自不可信来源的内容。</b>",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {
-    "message": "Number of registered rules: {count}",
+    "message": "已注册规则的数量：",
     "description": "Short sentence to report the number of currently registered DNR rules"
   }
 }

package/extensions/ublocklite/js/background.js

@@ -53,6 +53,7 @@ import {
 import {
     enableRulesets,
     excludeFromStrictBlock,
+    getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
     patchDefaultRulesets,
@@ -400,6 +401,12 @@ function onMessage(request, sender, callback) {
         });
         break;
 
+    case 'getEffectiveUserRules':
+        getEffectiveUserRules().then(result => {
+            callback(result);
+        });
+        return true;
+
     case 'updateUserDnrRules':
         updateUserRules().then(result => {
             callback(result);

package/extensions/ublocklite/js/report.js

@@ -106,12 +106,14 @@ async function getConfigData() {
         platformInfo,
         rulesets,
         defaultMode,
+        userRules,
         registerContentScriptsReason,
         unregisterContentScriptsReason,
     ] = await Promise.all([
         runtime.getPlatformInfo(),
         dnr.getEnabledRulesets(),
         sendMessage({ what: 'getDefaultFilteringMode' }),
+        sendMessage({ what: 'getEffectiveUserRules' }),
         localRead('$scripting.registerContentScripts'),
         localRead('$scripting.unregisterContentScripts'),
     ]);
@@ -148,8 +150,11 @@ async function getConfigData() {
             'site': `${modes[reportedPage.mode]}`,
             'default': `${modes[defaultMode]}`,
         },
-        rulesets,
     };
+    if ( userRules.length !== 0 ) {
+        config['user rules'] = userRules.length;
+    }
+    config.rulesets = rulesets;
     if ( registerContentScriptsReason !== undefined ) {
         config.registerContentScripts = registerContentScriptsReason;
     }

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

@@ -669,7 +669,7 @@ async function getEnabledRulesetsDetails() {
 
 /******************************************************************************/
 
-async function getUserRules() {
+async function getEffectiveUserRules() {
     const allRules = await dnr.getDynamicRules();
     const userRules = [];
     for ( const rule of allRules ) {
@@ -684,7 +684,7 @@ async function updateUserRules() {
         userRules,
         userRulesText = '',
     ] = await Promise.all([
-        getUserRules(),
+        getEffectiveUserRules(),
         localRead('userDnrRules'),
     ]);
 
@@ -735,7 +735,7 @@ async function updateUserRules() {
         console.info(`updateUserRules() / ${reason}`);
         out.errors.push(`${reason}`);
     } finally {
-        const userRules = await getUserRules();
+        const userRules = await getEffectiveUserRules();
         if ( userRules.length === 0 ) {
             await localRemove('userDnrRuleCount');
         } else {
@@ -751,6 +751,7 @@ export {
     enableRulesets,
     excludeFromStrictBlock,
     filteringModesToDNR,
+    getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
     patchDefaultRulesets,

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

@@ -616,7 +616,7 @@ async function registerInjectables() {
             await browser.scripting.unregisterContentScripts({ ids: toRemove });
             localRemove('$scripting.unregisterContentScripts');
         } catch(reason) {
-            localWrite('$scripting.unregisterContentScripts', reason);
+            localWrite('$scripting.unregisterContentScripts', `${reason}`);
             console.info(reason);
         }
     }
@@ -627,7 +627,7 @@ async function registerInjectables() {
             await browser.scripting.registerContentScripts(toAdd);
             localRemove('$scripting.registerContentScripts');
         } catch(reason) {
-            localWrite('$scripting.registerContentScripts', reason);
+            localWrite('$scripting.registerContentScripts', `${reason}`);
             console.info(reason);
         }
     }