@naxodev/opencode-music-player 0.1.5 → 0.2.0

package/index.tsx

@@ -1,7 +1,12 @@
 /** @jsxImportSource @opentui/solid */
 import { Plugin } from "@opencode-ai/plugin/tui"
 import { createSessionSystemMedia, openNowPlayingApp } from "./system-media.ts"
-import { isMac, mergeArtworkCompletion, type SessionMedia } from "./types.ts"
+import {
+  isMac,
+  mergeArtworkCompletion,
+  mergePlayerSnapshot,
+  type SessionMedia,
+} from "./types.ts"
 import { CompactPlayer, SidebarPlayer, type UiState } from "./ui.tsx"
 
 type Context = Plugin.Context
@@ -90,6 +95,7 @@ export function createController(
         loadingOwners: [],
         error: null,
         player: null,
+        clock_ms: Date.now(),
       },
     },
   )
@@ -112,8 +118,20 @@ export function createController(
   let activeSeek: SeekIntent | null = null
   let latestSeek: SeekIntent | null = null
   const pending = new Set<() => void>()
-
   const isActive = () => !disposed
+  let clockTimer: ReturnType<typeof setInterval> | null = null
+  const syncClock = () => {
+    if (clockTimer) clearInterval(clockTimer)
+    clockTimer = null
+    if (!isActive() || !session.player?.is_playing) return
+    clockTimer = setInterval(() => {
+      if (!isActive()) return
+      setSession((draft) => {
+        draft.clock_ms = Date.now()
+      })
+    }, 1_000)
+  }
+
   const publishError = () => {
     if (!isActive()) return
     const message =
@@ -222,7 +240,9 @@ export function createController(
         return
       setSession((draft) => {
         draft.player = player
+        draft.clock_ms = Date.now()
       })
+      syncClock()
     } catch (error) {
       if (isActive() && generation === lifecycleGeneration)
         setTransportError(errMsg(error))
@@ -239,6 +259,7 @@ export function createController(
         setSession((draft) => {
           draft.player = optimisticPlayerState(draft.player, nextPlaying)
         })
+        syncClock()
       },
     ).finally(() => {
       playbackOperations--
@@ -270,8 +291,10 @@ export function createController(
       receivedSnapshot = true
       snapshotEpoch++
       setSession((draft) => {
-        draft.player = event.state
+        draft.player = mergePlayerSnapshot(draft.player, event.state)
+        draft.clock_ms = Date.now()
       })
+      syncClock()
       return
     }
     if (event?.type === "lifecycle") {
@@ -327,6 +350,7 @@ export function createController(
       activeSeek?.resolves.splice(0).forEach((resolve) => resolve())
       activeSeek = null
       for (const resolve of [...pending]) settle(resolve)
+      if (clockTimer) clearInterval(clockTimer)
       void media.dispose().catch(() => {})
       setLoadingOwner(false)
     },
@@ -414,6 +438,7 @@ export function createMusicPlayerPlugin(options?: {
         void ctrl.session.loading
         void ctrl.session.error
         void ctrl.session.player
+        void ctrl.session.clock_ms
       }
       const unsubApp = context.ui.slot({
         append: "session.composer.top",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naxodev/opencode-music-player",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "macOS system Now Playing controls for the OpenCode 2 TUI",
   "license": "MIT",
   "author": {

package/types.ts

@@ -113,3 +113,35 @@ export function mergeArtworkCompletion(
     },
   }
 }
+
+/** Keep host-local artwork presentation across playback-only snapshots. */
+export function mergePlayerSnapshot(
+  player: PlayerState | null,
+  snapshot: PlayerState,
+): PlayerState {
+  const current = player?.track
+  const next = snapshot.track
+  if (
+    !current ||
+    !next ||
+    current.name !== next.name ||
+    current.artists !== next.artists ||
+    current.album !== next.album ||
+    (current.duration_ms > 0 &&
+      next.duration_ms > 0 &&
+      current.duration_ms !== next.duration_ms) ||
+    (current.artwork === null && current.artwork_loading !== false)
+  ) {
+    return snapshot
+  }
+  return {
+    ...snapshot,
+    track: {
+      ...next,
+      artwork: next.artwork ?? current.artwork,
+      artwork_loading: false,
+      duration_ms:
+        next.duration_ms > 0 ? next.duration_ms : current.duration_ms,
+    },
+  }
+}

package/ui.tsx

@@ -5,7 +5,6 @@ import {
   createMemo,
   createSignal,
   onCleanup,
-  onMount,
 } from "solid-js"
 import type { Plugin } from "@opencode-ai/plugin/tui"
 import {
@@ -22,6 +21,7 @@ export type UiState = {
   loading: boolean
   error: string | null
   player: import("./types.ts").PlayerState | null
+  clock_ms?: number
 }
 
 type Theme = Context["theme"]
@@ -311,12 +311,12 @@ export function CompactPlayer(props: {
   )
 }
 
-function liveProgress(player: UiState["player"]): number {
+function liveProgress(player: UiState["player"], now = Date.now()): number {
   if (!player?.track) return 0
   if (!player.is_playing) return player.progress_ms
   return Math.min(
     player.track.duration_ms,
-    player.progress_ms + (Date.now() - player.fetched_at),
+    player.progress_ms + (Math.max(now, player.fetched_at) - player.fetched_at),
   )
 }
 
@@ -467,29 +467,9 @@ export function SidebarPlayer(props: {
   const track = createMemo(() => player()?.track)
   const playing = createMemo(() => !!player()?.is_playing)
 
-  const [tick, setTick] = createSignal(0)
-  onMount(() => {
-    let id: ReturnType<typeof setInterval> | null = null
-    const sync = () => {
-      const on = !!props.state.player?.is_playing
-      if (on && !id) id = setInterval(() => setTick((t) => t + 1), 1000)
-      else if (!on && id) {
-        clearInterval(id)
-        id = null
-      }
-    }
-    sync()
-    const watch = setInterval(sync, 400)
-    onCleanup(() => {
-      if (id) clearInterval(id)
-      clearInterval(watch)
-    })
-  })
-
-  const progress = createMemo(() => {
-    tick()
-    return liveProgress(player())
-  })
+  const progress = createMemo(() =>
+    liveProgress(player(), props.state.clock_ms),
+  )
   const duration = createMemo(() => track()?.duration_ms ?? 0)
 
   return (