feat(limit): optimize rule modification

Author: sheepzh

package.json

@@ -34,9 +34,9 @@
         "@rsdoctor/rspack-plugin": "^1.3.9",
         "@rspack/cli": "^1.6.3",
         "@rspack/core": "^1.6.3",
-        "@swc/core": "^1.15.1",
+        "@swc/core": "^1.15.2",
         "@swc/jest": "^0.2.39",
-        "@types/chrome": "0.1.28",
+        "@types/chrome": "0.1.29",
         "@types/decompress": "^4.2.7",
         "@types/jest": "^30.0.0",
         "@types/node": "^24.10.1",
@@ -63,7 +63,7 @@
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.2",
         "echarts": "^6.0.0",
-        "element-plus": "2.11.7",
+        "element-plus": "2.11.8",
         "punycode": "^2.3.1",
         "vue": "^3.5.24",
         "vue-router": "^4.6.3"

src/background/content-script-handler.ts

@@ -10,7 +10,7 @@ import { createTab } from "@api/chrome/tab"
 import { ANALYSIS_ROUTE, LIMIT_ROUTE } from "@app/router/constants"
 import optionHolder from "@service/components/option-holder"
 import limitService from "@service/limit-service"
-import siteService from "@service/site-service"
+import { getSite } from "@service/site-service"
 import timelineThrottler from '@service/throttler/timeline-throttler'
 import whitelistHolder from "@service/whitelist/holder"
 import { getAppPageUrl } from "@util/constant/url"
@@ -71,7 +71,7 @@ export default function init(dispatcher: MessageDispatcher) {
             const { host } = extractHostname(url) || {}
             if (!host) return null
             const site: timer.site.SiteKey = { host, type: 'normal' }
-            const exist = await siteService.get(site)
+            const exist = await getSite(site)
             return exist?.run ? site : null
         })
         .register<void, boolean>('cs.getAudible', async (_, sender) => !!sender.tab?.audible)

src/background/icon-and-alias-collector.ts

@@ -6,7 +6,7 @@
  */
 
 import { getTab } from "@api/chrome/tab"
-import siteService from "@service/site-service"
+import { saveAlias, saveIconUrl } from "@service/site-service"
 import { IS_ANDROID, IS_CHROME, IS_SAFARI } from "@util/constant/environment"
 import { extractHostname, isBrowserUrl, isHomepage } from "@util/pattern"
 import { extractSiteName } from "@util/site"
