fix: fix some bugs (#585)

sheepzh · web-flow · commit 7d093f876291 · 2025-10-23T11:27:55.000+08:00
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
         "@types/chrome": "0.1.24",
         "@types/decompress": "^4.2.7",
         "@types/jest": "^30.0.0",
-        "@types/node": "^24.7.2",
+        "@types/node": "^24.9.1",
         "@types/punycode": "^2.1.4",
         "@vue/babel-plugin-jsx": "^2.0.1",
         "babel-loader": "^10.0.0",
@@ -53,7 +53,7 @@
         "postcss": "^8.5.6",
         "postcss-loader": "^8.2.0",
         "postcss-rtlcss": "^5.7.1",
-        "puppeteer": "^24.25.0",
+        "puppeteer": "^24.26.0",
         "sass": "^1.93.2",
         "sass-loader": "^16.0.5",
         "ts-loader": "^9.5.4",
@@ -68,11 +68,11 @@
         "@element-plus/icons-vue": "^2.3.2",
         "countup.js": "^2.9.0",
         "echarts": "^6.0.0",
-        "element-plus": "2.11.4",
+        "element-plus": "2.11.5",
         "js-base64": "^3.7.8",
         "punycode": "^2.3.1",
         "vue": "^3.5.22",
-        "vue-router": "^4.6.2"
+        "vue-router": "^4.6.3"
     },
     "engines": {
         "node": ">=20"
diff --git a/src/pages/app/components/Analysis/components/AnalysisFilter/TargetSelect.tsx b/src/pages/app/components/Analysis/components/AnalysisFilter/TargetSelect.tsx
@@ -3,7 +3,7 @@ import { t } from "@app/locale"
 import { useDebounce, useRequest, useState } from "@hooks"
 import Flex from "@pages/components/Flex"
 import siteService from "@service/site-service"
-import statService from "@service/stat-service"
+import { listHosts } from "@service/stat-service"
 import { identifySiteKey, parseSiteKeyFromIdentity, SiteMap } from "@util/site"
 import { ElSelectV2, ElTag, useNamespace } from "element-plus"
 import type { OptionType } from "element-plus/es/components/select-v2/src/select.types"
@@ -64,7 +64,7 @@ const fetchItems = async (categories: timer.site.Cate[]): Promise<[siteItems: Ta
     const siteSet = new SiteMap<timer.site.SiteInfo>()
 
     // 2.1 sites from hosts
-    const hosts = await statService.listHosts()
+    const hosts = await listHosts()
     collectHosts(hosts, siteSet)
 
     // 2.2 query sites from sites
diff --git a/src/pages/app/components/Analysis/context.ts b/src/pages/app/components/Analysis/context.ts
@@ -6,7 +6,7 @@
  */
 
 import { useLocalStorage, useProvide, useProvider, useRequest } from "@hooks"
-import statService from "@service/stat-service"
+import { selectCate, selectSite } from "@service/stat-service"
 import { ref, watch, type Ref } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import type { AnalysisTarget } from "./types"
@@ -36,10 +36,10 @@ async function queryRows(target: AnalysisTarget | undefined): Promise<(timer.sta
     if (!key) return []
 
     if (type === 'cate') {
-        return statService.selectCate({ cateIds: [key], sortKey: 'date' })
+        return selectCate({ cateIds: [key], sortKey: 'date' })
     } else if (type === 'site') {
         const { host, type: siteType } = key ?? {}
-        return statService.selectSite({ host, mergeHost: siteType === 'merged', sortKey: 'date' })
+        return selectSite({ host, mergeHost: siteType === 'merged', sortKey: 'date' })
     } else {
         // Not supported yet
         return []
diff --git a/src/pages/app/components/Dashboard/components/Calendar/index.tsx b/src/pages/app/components/Dashboard/components/Calendar/index.tsx
@@ -13,7 +13,7 @@ import { useRequest } from "@hooks"
 import { useEcharts } from "@hooks/useEcharts"
 import Flex from "@pages/components/Flex"
 import weekHelper from "@service/components/week-helper"
-import statService from "@service/stat-service"
+import { selectSite } from '@service/stat-service'
 import { groupBy, sum } from "@util/array"
 import { getAppPageUrl } from "@util/constant/url"
 import { formatTimeYMD, MILL_PER_DAY, MILL_PER_HOUR } from "@util/time"
@@ -40,7 +40,7 @@ const fetchData = async (): Promise<Result> => {
     const endTime = new Date()
     const yearAgo = new Date(endTime.getTime() - MILL_PER_DAY * 365)
     const [startTime] = await weekHelper.getWeekDate(yearAgo)
-    const items = await statService.selectSite({ date: [startTime, endTime], sortKey: 'date' })
+    const items = await selectSite({ date: [startTime, endTime], sortKey: 'date' })
     const value = groupBy(
         items,
         i => i.date,
diff --git a/src/pages/app/components/Dashboard/components/Indicator.tsx b/src/pages/app/components/Dashboard/components/Indicator.tsx
@@ -11,7 +11,7 @@ import periodDatabase from "@db/period-database"
 import { Sunrise } from "@element-plus/icons-vue"
 import { useRequest, useXsState } from "@hooks"
 import Flex from "@pages/components/Flex"
-import statService from "@service/stat-service"
+import { selectSite } from "@service/stat-service"
 import { calcMostPeriodOf2Hours } from "@util/period"
 import { getStartOfDay, MILL_PER_DAY, MILL_PER_MINUTE } from "@util/time"
 import { ElIcon } from "element-plus"
@@ -34,7 +34,7 @@ function calculateInstallDays(installTime: Date, now: Date): number {
 }
 
 async function query(): Promise<_Value> {
-    const allData = await statService.selectSite()
+    const allData = await selectSite()
     const hostSet = new Set<string>()
     let visits = 0
     let browsingTime = 0
diff --git a/src/pages/app/components/Dashboard/components/MonthOnMonth/index.tsx b/src/pages/app/components/Dashboard/components/MonthOnMonth/index.tsx
@@ -1,7 +1,7 @@
 import { t } from "@app/locale"
 import { useEcharts } from "@hooks/useEcharts"
 import Flex from "@pages/components/Flex"
-import statService from "@service/stat-service"
+import { selectSite } from "@service/stat-service"
 import { groupBy, sum } from "@util/array"
 import DateIterator from "@util/date-iterator"
 import { MILL_PER_DAY } from "@util/time"
@@ -37,9 +37,9 @@ const fetchData = async (): Promise<[thisMonth: Row[], lastMonth: Row[]]> => {
 
     // Query with alias
     // @since 1.1.8
-    const lastPeriodItems = await statService.selectSite({ date: [lastPeriodStart, lastPeriodEnd] })
+    const lastPeriodItems = await selectSite({ date: [lastPeriodStart, lastPeriodEnd] })
     const lastRows = cvtRow(lastPeriodItems, lastPeriodStart, lastPeriodEnd)
-    const thisPeriodItems = await statService.selectSite({ date: [thisPeriodStart, thisPeriodEnd] })
+    const thisPeriodItems = await selectSite({ date: [thisPeriodStart, thisPeriodEnd] })
     const thisRows = cvtRow(thisPeriodItems, thisPeriodStart, thisPeriodEnd)
     return [lastRows, thisRows]
 }
diff --git a/src/pages/app/components/Dashboard/components/TopKVisit/context.ts b/src/pages/app/components/Dashboard/components/TopKVisit/context.ts
@@ -1,5 +1,5 @@
 import { useLocalStorage, useProvide, useProvider, useRequest } from "@hooks"
-import statService, { SiteQuery } from "@service/stat-service"
+import { selectSitePage, type SiteQuery } from "@service/stat-service"
 import { MILL_PER_DAY } from "@util/time"
 import { reactive, toRaw, watch, type Reactive, type Ref } from "vue"
 
@@ -42,7 +42,7 @@ export const initProvider = () => {
             mergeDate: true,
         }
         const SIZE = filter.topK
-        const top = (await statService.selectSitePage(query, { num: 1, size: SIZE })).list
+        const top = (await selectSitePage(query, { num: 1, size: SIZE })).list
         const data: BizOption[] = top.map(({ time, siteKey, alias }) => ({
             name: alias ?? siteKey?.host ?? '',
             host: siteKey?.host ?? '',
diff --git a/src/pages/app/components/Habit/components/Site/context.ts b/src/pages/app/components/Habit/components/Site/context.ts
@@ -6,7 +6,7 @@
  */
 
 import { useProvide, useProvider, useRequest } from "@hooks"
-import statService from "@service/stat-service"
+import { selectSite } from "@service/stat-service"
 import { mergeDate } from "@service/stat-service/merge/date"
 import { getDayLength } from "@util/time"
 import { computed, type Ref } from "vue"
@@ -22,7 +22,7 @@ const NAMESPACE = 'habitSite'
 export const initProvider = () => {
     const filter = useHabitFilter()
 
-    const { data: rows } = useRequest(() => statService.selectSite({ date: filter.dateRange }), {
+    const { data: rows } = useRequest(() => selectSite({ date: filter.dateRange }), {
         deps: [() => filter.dateRange],
         defaultValue: [],
     })
diff --git a/src/pages/app/components/Report/ReportFilter/BatchDelete.tsx b/src/pages/app/components/Report/ReportFilter/BatchDelete.tsx
@@ -2,7 +2,7 @@ import { getGroup } from "@api/chrome/tabGroups"
 import { type I18nKey, t } from "@app/locale"
 import statDatabase from "@db/stat-database"
 import { DeleteFilled } from "@element-plus/icons-vue"
-import statService from "@service/stat-service"
+import { batchDelete, countGroupByIds, countSiteByHosts } from "@service/stat-service"
 import { isGroup, isNormalSite, isSite } from "@util/stat"
 import { formatTime } from "@util/time"
 import { ElButton, ElMessage, ElMessageBox } from "element-plus"
@@ -30,8 +30,8 @@ async function computeBatchDeleteMsg(selected: timer.stat.Row[], mergeDate: bool
     let count2Delete = selected.length ?? 0
     if (mergeDate) {
         // All the items
-        const siteCount = hosts.length ? await statService.countSiteByHosts(hosts, dateRange) : 0
-        const groupCount = groupIds.length ? await statService.countGroupByIds(groupIds, dateRange) : 0
+        const siteCount = hosts.length ? await countSiteByHosts(hosts, dateRange) : 0
+        const groupCount = groupIds.length ? await countGroupByIds(groupIds, dateRange) : 0
         count2Delete = siteCount + groupCount
     }
     const i18nParam: Record<string, string | number | undefined> = {
@@ -111,7 +111,7 @@ async function deleteBatch(selected: timer.stat.Row[], mergeDate: boolean, dateR
         }
     } else {
         // If not merge date, batch delete
-        await statService.batchDelete(selected)
+        await batchDelete(selected)
     }
 }
 
diff --git a/src/pages/app/components/Report/ReportFilter/RemoteClient.tsx b/src/pages/app/components/Report/ReportFilter/RemoteClient.tsx
@@ -8,7 +8,7 @@
 import { t } from "@app/locale"
 import { UploadFilled } from "@element-plus/icons-vue"
 import { useRequest } from "@hooks"
-import statService from "@service/stat-service"
+import { canReadRemote } from '@service/stat-service/remote'
 import { ElButton, ElIcon, ElTooltip } from "element-plus"
 import { computed, defineComponent } from "vue"
 import { useReportFilter } from "../context"
@@ -17,7 +17,7 @@ import { ICON_BTN_STYLE } from "./common"
 const _default = defineComponent(() => {
     const filter = useReportFilter()
     const content = computed(() => t(msg => msg.report.remoteReading[filter.readRemote ? 'on' : 'off']))
-    const { data: visible } = useRequest(() => statService.canReadRemote(), { defaultValue: false })
+    const { data: visible } = useRequest(() => canReadRemote(), { defaultValue: false })
 
     return () => (
         <ElTooltip trigger="hover" placement="bottom-start" effect="dark" content={content.value}>
diff --git a/src/pages/app/components/Report/ReportTable/index.tsx b/src/pages/app/components/Report/ReportTable/index.tsx
@@ -13,7 +13,7 @@ import { Histogram } from "@element-plus/icons-vue"
 import { useDocumentVisibility, useManualRequest, useRequest, useState } from "@hooks"
 import Flex from "@pages/components/Flex"
 import siteService from "@service/site-service"
-import statService, { type SiteQuery } from "@service/stat-service"
+import { selectCate, selectGroup, selectSite, type SiteQuery } from "@service/stat-service"
 import { sum } from "@util/array"
 import { isRtl } from "@util/document"
 import { siteEqual } from "@util/site"
@@ -75,15 +75,15 @@ const _default = defineComponent((_, ctx) => {
         const { siteMerge, dateRange: date, query, readRemote: inclusiveRemote, cateIds } = filter
         let rows: timer.stat.Row[] = []
         if (siteMerge === 'group') {
-            rows = await statService.selectGroup({ date, query })
+            rows = await selectGroup({ date, query })
         } else if (siteMerge === 'cate') {
-            rows = await statService.selectCate({ date, query, cateIds, inclusiveRemote })
+            rows = await selectCate({ date, query, cateIds, inclusiveRemote })
         } else {
             const param: SiteQuery = {
                 date, query, cateIds, inclusiveRemote,
                 mergeHost: siteMerge === 'domain',
             }
-            rows = await statService.selectSite(param)
+            rows = await selectSite(param)
         }
         const visit = sum(rows.map(e => e.time))
         const focus = sum(rows.map(e => e.focus))
diff --git a/src/pages/app/components/Report/common.ts b/src/pages/app/components/Report/common.ts
@@ -1,6 +1,9 @@
 import { t } from "@app/locale"
 import statDatabase from "@db/stat-database"
-import statService, { type CateQuery, type GroupQuery, type SiteQuery } from "@service/stat-service"
+import {
+    selectCate, selectCatePage, selectGroup, selectGroupPage, selectSite, selectSitePage,
+    type CateQuery, type GroupQuery, type SiteQuery,
+} from "@service/stat-service"
 import { getGroupName, isGroup, isSite } from "@util/stat"
 import { formatTime } from "@util/time"
 import type { ReportFilterOption, ReportSort } from "./types"
@@ -106,21 +109,21 @@ const cvt2CateQuery = (
 export const queryPage = (filter: ReportFilterOption, sort: ReportSort, page: timer.common.PageQuery): Promise<timer.common.PageResult<timer.stat.Row>> => {
     const { siteMerge } = filter
     if (siteMerge === 'group') {
-        return statService.selectGroupPage(cvt2GroupQuery(filter, sort), page)
+        return selectGroupPage(cvt2GroupQuery(filter, sort), page)
     } else if (siteMerge === 'cate') {
-        return statService.selectCatePage(cvt2CateQuery(filter, sort), page)
+        return selectCatePage(cvt2CateQuery(filter, sort), page)
     } else {
-        return statService.selectSitePage(cvt2SiteQuery(filter, sort), page)
+        return selectSitePage(cvt2SiteQuery(filter, sort), page)
     }
 }
 
 export const queryAll = (filter: ReportFilterOption, sort: ReportSort): Promise<timer.stat.Row[]> => {
     const { siteMerge } = filter
     if (siteMerge === 'group') {
-        return statService.selectGroup(cvt2GroupQuery(filter, sort))
+        return selectGroup(cvt2GroupQuery(filter, sort))
     } else if (siteMerge === 'cate') {
-        return statService.selectCate(cvt2CateQuery(filter, sort))
+        return selectCate(cvt2CateQuery(filter, sort))
     } else {
-        return statService.selectSite(cvt2SiteQuery(filter, sort))
+        return selectSite(cvt2SiteQuery(filter, sort))
     }
 }
diff --git a/src/pages/app/components/SiteManage/SiteManageModify/HostSelect.tsx b/src/pages/app/components/SiteManage/SiteManageModify/HostSelect.tsx
@@ -6,7 +6,7 @@
  */
 import { useManualRequest } from "@hooks"
 import siteService from "@service/site-service"
-import statService from "@service/stat-service"
+import { listHosts } 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,7 +32,7 @@ function cleanQuery(query: string) {
 async function handleRemoteSearch(query: string): Promise<_OptionInfo[]> {
     query = cleanQuery(query)
     if (!query) return []
-    const { normal, merged } = await statService.listHosts(query)
+    const { normal, merged } = await listHosts(query)
     const allAlias: timer.site.SiteKey[] = [
         ...normal.map(host => ({ host, type: 'normal' } satisfies timer.site.SiteKey)),
         ...merged.map(host => ({ host, type: 'merged' } satisfies timer.site.SiteKey)),
diff --git a/src/pages/app/components/common/filter/DateRangeFilterItem.tsx b/src/pages/app/components/common/filter/DateRangeFilterItem.tsx
@@ -88,6 +88,14 @@ const DateRangeFilterItem = defineComponent<Props>(props => {
         shortcuts, clearable,
     } = useRange(props)
 
+    const handleUpdate = (value: [Date, Date] | undefined) => {
+        if (value?.[0].getTime() === 0 && value[1].getTime() === 0) {
+            // clear shortcuts
+            value = undefined
+        }
+        props.onChange?.(value)
+    }
+
     return () => (
         <span class="filter-item">
             <Flex gap={1} width="fit-content">
@@ -113,7 +121,7 @@ const DateRangeFilterItem = defineComponent<Props>(props => {
                     rangeSeparator="-"
                     disabledDate={props.disabledDate}
                     shortcuts={shortcuts.value}
-                    onUpdate:modelValue={newVal => props.onChange?.(toRaw(newVal) ?? undefined)}
+                    onUpdate:modelValue={newVal => handleUpdate(toRaw(newVal))}
                     startPlaceholder={props.startPlaceholder}
                     endPlaceholder={props.endPlaceholder}
                     clearable={clearable.value}
diff --git a/src/pages/popup/common.tsx b/src/pages/popup/common.tsx
@@ -1,7 +1,7 @@
 import type { ReportQueryParam } from "@app/components/Report/types"
 import { REPORT_ROUTE } from "@app/router/constants"
 import weekHelper from "@service/components/week-helper"
-import statService from "@service/stat-service"
+import { selectCate, selectGroup, selectSite } from '@service/stat-service'
 import { isRemainHost } from "@util/constant/remain-host"
 import { getAppPageUrl } from "@util/constant/url"
 import { isSite } from "@util/stat"
@@ -30,11 +30,11 @@ export const queryRows = async (param: PopupQuery): Promise<[rows: timer.stat.Ro
     const sortDirection: timer.common.SortDirection = 'DESC'
     let rows: timer.stat.Row[]
     if (mergeMethod === 'cate') {
-        rows = await statService.selectCate({ date, mergeDate: true, sortKey, sortDirection })
+        rows = await selectCate({ date, mergeDate: true, sortKey, sortDirection })
     } else if (mergeMethod === 'group') {
-        rows = await statService.selectGroup({ date, mergeDate: true, sortKey, sortDirection })
+        rows = await selectGroup({ date, mergeDate: true, sortKey, sortDirection })
     } else {
-        rows = await statService.selectSite({
+        rows = await selectSite({
             date, mergeDate: true,
             mergeHost: mergeMethod === 'domain',
             sortKey, sortDirection,
diff --git a/src/pages/side/Layout.tsx b/src/pages/side/Layout.tsx
@@ -1,5 +1,5 @@
 import { useRequest } from "@hooks"
-import statService from "@service/stat-service"
+import { selectSite } from "@service/stat-service"
 import { formatTime } from "@util/time"
 import { ElText } from "element-plus"
 import { defineComponent, ref, type StyleValue } from "vue"
@@ -11,14 +11,12 @@ const _default = defineComponent(() => {
     const date = ref(new Date())
     const query = ref('')
 
-    const { data, refresh, loading } = useRequest(() => {
-        return statService.selectSite({
-            date: date.value ?? new Date(),
-            query: query.value,
-            sortKey: 'focus',
-            sortDirection: 'DESC',
-        })
-    })
+    const { data, refresh, loading } = useRequest(() => selectSite({
+        date: date.value ?? new Date(),
+        query: query.value,
+        sortKey: 'focus',
+        sortDirection: 'DESC',
+    }))
 
     return () => <div class="main">
         <Search
diff --git a/src/service/stat-service/index.ts b/src/service/stat-service/index.ts
diff --git a/test-e2e/tracker/run-time.test.ts b/test-e2e/tracker/run-time.test.ts
