@browserless.io/browserless 2.31.1 → 2.32.0-beta-1

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

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
-    "message": "Develop",
+    "message": "Phát triển",
     "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": "Chế độ nhà phát triển",
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
-    "message": "Enables access to features suitable for technical users.",
+    "message": "Cho phép truy cập các tính năng dành cho người dùng nâng cao",
     "description": "Short description for a checkbox in the options page"
   },
   "findListsPlaceholder": {
@@ -295,24 +295,48 @@
     "message": "Thoát khỏi chế độ chặn phần tử tạm thời",
     "description": "Tooltip for the button used to exit zapper mode"
   },
+  "developDropdownLabel": {
+    "message": "View:",
+    "description": "A label of a dropdown list"
+  },
+  "developOptionFilteringModeDetails": {
+    "message": "Filtering mode details",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionCustomDnrRules": {
+    "message": "Custom DNR rules",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionDnrRulesOf": {
+    "message": "DNR rules of …",
+    "description": "A section header in a dropdown list"
+  },
+  "developOptionDynamicRuleset": {
+    "message": "Dynamic ruleset",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionSessionRuleset": {
+    "message": "Session ruleset",
+    "description": "An option in a dropdown list"
+  },
   "saveButton": {
-    "message": "Save",
+    "message": "Lưu",
     "description": "Text for buttons used to save changes"
   },
   "revertButton": {
-    "message": "Revert",
+    "message": "Đặt lại",
     "description": "Text for buttons used to revert changes"
   },
   "importAndAppendButton": {
-    "message": "Import and append…",
+    "message": "Nhập và thêm vào",
     "description": "Text for buttons used to import and append content"
   },
   "exportButton": {
-    "message": "Export…",
+    "message": "Xuất...",
     "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>",
+  "dnrRulesWarning": {
+    "message": "Do not add content from untrusted sources",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {

package/extensions/ublocklite/_locales/zh_CN/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": {
@@ -295,24 +295,48 @@
     "message": "退出临时元素移除模式",
     "description": "Tooltip for the button used to exit zapper mode"
   },
+  "developDropdownLabel": {
+    "message": "View:",
+    "description": "A label of a dropdown list"
+  },
+  "developOptionFilteringModeDetails": {
+    "message": "Filtering mode details",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionCustomDnrRules": {
+    "message": "Custom DNR rules",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionDnrRulesOf": {
+    "message": "DNR rules of …",
+    "description": "A section header in a dropdown list"
+  },
+  "developOptionDynamicRuleset": {
+    "message": "Dynamic ruleset",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionSessionRuleset": {
+    "message": "Session ruleset",
+    "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"
   },
-  "dnrRulesSummary": {
-    "message": "在下面输入您自己的DNR规则<b> 不要添加来自不可信来源的内容。</b>",
+  "dnrRulesWarning": {
+    "message": "Do not add content from untrusted sources",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {

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

@@ -295,6 +295,30 @@
     "message": "離開元素臨時移除模式",
     "description": "Tooltip for the button used to exit zapper mode"
   },
+  "developDropdownLabel": {
+    "message": "View:",
+    "description": "A label of a dropdown list"
+  },
+  "developOptionFilteringModeDetails": {
+    "message": "Filtering mode details",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionCustomDnrRules": {
+    "message": "Custom DNR rules",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionDnrRulesOf": {
+    "message": "DNR rules of …",
+    "description": "A section header in a dropdown list"
+  },
+  "developOptionDynamicRuleset": {
+    "message": "Dynamic ruleset",
+    "description": "An option in a dropdown list"
+  },
+  "developOptionSessionRuleset": {
+    "message": "Session ruleset",
+    "description": "An option in a dropdown list"
+  },
   "saveButton": {
     "message": "儲存",
     "description": "Text for buttons used to save changes"
@@ -311,8 +335,8 @@
     "message": "匯出…",
     "description": "Text for buttons used to export content"
   },
-  "dnrRulesSummary": {
-    "message": "請在下方輸入您的 DNR 規則。<b>請勿新增來自不受信任來源的內容。</b>",
+  "dnrRulesWarning": {
+    "message": "Do not add content from untrusted sources",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {

package/extensions/ublocklite/css/develop.css

@@ -19,38 +19,35 @@ section[data-pane="develop"] > div > * {
     margin-top: 1em;
     }
 
-#cm-dnrRules {
+#cm-container {
     flex-grow: 1;
     font-size: var(--monospace-size);
     overflow: hidden;
     }
 
 /* https://discuss.codemirror.net/t/how-to-set-max-height-of-the-editor/2882/2 */
-#cm-dnrRules .cm-editor {
+#cm-container .cm-editor {
     background-color: var(--surface-0);
     height: 100%;
     }
 
-#cm-dnrRules .cm-editor .cm-line {
-    border-bottom: 1px dotted transparent;
-    border-top: 1px dotted transparent;
+#cm-container .cm-editor .cm-line:has(.ͼ5),
+#cm-container .cm-editor .cm-line:has(.ͼw) {
+    background-image: url('line-hor-dashed.png'), url('line-hor-dashed.png');
+    background-position: left 3px, left calc(100% - 3px);
+    background-repeat: repeat-x;
     }
 
-#cm-dnrRules .cm-editor .cm-line:has(.ͼc) {
-    border-bottom: 1px dotted var(--border-1);
-    border-top: 1px dotted var(--border-1);
-    }
-
-#cm-dnrRules .cm-editor .cm-line.badline:not(.cm-activeLine) {
+#cm-container .cm-editor .cm-line.badline:not(.cm-activeLine) {
     background-color: color-mix(in srgb, var(--info3-ink) 15%, transparent 85%);
     }
 
-#cm-dnrRules .cm-editor .cm-line .badmark {
+#cm-container .cm-editor .cm-line .badmark {
     text-decoration: underline var(--cm-negative) wavy;
     text-decoration-skip-ink: none;
     }
 
-#cm-dnrRules .cm-editor .cm-panel.cm-search {
+#cm-container .cm-editor .cm-panel.cm-search {
     display: flex;
     flex-wrap: wrap;
     font-family: sans-serif;
@@ -59,13 +56,13 @@ section[data-pane="develop"] > div > * {
     padding: 0.5em 1.5em 0.5em 0.5em;
     }
 
-#cm-dnrRules .cm-editor .cm-panel.cm-search > * {
+#cm-container .cm-editor .cm-panel.cm-search > * {
     margin: 0;
     }
 
