Merge branch 'main' of github.com:sheepzh/timer

Author: sheepzh

src/background/badge-text-manager.ts

@@ -6,6 +6,7 @@
  */
 
 import TimerDatabase from "@db/timer-database"
+import whitelistHolder from "@service/components/whitelist-holder"
 import optionService from "@service/option-service"
 import { extractHostname, isBrowserUrl } from "@util/pattern"
 
@@ -18,9 +19,9 @@ export type BadgeLocation = {
      */
     tabId: number
     /**
-     * The host to gain the focus time, can be undefined or null
+     * The url of tab
      */
-    host: string
+    url: string
 }
 
 function mill2Str(milliseconds: number) {
@@ -35,8 +36,12 @@ function mill2Str(milliseconds: number) {
     }
 }
 
-function setBadgeText(milliseconds: number | undefined, tabId: number | undefined) {
+function setBadgeTextOfMills(milliseconds: number | undefined, tabId: number | undefined) {
     const text = milliseconds === undefined ? '' : mill2Str(milliseconds)
+    setBadgeText(text, tabId)
+}
+
+function setBadgeText(text: string, tabId: number | undefined) {
     chrome.browserAction?.setBadgeText?.({ text, tabId })
 }
 
@@ -64,8 +69,7 @@ function findActiveTab(): Promise<BadgeLocation> {
                 resolve(undefined)
             } else {
                 const { url, id } = tabs[0]
-                const host = extractHostname(url).host
-                resolve({ tabId: id, host })
+                resolve({ tabId: id, url })
             }
         })
     }))
@@ -76,9 +80,17 @@ async function updateFocus(badgeLocation?: BadgeLocation) {
     if (!badgeLocation) {
         return
     }
-    const { host, tabId } = badgeLocation
+    const { url, tabId } = badgeLocation
+    if (!url || isBrowserUrl(url)) {
+        return
+    }
+    const host = extractHostname(url)?.host
+    if (whitelistHolder.contains(host)) {
+        setBadgeText('W', tabId)
+        return
+    }
     const milliseconds = host ? (await timerDb.get(host, new Date())).focus : undefined
-    setBadgeText(milliseconds, tabId)
+    setBadgeTextOfMills(milliseconds, tabId)
 }
 
 const ALARM_NAME = 'timer-badge-text-manager-alarm'
@@ -102,14 +114,16 @@ class BadgeTextManager {
         const option: Partial<timer.option.AllOption> = await optionService.getAllOption()
         this.pauseOrResumeAccordingToOption(!!option.displayBadgeText)
         optionService.addOptionChangeListener(({ displayBadgeText }) => this.pauseOrResumeAccordingToOption(displayBadgeText))
+        whitelistHolder.addPostHandler(updateFocus)
     }
 
     /**
      * Hide the badge text
      */
-    pause() {
+    async pause() {
         this.isPaused = true
-        setBadgeText(undefined, undefined)
+        const tab = await findActiveTab()
+        setBadgeText('P', tab?.tabId)
     }
 
     /**

src/background/index.ts

@@ -19,7 +19,6 @@ import { getGuidePageUrl } from "@util/constant/url"
 import MessageDispatcher from "./message-dispatcher"
 import initLimitProcesser from "./limit-processor"
 import initCsHandler from "./content-script-handler"
-import { isBrowserUrl } from "@util/pattern"
 
 // Open the log of console
 openLog()
@@ -52,7 +51,7 @@ badgeTextManager.init()
 
 // Listen to tab active changed
 new ActiveTabListener()
-    .register(({ url, host, tabId }) => !isBrowserUrl(url) && badgeTextManager.forceUpdate({ host, tabId }))
+    .register(({ url, tabId }) => badgeTextManager.forceUpdate({ url, tabId }))
     .listen()
 
 // Collect the install time

src/service/components/whitelist-holder.ts

@@ -14,16 +14,29 @@ const whitelistDatabase = new WhitelistDatabase(chrome.storage.local)
  */
 class WhitelistHolder {
     private whitelist: string[]
+    private postHandlers: (() => void)[]
 
     constructor() {
         const whitelistSetter = (whitelist: string[]) => this.whitelist = whitelist
         whitelistDatabase.selectAll().then(whitelistSetter)
-        whitelistDatabase.addChangeListener(whitelistSetter)
+        whitelistDatabase.addChangeListener((whitelist: string[]) => {
+            whitelistSetter(whitelist)
+            this.postHandlers.forEach(handler => handler())
+        })
+        this.postHandlers = []
+    }
+
+    addPostHandler(handler: () => void) {
+        this.postHandlers.push(handler)
     }
 
     notContains(host: string): boolean {
         return !this.whitelist.includes(host)
     }
+
+    contains(host: string): boolean {
+        return this.whitelist.includes(host)
+    }
 }
 
 export default new WhitelistHolder()