Merge remote-tracking branch 'origin/main' into v3.2.0

Author: sheepzh

.vscode/settings.json

@@ -32,6 +32,7 @@
         "Popconfirm",
         "PROPFIND",
         "Qihu",
+        "Rsdoctor",
         "rtlcss",
         "selectchanged",
         "sheepzh",

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to Time Tracker will be documented in this file.
 
 It is worth mentioning that the release time of each change refers to the time when the installation package is submitted to the webstore. It is about one week for Edge to moderate packages, while only 1-2 days for Chrome and Firefox.
 
+## [3.1.2] - 2025-02-11
+
+-   Fixed some bugs
+
 ## [3.1.1] - 2025-02-07 [For Firefox]
 
 -   Supported sidebar for Firefox

package.json

@@ -1,6 +1,6 @@
 {
     "name": "timer",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "description": "Time tracker",
     "homepage": "https://www.wfhg.cc",
     "scripts": {
@@ -29,6 +29,7 @@
         "@babel/plugin-transform-modules-commonjs": "^7.26.3",
         "@babel/preset-env": "^7.26.7",
         "@crowdin/crowdin-api-client": "^1.41.1",
+        "@rsdoctor/webpack-plugin": "^0.4.13",
         "@swc/core": "^1.10.15",
         "@swc/jest": "^0.2.37",
         "@types/chrome": "0.0.303",
@@ -40,7 +41,6 @@
         "@types/psl": "^1.1.3",
         "@types/punycode": "^2.1.4",
         "@types/webpack": "^5.28.5",
-        "@types/webpack-bundle-analyzer": "^4.7.0",
         "@vue/babel-plugin-jsx": "^1.2.5",
         "babel-loader": "^9.2.1",
         "copy-webpack-plugin": "^12.0.2",
@@ -63,11 +63,9 @@
         "ts-loader": "^9.5.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
-        "tslib": "^2.8.1",
         "typescript": "5.7.3",
         "url-loader": "^4.1.1",
         "webpack": "^5.97.1",
-        "webpack-bundle-analyzer": "^4.10.2",
         "webpack-cli": "^6.0.1"
     },
     "dependencies": {
@@ -85,4 +83,4 @@
     "engines": {
         "node": ">=20"
     }
-}
+}

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

@@ -1,7 +1,7 @@
 import { SELECT_WRAPPER_STYLE } from "@app/components/common/filter/common"
 import { useCategories } from "@app/context"
 import { t } from "@app/locale"
-import { useManualRequest } from "@hooks"
+import { useManualRequest, useState } from "@hooks"
 import Flex from "@pages/components/Flex"
 import siteService from "@service/site-service"
 import statService from "@service/stat-service"
@@ -44,32 +44,29 @@ type TargetItem = AnalysisTarget & {
     label: string
 }
 