-#cm-dnrRules .cm-editor .cm-panel.cm-search .cm-textfield,
-#cm-dnrRules .cm-editor .cm-panel.cm-search .cm-button,
-#cm-dnrRules .cm-editor .cm-panel.cm-search label {
+#cm-container .cm-editor .cm-panel.cm-search .cm-textfield,
+#cm-container .cm-editor .cm-panel.cm-search .cm-button,
+#cm-container .cm-editor .cm-panel.cm-search label {
     background-image: inherit;
     border: inherit;
     flex-grow: 0;
@@ -73,40 +70,77 @@ section[data-pane="develop"] > div > * {
     min-height: calc(var(--button-font-size) * 1.8);
     }
 
-#cm-dnrRules .cm-editor .cm-panel.info-panel {
+#cm-container .cm-editor .cm-panel .warning {
+    color: var(--info3-ink);
+    }
+
+#cm-container .cm-editor .cm-panel.io-panel {
+    background-color: var(--surface-1);
+    box-sizing: border-box;
+    display: inline-flex;
+    gap: 0.25em;
+    padding: 0.25em;
+    padding-inline-start: 0;
+    width: 100%;
+    }
+#cm-container .cm-editor .cm-panel.io-panel button {
+    min-height: 30px;
+    }
+#cm-container .cm-editor .cm-panel.io-panel button#revert {
+    margin-inline-end: 1em;
+    }
+#cm-container .cm-editor .cm-panel.io-panel:not([data-io~="apply"]) button#apply {
+    display: none;
+    }
+#cm-container .cm-editor .cm-panel.io-panel:not([data-io~="revert"]) button#revert {
+    display: none;
+    }
+#cm-container .cm-editor .cm-panel.io-panel:not([data-io~="import"]) button#import {
+    display: none;
+    }
+#cm-container .cm-editor .cm-panel.io-panel:not([data-io~="export"]) button#export {
+    display: none;
+    }
+
+#cm-container .cm-editor .cm-panel.info-panel {
     display: flex;
     flex-wrap: nowrap;
     font-size: var(--font-size);
     padding: var(--default-gap-xxsmall) var(--default-gap-xsmall);
     }
