feat: semi

Author: sheepzh

.vscode/settings.json

@@ -13,6 +13,7 @@
     "js/ts.format.insertSpaceAfterCommaDelimiter": true,
     "js/ts.preferences.quoteStyle": "single",
     "js/ts.format.semicolons": "remove",
+    "js/ts.preferences.preferTypeOnlyAutoImports": true,
     "js/ts.format.insertSpaceBeforeFunctionParenthesis": false,
     "files.eol": "\n",
     "cSpell.words": [

src/background/limit-processor.ts

@@ -26,13 +26,21 @@ function initDailyBroadcast() {
     )
 }
 
-function initCountdownBroadcast() {
+function anyChanged(
+    newVal: tt4b.option.LimitOption,
+    oldVal: tt4b.option.LimitOption,
+    ...keys: (keyof tt4b.option.LimitOption)[]
+) {
+    return keys.some(key => newVal[key] !== oldVal[key])
+}
+
+function initOptionBroadcast() {
     optionHolder.addChangeListener(async (newVal, oldVal) => {
-        if (newVal.limitCountdown === oldVal.limitCountdown) return
+        if (!anyChanged(newVal, oldVal, 'limitCountdown', 'limitDelayDuration')) return
         const tabs = await listTabs()
         for (const { id: tabId } of tabs) {
             try {
-                tabId && await sendMsg2Tab(tabId, 'limitCountdownChanged')
+                tabId && await sendMsg2Tab(tabId, 'limitOptionChanged', newVal)
             } catch { }
         }
     })
@@ -68,7 +76,7 @@ async function querySummary(): Promise<tt4b.limit.Summary | undefined> {
 
 export default function init(dispatcher: MessageDispatcher) {
     initDailyBroadcast()
-    initCountdownBroadcast()
+    initOptionBroadcast()
 
     dispatcher
         .register('limit.list', selectLimit)

src/content-script/limit/countdown/index.ts

@@ -1,5 +1,4 @@
 import { trySendMsg2Runtime } from '@api/sw/common'
-import { getOption } from '@api/sw/option'
 import LocationWatcher from '@cs/location-watcher'
 import DelayCoordinator from '../manager/delay-coordinator'
 import LimitState from '../manager/state'
@@ -12,17 +11,17 @@ const TIMER_INTERVAL = 1000
 export default class Countdown {
     #enabled: boolean = false
     #visible: boolean = false
-    #state = new CountdownState()
-    #component = new CountdownComponent()
     #interval?: ReturnType<typeof setInterval>
-    #onVisibleChange = () => document.visibilityState === 'visible' && this.#sync()
+    readonly #state = new CountdownState()
+    readonly #component = new CountdownComponent()
+    readonly #onVisibleChange = () => document.visibilityState === 'visible' && this.#sync()
 
     get isEffective() {
         return this.#enabled && !this.#visible && !this.location.isWhite
     }
 
     constructor(private readonly location: LocationWatcher, initialOption: tt4b.option.LimitOption) {
-        this.#applyOption(initialOption)
+        this.applyOption(initialOption)
     }
 
     async init(state: LimitState, visit: VisitProcessor, delayCoord: DelayCoordinator) {
@@ -57,15 +56,10 @@ export default class Countdown {
         document.removeEventListener('visibilitychange', this.#onVisibleChange)
     }
 
-    async fetchOption() {
-        const option = await getOption()
-        this.#applyOption(option)
-        this.#sync()
-    }
-
-    #applyOption(option: tt4b.option.LimitOption) {
+    applyOption(option: tt4b.option.LimitOption) {
         this.#state.delayDuration = option.limitDelayDuration
         this.#enabled = option.limitCountdown
+        this.#sync()
     }
 
     async #sync() {
@@ -91,7 +85,7 @@ export default class Countdown {
         this.#interval = undefined
     }
 
-    async #render() {
+    #render() {
         const data = this.#state.data
         this.#component.render(data)
         data ? this.#startTimer() : this.#stopTimer()

src/content-script/limit/countdown/state.ts

@@ -13,7 +13,7 @@ export class CountdownState {
     /**
      * Calculate the milliseconds of each dimension
      */
-    #dimStrategy: Record<Dimension, (item: tt4b.limit.Item) => [total: number, used: number] | undefined> = {
+    readonly #dimStrategy: Record<Dimension, (item: tt4b.limit.Item) => [total: number, used: number] | undefined> = {
         daily: ({ time, waste, delayCount }) => {
             if (!time) return undefined
             const total = time * MILL_PER_SECOND
@@ -26,7 +26,11 @@ export class CountdownState {
             const used = waste + this.#activeMills - delayCount * this.delayDuration * MILL_PER_MINUTE
             return [total, used]
         },
-        visit: ({ visitTime }) => visitTime ? [visitTime * MILL_PER_SECOND, this.#visitMills] : undefined,
+        visit: ({ visitTime }) => {
+            if (!visitTime) return undefined
+            const used = Math.max(0, this.#visitMills - this.#delayCount * this.delayDuration * MILL_PER_MINUTE)
+            return [visitTime * MILL_PER_SECOND, used]
+        },
     }
 
     set rules(rules: tt4b.limit.Item[]) {

src/content-script/limit/index.ts

@@ -20,7 +20,7 @@ export default async function processLimit(state: LimitState, location: Location
 
     const processors = [dailyWeeklyPsr, visitPsr, periodPsr, focusPsr]
     await Promise.all(processors.map(p => p.init()))
-    location.onCurrChange(() => void processors.forEach(p => void p.reset()))
+    location.onCurrChange(() => processors.forEach(p => void p.reset()))
 
     new ModalManager(location).init(state, delayCoord, visitPsr)
 
@@ -32,7 +32,7 @@ export default async function processLimit(state: LimitState, location: Location
         .register('limitChanged', () => processors.forEach(p => void p.reset()))
         .register('limitTimeMeet', items => dailyWeeklyPsr.onTimeMeet(items))
         .register('limitReminder', data => reminder.show(data))
-        .register('limitCountdownChanged', () => countdown.fetchOption())
+        .register('limitOptionChanged', val => countdown.applyOption(val))
         .register('askVisitHit', ruleId => state.reasons.some(r => r.type === 'VISIT' && ruleId === r.id))
         .register('focusChanged', session => focusPsr.onFocusChanged(session))
 }

types/tt4b.d.ts

@@ -958,7 +958,7 @@ declare namespace tt4b {
             limitReminderDuration?: number
             /**
              * Whether to display the countdown
-             * 
+             *
              * @since 4.5.1
              */
             limitCountdown: boolean
@@ -1214,7 +1214,7 @@ declare namespace tt4b {
             & mq._MakeRegistry<'limitReminder', limit.ReminderInfo>
             & mq._MakeRegistry<'askVisitHit', number, boolean>
             & mq._MakeRegistry<'focusChanged', focus.Session | undefined>
-            & mq._MakeRegistry<'limitCountdownChanged'>
+            & mq._MakeRegistry<'limitOptionChanged', tt4b.option.LimitOption>
 
         type ReqCode = keyof _HandlerRegistry