dsh-music-player 0.1.3 → 0.1.4

package/README.md

@@ -11,6 +11,7 @@ DeepSeek Harness 本地音乐库播放器插件（bundle）。
 - 本地音频流式播放（HTTP Range），刷新后断点续播
 - 顺序播放、单曲循环、乱序播放三种模式
 - 实时 7 段频谱可视化（解码音频包络驱动）
+- 播放时申请屏幕唤醒锁，防止听歌时熄屏/休眠（支持 Wake Lock 的浏览器，如 Chrome/Edge）
 - 播放列表面板可自由拖动，位置跨刷新记忆
 - `music_play` 模型工具：agent 可按关键词让浏览器播放
 - 支持的格式：`mp3 / m4a / m4b / aac / flac / wav / ogg / opus / webm / aiff`（自动递归扫描子目录，上限 500 首）

package/lib/client.js

@@ -379,13 +379,40 @@ window.__ModuleLoader__.load({
       audio.load();
       set({ currentId: null, currentName: null, playing: false, position: 0, duration: 0, pendingId: null, pendingName: null, vizState: 'ok' });
       clearPref(PREF_PLAYBACK);
+      releaseWakeLock();
+    }
+
+    // ---- Screen Wake Lock: keep the screen awake while music is playing ----
+    // While audio plays we request a screen wake lock so the display (and, for
+    // most power policies, the system) doesn't blank or sleep mid-song. Tabs
+    // can't stop OS-level deep sleep, but holding a wake lock while visible
+    // covers the common "screen blanked while I listened" case. Unsupported
+    // browsers (e.g. Safari) silently skip it — never fatal.
+    let wakeLock = null;
+    const wakeLockSupported = (typeof navigator !== 'undefined') && ('wakeLock' in navigator);
+    async function acquireWakeLock() {
+      if (!wakeLockSupported || !store.playing) return;
+      if (wakeLock !== null) return; // already held
+      try {
+        const sentinel = await navigator.wakeLock.request('screen');
+        sentinel.addEventListener('release', () => { if (wakeLock === sentinel) wakeLock = null; });
+        wakeLock = sentinel;
+      } catch (e) {
+        wakeLock = null; // denied or transient — non-fatal
+      }
+    }
+    function releaseWakeLock() {
+      if (wakeLock !== null) {
+        try { wakeLock.release(); } catch (e) {}
+        wakeLock = null;
+      }
     }
 
     function bindAudio() {
       const onTime = () => set({ position: audio.currentTime || 0 });
       const onDur = () => set({ duration: audio.duration || 0 });
-      const onPlay = () => set({ playing: true, error: null });
-      const onPause = () => { set({ playing: false }); savePlayback(); };
+      const onPlay = () => { set({ playing: true, error: null }); acquireWakeLock(); };
+      const onPause = () => { set({ playing: false }); savePlayback(); releaseWakeLock(); };
       const onEnded = () => {
         if (store.mode === 'single' && store.currentId !== null) {
           audio.currentTime = 0;
@@ -832,14 +859,35 @@ window.__ModuleLoader__.load({
       ctx.effect(() => {
         const unbind = bindAudio();
         startRaf();
-        return () => { stopRaf(); unbind(); closeDecodeCtx(); };
+        // 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.
+        const onVis = () => {
+          if (document.hidden) releaseWakeLock();
+          else acquireWakeLock();
+        };
+        document.addEventListener('visibilitychange', onVis);
+        return () => { document.removeEventListener('visibilitychange', onVis); stopRaf(); unbind(); closeDecodeCtx(); releaseWakeLock(); };
       }, 'music-player: audio + viz engine');
 
       loadTracks();
 
       const intentTimer = setInterval(() => {
         jsonGet('/dsh-music/intent').then((intent) => {
-          if (intent === null || typeof intent !== 'object' || intent.id === undefined) return;
+          if (intent === null || typeof intent !== 'object') return;
+          const action = intent.action || 'play';
+          // Transport commands operate on the current playback state (no track id).
+          if (action === 'pause') { audio.pause(); set({ playing: false }); return; }
+          if (action === 'resume') {
+            const p = audio.play();
+            if (p !== undefined && typeof p.catch === 'function') p.catch(() => set({ error: '\u64ad\u653e\u5931\u8d25' }));
+            return;
+          }
+          if (action === 'stop') { stop(); return; }
+          if (action === 'next') { step(1); return; }
+          if (action === 'prev') { step(-1); return; }
+          // play (default): needs a track id.
+          if (intent.id === undefined) return;
           set({ pendingId: intent.id, pendingName: intent.name || '' });
           const track = trackById(intent.id);
           if (track !== null) {

package/lib/index.js

@@ -353,18 +353,26 @@ export function apply(ctx) {
   ctx.effect(() => ctx.webServer.register({ kind: 'prefix', path: '/dsh-music', handler: serve }), 'music-player: routes')
 
   // ---- model tool: music_play ----
+  const PLAY_ACTIONS = ['play', 'pause', 'resume', 'stop', 'next', 'prev']
   const tool = {
     name: 'music_play',
-    description: '在 DSH 本地音乐库中搜索并播放音乐。给出歌曲名/歌手关键词，不传则播放第一首。',
+    description: '控制 DSH 本地音乐库的播放。播放时可按歌曲名/歌手关键词搜索并播放（不传 query 则播放第一首）；也可用 action 执行暂停/继续/停止/下一首/上一首。',
     parameters: {
       type: 'object',
       additionalProperties: false,
-      properties: { query: { type: 'string', description: '歌曲名/歌手关键词，可留空' } },
+      properties: {
+        query: { type: 'string', description: '歌曲名/歌手关键词，用于搜索并播放。仅当 action 为 play（默认）时使用，可留空' },
+        action: { type: 'string', enum: PLAY_ACTIONS, description: '要执行的动作：play 播放（默认）、pause 暂停、resume 继续、stop 停止、next 下一首、prev 上一首' },
+      },
     },
     output: {
       schema: {
         type: 'object', additionalProperties: false,
-        properties: { played: { type: 'boolean' }, track: { type: 'string' }, notice: { type: 'string' } },
+        properties: {
+          action: { type: 'string' }, played: { type: 'boolean' },
+          track: { type: 'string' }, matches: { type: 'number' }, count: { type: 'number' },
+          notice: { type: 'string' },
+        },
       },
       render(_args, value) {
         return [{ type: 'text', text: (value && value.notice) || (value && value.track ? '已请求播放：' + value.track : '音乐库为空') }]
@@ -372,22 +380,39 @@ export function apply(ctx) {
     },
     async execute(args) {
       await ensureStarted()
-      if (tracks.length === 0) {
-        return {
-          played: false, track: '',
-          notice: '本地音乐库为空。请打开播放列表面板，点击「选择音乐目录」配置音乐目录。',
+      const count = tracks.length
+      const action = args && typeof args.action === 'string' && PLAY_ACTIONS.includes(args.action) ? args.action : 'play'
+
+      if (count === 0) {
+        const notice = '本地音乐库为空。请打开播放列表面板，点击「选择音乐目录」配置音乐目录。'
+        return { action, played: false, track: '', matches: 0, count: 0, notice }
+      }
+
+      // Non-play actions just relay a transport command to the browser player.
+      if (action !== 'play') {
+        pendingIntent = { action }
+        const labels = {
+          pause: '已请求暂停播放', resume: '已请求继续播放', stop: '已请求停止播放',
+          next: '已请求播放下一首', prev: '已请求播放上一首',
         }
+        const notice = labels[action] + '。若浏览器拦截自动操作，请在播放条上点击对应按钮。'
+        return { action, played: false, track: '', matches: 0, count, notice }
       }
+
+      // play: search (exact match first, then substring) and pick the first hit.
       const query = args && typeof args.query === 'string' ? args.query.trim().toLowerCase() : ''
-      const list = query === '' ? tracks : tracks.filter((t) => t.name.toLowerCase().includes(query))
-      if (list.length === 0) {
-        return { played: false, track: '', notice: '没有找到包含「' + args.query + '」的音乐（音乐库共 ' + tracks.length + ' 首）。' }
+      const pool = query === '' ? tracks : tracks.filter((t) => t.name.toLowerCase().includes(query))
+      if (pool.length === 0) {
+        const notice = '没有找到包含「' + (args && args.query) + '」的音乐（音乐库共 ' + count + ' 首）。'
+        return { action, played: false, track: '', matches: 0, count, notice }
       }
-      const pick = list[0]
-      pendingIntent = { id: pick.id, name: pick.name }
+      // Prefer an exact (case-insensitive) filename match over the first substring hit.
+      const pick = query === '' ? pool[0]
+        : (tracks.find((t) => t.name.toLowerCase() === query) || pool[0])
+      pendingIntent = { action: 'play', id: pick.id, name: pick.name }
       return {
-        played: true, track: pick.name,
-        notice: '已请求播放「' + pick.name + '」。浏览器可能拦截自动播放，请在页面播放条上点击一次▶解锁。',
+        action, played: true, track: pick.name, matches: pool.length, count,
+        notice: '已请求播放「' + pick.name + '」（匹配 ' + pool.length + ' / 共 ' + count + ' 首）。浏览器可能拦截自动播放，请在页面播放条上点击一次▶解锁。',
       }
     },
   }
@@ -396,7 +421,7 @@ export function apply(ctx) {
   // ---- light prompt hint so the agent knows it can play local music ----
   ctx.systemPrompt.section({
     name: 'tool:music-player', order: 116,
-    text: '本机已挂载本地音乐播放器：可用 music_play 工具按关键词播放 ~/Music（或设置的目录）里的音乐。',
+    text: '本机已挂载本地音乐播放器：可用 music_play 工具按关键词播放 ~/Music（或设置的目录）里的音乐，并支持 action 暂停/继续/停止/上下首控制。',
   })
 
   void ensureStarted()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-music-player",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "DeepSeek Harness 本地音乐库播放器：Host 扫描音乐目录并以 HTTP 流式提供音频，浏览器侧提供播放条/播放面板/设置页与实时频谱，并注册 music_play 模型工具",
   "type": "module",
   "main": "lib/index.js",