-#cm-dnrRules .cm-editor .cm-panel.info-panel .info {
+#cm-container .cm-editor .cm-panel.info-panel .info {
     flex-grow: 1;
     overflow: auto;
     }
-#cm-dnrRules .cm-editor .cm-panel.info-panel .close {
+#cm-container .cm-editor .cm-panel.info-panel .close {
     cursor: default;
     flex-shrink: 0;
     padding-inline-start: 1em;
     }
-#cm-dnrRules .cm-editor .cm-panel.info-panel .close::after {
+#cm-container .cm-editor .cm-panel.info-panel .close::after {
     content: '\2715';
     }
-#cm-dnrRules .cm-editor .cm-panel.summary-panel {
+
+#cm-container .cm-editor .cm-panel.summary-panel {
     background-color: color-mix(in srgb, var(--info1-ink) 15%, transparent 85%);
+    gap: 1em;
+    }
+#cm-container .cm-editor .cm-panel.summary-panel .info {
+    flex-shrink: 0;
     }
 
-#cm-dnrRules .cm-editor .cm-panel.feedback-panel {
+#cm-container .cm-editor .cm-panel.feedback-panel {
     background-color: color-mix(in srgb, var(--info3-ink) 15%, transparent 85%);
     white-space: pre;
     max-height: 10cqh;
     }
 
-#cm-dnrRules .cm-editor .cm-gutterElement {
+#cm-container .cm-editor .cm-gutterElement {
     cursor: default;
     user-select: none;
     }
 
-#cm-dnrRules .cm-editor .cm-tooltip .badmark-tooltip {
+#cm-container .cm-editor .cm-tooltip .badmark-tooltip {
     background-color: color-mix(in srgb, var(--info3-ink) 15%, transparent 85%);
     padding: var(--default-gap-xxsmall) var(--default-gap-xsmall);
     }

package/extensions/ublocklite/dashboard.html

@@ -89,12 +89,6 @@
             <p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
             <p id="developerMode"><label data-i18n="developerModeLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="developerModeLegend"></legend>
         </div>
-
-        <div>
-            <h3 data-i18n="filteringMode0Name"></h3>
-            <p data-i18n="noFilteringModeDescription">_</p>
-            <div id="trustedSites"></div>
-        </div>
     </section>
     <!-- -------- -->
     <section data-pane="rulesets">
@@ -108,14 +102,17 @@
     <section data-pane="develop">
         <div>
             <p>
-                <button id="dnrRulesApply" class="preferred iconified" type="button" disabled><span class="fa-icon">save</span><span data-i18n="saveButton">_</span><span class="hover"></span></button>
-                <button id="dnrRulesRevert" class="iconified" type="button" disabled><span class="fa-icon">undo</span><span data-i18n="revertButton">_</span><span class="hover"></span></button>
-                &emsp;
-                <button id="dnrRulesImport" class="iconified" type="button"><span class="fa-icon">download-alt</span><span data-i18n="importAndAppendButton">_</span><span class="hover"></span></button>
-                <button id="dnrRulesExport" class="iconified" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="exportButton">_</span><span class="hover"></span></button><input type="file" accept="json/application">
+                <label for="editors" data-i18n="developDropdownLabel"></label> <select id="editors">
+                    <option value="modes" selected data-i18n="developOptionFilteringModeDetails"></option>
+                    <option value="dnr.rw.user" data-i18n="developOptionCustomDnrRules"></option>
+                    <hr>
+                    <optgroup label="" data-i18n-label="developOptionDnrRulesOf">
+                        <option value="dnr.ro.dynamic" data-i18n="developOptionDynamicRuleset"></option>
+                        <option value="dnr.ro.session" data-i18n="developOptionSessionRuleset"></option>
+                    </optgroup>
+                </select>&nbsp;
             </p>
-            <p data-i18n="dnrRulesSummary"></p>
-            <div id="cm-dnrRules"></div>
+            <div id="cm-container"></div>
         </div>
     </section>
     <!-- -------- -->
@@ -165,16 +162,24 @@
             </span>
         </div>
         <div class="listEntry expandable" data-role="rootnode">