@@ -19,7 +19,7 @@ async function collectAlias(key: timer.site.SiteKey, tabTitle: string) {
     if (!tabTitle) return
     if (isUrl(tabTitle)) return
     const siteName = extractSiteName(tabTitle, key.host)
-    siteName && await siteService.saveAlias(key, siteName, true)
+    siteName && await saveAlias(key, siteName, true)
 }
 
 /**
@@ -35,7 +35,7 @@ async function processTabInfo(tab: ChromeTab): Promise<void> {
     // localhost hosts with Chrome use cache, so keep the favIcon url undefined
     IS_CHROME && /^localhost(:.+)?/.test(host) && (favIconUrl = undefined)
     const siteKey: timer.site.SiteKey = { host, type: 'normal' }
-    favIconUrl && await siteService.saveIconUrl(siteKey, favIconUrl)
+    favIconUrl && await saveIconUrl(siteKey, favIconUrl)
     !IS_ANDROID
         && !isBrowserUrl(url)
         && isHomepage(url)

src/background/migrator/cate-initializer.ts

@@ -1,5 +1,5 @@
 import cateService from "@service/cate-service"
-import siteService from "@service/site-service"
+import { batchSaveSiteCate } from "@service/site-service"
 import { Migrator } from "./common"
 
 type InitialCate = {
@@ -34,7 +34,7 @@ async function initItem(item: InitialCate) {
     const cate = await cateService.add(name)
     const cateId = cate.id
     const siteKeys = hosts.map(host => ({ host, type: 'normal' } satisfies timer.site.SiteKey))
-    await siteService.batchSaveCate(cateId, siteKeys)
+    await batchSaveSiteCate(cateId, siteKeys)
 }
 
 export default class CateInitializer implements Migrator {

src/background/migrator/local-file-initializer.ts

@@ -7,7 +7,7 @@
 
 import mergeRuleDatabase from "@db/merge-rule-database"
 import { t2Chrome } from "@i18n/chrome/t"
-import siteService from "@service/site-service"
+import { saveAlias } from '@service/site-service'
 import { JSON_HOST, LOCAL_HOST_PATTERN, MERGED_HOST, PDF_HOST, PIC_HOST, TXT_HOST } from "@util/constant/remain-host"
 import { type Migrator } from "./common"
 
@@ -27,19 +27,19 @@ export default class LocalFileInitializer implements Migrator {
             merged: MERGED_HOST,
         }).then(() => console.log('Local file merge rules initialized'))
         // Add site name
-        siteService.saveAlias(
+        saveAlias(
             { host: PDF_HOST, type: 'normal' },
             t2Chrome(msg => msg.initial.localFile.pdf),
         )
-        siteService.saveAlias(
+        saveAlias(
             { host: JSON_HOST, type: 'normal' },
             t2Chrome(msg => msg.initial.localFile.json),
         )
-        siteService.saveAlias(
+        saveAlias(
             { host: PIC_HOST, type: 'normal' },
             t2Chrome(msg => msg.initial.localFile.pic),
         )
-        siteService.saveAlias(
+        saveAlias(
             { host: TXT_HOST, type: 'normal' },
             t2Chrome(msg => msg.initial.localFile.txt),
         )

src/database/option-database.ts

@@ -44,7 +44,7 @@ class OptionDatabase extends BaseDatabase {
             _areaName: chrome.storage.AreaName,
         ) => {
             const optionInfo = changes[DB_KEY]
-            optionInfo && listener(optionInfo.newValue || {} as timer.option.AllOption)
+            optionInfo && listener(optionInfo.newValue as timer.option.AllOption ?? {})
         }
         chrome.storage.onChanged.addListener(storageListener)
     }

src/database/whitelist-database.ts

@@ -47,7 +47,9 @@ class WhitelistDatabase extends BaseDatabase {
             _areaName: chrome.storage.AreaName,
         ) => {
             const changeInfo = changes[WHITELIST_KEY]
-            changeInfo && listener(changeInfo.newValue || [])
+            const newValue = changeInfo?.newValue
+            const whitelists: string[] = Array.isArray(newValue) ? newValue.map(n => new String(n).toString()) : []
+            changeInfo && listener(whitelists)
         }
         chrome.storage.onChanged.addListener(storageListener)
     }

src/i18n/message/app/limit-resource.json

@@ -35,7 +35,6 @@
             "deleteConfirm": "是否要删除规则 [{name}]？",
             "lockConfirm": "锁定后，即使未触发此规则，所有操作也需要验证",
             "inputTestUrl": "请先输入需要测试的网址链接",
-            "clickTestButton": "输入完成后请点击【{buttonText}】按钮",
             "noRuleMatched": "该网址未命中任何规则",
             "rulesMatched": "该网址命中以下规则：",
             "timeout": "倒计时已结束 XD"
@@ -88,7 +87,6 @@
             "deleteConfirm": "確定要刪除規則「{name}」嗎？",
             "lockConfirm": "如果鎖定，所有操作都需要驗證，即使規則未觸發也一樣。",
             "inputTestUrl": "請輸入要測試的網址",
-            "clickTestButton": "輸入完成後請點擊【{buttonText}】按鈕",
             "noRuleMatched": "此網址未符合任何規則",
             "rulesMatched": "此網址符合以下規則：",
             "timeout": "時間到啦！XDDD"
@@ -108,6 +106,7 @@
     "en": {
         "filterDisabled": "Only enabled",
         "wildcardTip": "You can use wildcards to match subdomains or subpages, and use \"+\" as a prefix to exclude subpages!",
+        "emptyTips": "Click here to create one rule!",
         "item": {
             "name": "Rule name",
             "condition": "Restricted URL",
@@ -141,7 +140,6 @@
             "deleteConfirm": "Do you want to delete the rule [{name}]?",
             "lockConfirm": "If locked, all operations will require verification even if the rule is not triggered.",
             "inputTestUrl": "Please enter the URL link to be tested first",
-            "clickTestButton": "After inputting, please click the button ({buttonText})",
             "noRuleMatched": "The URL does not hit any rules",
             "rulesMatched": "The URL hits the following rules:",
             "timeout": "Time is up! XD"
@@ -192,7 +190,6 @@
             "noRule": "ルールが記入されていません",
             "deleteConfirm": "ルール [{name}] を削除しますか?",
             "inputTestUrl": "最初にテストする URL リンクを入力してください",
-            "clickTestButton": "入力後、ボタン({buttonText})をクリックしてください",
             "noRuleMatched": "URL がどのルールとも一致しません",
             "rulesMatched": "URL は次のルールに一致します。"
         },
@@ -244,7 +241,6 @@
             "deleteConfirm": "Eliminar a regra [{name}]?",
             "lockConfirm": "Se bloqueado, exigirá verificação mesmo sem ser acionado",
             "inputTestUrl": "Introduza primeiro o URL a testar",
-            "clickTestButton": "Clique no botão ({buttonText}) após introduzir",
             "noRuleMatched": "O URL não corresponde a nenhuma regra",
             "rulesMatched": "O URL corresponde às seguintes regras:",
             "timeout": "Tempo esgotado! XD"
@@ -297,7 +293,6 @@
             "deleteConfirm": "Ви дійсно хочете видалити правило {cond}?",
             "lockConfirm": "Якщо заблоковано, всі операції потребують перевірки, навіть якщо правило не спрацьовує.",
             "inputTestUrl": "Спочатку введіть URL-адресу посилання для перевірки",
-            "clickTestButton": "Після введення натисніть кнопку ({buttonText})",
             "noRuleMatched": "URL не відповідає жодному правилу",
             "rulesMatched": "URL-адреса отримує такі правила:",
             "timeout": "Час вийшов! XD"
@@ -348,7 +343,6 @@
             "deleteConfirm": "¿Deseas eliminar la regla de {cond}?",
             "lockConfirm": "Si está bloqueado, todas las operaciones requerirán verificación incluso si no se activa la regla.",
             "inputTestUrl": "Por favor, introduce primero el enlace URL a ser probado",
-            "clickTestButton": "Después de ingresarla, haz clic en el botón ({buttonText})",
             "noRuleMatched": "La URL no sigue ninguna regla",
             "rulesMatched": "La URL sigue las siguientes reglas:",
             "timeout": "¡Tiempo se acabó! XD"
@@ -401,7 +395,6 @@
             "deleteConfirm": "Möchten Sie die Regel [{name}] löschen?",
             "lockConfirm": "Wenn gesperrt, müssen alle Operationen geprüft werden, auch wenn die Regel nicht ausgelöst wird.",
             "inputTestUrl": "Bitte geben Sie zunächst den zu testenden URL-Link ein",
-            "clickTestButton": "Klicken Sie nach der Eingabe bitte auf die Schaltfläche ({buttonText}).",
             "noRuleMatched": "Die URL entspricht keinen Regeln",
             "rulesMatched": "Die URL erfüllt die folgenden Regeln:",
             "timeout": "Zeit ist abgelaufen! XD"
@@ -454,7 +447,6 @@
             "deleteConfirm": "Voulez-vous supprimer la règle [{name}]?",
             "lockConfirm": "Si verrouillé, toutes les opérations nécessiteront une vérification, même si la règle n'est pas activée.",
             "inputTestUrl": "Veuillez entrer le lien URL à tester en premier",
-            "clickTestButton": "Après l'entrée, cliquez sur le bouton ({buttonText})",
             "noRuleMatched": "L'URL ne correspond à aucune règle",
             "rulesMatched": "L'URL atteint les règles suivantes :",
             "timeout": "Temps écoulé ! XD"
@@ -500,7 +492,6 @@
             "noRule": "Нет заполненных правил",
             "deleteConfirm": "Вы хотите удалить правило [{name}]?",
             "inputTestUrl": "Пожалуйста, введите ссылку для тестирования",
-            "clickTestButton": "После ввода информации, пожалуйста, нажмите кнопку ({buttonText})",
             "noRuleMatched": "URL не содержит правил",
             "rulesMatched": "URL попадает в следующие правила:"
         },
@@ -551,7 +542,6 @@
             "deleteConfirm": "هل تريد حذف القاعدة [{name}]؟",
             "lockConfirm": "إذا تم القَفل، فإن جميع العمليات ستتطلب التحقق حتى وإن لم يتم تفعيل القاعدة.",
             "inputTestUrl": "الرجاء إدخال رابط URL ليتم اختباره أولاً",
-            "clickTestButton": "بعد الإدخال، الرجاء الضغط على الزر ({buttonText})",
             "noRuleMatched": "عنوان URL لا يصطدم بأي قواعد",
             "rulesMatched": "يتوافق عنوان URL مع القواعد التالية:",
             "timeout": "انتهى الوقت! XD"
@@ -604,7 +594,6 @@
             "deleteConfirm": "{name} kuralını silmek istiyor musunuz?",
             "lockConfirm": "Kilitliyse, kural tetiklenmemiş olsa bile tüm işlemler doğrulama gerektirecektir.",
             "inputTestUrl": "Lütfen önce test edilecek URL bağlantısını girin",
-            "clickTestButton": "Giriş yaptıktan sonra, lütfen düğmeye tıklayın ({buttonText})",
             "noRuleMatched": "URL hiçbir kurala uymuyor",
             "rulesMatched": "URL aşağıdaki kurallara uygundur:",
             "timeout": "Zaman doldu!"
@@ -657,7 +646,6 @@
             "deleteConfirm": "Na pewno chcesz usunąć regułę [{name}]?",
             "lockConfirm": "Jeśli zablokowane, wszystkie operacje będą wymagały weryfikacji, nawet jeśli reguła nie zostanie uruchomiona.",
             "inputTestUrl": "Wpisz URL do przetestowania",
-            "clickTestButton": "Po wpisaniu kliknij przycisk ({buttonText})",
             "noRuleMatched": "Podany URL nie aktywuje żadnej reguły",
             "rulesMatched": "Podany URL aktywuje następujące reguły:",
             "timeout": "Czas minął! XD"

src/i18n/message/app/limit.ts

@@ -10,6 +10,7 @@ import resource from './limit-resource.json'
 export type LimitMessage = {
     filterDisabled: string
     wildcardTip: string
+    emptyTips: string
     step: {
         base: string
         url: string
@@ -43,7 +44,6 @@ export type LimitMessage = {
         deleteConfirm: string
         lockConfirm: string
         inputTestUrl: string
-        clickTestButton: string
         noRuleMatched: string
         rulesMatched: string
         timeout: string

src/pages/app/components/Analysis/components/AnalysisFilter/TargetSelect.tsx

@@ -1,8 +1,8 @@
 import { useCategory } from "@app/context"
 import { t } from "@app/locale"
-import { useDebounce, useRequest, useState } from "@hooks"
+import { useDebounceState, useRequest } from "@hooks"
 import Flex from "@pages/components/Flex"
-import siteService from "@service/site-service"
+import { selectAllSites } from "@service/site-service"
 import { listHosts } from "@service/stat-service"
 import { identifySiteKey, parseSiteKeyFromIdentity, SiteMap } from "@util/site"
 import { ElSelectV2, ElTag, useNamespace } from "element-plus"
@@ -67,7 +67,7 @@ const fetchItems = async (categories: timer.site.Cate[]): Promise<[siteItems: Ta
     collectHosts(hosts, siteSet)
 
     // 2.2 query sites from sites
-    const sites = await siteService.selectAll()
+    const sites = await selectAllSites()
     sites?.forEach(site => siteSet.put(site, site))
 
     const siteItems = siteSet?.map((_, site) => site)
@@ -115,11 +115,9 @@ const TargetSelect = defineComponent(() => {
         { defaultValue: [[], []], deps: [() => cate.all] },
     )
 
-    const [query, setQuery] = useState('')
-    const debouncedQuery = useDebounce(query, 50)
-
+    const [query, setQuery] = useDebounceState('', 50)
     const options = computed(() => {
-        const q = debouncedQuery.value?.trim?.()
+        const q = query.value?.trim?.()
         let [cateItems, siteItems] = allItems.value
         if (q) {
             siteItems = siteItems.filter(item => {