@naxodev/opencode-music-player 0.4.0 → 0.4.2

package/README.md

@@ -14,6 +14,8 @@ Read the [music session architecture field guide](../../docs/music-session-archi
 
 ## Artwork
 
+The player retains a completed cover when the same recording loses duration metadata or reports a duration within one second of the resolved value. Conflicting recording metadata starts a new acquisition. A catalog duration keeps the seek bar usable when the provider has no duration; this host-only fallback does not change daemon playback state. A valid provider duration takes priority.
+
 The daemon performs the bounded native `media-control get --now` read and validates the complete recording identity before and after the read. OpenCode uses those bytes when available, then keeps iTunes Search fallback, image downloads, conversion, cache/job ownership, and terminal rendering locally. Artwork failure never blocks playback state.
 
 Catalog matching, bounded downloads, cancellation, and transient retries use the [shared host-side acquisition policy](../music-core/README.md#host-side-catalog-artwork). OpenCode keeps image conversion and its shared presentation cache/jobs. Track changes remove only the changing view's interest; another view can keep the same job alive.

package/dist/index.js

@@ -181,6 +181,53 @@ async function resolveArtworkDetails(id, target, nativeBase64, legacyId = id, fe
   }
 }
 
+// types.ts
+import {
+  emptyPlayer as emptyCorePlayer,
+  formatMs,
+  isMac
+} from "@naxodev/music-core";
+function presentationDuration(track) {
+  for (const duration of [track?.duration_ms, track?.artwork_duration_ms])
+    if (typeof duration === "number" && Number.isFinite(duration) && duration > 0 && duration <= 86400000)
+      return duration;
+  return 0;
+}
+function compatibleArtworkDuration(previous, resolved, next) {
+  return next === previous || next === 0 || typeof resolved === "number" && resolved > 0 && Number.isFinite(resolved) && Math.abs(next - resolved) <= 1000;
+}
+function mergeArtworkCompletion(player, event) {
+  const track = player?.track;
+  if (!track || track.name !== event.identity.title || track.artists !== event.identity.artist || track.album !== event.identity.album || track.duration_ms > 0 && track.duration_ms !== event.identity.duration_ms) {
+    return player;
+  }
+  return {
+    ...player,
+    track: {
+      ...track,
+      artwork: event.artwork,
+      artwork_loading: false,
+      artwork_duration_ms: event.duration_ms
+    }
+  };
+}
+function mergePlayerSnapshot(player, snapshot) {
+  const current = player?.track;
+  const next = snapshot.track;
+  if (!current || !next || current.name !== next.name || current.artists !== next.artists || current.album !== next.album || !compatibleArtworkDuration(current.duration_ms, current.artwork_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,
+      artwork_duration_ms: next.artwork_duration_ms || current.artwork_duration_ms || 0
+    }
+  };
+}
+
 // system-media.ts
 var MAX_ARTWORK_ENTRIES = 32;
 var artworkCache = new Map;
@@ -377,6 +424,7 @@ function createSessionSystemMedia(overrides = {}) {
   let disposed = false;
   let currentArtworkIdentity = null;
   let currentArtworkKey = null;
+  let currentArtworkTrack = null;
   let client;
   let installed = false;
   let latest;
@@ -449,10 +497,15 @@ function createSessionSystemMedia(overrides = {}) {
     emit(event);
   };
   const project = (state) => {
-    const nextKey = state?.state.track ? artworkCacheKey(identityFromTrack(state.state.track)) : null;
+    const nextIdentity = state?.state.track ? identityFromTrack(state.state.track) : null;
+    let nextKey = nextIdentity ? artworkCacheKey(nextIdentity) : null;
+    const retained = currentArtworkKey ? artworkCache.get(currentArtworkKey) : undefined;
+    if (nextIdentity && currentArtworkTrack && retained?.value && nextIdentity.title === currentArtworkTrack.title && nextIdentity.artist === currentArtworkTrack.artist && nextIdentity.album === currentArtworkTrack.album && compatibleArtworkDuration(currentArtworkTrack.duration_ms, retained.duration_ms, nextIdentity.duration_ms))
+      nextKey = currentArtworkKey;
     if (nextKey !== currentArtworkKey)
       removeArtworkInterests(host);
     currentArtworkKey = nextKey;
+    currentArtworkTrack = nextIdentity;
     if (!state) {
       currentArtworkIdentity = null;
       return null;
@@ -464,7 +517,7 @@ function createSessionSystemMedia(overrides = {}) {
     const track = state.state.track;
     const identity = identityFromTrack(track);
     currentArtworkIdentity = artworkIdentityKey(identity);
-    const artworkState = artworkForTrack(artworkCacheKey(identity), artworkIdentityKey(identity), {
+    const artworkState = artworkForTrack(currentArtworkKey, artworkIdentityKey(identity), {
       title: track.name,
       artist: track.artists,
       album: track.album,
@@ -487,7 +540,8 @@ function createSessionSystemMedia(overrides = {}) {
       track: {
         ...track,
         artwork: artworkState.artwork,
-        artwork_loading: artworkState.loading
+        artwork_loading: artworkState.loading,
+        artwork_duration_ms: artworkState.duration_ms
       }
     };
   };
@@ -552,10 +606,12 @@ function createSessionSystemMedia(overrides = {}) {
       const track = latest?.state.track;
       if (!track)
         return;
-      const key = artworkCacheKey(identityFromTrack(track));
-      if (artworkJobs.has(key))
+      const key = currentArtworkKey ?? artworkCacheKey(identityFromTrack(track));
+      const requestedKey = artworkCacheKey(identityFromTrack(track));
+      if (artworkJobs.has(key) || artworkJobs.has(requestedKey))
         return;
       artworkCache.delete(key);
+      artworkCache.delete(requestedKey);
       emit({ type: "snapshot", state: project(latest) });
     },
     async play() {
@@ -644,42 +700,6 @@ function openNowPlayingApp() {
   });
 }
 
-// types.ts
-import {
-  emptyPlayer as emptyCorePlayer,
-  formatMs,
-  isMac
-} from "@naxodev/music-core";
-function mergeArtworkCompletion(player, event) {
-  const track = player?.track;
-  if (!track || track.name !== event.identity.title || track.artists !== event.identity.artist || track.album !== event.identity.album || track.duration_ms > 0 && track.duration_ms !== event.identity.duration_ms) {
-    return player;
-  }
-  return {
-    ...player,
-    track: {
-      ...track,
-      artwork: event.artwork,
-      artwork_loading: false
-    }
-  };
-}
-function mergePlayerSnapshot(player, snapshot) {
-  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
-    }
-  };
-}
-
 // ui.tsx
 import { memo as _$memo } from "@opentui/solid";
 import { effect as _$effect2 } from "@opentui/solid";
@@ -1415,7 +1435,7 @@ function CompactPlayer(props) {
         }
         if (cell < 0 || cell >= seekWidth)
           return;
-        const position = seekPositionForCell(cell, seekWidth, current.duration_ms);
+        const position = seekPositionForCell(cell, seekWidth, presentationDuration(current));
         if (position === null)
           return;
         event.preventDefault();
@@ -1439,7 +1459,7 @@ function liveProgress(player, now = Date.now()) {
     return 0;
   if (!player.is_playing)
     return player.progress_ms;
-  return Math.min(player.track.duration_ms, player.progress_ms + (Math.max(now, player.fetched_at) - player.fetched_at));
+  return Math.min(presentationDuration(player.track), player.progress_ms + (Math.max(now, player.fetched_at) - player.fetched_at));
 }
 function progressSegments(progress, duration, width) {
   if (duration <= 0)
@@ -1465,7 +1485,7 @@ function ProgressBar(props) {
   const width = () => Math.max(8, props.width ?? 28);
   const rendered = () => {
     const player = props.source.current();
-    return progressSegments(liveProgress(player), player?.track?.duration_ms ?? 0, width());
+    return progressSegments(liveProgress(player), presentationDuration(player?.track), width());
   };
   const paint = () => {
     const next = rendered();
@@ -1496,7 +1516,7 @@ function ProgressBar(props) {
     _$setProp2(_el$3, "onMouseDown", (event) => {
       if (event.button !== MouseButton.LEFT || !bar)
         return;
-      const position = seekPositionForCell(event.x - bar.x, bar.width, props.source.current()?.track?.duration_ms ?? 0);
+      const position = seekPositionForCell(event.x - bar.x, bar.width, presentationDuration(props.source.current()?.track));
       if (position === null)
         return;
       event.preventDefault();
@@ -1642,7 +1662,7 @@ function SidebarPlayer(props) {
   const player = createMemo(() => props.state.player);
   const track = createMemo(() => player()?.track);
   const playing = createMemo(() => !!player()?.is_playing);
-  const duration = createMemo(() => track()?.duration_ms ?? 0);
+  const duration = createMemo(() => presentationDuration(track()));
   return (() => {
     var _el$1 = _$createElement3("box"), _el$10 = _$createElement3("box"), _el$11 = _$createElement3("box"), _el$12 = _$createElement3("box"), _el$16 = _$createElement3("box");
     _$insertNode2(_el$1, _el$10);
@@ -2026,7 +2046,7 @@ function createController(context, dependencies = controllerDependencies) {
   };
   const playPause = () => runCommand(() => media.toggle());
   const seek = (positionMs) => {
-    const target = seekTarget(positionMs, session.player?.track?.duration_ms);
+    const target = seekTarget(positionMs, presentationDuration(session.player?.track));
     if (!session.player?.track || target === null || !isActive())
       return Promise.resolve();
     return new Promise((resolve) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naxodev/opencode-music-player",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "macOS system Now Playing controls for the OpenCode 2 TUI",
   "license": "MIT",
   "author": {
@@ -60,7 +60,7 @@
     "validate": "bun run format:check && bun run check && bun run test && bun run pack:check"
   },
   "dependencies": {
-    "@naxodev/music-core": "^0.1.4",
+    "@naxodev/music-core": "^0.1.5",
     "pngjs": "^7.0.0"
   },
   "peerDependencies": {