v3.4.0

* feat: lock limit rule (#338, #407)

* i18n(zh_TW): optimize the texts by deepseek

* test: fix e2e cases

* test: fix e2e cases

* feat: support caching filter value for the report page (#449) (#451)

* refactor: refactor with provider (#453)

* test: use localhost for example pages

* ci: fix end-to-end tests

* feat: simplify URL configuration for time limit rules (#424) (#455)

Author: sheepzh

.commitlintrc.ts

@@ -40,6 +40,7 @@ export default {
                 "revert",
                 "style",
                 "test",
+                "i18n",
             ],
         ] satisfies [RuleConfigSeverity, RuleConfigCondition, string[]],
     },

.github/workflows/end-to-end-tests.yml

@@ -9,12 +9,20 @@ jobs:
               uses: actions/setup-node@v1
               with:
                   node-version: "v20.11.0"
-            - run: npm install
+            - name: Install dependencies
+              run: npm install
+            - name: Install http-server
+              run: npm install -g http-server pm2
             - name: Build e2e outputs
               run: npm run dev:e2e
             - name: Build production outputs
               run: npm run build
 
+            - name: Start up mock server
+              run: |
+                  pm2 start 'http-server ./test-e2e/example -p 12345'
+                  pm2 start 'http-server ./test-e2e/example -p 12346'
+
             - name: Run tests
               env:
                   USE_HEADLESS_PUPPETEER: true

.gitignore

@@ -29,3 +29,4 @@ package-lock.json
 aaa
 
 user-chart.svg
+test.log

.vscode/settings.json

@@ -19,6 +19,7 @@
         "COPYFILE",
         "countup",
         "daterange",
+        "delayable",
         "domcontentloaded",
         "dont",
         "echarts",
@@ -29,6 +30,7 @@
         "Kanban",
         "MKCOL",
         "newtab",
+        "nohup",
         "okey",
         "Openeds",
         "Popconfirm",
@@ -38,6 +40,7 @@
         "rtlcss",
         "selectchanged",
         "sheepzh",
+        "subpages",
         "Treemap",
         "Vnode",
         "vueuse",

package.json

@@ -30,16 +30,15 @@
     "devDependencies": {
         "@babel/plugin-transform-modules-commonjs": "^7.26.3",
         "@babel/preset-env": "^7.26.9",
-        "@crowdin/crowdin-api-client": "^1.41.2",
-        "@rsdoctor/webpack-plugin": "^1.0.0",
-        "@swc/core": "^1.11.11",
+        "@crowdin/crowdin-api-client": "^1.42.0",
+        "@rsdoctor/webpack-plugin": "^1.0.2",
+        "@swc/core": "^1.11.21",
         "@swc/jest": "^0.2.37",
-        "@types/chrome": "0.0.313",
+        "@types/chrome": "0.0.315",
         "@types/decompress": "^4.2.7",
-        "@types/echarts": "^5.0.0",
         "@types/generate-json-webpack-plugin": "^0.3.7",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.10",
+        "@types/node": "^22.14.1",
         "@types/punycode": "^2.1.4",
         "@types/webpack": "^5.28.5",
         "@vue/babel-plugin-jsx": "^1.4.0",
@@ -48,7 +47,7 @@
         "copy-webpack-plugin": "^13.0.0",
         "css-loader": "^7.1.2",
         "decompress": "^4.2.1",
-        "eslint": "^9.22.0",
+        "eslint": "^9.25.0",
         "filemanager-webpack-plugin": "^8.0.0",
         "generate-json-webpack-plugin": "^2.0.0",
         "html-webpack-plugin": "^5.6.3",
@@ -59,26 +58,26 @@
         "mini-css-extract-plugin": "^2.9.2",
         "postcss": "^8.5.3",
         "postcss-loader": "^8.1.1",
-        "postcss-rtlcss": "^5.6.0",
-        "puppeteer": "^24.4.0",
-        "sass": "^1.86.0",
+        "postcss-rtlcss": "^5.7.0",
+        "puppeteer": "^24.6.1",
+        "sass": "^1.86.3",
         "sass-loader": "^16.0.5",
         "style-loader": "^4.0.0",
         "ts-loader": "^9.5.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "5.8.2",
+        "typescript": "5.8.3",
         "url-loader": "^4.1.1",
         "web-ext": "^8.5.0",
-        "webpack": "^5.98.0",
+        "webpack": "^5.99.6",
         "webpack-cli": "^6.0.1"
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
-        "@vueuse/core": "^13.0.0",
+        "@vueuse/core": "^13.1.0",
         "countup.js": "^2.8.0",
         "echarts": "^5.6.0",
-        "element-plus": "2.9.7",
+        "element-plus": "2.9.8",
         "js-base64": "^3.7.7",
         "punycode": "^2.3.1",
         "stream-browserify": "^3.0.0",

src/background/migrator/index.ts

@@ -11,6 +11,7 @@ import { type Migrator } from "./common"
 import HostMergeInitializer from "./host-merge-initializer"
 import LocalFileInitializer from "./local-file-initializer"
 import WhitelistInitializer from "./whitelist-initializer"
+import LimitRuleMigrator from "./limit-rule-migrator"
 
 /**
  * Version manager
@@ -26,6 +27,7 @@ class VersionManager {
             new LocalFileInitializer(),
             new WhitelistInitializer(),
             new CateInitializer(),
+            new LimitRuleMigrator(),
         )
     }
 

src/background/migrator/limit-rule-migrator.ts

@@ -0,0 +1,35 @@
+import limitService from "@service/limit-service"
+import { cleanCond } from "@util/limit"
+import type { Migrator } from "./common"
+
+export default class LimitRuleMigrator implements Migrator {
+    onInstall(): void {
+    }
+
+    async onUpdate(_version: string): Promise<void> {
+        const rules = await limitService.select()
+        if (!rules?.length) return
+        const needUpdate: timer.limit.Rule[] = []
+        const needRemoved: timer.limit.Rule[] = []
+        rules.forEach(async rule => {
+            const { cond } = rule
+            let changed = false
+            const newCond: string[] = []
+            cond?.forEach(url => {
+                const clean = cleanCond(url)
+                changed = changed || clean !== url
+                clean && newCond.push(clean)
+            })
+            if (!changed) return
+            if (rule.cond.length) {
+                rule.cond = newCond
+                needUpdate.push(rule)
+            } else {
+                needRemoved.push(rule)
+            }
+
+        })
+        needRemoved.length && await limitService.remove(...needRemoved)
+        needUpdate.length && await limitService.update(...needUpdate)
+    }
+}

src/database/limit-database.ts

@@ -64,6 +64,10 @@ type ItemValue = {
      * Enabled flag
      */
     e: boolean
+    /**
+     * Locked flag
+     */
+    l: boolean
     /**
      * Allow to delay
      */
@@ -94,7 +98,7 @@ type ItemValue = {
 }
 
 const cvtItem2Rec = (item: ItemValue): LimitRecord => {
-    const { i, n, c, t, v, p, e, ad, wd, wt, r, ct, wct, } = item
+    const { i, n, c, t, v, p, e, l, ad, wd, wt, r, ct, wct, } = item
     const records: DateRecords = {}
     Object.entries(r || {}).forEach?.(([date, { m, d, c }]) => records[date] = { mill: m, delay: d, visit: c })
     return {
@@ -111,6 +115,7 @@ const cvtItem2Rec = (item: ItemValue): LimitRecord => {
         allowDelay: !!ad,
         weekdays: wd,
         records: records,
+        locked: l,
     }
 }
 
@@ -121,9 +126,9 @@ function migrate(exist: Items, toMigrate: any) {
     Object.values(toMigrate).forEach((value, idx) => {
         const id = idBase + idx
         const itemValue: ItemValue = value as ItemValue
-        const { c, n, t, e, ad, v, p } = itemValue
+        const { c, n, t, e, l, ad, v, p } = itemValue
         exist[id] = {
-            i: id, c, n, t, e: !!e, ad: !!ad, v, p,
+            i: id, c, n, t, e: !!e, l: !!l, ad: !!ad, v, p,
             r: {},
         }
     })
@@ -162,7 +167,7 @@ class LimitDatabase extends BaseDatabase {
         const items = await this.getItems()
         let {
             id, name, weekdays,
-            enabled, allowDelay,
+            enabled, locked, allowDelay,
             cond,
             time, count,
             weekly, weeklyCount,
@@ -181,7 +186,7 @@ class LimitDatabase extends BaseDatabase {
             // Can be overridden by existing
             ...(existItem || {}),
             i: id, n: name, c: cond, wd: weekdays,
-            e: !!enabled, ad: !!allowDelay,
+            e: !!enabled, l: locked, ad: !!allowDelay,
             t: time, ct: count,
             wt: weekly, wct: weeklyCount,
             v: visitTime, p: periods,
@@ -247,6 +252,13 @@ class LimitDatabase extends BaseDatabase {
         await this.update(items)
     }
 
+    async updateLocked(id: number, locked: boolean) {
+        const items = await this.getItems()
+        if (!items[id]) return
+        items[id].l = !!locked
+        await this.update(items)
+    }
+
     async importData(data: any): Promise<void> {
         let toImport = data[KEY] as Items
         // Not import

src/database/memory-detector.ts

@@ -10,7 +10,7 @@ import StoragePromise from "./common/storage-promise"
 /**
  * User memory of this extension
  */
-type MemoryInfo = {
+export type MemoryInfo = {
     /**
      * Used bytes
      */

src/database/site-database.ts

@@ -81,8 +81,8 @@ function cvt2Entry({ alias, iconUrl, cate, run }: timer.site.SiteInfo): _Entry {
     return entry
 }
 
-function cvt2SiteInfo(key: timer.site.SiteKey, entry: _Entry): timer.site.SiteInfo {
-    const { a, i, c, r } = entry
+function cvt2SiteInfo(key: timer.site.SiteKey, entry: _Entry | undefined): timer.site.SiteInfo {
+    const { a, i, c, r } = entry || {}
     const siteInfo: timer.site.SiteInfo = { ...key }
     siteInfo.alias = a
     siteInfo.cate = c