-            <span class="detailbar">
+            <div class="detailbar">
                 <h3 class="listname"></h3>
                 <span class="count"></span>
                 <span class="fa-icon listExpander">angle-up</span>
-            </span>
+            </div>
         </div>
     </div>
+    <template class="io-panel">
+        <span class="io-panel">
+            <button id="apply" class="preferred iconified" type="button" disabled><span class="fa-icon">save</span><span data-i18n="saveButton">_</span><span class="hover"></span></button>
+            <button id="revert" class="iconified" type="button" disabled><span class="fa-icon">undo</span><span data-i18n="revertButton">_</span><span class="hover"></span></button>
+            <button id="import" class="iconified" type="button"><span class="fa-icon">download-alt</span><span data-i18n="importAndAppendButton">_</span><span class="hover"></span></button>
+            <button id="export" class="iconified" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="exportButton">_</span><span class="hover"></span></button><input type="file" accept="json/application">
+        </span>
+    </template>
     <template class="summary-panel">
         <div class="info-panel summary-panel">
-            <div class="info"></div>
+            <span class="info"></span><span class="warning" data-i18n="dnrRulesWarning"></span>
         </div>
     </template>
     <template class="feedback-panel">
@@ -183,6 +188,10 @@
             <div class="close"></div>
         </div>
     </template>
+    <template class="ro-summary-panel">
+        <div class="info-panel summary-panel">
+        </div>
+    </template>
     <template class="badmark-tooltip">
         <div class="badmark-tooltip">
         </div>

package/extensions/ublocklite/js/admin.js

@@ -21,7 +21,7 @@
 
 import {
     adminRead,
-    localRead, localWrite,
+    localRead, localRemove, localWrite,
     sessionRead, sessionWrite,
 } from './ext.js';
 