-function collectHosts(hosts: Set<string>, siteType: timer.site.Type, collector: SiteMap<timer.site.SiteInfo>) {
-    hosts?.forEach(host => {
-        const site: timer.site.SiteInfo = { host, type: siteType }
-        collector?.put(site, site)
+function collectHosts(hosts: Record<timer.site.Type, string[]>, collector: SiteMap<timer.site.SiteInfo>) {
+    Object.entries(hosts).forEach(([key, arr]) => {
+        const type = key as timer.site.Type
+        arr.forEach(host => {
+            const site: timer.site.SiteInfo = { host, type }
+            collector?.put(site, site)
+        })
     })
 }
 
-const fetchItems = async (query: string, categories: timer.site.Cate[]): Promise<[siteItems: TargetItem[], cateItems: TargetItem[]]> => {
-    query = query?.trim?.()
+const fetchItems = async (categories: timer.site.Cate[]): Promise<[siteItems: TargetItem[], cateItems: TargetItem[]]> => {
     // 1. query categories
-    const cateItems = categories
-        ?.filter(({ name }) => !query || name?.includes(query))
-        ?.map(({ id, name }) => ({ type: 'cate', key: id, label: name } satisfies TargetItem))
+    const cateItems = categories?.map(({ id, name }) => ({ type: 'cate', key: id, label: name } satisfies TargetItem))
 
     // 2. query sites
     const siteSet = new SiteMap<timer.site.SiteInfo>()
 
     // 2.1 sites from hosts
-    const hosts = await statService.listHosts(query)
-    const { origin, merged, virtual } = hosts || {}
-    collectHosts(origin, 'normal', siteSet)
-    collectHosts(merged, 'merged', siteSet)
-    collectHosts(virtual, 'virtual', siteSet)
+    const hosts = await statService.listHosts()
+    collectHosts(hosts, siteSet)
 
     // 2.2 query sites from sites
-    const sites = await siteService.selectAll({ fuzzyQuery: query })
+    const sites = await siteService.selectAll()
     sites?.forEach(site => siteSet.put(site, site))
 
     const siteItems = siteSet?.map((_, site) => ({ type: 'site', key: site, label: labelOfHostInfo(site) }) satisfies TargetItem)
@@ -129,19 +126,31 @@ const TargetSelect = defineComponent({
             ctx.emit('change', target)
         }
 
-        const { data: items, refresh, refreshAgain } = useManualRequest(
-            (query: string) => fetchItems(query, categories.value),
+        const { data: allItems } = useManualRequest(
+            () => fetchItems(categories.value),
             { deps: categories },
         )
 
-        const searchRemote = useDebounceFn(query => {
-            if (!query && !!selectKey.value) {
-                // Use last query
-                refreshAgain()
-            } else {
-                refresh(query)
-            }
-        }, 200)
+        const [query, setQuery] = useState<string>()
+
+        const items = computed(() => {
+            const q = query.value?.trim?.()
+            if (!q) return allItems.value
+
+            return allItems.value?.map(itemArr => {
+                const newItems = itemArr.filter(item => {
+                    if (item.type === 'cate') {
+                        return item.label?.includes?.(q)
+                    } else {
+                        const { host, alias } = item.key || {}
+                        return host?.includes?.(q) || alias?.includes?.(q)
+                    }
+                })
+                return newItems
+            }) ?? []
+        })
+
+        const searchRemote = useDebounceFn(setQuery, 50)
 
         return () => (
             <ElSelect

src/pages/app/components/SiteManage/SiteManageModify/HostSelect.tsx

@@ -6,7 +6,7 @@
  */
 import { useManualRequest } from "@hooks"
 import siteService from "@service/site-service"
-import statService, { type HostSet } from "@service/stat-service"
+import statService from "@service/stat-service"
 import { MERGED_HOST, ALL_HOSTS as REMAIN_HOSTS } from "@util/constant/remain-host"
 import { isValidVirtualHost, judgeVirtualFast } from "@util/pattern"
 import { ElOption, ElSelect, ElTag } from "element-plus"
@@ -32,10 +32,10 @@ function cleanQuery(query: string) {
 async function handleRemoteSearch(query: string): Promise<_OptionInfo[]> {
     query = cleanQuery(query)
     if (!query) return []
-    const hostSet: HostSet = (await statService.listHosts(query))
+    const { normal, merged } = (await statService.listHosts(query)) || {}
     const allAlias: timer.site.SiteKey[] = [
-        ...Array.from(hostSet.origin || []).map(host => ({ host, type: 'normal' } satisfies timer.site.SiteKey)),
-        ...Array.from(hostSet.merged || []).map(host => ({ host, type: 'merged' } satisfies timer.site.SiteKey)),
+        ...normal?.map(host => ({ host, type: 'normal' } satisfies timer.site.SiteKey)) ?? [],
+        ...merged?.map(host => ({ host, type: 'merged' } satisfies timer.site.SiteKey)) ?? [],
     ]
     // Add local files
     REMAIN_HOSTS.forEach(remain => allAlias.push({ host: remain, type: 'normal' }))

src/service/stat-service/index.ts

@@ -62,12 +62,6 @@ export type StatQueryParam = StatCondition & {
     sortOrder?: SortDirect
 }
 
-export type HostSet = {
-    origin: Set<string>
-    merged: Set<string>
-    virtual: Set<string>
-}
-
 function cvtStatRow2BaseKey(statRow: timer.stat.Row): timer.core.RowKey {
     const { siteKey, date } = statRow || {}
     if (!date) return undefined
@@ -116,36 +110,39 @@ class StatService {
      * @param fuzzyQuery the part of host
      * @since 0.0.8
      */
-    async listHosts(fuzzyQuery: string): Promise<HostSet> {
+    async listHosts(fuzzyQuery?: string): Promise<Record<timer.site.Type, string[]>> {
         const rows = await statDatabase.select()
         const allHosts: Set<string> = new Set(rows.map(row => row.host))
         // Generate ruler
         const mergeRuleItems: timer.merge.Rule[] = await mergeRuleDatabase.selectAll()
         const mergeRuler = new CustomizedHostMergeRuler(mergeRuleItems)
 
-        const origin: Set<string> = new Set()
-        const merged: Set<string> = new Set()
-        const virtual: Set<string> = new Set()
+        const normalSet: Set<string> = new Set()
+        const mergedSet: Set<string> = new Set()
+        const virtualSet: Set<string> = new Set()
 
         const allHostArr = Array.from(allHosts)
 
         allHostArr.forEach(host => {
             if (judgeVirtualFast(host)) {
-                host.includes(fuzzyQuery) && virtual.add(host)
+                virtualSet.add(host)
                 return
             }
-            host.includes(fuzzyQuery) && origin.add(host)
+            normalSet.add(host)
             const mergedHost = mergeRuler.merge(host)
-            mergedHost?.includes(fuzzyQuery) && merged.add(mergedHost)
+            mergedSet.add(mergedHost)
         })
 
-        const virtualSites = await siteDatabase.select({ types: 'virtual' })
-        virtualSites
-            .map(site => site.host)
-            .filter(host => host?.includes(fuzzyQuery))
-            .forEach(host => virtual.add(host))
+        let normal = Array.from(normalSet)
+        let merged = Array.from(mergedSet)
+        let virtual = Array.from(virtualSet)
+        if (fuzzyQuery) {
+            normal = normal.filter(host => host?.includes(fuzzyQuery))
+            merged = merged.filter(host => host?.includes(fuzzyQuery))
+            virtual = virtual.filter(host => host?.includes(fuzzyQuery))
+        }
 
-        return { origin, merged, virtual }
+        return { normal, merged, virtual }
     }
 
     /**

webpack/webpack.analyze.ts

@@ -5,7 +5,7 @@
 
 import path from 'path'
 import generateOption from "./webpack.common"
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
+import { RsdoctorWebpackPlugin } from '@rsdoctor/webpack-plugin'
 import manifest from '../src/manifest'
 
 const option = generateOption({
@@ -16,6 +16,6 @@ const option = generateOption({
 
 option.optimization.minimize = true
 option.optimization.usedExports = true
-option.plugins.push(new BundleAnalyzerPlugin())
+option.plugins.push(new RsdoctorWebpackPlugin())
 
 export default option