Refacotr declarations

Author: sheepzh

global.d.ts

@@ -42,6 +42,7 @@ declare namespace timer {
             | "off"
             // Timed on
             | "timed"
+
         type AppearanceOption = {
             /**
              * Whether to display the whitelist button in the context menu
@@ -135,4 +136,32 @@ declare namespace timer {
         // @since 0.9.0
         | 'zh_TW'
 
+    namespace stat {
+        /**
+         * Time waste per day
+         * 
+         * @since 0.0.1
+         */
+        type WastePerDay = {
+            /**
+             * Duration of visit
+             */
+            total: number
+            /**
+             * Duration of focus
+             */
+            focus: number
+            /**
+             * Visit times
+             */
+            time: number
+        }
+
+        /**
+         * Waste data
+         * 
+         * @since 0.3.3
+         */
+        type WasteData = { [host: string]: WastePerDay }
+    }
 }

src/background/chrome-synchronizer.ts

@@ -0,0 +1,37 @@
+import MetaDatabase from "@db/meta-database"
+import TimerDatabase from "@db/timer-database"
+import { MILL_PER_DAY } from "@util/time"
+
+const metaDb = new MetaDatabase(chrome.storage.local)
+const local = chrome.storage.local
+const sync = chrome.storage.sync
+
+async function syncData() {
+    const current = new Date().getTime()
+    const meta = (await metaDb.getMeta())?.sync
+    syncTimer(current, 11)
+}
+
+async function syncTimer(current: number, lastSyncTs: number) {
+    const startTime = lastSyncTs
+    const endTime = current - MILL_PER_DAY
+    const localDb = new TimerDatabase(local)
+    const syncDb = new TimerDatabase(sync)
+
+    const dateRange = [
+        startTime ? new Date(startTime) : undefined,
+        new Date(endTime)
+    ]
+
+    const localItems = await localDb.select({ date: dateRange })
+    const remoteItems = await syncDb.select({ date: dateRange })
+    localItems.forEach(item => {
+        syncDb.accumulate(item.host, item.date, item)
+    })
+
+    console.log(localItems, remoteItems)
+}
+
+export default class ChromeSynchronizer {
+    sync = syncData
+}

src/background/index.ts

@@ -16,6 +16,7 @@ import ActiveTabListener from "./active-tab-listener"
 import badgeTextManager from "./badge-text-manager"
 import metaService from "@service/meta-service"
 import UninstallListener from "./uninstall-listener"
+import ChromeSynchronizer from "./chrome-synchronizer"
 
 // Open the log of console
 openLog()
@@ -51,4 +52,6 @@ chrome.runtime.onInstalled.addListener(async detail => {
     detail.reason === "install" && await metaService.updateInstallTime(new Date())
     // Questionnaire for uninstall
     new UninstallListener().listen()
-})
+})
+
+new ChromeSynchronizer().sync()

src/content-script/printer.ts

@@ -6,7 +6,6 @@
  */
 
 import TimerDatabase from "@db/timer-database"
-import WastePerDay from "@entity/dao/waste-per-day"
 import { t2Chrome } from "@util/i18n/chrome/t"
 import { formatPeriod } from "@util/time"
 
