feat: semi

Author: sheepzh

src/api/sw/focus.ts

@@ -0,0 +1,7 @@
+import { sendMsg2Runtime } from './common'
+
+export const listFocusPresets = () => sendMsg2Runtime('focus.allPresets')
+
+export const getCurrentSession = () => sendMsg2Runtime('focus.current')
+
+export const focusAction = (request: tt4b.focus.ActionRequest) => sendMsg2Runtime('focus.action', request)

src/background/message-dispatcher.ts

@@ -19,7 +19,7 @@ import { exportData, importData, migrateStorage } from "./service/components/imm
 import { importOther, previewBackup } from "./service/components/import-processor"
 import optionHolder from "./service/components/option-holder"
 import { getWeekStartDay, getWeekStartTime } from "./service/components/week-helper"
-import { handleAction } from "./service/focus-service"
+import { getCurrentSession, handleAction } from "./service/focus-service"
 import { getTodayResult } from './service/item-service'
 import { getInstallTime, getLastBackUp } from "./service/meta-service"
 import notificationProcessor from './service/notification/processor'
@@ -136,6 +136,7 @@ class MessageDispatcher {
             .register('focus.addPreset', data => focusPresetDatabase.add(data))
             .register('focus.savePreset', data => focusPresetDatabase.update(data))
             .register('focus.action', handleAction)
+            .register('focus.current', getCurrentSession)
             // Data immigration
             .register('immigration.import', importData)
             .register('immigration.export', exportData)

src/background/service/focus-service.ts

@@ -66,7 +66,7 @@ class FocusHolder {
         if (this.#session.state !== 'running') return
 
         const now = Date.now()
-        increaseTime(this.#session, now)
+        await increaseTime(this.#session, now)
         this.#session.end = now
         this.#session.state = 'paused'
         this.#session.logs.push({ action: 'pause', ts: now })
@@ -98,10 +98,16 @@ class FocusHolder {
         this.#session.duration += MILL_PER_MINUTE * 5
         await db.save(this.#session)
     }
+
+    get current(): tt4b.focus.Record | undefined {
+        return this.#session
+    }
 }
 
 const focusHolder = new FocusHolder()
 
+export const getCurrentSession = () => focusHolder.current
+
 export async function handleAction(request: tt4b.focus.ActionRequest): Promise<void> {
     if (typeof request === 'object') {
         return focusHolder.start(request.config, request.presetId)

src/i18n/message/app/limit-resource.json

@@ -13,7 +13,6 @@
             "enabled": "启用",
             "locked": "锁定",
             "effectiveDay": "生效日期",
-            "allowDelay": "可延时",
             "or": "或者",
             "notEffective": "未生效"
         },
@@ -62,7 +61,6 @@
             "enabled": "是否啟用",
             "locked": "已鎖定",
             "effectiveDay": "生效日期",
-            "allowDelay": "允許延遲",
             "or": "或",
             "notEffective": "未生效"
         },
@@ -110,7 +108,6 @@
             "enabled": "Enabled",
             "locked": "Locked",
             "effectiveDay": "Effective On",
-            "allowDelay": "Allow Delay",
             "or": "or",
             "notEffective": "Not effective"
         },
@@ -204,7 +201,6 @@
             "enabled": "Ativo",
             "locked": "Bloqueado",
             "effectiveDay": "Dias de aplicação",
-            "allowDelay": "Permitir atraso",
             "or": "ou",
             "notEffective": "Não aplicável"
         },
@@ -252,7 +248,6 @@
             "enabled": "Увімкнено",
             "locked": "Заблоковано",
             "effectiveDay": "Діє",
-            "allowDelay": "Дозволити затримку",
             "or": "або",
             "notEffective": "Не діє"
         },
@@ -347,7 +342,6 @@
             "enabled": "Aktiviert",
             "locked": "Gesperrt",
             "effectiveDay": "Wirksam auf",
-            "allowDelay": "Verzögerung zulassen",
             "or": "oder",
             "notEffective": "Nicht wirksam"
         },
@@ -397,7 +391,6 @@
             "enabled": "Activé",
             "locked": "Verrouillé",
             "effectiveDay": "Effectif le",
-            "allowDelay": "Retardable",
             "or": "ou",
             "notEffective": "Non efficace"
         },
@@ -447,7 +440,6 @@
             "enabled": "Включено",
             "locked": "Заблокировано",
             "effectiveDay": "Эффективный",
-            "allowDelay": "Разрешить задержку",
             "or": "или",
             "notEffective": "Не активировано"
         },
@@ -541,7 +533,6 @@
             "enabled": "Etkinleştirildi",
             "locked": "Kilitli",
             "effectiveDay": "Geçerli Olduğu Gün(ler)",
-            "allowDelay": "Ertelenebilir",
             "or": "yada",
             "notEffective": "Geçerli değil"
         },
@@ -588,7 +579,6 @@
             "enabled": "Aktywne",
             "locked": "Zablokowany",
             "effectiveDay": "Aktywna w",
-            "allowDelay": "Możliwe do przedłużenia",
             "or": "lub",
             "notEffective": "Nieskuteczny"
         },
@@ -636,7 +626,6 @@
             "enabled": "Attivata",
             "locked": "Bloccato",
             "effectiveDay": "Effettivo On",
