Refactor code of service worker (#327)

Author: sheepzh

src/background/content-script-handler.ts

@@ -5,16 +5,16 @@
  * https://opensource.org/licenses/MIT
  */
 
+import { getUrl } from "@api/chrome/runtime"
+import { createTab } from "@api/chrome/tab"
+import { ANALYSIS_ROUTE, LIMIT_ROUTE } from "@app/router/constants"
+import whitelistHolder from "@service/components/whitelist-holder"
+import itemService from "@service/item-service"
 import limitService from "@service/limit-service"
 import optionService from "@service/option-service"
-import statService from "@service/stat-service"
-import MessageDispatcher from "./message-dispatcher"
-import whitelistHolder from "@service/components/whitelist-holder"
-import { extractFileHost, extractHostname } from "@util/pattern"
-import { getUrl } from "@api/chrome/runtime"
 import { getAppPageUrl } from "@util/constant/url"
-import { ANALYSIS_ROUTE, LIMIT_ROUTE } from "@app/router/constants"
-import { createTab } from "@api/chrome/tab"
+import { extractFileHost, extractHostname } from "@util/pattern"
+import MessageDispatcher from "./message-dispatcher"
 
 const handleOpenAnalysisPage = (sender: ChromeMessageSender) => {
     const { tab, url } = sender || {}
@@ -53,7 +53,7 @@ export default function init(dispatcher: MessageDispatcher) {
                 host = param?.host
                 url = param?.url
             }
-            statService.addOneTime(host, url)
+            itemService.addOneTime(host, url)
         })
         // Judge is in whitelist
         .register<{ host?: string, url?: string }, boolean>('cs.isInWhitelist', ({ host, url } = {}) => whitelistHolder.contains(host, url))
@@ -63,7 +63,7 @@ export default function init(dispatcher: MessageDispatcher) {
             return !!option.printInConsole
         })
         // Get today info
-        .register<string, timer.stat.Result>('cs.getTodayInfo', host => statService.getResult(host, new Date()))
+        .register<string, timer.stat.Result>('cs.getTodayInfo', host => itemService.getResult(host, new Date()))
         // cs.getLimitedRules
         .register<string, timer.limit.Item[]>('cs.getLimitedRules', url => limitService.getLimited(url))
         .register<string, timer.limit.Item[]>('cs.getRelatedRules', url => limitService.getRelated(url))

src/background/timer/server.ts

@@ -1,12 +1,12 @@
 import { getTab, listTabs, sendMsg2Tab } from "@api/chrome/tab"
 import { getWindow } from "@api/chrome/window"
+import itemService from "@service/item-service"
 import limitService from "@service/limit-service"
+import optionService from "@service/option-service"
 import periodService from "@service/period-service"
-import statService from "@service/stat-service"
 import { extractHostname } from "@util/pattern"
 import badgeManager from "../badge-manager"
 import MessageDispatcher from "../message-dispatcher"
-import optionService from "@service/option-service"
 
 let option = null
 optionService.getAllOption().then(opt => option = opt)
