dsh-music-player 0.2.0 → 0.2.2

package/lib/client.js

@@ -52,13 +52,54 @@ window.__ModuleLoader__.load({
     const PREF_MODE = 'dsh-music-mode';
     const PREF_VOL = 'dsh-music-volume';
     const PREF_PLAYBACK = 'dsh-music-playback';
-    const PREF_BOOK_PLAYBACK = 'dsh-music-book-playback';
+    const PREF_BOOKS_PLAYBACK = 'dsh-music-books-playback';
     const PREF_ROOT = 'dsh-music-root';
     const PREF_PANEL_POS = 'dsh-music-panel-pos';
     const PREF_VOICE = 'dsh-music-voice';
     const loadPref = (k) => { try { return localStorage.getItem(k); } catch (e) { return null; } };
     const savePref = (k, v) => { try { localStorage.setItem(k, v); } catch (e) {} };
     const clearPref = (k) => { try { localStorage.removeItem(k); } catch (e) {} };
+    // ---- per-book novel progress (independent from music) ----
+    // Every novel remembers its own position, keyed by its filename, so switching
+    // between books — or to music — never loses another book's place. Music
+    // progress lives in PREF_PLAYBACK and this subsystem never touches it.
+    const PREF_BOOK_PLAYBACK = 'dsh-music-book-playback'; // legacy single-book key
+    function readBooksPlayback() {
+      try {
+        const raw = loadPref(PREF_BOOKS_PLAYBACK);
+        if (raw) { const o = JSON.parse(raw); if (o && typeof o === 'object') return o; }
+      } catch (e) {}
+      return {};
+    }
+    function writeBooksPlayback(map) { savePref(PREF_BOOKS_PLAYBACK, JSON.stringify(map)); }
+    function getBookPlayback(name) { return readBooksPlayback()[name] || null; }
+    function clearBookPlayback(name) {
+      const map = readBooksPlayback();
+      if (Object.prototype.hasOwnProperty.call(map, name)) { delete map[name]; writeBooksPlayback(map); }
+    }
+    // Persist the currently playing novel's position into the per-book map.
+    function saveCurrentBookPlayback() {
+      const id = currentBookId();
+      if (id === null) return;
+      const book = bookById(id);
+      if (book === null) return;
+      const map = readBooksPlayback();
+      map[book.name] = {
+        from: bookFromRef, base: bookBaseTime,
+        pos: audio.currentTime || 0, total: bookTotal,
+        ts: Date.now(),
+      };
+      writeBooksPlayback(map);
+    }
+    // The most recently played novel (largest ts), used by refresh restore.
+    function latestBookPlayback() {
+      const map = readBooksPlayback();
+      let best = null, bestTs = -1;
+      for (const [name, e] of Object.entries(map)) {
+        if (e && typeof e.from === 'number' && e.ts > bestTs) { best = { name, ...e }; bestTs = e.ts; }
+      }
+      return best;
+    }
     // Restore the playback-panel position ({x,y,h}) previously saved by dragging, if any.
     function loadPanelPos() {
       const raw = loadPref(PREF_PANEL_POS);
@@ -159,23 +200,28 @@ window.__ModuleLoader__.load({
       if (typeof voice === 'string' && voice !== '') store.voice = voice;
     } catch (e) {}
 
-    function savePlayback() {
-      if (store.currentId === null) { clearPref(PREF_PLAYBACK); clearPref(PREF_BOOK_PLAYBACK); return; }
-      if (String(store.currentId).startsWith('book:')) {
-        // Books cache their own richer state: chunk index, the cumulative
-        // book-wide clock, and the in-chunk position, so a refresh can resume
-        // the exact spot with a continuous time readout.
-        clearPref(PREF_PLAYBACK);
-        const id = currentBookId();
-        if (id === null) { clearPref(PREF_BOOK_PLAYBACK); return; }
-        savePref(PREF_BOOK_PLAYBACK, JSON.stringify({
-          id, name: store.currentName,
-          from: bookFromRef, base: bookBaseTime,
-          pos: audio.currentTime || 0, total: bookTotal,
-        }));
-        return;
+    // Migrate legacy single-book progress (pre-0.2.1) into the per-book map once.
+    try {
+      const legacy = loadPref(PREF_BOOK_PLAYBACK);
+      if (legacy) {
+        const p = JSON.parse(legacy);
+        if (p && typeof p.id === 'string' && typeof p.name === 'string' && p.name !== '') {
+          const map = readBooksPlayback();
+          if (!Object.prototype.hasOwnProperty.call(map, p.name)) {
+            map[p.name] = { from: p.from, base: p.base, pos: p.pos, total: p.total, ts: p.ts || Date.now() };
+            writeBooksPlayback(map);
+          }
+        }
+        clearPref(PREF_BOOK_PLAYBACK);
       }
-      clearPref(PREF_BOOK_PLAYBACK);
+    } catch (e) {}
+
+    // Persist the current playback position. Music and novels are fully separate:
+    // music writes PREF_PLAYBACK, novels write into the per-book map — neither
+    // clears the other, so switching modes never loses progress.
+    function savePlayback() {
+      if (store.currentId === null) { clearPref(PREF_PLAYBACK); return; }
+      if (String(store.currentId).startsWith('book:')) { saveCurrentBookPlayback(); return; }
       savePref(PREF_PLAYBACK, JSON.stringify({
         id: store.currentId, name: store.currentName,
         // While a restored track is still paused, the <audio> currentTime can
@@ -184,6 +230,7 @@ window.__ModuleLoader__.load({
         // Persist the known duration too: on restore the browser may not have
         // loaded the track's metadata yet, and we don't want a "0:00" readout.
         duration: Number.isFinite(audio.duration) ? audio.duration : 0,
+        ts: Date.now(),
       }));
     }
     function loadPlayback() {
@@ -274,15 +321,30 @@ window.__ModuleLoader__.load({
     const smoothCur = new Float32Array(SMOOTH_BARS);
     const smoothPeak = new Float32Array(SMOOTH_BARS);
     const targetBuf = new Float32Array(SMOOTH_BARS);
-    // Accent color for the spectrum bars, read from the theme-derived
-    // --dsh-music-accent (see PLAYER_CSS), cached once.
+    // Accent color for the spectrum bars. DSH defines its --dsw-alias-* theme
+    // tokens on <body> — never on :root — so --dsh-music-accent must be read
+    // from body (reading documentElement would always return the fallback and
+    // the bars would never follow the theme). The value is cached but the cache
+    // is invalidated whenever the theme changes at runtime: the ThemePresenter
+    // projects tokens + the dark attribute onto body, so a MutationObserver on
+    // body's style/dark-attribute keeps the bars tracking live brand changes.
     let accentColor = null;
+    let accentObserver = null;
+    function readAccent() {
+      const el = document.body || document.documentElement;
+      return getComputedStyle(el).getPropertyValue('--dsh-music-accent').trim() || '#2f9e6e';
+    }
     function currentAccent() {
-      if (accentColor === null) {
-        accentColor = getComputedStyle(document.documentElement).getPropertyValue('--dsh-music-accent').trim() || '#2f9e6e';
-      }
+      if (accentColor === null) accentColor = readAccent();
       return accentColor;
     }
+    function watchAccent() {
+      if (accentObserver !== null) return accentObserver;
+      if (typeof MutationObserver === 'undefined') return null;
+      accentObserver = new MutationObserver(() => { accentColor = readAccent(); });
+      accentObserver.observe(document.body, { attributes: true, attributeFilter: ['style', 'data-ds-dark-theme'] });
+      return accentObserver;
+    }
     function drawBars(canvas, useCaps) {
       const c = canvas.getContext('2d');
       const w = canvas.width; const h = canvas.height;
@@ -581,7 +643,25 @@ window.__ModuleLoader__.load({
       }
     }
     // `from` lets the toc jump straight to a chapter's chunk index.
-    function playBook(id, from = 0) { unlockAutoplay(); bookTotal = -1; bookBufferedFrom = -1; bookBaseTime = 0; bookRestorePos = -1; clearPref(PREF_BOOK_PLAYBACK); playBookFrom(id, from, false); }
+    function playBook(id, from = 0) { unlockAutoplay(); bookTotal = -1; bookBufferedFrom = -1; bookBaseTime = 0; bookRestorePos = -1; playBookFrom(id, from, false); saveCurrentBookPlayback(); }
+    // Play a novel from its saved progress when available (e.g. switching to
+    // music and back), otherwise start fresh from the beginning. Explicit
+    // chapter jumps keep using playBook(id, fromChunk) and are unaffected.
+    function resumeOrPlayBook(id) {
+      const book = bookById(id);
+      if (book === null) return;
+      const entry = getBookPlayback(book.name);
+      if (entry === null) { playBook(id); return; }
+      // Seed chunk / cumulative clock / in-chunk position from this book's entry.
+      restoreBookPlayback(book.name);
+      if (String(store.currentId) === 'book:' + id) {
+        // Restore applied: play the saved chunk; onTime seeks to the in-chunk pos.
+        unlockAutoplay();
+        playBookFrom(id, bookFromRef, false);
+      } else {
+        playBook(id); // restore bailed (book gone) → start fresh
+      }
+    }
     // When a chunk ends, switch to the next HTTP chunk (warmed by preAudio).
     // The switch is silent: no buffering flash, and the book-wide clock keeps
     // the completed chunk's duration so the readout never resets.
@@ -745,6 +825,10 @@ window.__ModuleLoader__.load({
         });
     }
     function stop() {
+      // Capture the current novel before resetting, so stopping forgets only
+      // that one book's position (other novels keep their own progress).
+      const stoppedBook = (store.currentId !== null && String(store.currentId).startsWith('book:'))
+        ? bookById(currentBookId()) : null;
       envReqId++;
       trackEnv = null;
       restoredMusicPos = null;
@@ -754,7 +838,7 @@ window.__ModuleLoader__.load({
       stopBookHelper();
       set({ currentId: null, currentName: null, playing: false, position: 0, duration: 0, pendingId: null, pendingName: null, vizState: 'ok', bookBuffering: false, bookError: '', bookBufferingSince: 0, bookBufferingSilent: false, tocOpen: false, currentSection: '', voiceSwitching: false });
       clearPref(PREF_PLAYBACK);
-      clearPref(PREF_BOOK_PLAYBACK);
+      if (stoppedBook !== null) clearBookPlayback(stoppedBook.name);
       releaseWakeLock();
     }
 
@@ -923,37 +1007,41 @@ window.__ModuleLoader__.load({
         restoredMusicPos = null;
       }
       // Save the restored spot explicitly so it survives another refresh.
-      savePref(PREF_PLAYBACK, JSON.stringify({ id: track.id, name: track.name, position: pos, duration: savedDur }));
+      savePref(PREF_PLAYBACK, JSON.stringify({ id: track.id, name: track.name, position: pos, duration: savedDur, ts: Date.now() }));
     }
 
-    // Restore a novel's playback after a refresh: same book, same chunk, same
-    // cumulative clock, and same in-chunk position — paused (tap ▶ to resume),
-    // matching how music is restored. The chunk URL is loaded in the background
-    // so resuming is instant (and the next chunk gets pre-warmed).
-    function restoreBookPlayback() {
-      const raw = loadPref(PREF_BOOK_PLAYBACK);
-      if (raw === null) return;
-      let saved;
-      try { saved = JSON.parse(raw); } catch (e) { return; }
-      if (saved === null || typeof saved !== 'object' || typeof saved.id !== 'string') return;
-      const book = store.books.find((b) => b.id === saved.id);
+    // Restore a novel's playback after a refresh (or when resuming a book):
+    // same book, same chunk, same cumulative clock, and same in-chunk position —
+    // paused (tap ▶ to resume), matching how music is restored. When targetName
+    // is given, restore that book; otherwise restore the most recently played
+    // novel from the per-book map.
+    function restoreBookPlayback(targetName) {
+      const map = readBooksPlayback();
+      let name = targetName;
+      let entry = null;
+      if (typeof name === 'string' && name !== '') {
+        entry = map[name] || null;
+      } else {
+        for (const [n, e] of Object.entries(map)) {
+          if (e && typeof e.from === 'number' && (entry === null || e.ts > entry.ts)) { entry = e; name = n; }
+        }
+      }
+      if (entry === null || !name) return;
+      const book = store.books.find((b) => b.name === name);
       if (book === undefined) return; // the book is no longer in the library
-      // Guard against the scan order shifting and reusing this id for a
-      // different file: only restore when the saved name still matches.
-      if (typeof saved.name === 'string' && saved.name !== '' && saved.name !== book.name) return;
-      const from = Number.isFinite(saved.from) && saved.from >= 0 ? saved.from : 0;
-      const base = Number.isFinite(saved.base) ? saved.base : 0;
-      const pos = Number.isFinite(saved.pos) ? saved.pos : 0;
-      bookTotal = Number.isFinite(saved.total) ? saved.total : -1;
+      const from = Number.isFinite(entry.from) && entry.from >= 0 ? entry.from : 0;
+      const base = Number.isFinite(entry.base) ? entry.base : 0;
+      const pos = Number.isFinite(entry.pos) ? entry.pos : 0;
+      bookTotal = Number.isFinite(entry.total) ? entry.total : -1;
       bookFromRef = from;
       bookBaseTime = base;
-      const url = bookUrl(saved.id, from);
+      const url = bookUrl(book.id, from);
       if (url === null) return;
       // Mark the book as current. Like music restore, we do NOT touch the
       // <audio> element here (avoiding the Chromium 'getTopURL' quirk on
       // refresh); togglePlay loads + seeks the chunk when the user resumes.
       set({
-        currentId: 'book:' + saved.id, currentName: book.name,
+        currentId: 'book:' + book.id, currentName: book.name,
         position: base + pos, duration: base + (Number.isFinite(audio.duration) ? audio.duration : 0),
         pendingId: null, pendingName: null, error: null, playing: false,
         bookBuffering: false, bookBufferingSilent: false, bookError: '', bookBufferingSince: 0,
@@ -963,13 +1051,31 @@ window.__ModuleLoader__.load({
       // changed since the save); fall back to the saved total on failure.
       const savedTotal = bookTotal;
       bookTotal = -1;
-      void ensureBookTotal(saved.id).then((total) => {
+      void ensureBookTotal(book.id).then((total) => {
         if (!Number.isFinite(total) || total < 0) { bookTotal = savedTotal; return; }
         bookTotal = total;
-        if (from + 1 < total) preloadBook(saved.id, from + 1);
+        if (from + 1 < total) preloadBook(book.id, from + 1);
       });
     }
 
+    // Restore whichever (music vs novel) was playing most recently — both now
+    // persist independently, so a music interlude never wipes a novel's progress.
+    function restoreLatest(list) {
+      let musicTs = -1;
+      try {
+        const p = JSON.parse(loadPref(PREF_PLAYBACK) || 'null');
+        if (p && typeof p.ts === 'number') musicTs = p.ts;
+      } catch (e) {}
+      const book = latestBookPlayback();
+      const bookTs = book ? book.ts : -1;
+      if (bookTs > musicTs) { restoreBookPlayback(); return; }
+      if (musicTs > bookTs) { restorePlayback(list); return; }
+      // tie / legacy data without timestamps: restore whatever exists (music
+      // first, book last — legacy data only ever had one of the two populated).
+      restorePlayback(list);
+      restoreBookPlayback();
+    }
+
     // ---- host data ----
     async function loadTracks() {
       set({ loading: true });
@@ -994,8 +1100,7 @@ window.__ModuleLoader__.load({
         // Envelope (spectrum) decoding is deferred to actual playback — no need
         // to decode several full files eagerly at page load; the current track's
         // envelope decodes on play (startPlay / resume).
-        restorePlayback(list);
-        restoreBookPlayback();
+        restoreLatest(list);
       } catch (err) {
         set({ loading: false, error: '\u65e0\u6cd5\u8bfb\u53d6\u97f3\u4e50\u5e93\uff1a' + String((err && err.message) || err) });
       }
@@ -1015,8 +1120,7 @@ window.__ModuleLoader__.load({
             tracks: result.tracks || [], books: result.books || [],
             count: result.count || 0, loading: false, error: null,
           });
-          restorePlayback(result.tracks || []);
-          restoreBookPlayback();
+          restoreLatest(result.tracks || []);
         } else {
           set({ loading: false, error: (result && result.error) || '\u8bbe\u7f6e\u76ee\u5f55\u5931\u8d25' });
         }
@@ -1417,7 +1521,7 @@ window.__ModuleLoader__.load({
           key: b.id,
           className: 'dsh-music-track' + (active ? ' active' : ''),
           title: b.url,
-          onClick: () => { if (active) togglePlay(); else playBook(b.id); },
+          onClick: () => { if (active) togglePlay(); else resumeOrPlayBook(b.id); },
         },
           React.createElement('span', { className: 'dsh-music-track-name' }, (playing ? '\u25b6 ' : '') + b.name),
           React.createElement('span', { className: 'dsh-music-track-size' }, formatSize(b.size)),
@@ -1559,6 +1663,7 @@ window.__ModuleLoader__.load({
         attachAudioElements();
         const unbind = bindAudio();
         startRaf();
+        const accentWatch = watchAccent();
         // Browsers auto-release a wake lock when the page is hidden; re-acquire
         // on return if playback is still running, and drop it on hide so we
         // don't hold it while the tab is backgrounded.
@@ -1578,6 +1683,8 @@ window.__ModuleLoader__.load({
         return () => {
           window.removeEventListener('pagehide', onPageHide);
           document.removeEventListener('visibilitychange', onVis); stopRaf(); unbind(); closeDecodeCtx(); releaseWakeLock();
+          if (accentWatch !== null) accentWatch.disconnect();
+          accentObserver = null;
         };
       }, 'music-player: audio + viz engine');
 
@@ -1609,7 +1716,7 @@ window.__ModuleLoader__.load({
           const book = bookById(intent.id);
           if (book !== null) {
             set({ pendingId: 'book:' + book.id, pendingName: intent.name || book.name, error: null });
-            playBook(book.id);
+            resumeOrPlayBook(book.id);
             return;
           }
           const track = trackById(intent.id);
@@ -1651,8 +1758,13 @@ window.__ModuleLoader__.load({
     const PLAYER_CSS = '\n' +
       // Accent follows the host app's theme brand color (stable from the start —
       // no green-default-to-sampled-blue flash); green is only the fallback when
-      // the app exposes no brand color.
-      ':root { --dsh-music-accent: var(--dsw-alias-brand-primary, #2f9e6e); }\n' +
+      // the app exposes no brand color. The alias must be declared on BODY, not
+      // :root: DSH defines its --dsw-alias-* theme tokens on <body> only, and a
+      // var() reference resolves against the element that declares it — on
+      // :root (html) it cannot see body's tokens and would always fall back to
+      // green. Declared on body, the reference resolves and children inherit
+      // the theme's actual brand color.
+      'body { --dsh-music-accent: var(--dsw-alias-brand-primary, #2f9e6e); }\n' +
       '.dsh-music-bar-wrap { box-sizing: border-box; width: 100%; padding: 0 var(--dsh-composer-side-clearance, 16px); }\n' +
       '.dsh-music-bar { box-sizing: border-box; display: flex; align-items: center; gap: 8px; width: 100%; max-width: var(--dsh-composer-card-max-width, 780px); margin: 0 auto; padding: 4px 10px; font-size: 12px; color: var(--dsw-alias-label-secondary, #8a8f98); background: var(--dsw-alias-bg-layer-1, rgba(0,0,0,0.04)); border: 1px solid var(--dsw-alias-border-l1, rgba(128,128,128,0.2)); border-radius: 8px; }\n' +
       '.dsh-music-bar-idle { color: var(--dsw-alias-label-primary, #e6e6e6); font-weight: 500; display: inline-flex; align-items: center; }\n' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-music-player",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "DeepSeek Harness 本地音乐 + AI 讲书插件：Host 扫描音乐目录并以 HTTP 流式提供音频、解析 .txt 小说结构并经 MiMo TTS 合成朗读，浏览器侧提供播放条/播放面板/章节目录跳转/多声音选择/实时频谱，并注册 music_play 模型工具",
   "type": "module",
   "main": "lib/index.js",