-            "allowDelay": "Ritardabile",
             "or": "o",
             "notEffective": "Non valido"
         },

src/i18n/message/app/limit.ts

@@ -24,7 +24,6 @@ export type LimitMessage = {
         enabled: string
         locked: string
         effectiveDay: string
-        allowDelay: string
         delayCount: string
         detail: string
         or: string

src/i18n/message/app/menu-resource.json

@@ -28,7 +28,6 @@
         "analysis": "Site Analysis",
         "productivity": "Productivity & Focus",
         "habit": "Habits",
-        "focus": "Focus Mode",
         "siteRule": "Sites & Rules",
         "sites": "Site Management",
         "whitelist": "Whitelist",

src/i18n/message/app/menu.ts

@@ -12,16 +12,12 @@ export type MenuMessage = {
     dashboard: string
     record: string
     analysis: string
-
     productivity: string
     habit: string
-    focus: string
-
     siteRule: string
     sites: string
     whitelist: string
     mergeRule: string
-
     other: string
     migration: string
     about: string

src/i18n/message/common/shared-resource.json

@@ -18,7 +18,17 @@
             "daily": "Daily limit",
             "weekly": "Weekly limit",
             "period": "Blocked periods",
-            "visits": "{n} visits"
+            "visits": "{n} visits",
+            "allowDelay": "Allow Delay",
+            "unlimited": "Unlimited"
+        },
+        "focus": {
+            "menu": "Focus Mode",
+            "mode": {
+                "allow": "Allow only",
+                "block": "Block"
+            },
+            "duration": "Focus Time"
         }
     },
     "zh_CN": {
@@ -40,7 +50,8 @@
             "daily": "每日上限",
             "weekly": "每周上限",
             "period": "不可访问的时间段",
-            "visits": "{n}次访问"
+            "visits": "{n}次访问",
+            "allowDelay": "可延时"
         }
     },
     "ja": {
@@ -83,7 +94,8 @@
             "daily": "每日上限",
             "weekly": "每週上限",
             "period": "限制時段",
-            "visits": "{n}次造訪"
+            "visits": "{n}次造訪",
+            "allowDelay": "允許延遲"
         }
     },
     "pt_PT": {
@@ -104,7 +116,8 @@
             "daily": "Limite diário",
             "weekly": "Limite semanal",
             "period": "Períodos bloqueados",
-            "visits": "{n} visitas"
+            "visits": "{n} visitas",
+            "allowDelay": "Permitir atraso"
         }
     },
     "uk": {
@@ -125,7 +138,8 @@
             "daily": "Денний ліміт",
             "weekly": "Тижневий ліміт",
             "period": "Недозволені періоди",
-            "visits": "{n} відвідування"
+            "visits": "{n} відвідування",
+            "allowDelay": "Дозволити затримку"
         }
     },
     "it": {
@@ -147,7 +161,8 @@
             "daily": "Limite giornaliero",
             "weekly": "Limite settimanale",
             "period": "Periodi bloccati",
-            "visits": "{n} visite"
+            "visits": "{n} visite",
+            "allowDelay": "Ritardabile"
         }
     },
     "es": {
@@ -190,7 +205,8 @@
             "daily": "Tägliches Limit",
             "weekly": "Wöchentliches Limit",
             "period": "Unzulässiger Zeitraum",
-            "visits": "{n} Besuche"
+            "visits": "{n} Besuche",
+            "allowDelay": "Verzögerung zulassen"
         }
     },
     "fr": {
@@ -212,7 +228,8 @@
             "daily": "Limite quotidienne",
             "weekly": "Limite hebdomadaire",
             "period": "Périodes bloquées",
-            "visits": "{n} visites"
+            "visits": "{n} visites",
+            "allowDelay": "Retardable"
         }
     },
     "ru": {
@@ -233,7 +250,8 @@
             "daily": "Дневной лимит",
             "weekly": "Недельный лимит",
             "period": "Заблокированное время",
-            "visits": "{n} посещения"
+            "visits": "{n} посещения",
+            "allowDelay": "Разрешить задержку"
         }
     },
     "ar": {
@@ -275,7 +293,8 @@
             "daily": "Günlük limit",
             "weekly": "Haftalık limit",
             "period": "Engellenen periyotlar",
-            "visits": "{n} ziyaretler"
+            "visits": "{n} ziyaretler",
+            "allowDelay": "Ertelenebilir"
         }
     },
     "pl": {
@@ -296,7 +315,8 @@
             "daily": "Dzienny limit",
             "weekly": "Limit tygodniowy",
             "period": "Godziny blokowania",
-            "visits": "{n} wizyt"
+            "visits": "{n} wizyt",
+            "allowDelay": "Możliwe do przedłużenia"
         }
     }
 }

src/i18n/message/common/shared.ts

@@ -14,6 +14,13 @@ export type SharedMessage = {
         weekly: string
         period: string
         visits: string
+        allowDelay: string
+        unlimited: string
+    }
+    focus: {
+        menu: string
+        mode: Record<tt4b.focus.Mode, string>
+        duration: string
     }
 }
 

src/i18n/message/popup/content.ts

@@ -37,6 +37,6 @@ export type ContentMessage = {
     }
 }
 
-const contentMessages = resource as Messages<ContentMessage>
+const contentMessages = resource satisfies Messages<ContentMessage>
 
 export default contentMessages