@@ -16,7 +16,7 @@ async function handleTime(host: string, url: string, dateRange: [number, number]
     const [start, end] = dateRange
     const focusTime = end - start
     // 1. Save async
-    await statService.addFocusTime(host, url, focusTime)
+    await itemService.addFocusTime(host, url, focusTime)
     // 2. Process limit
     const metLimits = await limitService.addFocusTime(host, url, focusTime)
     // If time limited after this operation, send messages

src/common/backup/processor.ts

@@ -6,9 +6,9 @@
  */
 
 import BackupDatabase from "@db/backup-database"
+import itemService from "@service/item-service"
 import metaService from "@service/meta-service"
 import optionService from "@service/option-service"
-import statService from "@service/stat-service"
 import { judgeVirtualFast } from "@util/pattern"
 import { formatTimeYMD, getBirthday } from "@util/time"
 import GistCoordinator from "./gist/coordinator"
@@ -112,7 +112,7 @@ async function syncFull(
     // 1. select rows
     let start = getBirthday()
     let end = new Date()
-    const rows = await statService.select({ date: [start, end] })
+    const rows = await itemService.selectItems({ date: [start, end] })
     const allDates = rows.map(r => r.date).sort((a, b) => a == b ? 0 : a > b ? 1 : -1)
     client.maxDate = allDates[allDates.length - 1]
     client.minDate = allDates[0]

src/service/item-service.ts

@@ -0,0 +1,35 @@
+import StatDatabase, { StatCondition } from "@db/stat-database"
+import { resultOf } from "@util/stat"
+import virtualSiteHolder from "./components/virtual-site-holder"
+import whitelistHolder from "./components/whitelist-holder"
+
+const db = new StatDatabase(chrome.storage.local)
+
+async function addFocusTime(host: string, url: string, focusTime: number): Promise<void> {
+    if (whitelistHolder.contains(host, url)) return
+
+    const resultSet: timer.stat.ResultSet = { [host]: resultOf(focusTime, 0) }
+    const virtualHosts = virtualSiteHolder.findMatched(url)
+    virtualHosts.forEach(virtualHost => resultSet[virtualHost] = resultOf(focusTime, 0))
+
+    await db.accumulateBatch(resultSet, new Date())
+}
+
+async function addOneTime(host: string, url: string) {
+    if (whitelistHolder.contains(host, url)) return
+
+    const resultSet: timer.stat.ResultSet = { [host]: resultOf(0, 1) }
+    virtualSiteHolder.findMatched(url).forEach(virtualHost => resultSet[virtualHost] = resultOf(0, 1))
+    await db.accumulateBatch(resultSet, new Date())
+}
+
+const getResult = (host: string, date: Date | string) => db.get(host, date)
+
+const selectItems = (cond: StatCondition) => db.select(cond)
+
+export default {
+    addFocusTime,
+    addOneTime,
+    getResult,
+    selectItems,
+}

src/service/stat-service/index.ts

@@ -5,17 +5,14 @@
  * https://opensource.org/licenses/MIT
  */
 
+import MergeRuleDatabase from "@db/merge-rule-database"
+import SiteDatabase from "@db/site-database"
 import StatDatabase, { StatCondition } from "@db/stat-database"
+import { judgeVirtualFast } from "@util/pattern"
 import { log } from "../../common/logger"
 import CustomizedHostMergeRuler from "../components/host-merge-ruler"
-import MergeRuleDatabase from "@db/merge-rule-database"
 import { slicePageResult } from "../components/page-info"
-import whitelistHolder from '../components/whitelist-holder'
-import { resultOf } from "@util/stat"
-import SiteDatabase from "@db/site-database"
 import { mergeDate, mergeHost } from "./merge"
-import virtualSiteHolder from "@service/components/virtual-site-holder"
-import { judgeVirtualFast } from "@util/pattern"
 import { canReadRemote, processRemote } from "./remote"
 
 const storage = chrome.storage.local
@@ -64,25 +61,6 @@ export type HostSet = {
  * @since 0.0.5
  */
 class StatService {
-
-    async addFocusTime(host: string, url: string, focusTime: number): Promise<void> {
-        if (whitelistHolder.contains(host, url)) return
-
-        const resultSet: timer.stat.ResultSet = { [host]: resultOf(focusTime, 0) }
-        const virtualHosts = virtualSiteHolder.findMatched(url)
-        virtualHosts.forEach(virtualHost => resultSet[virtualHost] = resultOf(focusTime, 0))
-
-        await statDatabase.accumulateBatch(resultSet, new Date())
-    }
-
-    async addOneTime(host: string, url: string) {
-        if (whitelistHolder.contains(host, url)) return
-
-        const resultSet: timer.stat.ResultSet = { [host]: resultOf(0, 1) }
-        virtualSiteHolder.findMatched(url).forEach(virtualHost => resultSet[virtualHost] = resultOf(0, 1))
-        await statDatabase.accumulateBatch(resultSet, new Date())
-    }
-
     /**
      * Query hosts
      *
@@ -196,10 +174,6 @@ class StatService {
         return origin
     }
 
-    getResult(host: string, date: Date): Promise<timer.stat.Result> {
-        return statDatabase.get(host, date)
-    }
-
     async selectByPage(
         param?: StatQueryParam,
         page?: timer.common.PageQuery,