@@ -33,7 +33,6 @@ import {
 
 import {
     getDefaultFilteringMode,
-    getTrustedSites,
     readFilteringModeDetails,
 } from './mode-manager.js';
 
@@ -132,9 +131,8 @@ const adminSettings = {
         }
         if ( this.keys.has('noFiltering') ) {
             ubolLog('admin setting "noFiltering" changed');
-            await readFilteringModeDetails(true);
-            const trustedSites = await getTrustedSites();
-            broadcastMessage({ trustedSites: Array.from(trustedSites) });
+            const filteringModeDetails = await readFilteringModeDetails(true);
+            broadcastMessage({ filteringModeDetails });
         }
         if ( this.keys.has('showBlockedCount') ) {
             ubolLog('admin setting "showBlockedCount" changed');
@@ -192,17 +190,18 @@ export async function getAdminRulesets() {
 
 export async function adminReadEx(key) {
     let cacheValue;
-    const session = await sessionRead(`admin_${key}`);
+    const session = await sessionRead(`admin.${key}`);
     if ( session ) {
         cacheValue = session.data;
     } else {
-        const local = await localRead(`admin_${key}`);
+        const local = await localRead(`admin.${key}`);
         if ( local ) {
             cacheValue = local.data;
         }
+        localRemove(`admin_${key}`); // TODO: remove eventually
     }
     adminRead(key).then(async value => {
-        const adminKey = `admin_${key}`;
+        const adminKey = `admin.${key}`;
         await Promise.all([
             sessionWrite(adminKey, { data: value }),
             localWrite(adminKey, { data: value }),

package/extensions/ublocklite/js/background.js

@@ -24,10 +24,10 @@ import {
     MODE_OPTIMAL,
     getDefaultFilteringMode,
     getFilteringMode,
-    getTrustedSites,
+    getFilteringModeDetails,
     setDefaultFilteringMode,
     setFilteringMode,
-    setTrustedSites,
+    setFilteringModeDetails,
     syncWithBrowserPermissions,
 } from './mode-manager.js';
 
@@ -53,6 +53,8 @@ import {
 import {
     enableRulesets,
     excludeFromStrictBlock,
+    getEffectiveDynamicRules,
+    getEffectiveSessionRules,
     getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
@@ -140,6 +142,7 @@ async function onPermissionsAdded(permissions) {
 function setDeveloperMode(state) {
     rulesetConfig.developerMode = state === true;
     toggleDeveloperMode(rulesetConfig.developerMode);
+    broadcastMessage({ developerMode: rulesetConfig.developerMode });
     return Promise.all([
         updateUserRules(),
         saveRulesetConfig(),
@@ -218,11 +221,10 @@ function onMessage(request, sender, callback) {
         return true;
     }
 
-    case 'getOptionsPageData': {
+    case 'getOptionsPageData':
         Promise.all([
             hasBroadHostPermissions(),
             getDefaultFilteringMode(),
-            getTrustedSites(),
             getRulesetDetails(),
             dnr.getEnabledRulesets(),
             getAdminRulesets(),
@@ -231,7 +233,6 @@ function onMessage(request, sender, callback) {
             const [
                 hasOmnipotence,
                 defaultFilteringMode,
-                trustedSites,
                 rulesetDetails,
                 enabledRulesets,
                 adminRulesets,
@@ -240,7 +241,6 @@ function onMessage(request, sender, callback) {
             callback({
                 hasOmnipotence,
                 defaultFilteringMode,
-                trustedSites: Array.from(trustedSites),
                 enabledRulesets,
                 adminRulesets,
                 maxNumberOfEnabledRulesets: dnr.MAX_NUMBER_OF_ENABLED_STATIC_RULESETS,
@@ -257,7 +257,12 @@ function onMessage(request, sender, callback) {
             process.firstRun = false;
         });
         return true;
-    }
+
+    case 'getRulesetDetails':
+        getRulesetDetails().then(rulesetDetails => {
+            callback(Array.from(rulesetDetails.values()));
+        });
+        return true;
 
     case 'setAutoReload':
         rulesetConfig.autoReload = request.state && true || false;
@@ -352,7 +357,7 @@ function onMessage(request, sender, callback) {
         return true;
     }
 
-    case 'setDefaultFilteringMode': {
+    case 'setDefaultFilteringMode':
         getDefaultFilteringMode().then(beforeLevel =>
             setDefaultFilteringMode(request.level).then(afterLevel =>
                 ({ beforeLevel, afterLevel })
@@ -364,19 +369,21 @@ function onMessage(request, sender, callback) {
             callback(afterLevel);
         });
         return true;
-    }
 
-    case 'setTrustedSites':
-        setTrustedSites(request.hostnames).then(( ) => {
+    case 'getFilteringModeDetails':
+        getFilteringModeDetails(true).then(details => {
+            callback(details);
+        });
+        return true;
+
+    case 'setFilteringModeDetails':
+        setFilteringModeDetails(request.modes).then(( ) => {
             registerInjectables();
-            return Promise.all([
-                getDefaultFilteringMode(),
-                getTrustedSites(),
-            ]);
-        }).then(results => {
-            callback({
-                defaultFilteringMode: results[0],
-                trustedSites: Array.from(results[1]),
+            getDefaultFilteringMode().then(defaultFilteringMode => {
+                broadcastMessage({ defaultFilteringMode });
+            });
+            getFilteringModeDetails(true).then(details => {
+                callback(details);
             });
         });
         return true;
@@ -401,6 +408,18 @@ function onMessage(request, sender, callback) {
         });
         break;
 
+    case 'getEffectiveDynamicRules':
+        getEffectiveDynamicRules().then(result => {
+            callback(result);
+        });
+        return true;
+
+    case 'getEffectiveSessionRules':
+        getEffectiveSessionRules().then(result => {
+            callback(result);
+        });
+        return true;
+
     case 'getEffectiveUserRules':
         getEffectiveUserRules().then(result => {
             callback(result);

package/extensions/ublocklite/js/dashboard.js

@@ -41,13 +41,13 @@ dom.on('#dashboard-nav', 'click', '.tabButton', ev => {
     const { pane } = ev.target.dataset;
     dom.body.dataset.pane = pane;
     if ( pane === 'settings' ) {
-        localRemove('activeDashboardPane');
+        localRemove('dashboard.activePane');
     } else {
-        localWrite('activeDashboardPane', pane);
+        localWrite('dashboard.activePane', pane);
     }
 });
 
-localRead('activeDashboardPane').then(pane => {
+localRead('dashboard.activePane').then(pane => {
     if ( typeof pane !== 'string' ) { return; }
     dom.body.dataset.pane = pane;
 });