Revert "feat: support tracking time in split-screen mode (#643) "

This reverts commit e7991b1.

Author: sheepzh

src/api/chrome/tab.ts

@@ -7,42 +7,6 @@
 
 import { handleError } from "./common"
 
-class ActivatedTabCtx {
-    lastTabId?: number
-    listened: boolean = false
-
-    async apply(): Promise<number | undefined> {
-        if (this.listened) {
-            return this.lastTabId
-        }
-
-        // init
-        chrome.tabs.onActivated.addListener(activeInfo => {
-            this.lastTabId = activeInfo.tabId
-        })
-        this.listened = true
-
-        return this.getInner()
-    }
-
-    private getInner(): Promise<number | undefined> {
-        return new Promise(resolve => chrome.tabs.query(
-            { active: true },
-            tabs => {
-                handleError('getActivatedTab')
-                const activeTab = tabs?.[0]
-                resolve(activeTab?.id)
-            }
-        ))
-    }
-}
-
-const ACTIVATED_TAB_CTX = new ActivatedTabCtx()
-
-export function lastActivatedTabId(): Promise<number | undefined> {
-    return ACTIVATED_TAB_CTX.apply()
-}
-
 export function getTab(id: number): Promise<ChromeTab | undefined> {
     if (id < 0) {
         return Promise.resolve(undefined)

src/api/chrome/window.ts

@@ -71,7 +71,7 @@ class FocusedWindowCtx {
 }
 const context = new FocusedWindowCtx(['normal'])
 
-export const lastFocusedNormalWinId = () => context.apply()
+export const getFocusedNormalWindowId = () => context.apply()
 
 export async function getWindow(id: number): Promise<chrome.windows.Window | undefined> {
     if (IS_ANDROID) {

src/background/badge-manager.ts

@@ -7,7 +7,7 @@
 
 import { setBadgeBgColor, setBadgeText } from "@api/chrome/action"
 import { listTabs } from "@api/chrome/tab"
-import { lastFocusedNormalWinId } from "@api/chrome/window"
+import { getFocusedNormalWindowId } from "@api/chrome/window"
 import statDatabase from "@db/stat-database"
 import optionHolder from "@service/components/option-holder"
 import whitelistHolder from "@service/whitelist/holder"
@@ -46,11 +46,11 @@ function setBadgeTextOfMills(milliseconds: number | undefined, tabId: number | u
 }
 
 async function findActiveTab(): Promise<BadgeLocation | undefined> {
-    const lastFocusWinId = await lastFocusedNormalWinId()
-    if (!lastFocusWinId) {
+    const windowId = await getFocusedNormalWindowId()
+    if (!windowId) {
         return undefined
     }
-    const tabs = await listTabs({ active: true, windowId: lastFocusWinId })
+    const tabs = await listTabs({ active: true, windowId })
     // Fix #131
     // Edge will return two active tabs, including the new tab with url 'edge://newtab/', GG
     for (const { id: tabId, url } of tabs) {
@@ -75,7 +75,7 @@ interface BadgeManager {
     updateFocus(location?: BadgeLocation): void
 }
 
-class DefaultBadgeManager implements BadgeManager {
+class DefaultBadgeManager {
     pausedTabId: number | undefined
     current: BadgeLocation | undefined
     visible: boolean | undefined

src/background/track-server/normal.ts

@@ -1,13 +1,13 @@
-import { lastActivatedTabId, listTabs, sendMsg2Tab } from "@api/chrome/tab"
-import { lastFocusedNormalWinId } from "@api/chrome/window"
+import { getTab, listTabs, sendMsg2Tab } from "@api/chrome/tab"
+import { getWindow } from "@api/chrome/window"
 import optionHolder from "@service/components/option-holder"
 import itemService, { type ItemIncContext } from "@service/item-service"
 import limitService from "@service/limit-service"
 import periodThrottler from '@service/throttler/period-throttler'
 import whitelistHolder from "@service/whitelist/holder"
 import { IS_ANDROID } from "@util/constant/environment"
 import { extractHostname } from "@util/pattern"
-import badgeManager from '../badge-manager'
+import badgeManager from "../badge-manager"
 
 async function handleTime(context: ItemIncContext, timeRange: [number, number], tabId: number | undefined): Promise<number> {
     const { host, url } = context
@@ -41,21 +41,26 @@ export async function handleTrackTimeEvent(event: timer.core.Event, senderTab: C
 
     await handleTime({ host, url, groupId }, [start, end], tabId)
     if (tabId) {
-        badgeManager.updateFocus({ tabId, url })
+        const winTabs = await listTabs({ active: true, windowId })
+        const firstActiveTab = winTabs?.[0]
+        // Cause there is no way to determine whether this tab is selected in screen-split mode
+        // So only show badge for first tab for screen-split mode
+        // @see #246
+        firstActiveTab?.id === tabId && badgeManager.updateFocus({ tabId, url })
     }
 }
 
 async function windowNotFocused(winId: number | undefined): Promise<boolean> {
     if (IS_ANDROID) return false
     if (!winId) return true
-    const focusedWinId = await lastFocusedNormalWinId()
-    return focusedWinId !== winId
+    const window = await getWindow(winId)
+    return !window?.focused
 }
 
 async function tabNotActive(tabId: number | undefined): Promise<boolean> {
     if (!tabId) return true
-    const lastActivated = await lastActivatedTabId()
-    return lastActivated !== tabId
+    const tab = await getTab(tabId)
+    return !tab?.active
 }
 
 async function sendLimitedMessage(items: timer.limit.Item[]) {