@browserless.io/browserless 2.36.0 → 2.37.0

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

@@ -19,6 +19,10 @@
     "message": "Cài đặt",
     "description": "appears as tab name in dashboard"
   },
+  "customFiltersPageName": {
+    "message": "Custom filters",
+    "description": "appears as tab name in dashboard"
+  },
   "developPageName": {
     "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"
@@ -83,6 +87,14 @@
     "message": "Khu vực, ngôn ngữ",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
+  "customFiltersImportExportLabel": {
+    "message": "Import / Export",
+    "description": "Text label heading the import/export area of custom filters"
+  },
+  "customFiltersImportTextareaPlaceholder": {
+    "message": "Paste here specific cosmetic filters to add",
+    "description": "Placeholder text which describes the purpose of the textarea widget"
+  },
   "aboutChangelog": {
     "message": "Nhật ký thay đổi",
     "description": ""
@@ -251,6 +263,18 @@
     "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"
   },
+  "settingsBackupRestoreLabel": {
+    "message": "Sao lưu",
+    "description": "The header text for the back up/restore section"
+  },
+  "settingsBackupRestoreSummary": {
+    "message": "Sao lưu cài đặt tùy chỉnh của bạn vào một tệp hoặc khôi phục cài đặt tùy chỉnh từ một tệp.",
+    "description": "A summary description of the back up/restore section."
+  },
+  "settingsBackupRestoreLegend": {
+    "message": "Restoring will overwrite all your current custom settings.",
+    "description": "Important information about the back up/restore section."
+  },
   "findListsPlaceholder": {
     "message": "Tìm danh sách",
     "description": "Placeholder for the input field used to find lists"
@@ -339,6 +363,10 @@
     "message": "Đặt lại",
     "description": "Text for buttons used to revert changes"
   },
+  "addButton": {
+    "message": "Add",
+    "description": "Text for buttons used to add content"
+  },
   "importAndAppendButton": {
     "message": "Nhập và thêm vào",
     "description": "Text for buttons used to import and append content"
@@ -347,6 +375,14 @@
     "message": "Xuất…",
     "description": "Text for buttons used to export content"
   },
+  "backupButton": {
+    "message": "Sao lưu…",
+    "description": "Text for buttons used to back up content"
+  },
+  "restoreButton": {
+    "message": "Khôi phục…",
+    "description": "Text for buttons used to restore content"
+  },
   "dnrRulesWarning": {
     "message": "Không thêm các bộ lọc từ các nguồn không đáng tin cậy",
     "description": "Short description of the DNR rules editor pane"

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

@@ -19,6 +19,10 @@
     "message": "设置",
     "description": "appears as tab name in dashboard"
   },
+  "customFiltersPageName": {
+    "message": "自定义过滤规则",
+    "description": "appears as tab name in dashboard"
+  },
   "developPageName": {
     "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"
@@ -83,6 +87,14 @@
     "message": "区域、语言",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
+  "customFiltersImportExportLabel": {
+    "message": "导入/导出",
+    "description": "Text label heading the import/export area of custom filters"
+  },
+  "customFiltersImportTextareaPlaceholder": {
+    "message": "在此粘贴要添加的特定元素过滤规则",
+    "description": "Placeholder text which describes the purpose of the textarea widget"
+  },
   "aboutChangelog": {
     "message": "更新日志",
     "description": ""
@@ -251,6 +263,18 @@
     "message": "启用访问适合技术用户的功能。",
     "description": "Short description for a checkbox in the options page"
   },
+  "settingsBackupRestoreLabel": {
+    "message": "Backup",
+    "description": "The header text for the back up/restore section"
+  },
+  "settingsBackupRestoreSummary": {
+    "message": "Back up your custom settings to a file, or restore your custom settings from a file.",
+    "description": "A summary description of the back up/restore section."
+  },
+  "settingsBackupRestoreLegend": {
+    "message": "Restoring will overwrite all your current custom settings.",
+    "description": "Important information about the back up/restore section."
+  },
   "findListsPlaceholder": {
     "message": "查找列表",
     "description": "Placeholder for the input field used to find lists"
@@ -339,6 +363,10 @@
     "message": "还原",
     "description": "Text for buttons used to revert changes"
   },
+  "addButton": {
+    "message": "添加",
+    "description": "Text for buttons used to add content"
+  },
   "importAndAppendButton": {
     "message": "导入并添加…",
     "description": "Text for buttons used to import and append content"
@@ -347,6 +375,14 @@
     "message": "导出…",
     "description": "Text for buttons used to export content"
   },
+  "backupButton": {
+    "message": "Back up…",
+    "description": "Text for buttons used to back up content"
+  },
+  "restoreButton": {
+    "message": "Restore…",
+    "description": "Text for buttons used to restore content"
+  },
   "dnrRulesWarning": {
     "message": "请勿添加来自不可信来源的内容",
     "description": "Short description of the DNR rules editor pane"

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

@@ -19,6 +19,10 @@
     "message": "設定",
     "description": "appears as tab name in dashboard"
   },
+  "customFiltersPageName": {
+    "message": "自訂篩選規則",
+    "description": "appears as tab name in dashboard"
+  },
   "developPageName": {
     "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"
@@ -83,6 +87,14 @@
     "message": "地區及語言",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
+  "customFiltersImportExportLabel": {
+    "message": "匯入 / 匯出",
+    "description": "Text label heading the import/export area of custom filters"
+  },
+  "customFiltersImportTextareaPlaceholder": {
+    "message": "在這裡貼上要新增的元素隱藏篩選規則",
+    "description": "Placeholder text which describes the purpose of the textarea widget"
+  },
   "aboutChangelog": {
     "message": "變更日誌",
     "description": ""
@@ -251,6 +263,18 @@
     "message": "啟用適合技術使用者使用的功能。",
     "description": "Short description for a checkbox in the options page"
   },
+  "settingsBackupRestoreLabel": {
+    "message": "備份",
+    "description": "The header text for the back up/restore section"
+  },
+  "settingsBackupRestoreSummary": {
+    "message": "將你的自訂設定備份到檔案，或是從檔案還原你的自訂設定。",
+    "description": "A summary description of the back up/restore section."
+  },
+  "settingsBackupRestoreLegend": {
+    "message": "還原將覆寫你目前所有的自訂設定。",
+    "description": "Important information about the back up/restore section."
+  },
   "findListsPlaceholder": {
     "message": "尋找清單",
     "description": "Placeholder for the input field used to find lists"
@@ -339,6 +363,10 @@
     "message": "還原",
     "description": "Text for buttons used to revert changes"
   },
+  "addButton": {
+    "message": "新增",
+    "description": "Text for buttons used to add content"
+  },
   "importAndAppendButton": {
     "message": "匯入並加入…",
     "description": "Text for buttons used to import and append content"
@@ -347,6 +375,14 @@
     "message": "匯出…",
     "description": "Text for buttons used to export content"
   },
+  "backupButton": {
+    "message": "備份…",
+    "description": "Text for buttons used to back up content"
+  },
+  "restoreButton": {
+    "message": "還原…",
+    "description": "Text for buttons used to restore content"
+  },
   "dnrRulesWarning": {
     "message": "切勿新增來自不受信任來源的內容",
     "description": "Short description of the DNR rules editor pane"

package/extensions/ublocklite/css/dashboard-common.css

@@ -3,7 +3,6 @@ body {
     box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    padding: 0 var(--default-gap-xxsmall);
     }
 body > * {
     width: min(640px, 100%);

package/extensions/ublocklite/css/dashboard.css

@@ -36,6 +36,7 @@ nav > .tabButton:hover {
 
 body[data-pane="settings"] #dashboard-nav .tabButton[data-pane="settings"],
 body[data-pane="rulesets"] #dashboard-nav .tabButton[data-pane="rulesets"],
+body[data-pane="filters"] #dashboard-nav .tabButton[data-pane="filters"],
 body[data-pane="develop"] #dashboard-nav .tabButton[data-pane="develop"],
 body[data-pane="about"] #dashboard-nav .tabButton[data-pane="about"] {
     background-color: var(--dashboard-tab-active-surface);
@@ -51,11 +52,18 @@ body:not([data-pane="rulesets"]) header [data-pane-related="rulesets"] {
     }
 
 body > section {
+    box-sizing: border-box;
     display: none;
+    padding: 0 var(--default-gap-xxsmall);
     padding-bottom: 2rem;
     }
+body [data-pane-related] {
+    padding: 0 var(--default-gap-xxsmall);
+    }
+
 body[data-pane="settings"] > section[data-pane="settings"],
 body[data-pane="rulesets"] > section[data-pane="rulesets"],
+body[data-pane="filters"] > section[data-pane="filters"],
 body[data-pane="develop"] > section[data-pane="develop"],
 body[data-pane="about"] > section[data-pane="about"] {
     display: block;

package/extensions/ublocklite/css/settings.css

@@ -86,6 +86,10 @@ h3[data-i18n="filteringMode0Name"]::first-letter {
     text-transform: capitalize;
     }
 
+body[data-platform="safari"] [data-platform-exclude="safari"] {
+    display: none;
+    }
+
 body:not(.committing) #commit-spinner {
     display: none;
     }
@@ -223,9 +227,105 @@ body.noMoreRuleset .listEntry:has(> .detailbar input:not(:checked)) {
     margin-top: 0.2em;
     }
 
-#templates {
+body section[data-pane="filters"] {
+    padding-inline: 0;
+    }
+body section[data-pane="filters"] .hostnames {
+    border-bottom: 1px solid var(--border-1);
+    margin-block-start: 1em;
+    }
+body section[data-pane="filters"] .hostnames:empty {
+    display: none;
+    }
+body.busy section[data-pane="filters"] .hostnames {
+    pointer-events: none;
+    }
+section[data-pane="filters"] ul {
+    list-style: none;
+    margin: 0;
+    padding-inline-start: 0;
+    }
+section[data-pane="filters"] .hostnames > li.hostname > div {
+    background-color: var(--surface-2);
+    padding-inline-start: 0.5em;
+    }
+section[data-pane="filters"] ul ul {
+    padding-block-end: 1em;
+    padding-inline-start: 0.5em;
+    }
+section[data-pane="filters"] li > div {
+    display: flex;
+    padding-block: 4px;
+    }
+section[data-pane="filters"] li [contenteditable] {
+    flex-grow: 1;
+    word-break: break-all;
+    }
+section[data-pane="filters"] li [contenteditable]:focus {
+    background-color: var(--surface-0);
+    }
+section[data-pane="filters"] li .fa-icon {
+    align-self: baseline;
+    font-size: calc(var(--font-size) + 2px);
+    padding: 0 0.5em;
+    top: 2px;
+    }
+section[data-pane="filters"] li.selector:not(:first-of-type) {
+    border-top: 1px dotted var(--border-1);
+    }
+section[data-pane="filters"] li.hostname:not(:has(li.selector:not(.removed))) > div [contenteditable],
+section[data-pane="filters"] li.selector.removed [contenteditable] {
+    color: red;
+    text-decoration-line: line-through;
+    }
+section[data-pane="filters"] li.hostname:not(:has(li.selector:not(.removed))) > div span.remove,
+section[data-pane="filters"] li.selector.removed > div span.remove,
+section[data-pane="filters"] li.hostname:has(li.selector:not(.removed)) > div span.undo,
+section[data-pane="filters"] li.selector:not(.removed) > div span.undo {
     display: none;
     }
+html.desktop section[data-pane="filters"] li > div:hover {
+    background-color: var(--surface-0);
+    }
+html.desktop section[data-pane="filters"] li > div span.fa-icon:hover {
+    transform: scale(1.3);
+    }
+section[data-pane="filters"] aside {
+    padding: 1em 0.5em;
+    }
+section[data-pane="filters"] aside details {
+    padding: 0;
+    }
+section[data-pane="filters"] aside summary {
+    cursor: default;
+    line-height: 2;
+    }
+section[data-pane="filters"] aside .importFromText {
+    color: var(--ink-2);
+    }
+section[data-pane="filters"] aside .importFromText textarea {
+    background-color: var(--surface-1);
+    border: 1px solid var(--border-1);
+    box-sizing: border-box;
+    min-height: 6em;
+    resize: vertical;
+    width: 100%;
+    }
+section[data-pane="filters"] aside .importFromText textarea:focus {
+    background-color: var(--surface-0);
+    }
+section[data-pane="filters"] aside .importFromText:has(textarea:placeholder-shown) button:has([data-i18n="addButton"]) {
+    display: none;
+    }
+section[data-pane="filters"] aside .importFromText:not(:has(textarea:placeholder-shown)) button:has([data-i18n="importAndAppendButton"]),
+section[data-pane="filters"] aside .importFromText:not(:has(textarea:placeholder-shown)) button:has([data-i18n="exportButton"]) {
+    display: none;
+    }
+section[data-pane="filters"] aside p {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 1em;
+    }
 
 @media (max-width: 480px) {
     #defaultFilteringMode {

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

@@ -50,6 +50,7 @@
     display: none;
 }
 #ubol-unpicker .customFilter.removed > span.selector {
+    color: red;
     pointer-events: none;
     text-decoration-line: line-through;
 }

package/extensions/ublocklite/dashboard.html

@@ -25,6 +25,7 @@
             <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBO Lite"></span><!--
          --><button class="tabButton" type="button" data-pane="settings" data-i18n="settingsPageName" tabindex="0"></button><!--
          --><button class="tabButton" type="button" data-pane="rulesets" data-i18n="aboutFilterLists" tabindex="0"></button><!--
+         --><button class="tabButton" type="button" data-pane="filters" data-i18n="customFiltersPageName"tabindex="0"></button><!--
          --><button class="tabButton" type="button" data-pane="develop" data-i18n="developPageName"tabindex="0"></button><!--
          --><button class="tabButton" type="button" data-pane="about" data-i18n="aboutPageName" tabindex="0"></button>
         </nav>
@@ -37,13 +38,6 @@
     </header>
     <!-- -------- -->
     <section data-pane="settings">
-        <div>
-            <h3 data-i18n="behaviorSectionLabel"></h3>
-            <p><label id="autoReload" data-i18n="autoReloadLabel"><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>
-            </p>
-            <p><label id="showBlockedCount" data-i18n="showBlockedCountLabel"><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>
-        </div>
-
         <div>
             <h3 data-i18n="defaultFilteringModeSectionLabel"></h3>
             <p data-i18n="defaultFilteringModeDescription"></p>
@@ -94,15 +88,43 @@
                     <div data-i18n="completeFilteringModeDescription"></div>
                 </label>
             </div>
-            <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>
+        </div>
+        <div>
+            <h3 data-i18n="behaviorSectionLabel"></h3>
+            <p><label id="autoReload" data-i18n="autoReloadLabel"><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>
+            </p>
+            <p><label id="showBlockedCount" data-i18n="showBlockedCountLabel"><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>
+            <p data-platform-exclude="safari"><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="settingsBackupRestoreLabel">_</h3>
+            <p data-i18n="settingsBackupRestoreSummary">_</p>
+            <p>
+                <button class="iconified dontshrink" type="button"><span class="fa-icon">download-alt</span><span data-i18n="backupButton">_</span><span class="hover"></span></button>&ensp;
+                <button class="iconified dontshrink" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="restoreButton">_</span><span class="hover"></span></button><input type="file" accept="application/json">
+            </p>
+        </div>
     </section>
     <!-- -------- -->
     <section data-pane="rulesets">
         <div id="lists"></div>
     </section>
     <!-- -------- -->
+    <section data-pane="filters">
+        <ul class="hostnames"></ul>
+        <aside>
+            <details class="importFromText"><summary data-i18n="customFiltersImportExportLabel">_</summary>
+                <div><textarea spellcheck="false" placeholder="customFiltersImportTextareaPlaceholder"></textarea></div>
+                <p>
+                    <button class="iconified dontshrink" type="button"><span class="fa-icon">check</span><span data-i18n="addButton">_</span><span class="hover"></span></button>
+                    <button class="iconified dontshrink" type="button"><span class="fa-icon">download-alt</span><span data-i18n="importAndAppendButton">_</span><span class="hover"></span></button>
+                    <button class="iconified dontshrink" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="exportButton">_</span><span class="hover"></span></button><input type="file" accept="text/plain">
+                </p>
+            </details>
+        </aside>
+    </section>
+    <!-- -------- -->
     <section data-pane="develop">
         <div>
             <p>
@@ -150,8 +172,7 @@
         </div>
     </section>
     <!-- -------- -->
-    <div id="templates">
-        <div class="listEntries"></div>
+    <template id="listEntryLeaf">
         <div class="listEntry" data-role="leaf">
             <span class="detailbar">
                 <label><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><span class="listname forinput"></span>
@@ -161,6 +182,8 @@
                 </span>
             </span>
         </div>
+    </template>
+    <template id="listEntryNode">
         <div class="listEntry expandable" data-role="node">
             <span class="detailbar">
                 <label><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><span class="listname forinput"></span></label>
@@ -168,6 +191,8 @@
                 <span class="fa-icon listExpander">angle-up</span>
             </span>
         </div>
+    </template>
+    <template id="listEntryRoot">
         <div class="listEntry expandable" data-role="rootnode">
             <div class="detailbar">
                 <h3 class="listname"></h3>
@@ -175,7 +200,18 @@
                 <span class="fa-icon listExpander">angle-up</span>
             </div>
         </div>
-    </div>
+    </template>
+    <template id="listEntries">
+        <div class="listEntries"></div>
+    </template>
+    <template id="customFiltersHostname">
+        <li class="hostname"><div><span class="hostname" spellcheck="false" contenteditable="plaintext-only" data-pretty="" data-ugly=""></span><span class="remove fa-icon">trash-o</span><span class="undo fa-icon">undo</span></div>
+        <ul class="selectors"></ul>
+        </li>
+    </template>
+    <template id="customFiltersSelector">
+        <li class="selector"><div><span class="selector" spellcheck="false" contenteditable="plaintext-only" data-pretty="" data-ugly=""></span><span class="remove fa-icon">trash-o</span><span class="undo fa-icon">undo</span></div></li>
+    </template>
     <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>
@@ -209,6 +245,7 @@
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard.js" type="module"></script>
 <script src="js/settings.js" type="module"></script>
+<script src="js/filter-manager-ui.js" type="module"></script>
 <script src="js/develop.js" type="module"></script>
 
 </body>

package/extensions/ublocklite/js/background.js

@@ -22,6 +22,7 @@
 import {
     MODE_BASIC,
     MODE_OPTIMAL,
+    defaultFilteringModes,
     getDefaultFilteringMode,
     getFilteringMode,
     getFilteringModeDetails,
@@ -32,11 +33,13 @@ import {
 } from './mode-manager.js';
 
 import {
-    addCustomFilter,
+    addCustomFilters,
+    customFiltersFromHostname,
+    getAllCustomFilters,
     hasCustomFilters,
     injectCustomFilters,
-    removeCustomFilter,
-    selectorsFromCustomFilters,
+    removeAllCustomFilters,
+    removeCustomFilters,
     startCustomFilters,
     terminateCustomFilters,
 } from './filter-manager.js';
@@ -61,9 +64,18 @@ import {
     webextFlavor,
 } from './ext.js';
 
+import {
+    defaultConfig,
+    loadRulesetConfig,
+    process,
+    rulesetConfig,
+    saveRulesetConfig,
+} from './config.js';
+
 import {
     enableRulesets,
     excludeFromStrictBlock,
+    getDefaultRulesetsFromEnv,
     getEffectiveDynamicRules,
     getEffectiveSessionRules,
     getEffectiveUserRules,
@@ -83,13 +95,6 @@ import {
     ubolLog,
 } from './debug.js';
 
-import {
-    loadRulesetConfig,
-    process,
-    rulesetConfig,
-    saveRulesetConfig,
-} from './config.js';
-
 import { dnr } from './ext-compat.js';
 import { getTroubleshootingInfo } from './troubleshooting.js';
 import { registerInjectables } from './scripting-manager.js';
@@ -109,18 +114,6 @@ function getCurrentVersion() {
     return runtime.getManifest().version;
 }
 
-// The goal is just to be able to find out whether a specific version is older
-// than another one.
-
-function intFromVersion(version) {
-    const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version);
-    if ( match === null ) { return 0; }
-    const year = parseInt(match[1], 10);
-    const monthday = parseInt(match[2], 10);
-    const min = parseInt(match[3], 10);
-    return (year - 2022) * (1232 * 2400) + monthday * 2400 + min;
-}
-
 /******************************************************************************/
 
 async function onPermissionsRemoved() {
@@ -282,6 +275,19 @@ function onMessage(request, sender, callback) {
         return true;
     }
 
+    case 'getDefaultConfig':
+        getDefaultRulesetsFromEnv().then(rulesets => {
+            callback({
+                autoReload: defaultConfig.autoReload,
+                developerMode: defaultConfig.developerMode,
+                showBlockedCount: defaultConfig.showBlockedCount,
+                strictBlockMode: defaultConfig.strictBlockMode,
+                rulesets,
+                filteringModes: Object.assign(defaultFilteringModes),
+            });
+        });
+        return true;
+
     case 'getOptionsPageData':
         Promise.all([
             hasBroadHostPermissions(),
@@ -487,8 +493,8 @@ function onMessage(request, sender, callback) {
         });
         return true;
 
-    case 'addCustomFilter':
-        addCustomFilter(request.hostname, request.selector).then(modified => {
+    case 'addCustomFilters':
+        addCustomFilters(request.hostname, request.selectors).then(modified => {
             if ( modified !== true ) { return; }
             return registerInjectables();
         }).then(( ) => {
@@ -496,8 +502,8 @@ function onMessage(request, sender, callback) {
         })
         return true;
 
-    case 'removeCustomFilter':
-        removeCustomFilter(request.hostname, request.selector).then(modified => {
+    case 'removeCustomFilters':
+        removeCustomFilters(request.hostname, request.selectors).then(modified => {
             if ( modified !== true ) { return; }
             return registerInjectables();
         }).then(( ) => {
@@ -505,12 +511,27 @@ function onMessage(request, sender, callback) {
         });
         return true;
 
-    case 'selectorsFromCustomFilters':
-        selectorsFromCustomFilters(request.hostname).then(selectors => {
+    case 'removeAllCustomFilters':
+        removeAllCustomFilters(request.hostname).then(modified => {
+            if ( modified !== true ) { return; }
+            return registerInjectables();
+        }).then(( ) => {
+            callback();
+        });
+        return true;
+
+    case 'customFiltersFromHostname':
+        customFiltersFromHostname(request.hostname).then(selectors => {
             callback(selectors);
         });
         return true;
 
+    case 'getAllCustomFilters':
+        getAllCustomFilters().then(data => {
+            callback(data);
+        });
+        return true;
+
     case 'getTroubleshootingInfo':
         getTroubleshootingInfo(request.siteMode).then(info => {
             callback(info);
@@ -566,13 +587,6 @@ async function startSession() {
     // obsolete ruleset to remove.
     if ( isNewVersion ) {
         ubolLog(`Version change: ${rulesetConfig.version} => ${currentVersion}`);
-        // https://github.com/uBlockOrigin/uBOL-home/issues/428#issuecomment-3172663563
-        if ( webextFlavor === 'safari' && rulesetConfig.strictBlockMode ) {
-            const before = intFromVersion(rulesetConfig.version);
-            if ( before <= intFromVersion('2025.804.2359') ) {
-                rulesetConfig.strictBlockMode = false;
-            }
-        }
         rulesetConfig.version = currentVersion;
         await patchDefaultRulesets();
         saveRulesetConfig();