@@ -16,7 +15,7 @@ const timerDatabase = new TimerDatabase(chrome.storage.local)
  * Print info of today
  */
 export default async function printInfo(host: string) {
-    const waste: WastePerDay = await timerDatabase.get(host, new Date())
+    const waste: timer.stat.WastePerDay = await timerDatabase.get(host, new Date())
     const hourMsg = t2Chrome(root => root.message.timeWithHour)
     const minuteMsg = t2Chrome(root => root.message.timeWithMinute)
     const secondMsg = t2Chrome(root => root.message.timeWithSecond)

src/database/archived-database.ts

@@ -6,7 +6,6 @@
  */
 
 import { log } from "../common/logger"
-import WastePerDay from "@entity/dao/waste-per-day"
 import DataItem from "@entity/dto/data-item"
 import BaseDatabase from "./common/base-database"
 import { ARCHIVED_PREFIX } from "./common/constant"
@@ -79,7 +78,7 @@ class ArchivedDatabase extends BaseDatabase {
         const result: DataItem[] = Object.entries(items)
             .filter(([key]) => domains.has(key))
             .map(([host, waste]) => {
-                const { focus, total, time } = waste as WastePerDay
+                const { focus, total, time } = waste as timer.stat.WastePerDay
                 return { focus, total, time, host, date: '', mergedHosts: [] }
             })
         return await Promise.resolve(result)

src/database/meta-database.ts

@@ -5,16 +5,15 @@
  * https://opensource.org/licenses/MIT
  */
 
-import { ExtensionMeta } from "@entity/dao/extension-meta"
 import BaseDatabase from "./common/base-database"
 import { META_KEY } from "./common/constant"
 
 /**
  * @since 0.6.0
  */
 class MetaDatabase extends BaseDatabase {
-    async getMeta(): Promise<ExtensionMeta> {
-        const meta = (await this.storage.getOne(META_KEY)) as ExtensionMeta
+    async getMeta(): Promise<timer.meta.ExtensionMeta> {
+        const meta = (await this.storage.getOne(META_KEY)) as timer.meta.ExtensionMeta
         if (!meta) {
             return {}
         } else {
@@ -23,7 +22,7 @@ class MetaDatabase extends BaseDatabase {
     }
 
     async importData(data: any): Promise<void> {
-        const meta: ExtensionMeta = data[META_KEY] as ExtensionMeta
+        const meta: timer.meta.ExtensionMeta = data[META_KEY] as timer.meta.ExtensionMeta
         if (!meta) {
             return
         }
@@ -45,7 +44,7 @@ class MetaDatabase extends BaseDatabase {
         await this.update(existMeta)
     }
 
-    async update(existMeta: ExtensionMeta): Promise<void> {
+    async update(existMeta: timer.meta.ExtensionMeta): Promise<void> {
         await this.storage.put(META_KEY, existMeta)
     }
 }

src/database/timer-database.ts

@@ -6,11 +6,11 @@
  */
 
 import { log } from "../common/logger"
-import WastePerDay, { merge, WasteData } from "@entity/dao/waste-per-day"
 import DataItem from "@entity/dto/data-item"
 import { formatTime } from "@util/time"
 import BaseDatabase from "./common/base-database"
 import { ARCHIVED_PREFIX, DATE_FORMAT, REMAIN_WORD_PREFIX } from "./common/constant"
+import { zero, merge, isNotZero } from "@util/waste-per-day"
 
 export type TimerCondition = {
     /**
@@ -107,20 +107,20 @@ function processCondition(condition: TimerCondition): _TimerCondition {
     return result
 }
 
-function mergeMigration(exist: WastePerDay | undefined, another: any) {
-    exist = exist || WastePerDay.zero()
-    return merge(exist, WastePerDay.of(another.total || 0, another.focus || 0, another.time || 0))
+function mergeMigration(exist: timer.stat.WastePerDay | undefined, another: any) {
+    exist = exist || zero()
+    return merge(exist, { total: another.total || 0, focus: another.focus || 0, time: another.time || 0 })
 }
 
-function migrate(exists: { [key: string]: WastePerDay }, data: any): { [key: string]: WastePerDay } {
+function migrate(exists: { [key: string]: timer.stat.WastePerDay }, data: any): { [key: string]: timer.stat.WastePerDay } {
     const result = {}
     Object.entries(data)
         .filter(([key]) => /^20\d{2}[01]\d[0-3]\d.*/.test(key))
         .forEach(([key, value]) => {
             if (typeof value !== "object") return
             const exist = exists[key]
             const merged = mergeMigration(exist, value)
-            merged && merged.isNotZero() && (result[key] = mergeMigration(exist, value))
+            merged && isNotZero(merged) && (result[key] = mergeMigration(exist, value))
         })
     return result
 }
@@ -151,10 +151,10 @@ class TimerDatabase extends BaseDatabase {
      * @param host host
      * @since 0.1.3
      */
-    async accumulate(host: string, date: Date, item: WastePerDay): Promise<void> {
+    async accumulate(host: string, date: Date | string, item: timer.stat.WastePerDay): Promise<void> {
         const key = this.generateKey(host, date)
         const items = await this.storage.get(key)
-        const exist: WastePerDay = merge(items[key] as WastePerDay || new WastePerDay(), item)
+        const exist: timer.stat.WastePerDay = merge(items[key] as timer.stat.WastePerDay || zero(), item)
         const toUpdate = {}
         toUpdate[key] = exist
         log('toUpdate', toUpdate)
@@ -168,7 +168,7 @@ class TimerDatabase extends BaseDatabase {
      * @param date date
      * @since 0.1.8
      */
-    async accumulateBatch(data: WasteData, date: Date): Promise<WasteData> {
+    async accumulateBatch(data: timer.stat.WasteData, date: Date): Promise<timer.stat.WasteData> {
         const hosts = Object.keys(data)
         if (!hosts.length) return
         const dateStr = formatTime(date, DATE_FORMAT)
@@ -178,10 +178,10 @@ class TimerDatabase extends BaseDatabase {
         const items = await this.storage.get(Object.values(keys))
 
         const toUpdate = {}
-        const afterUpdated: WasteData = {}
+        const afterUpdated: timer.stat.WasteData = {}
         Object.entries(keys).forEach(([host, key]) => {
             const item = data[host]
-            const exist: WastePerDay = merge(items[key] as WastePerDay || new WastePerDay(), item)
+            const exist: timer.stat.WastePerDay = merge(items[key] as timer.stat.WastePerDay || zero(), item)
             toUpdate[key] = afterUpdated[host] = exist
         })
         await this.storage.set(toUpdate)
@@ -203,7 +203,7 @@ class TimerDatabase extends BaseDatabase {
         for (let key in items) {
             const date = key.substring(0, 8)
             const host = key.substring(8)
-            const val: WastePerDay = items[key]
+            const val: timer.stat.WastePerDay = items[key]
             if (this.filterBefore(date, host, val, _cond)) {
                 const { total, focus, time } = val
                 result.push({ date, host, total, focus, time, mergedHosts: [] })
@@ -250,7 +250,7 @@ class TimerDatabase extends BaseDatabase {
      * @param condition  query parameters
      * @return true if valid, or false  
      */
-    private filterBefore(date: string, host: string, val: WastePerDay, condition: _TimerCondition): boolean {
+    private filterBefore(date: string, host: string, val: timer.stat.WastePerDay, condition: _TimerCondition): boolean {
         const { focus, total, time } = val
         const { timeStart, timeEnd, totalStart, totalEnd, focusStart, focusEnd } = condition
 
@@ -266,10 +266,10 @@ class TimerDatabase extends BaseDatabase {
      * 
      * @since 0.0.5 
      */
-    async get(host: string, date: Date): Promise<WastePerDay> {
+    async get(host: string, date: Date): Promise<timer.stat.WastePerDay> {
         const key = this.generateKey(host, date)
         const items = await this.storage.get(null)
-        return Promise.resolve(items[key] || new WastePerDay())
+        return Promise.resolve(items[key] || zero())
     }
 
     /**
@@ -342,7 +342,7 @@ class TimerDatabase extends BaseDatabase {
         for (let key in items) {
             const date = key.substring(0, 8)
             const host = key.substring(8)
-            const val: WastePerDay = items[key]
+            const val: timer.stat.WastePerDay = items[key]
             if (this.filterBefore(date, host, val, _cond)) {
                 count++
             }

src/entity/dao/waste-per-day.ts

@@ -6,18 +6,17 @@
  */
 
 import MetaDatabase from "@db/meta-database"
-import { ExtensionMeta } from "@entity/dao/extension-meta"
 
 const storage = chrome.storage.local
 const db: MetaDatabase = new MetaDatabase(storage)
 
 async function getInstallTime() {
-    const meta: ExtensionMeta = await db.getMeta()
+    const meta: timer.meta.ExtensionMeta = await db.getMeta()
     return meta && meta.installTime ? new Date(meta.installTime) : undefined
 }
 
 async function updateInstallTime(installTime: Date) {
-    const meta: ExtensionMeta = await db.getMeta()
+    const meta: timer.meta.ExtensionMeta = await db.getMeta()
     if (meta?.installTime) {
         // Must not rewrite
         return

src/service/meta-service.ts

@@ -12,11 +12,11 @@ import { log } from "../common/logger"
 import CustomizedHostMergeRuler from "./components/host-merge-ruler"
 import HostMergeRuleItem from "@entity/dto/host-merge-rule-item"
 import MergeRuleDatabase from "@db/merge-rule-database"
-import WastePerDay, { WasteData } from "@entity/dao/waste-per-day"
 import IconUrlDatabase from "@db/icon-url-database"
 import HostAliasDatabase from "@db/host-alias-database"
 import { PageParam, PageResult, slicePageResult } from "./components/page-info"
 import whitelistHolder from './components/whitelist-holder'
+import { wasteOf } from "@util/waste-per-day"
 
 const storage = chrome.storage.local
 
@@ -75,16 +75,16 @@ export type HostSet = {
  */
 class TimerService {
 
-    async addFocusAndTotal(data: { [host: string]: { run: number, focus: number } }): Promise<WasteData> {
+    async addFocusAndTotal(data: { [host: string]: { run: number, focus: number } }): Promise<timer.stat.WasteData> {
         const toUpdate = {}
         Object.entries(data)
             .filter(([host]) => whitelistHolder.notContains(host))
-            .forEach(([host, item]) => toUpdate[host] = WastePerDay.of(item.run, item.focus, 0))
+            .forEach(([host, item]) => toUpdate[host] = wasteOf(item.run, item.focus, 0))
         return timerDatabase.accumulateBatch(toUpdate, new Date())
     }
 
     async addOneTime(host: string) {
-        timerDatabase.accumulate(host, new Date(), WastePerDay.of(0, 0, 1))
+        timerDatabase.accumulate(host, new Date(), wasteOf(0, 0, 1))
     }
 
     /**