dsh-music-player 0.1.2 → 0.1.4

package/README.md

@@ -1,14 +1,17 @@
 # dsh-music-player
 
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+
 DeepSeek Harness 本地音乐库播放器插件（bundle）。
 
-在 Host 进程里扫描本地音乐目录（默认 `~/Music`，可在面板里改），以 HTTP 流式（支持 Range/拖进度）给浏览器提供音频；浏览器侧给聊天输入区注入**正在播放条**，并提供一个浮动的**播放面板**（曲目列表 / 循环模式 / 音量 / 实时频谱 / 音乐目录设置）。同时注册 `music_play` 模型工具，让 agent 可以直接按关键词播放本地音乐。
+在 Host 进程里扫描本地音乐目录（默认 `~/Music`，可在面板里改），以 HTTP Range 流式（仅显示播放时间，暂无拖动跳转）给浏览器提供音频；浏览器侧给聊天输入区注入**正在播放条**（曲目信息、上一首/播放暂停/下一首/停止、顺序/单曲/乱序循环模式、音量、实时频谱），并提供一个浮动的**播放面板**（曲目列表 / 音乐目录选择与格式提示）。同时注册 `music_play` 模型工具，让 agent 可以直接按关键词播放本地音乐。
 
 ## 特性
 
-- 本地音频流式播放，支持 seek / 断点续播
+- 本地音频流式播放（HTTP Range），刷新后断点续播
 - 顺序播放、单曲循环、乱序播放三种模式
 - 实时 7 段频谱可视化（解码音频包络驱动）
+- 播放时申请屏幕唤醒锁，防止听歌时熄屏/休眠（支持 Wake Lock 的浏览器，如 Chrome/Edge）
 - 播放列表面板可自由拖动，位置跨刷新记忆
 - `music_play` 模型工具：agent 可按关键词让浏览器播放
 - 支持的格式：`mp3 / m4a / m4b / aac / flac / wav / ogg / opus / webm / aiff`（自动递归扫描子目录，上限 500 首）
@@ -17,10 +20,10 @@ DeepSeek Harness 本地音乐库播放器插件（bundle）。
 
 ![播放条](assets/screenshot-bar.png)
 
-![播放面板](assets/screenshot-panel.png)
-
 ![实时频谱](assets/screenshot-spectrum.png)
 
+![播放面板](assets/screenshot-panel.png)
+
 ## 安装
 
 需要已安装 `dsh` CLI。

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;
@@ -739,6 +766,7 @@ window.__ModuleLoader__.load({
       const [dirs, setDirs] = useState([]);
       const [curPath, setCurPath] = useState('');
       const [curName, setCurName] = useState('');
+      const [curUp, setCurUp] = useState(null);
       const [dirError, setDirError] = useState(null);
       return React.createElement('div', { className: 'dsh-music-settings' },
         React.createElement('div', { className: 'dsh-music-settings-row' },
@@ -786,20 +814,30 @@ window.__ModuleLoader__.load({
           if (data && data.error) { setDirError(data.error); return; }
           setCurPath(data.path || '');
           setCurName(data.name || '');
+          setCurUp(data.up || null);
           setDirs(data.dirs || []);
         } catch (err) {
           setDirError('读取目录失败：' + String((err && err.message) || err));
         }
       }
       function goUp() {
-        const p = curPath;
-        if (p === '' || p === '/') return;
-        const idx = p.lastIndexOf('/');
-        browse(idx <= 0 ? '/' : p.slice(0, idx));
+        // Prefer the parent path computed by the host (correct separators per OS).
+        // At a drive root the host reports the "__drives__" sentinel, so "up"
+        // jumps to the drive list and lets the user switch disks.
+        if (curUp === '__drives__') { browse('__drives__'); return; }
+        if (curUp !== null && curUp !== undefined && curUp !== '') { browse(curUp); return; }
+        // fallback: derive the parent locally when the host omitted `up`.
+        // Handle both "\" and "/" so Windows paths never dead-end (the old
+        // POSIX-only parse did nothing on backslash paths like C:\Users\x).
+        if (curPath === '' || curPath === '/' || /^[A-Za-z]:[\\/]?$/.test(curPath)) return;
+        const idx = Math.max(curPath.lastIndexOf('/'), curPath.lastIndexOf('\\'));
+        if (idx <= 0) return;
+        browse(curPath.slice(0, idx));
       }
       function pickCurrent() {
         const p = curPath;
-        if (p === '') return;
+        // The drive-list view ("__drives__") is not a real directory.
+        if (p === '' || p === '__drives__') return;
         setPickerOpen(false);
         saveRoot(p);
       }
@@ -821,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

@@ -28,8 +28,9 @@ function audioType(name) {
   return i > 0 ? (AUDIO_TYPES[name.slice(i + 1).toLowerCase()] || 'application/octet-stream') : 'application/octet-stream'
 }
 
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
-import { dirname } from 'node:path'
+import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync, statSync } from 'node:fs'
+import { dirname, basename, parse as pathParse, join as pathJoin } from 'node:path'
+import * as os from 'node:os'
 
 export const name = 'dsh-music-player'
 export const inject = ['webServer', 'fs', 'shell', 'tools', 'systemPrompt']
@@ -43,6 +44,14 @@ export function apply(ctx) {
 
   const getHome = async () => {
     if (home !== null) return home
+    try {
+      // os.homedir() resolves the user's home cross-platform (Windows uses
+      // C:\Users\<name>; POSIX /Users/<name> or /home/<name>). The $HOME shell
+      // variable does not exist under cmd/powershell on Windows, so fall back
+      // to the shell only when os.homedir() is unusable.
+      const osHome = (typeof os !== 'undefined' && os.homedir) ? os.homedir() : ''
+      if (osHome !== '') { home = osHome; return home }
+    } catch { /* fall through to shell */ }
     try {
       const result = await ctx.shell.run(ctx.shell.resolve({ command: 'printf %s "$HOME"' }))
       const value = String((result.stdout && result.stdout.text) || '').trim()
@@ -100,21 +109,29 @@ export function apply(ctx) {
     const found = []
     const walk = async (dir, depth) => {
       if (depth > 4 || found.length >= 500) return
-      let entries = []
-      try { entries = await ctx.fs.listDir(dir) } catch { return }
+      // Tolerant listing (all entries, see listEntries): dsh-fs-local's listDir
+      // aborts on the first unreadable child, so scanning a drive root (or any
+      // dir with protected entries) would silently yield zero tracks.
+      const entries = listEntries(dir)
       for (const entry of entries) {
         if (found.length >= 500) return
-        if (entry.type === 'directory') { await walk(entry.target, depth + 1); continue }
-        if (entry.type !== 'file' || !isAudioName(entry.name)) continue
-        const abs = ctx.fs.processPath(entry.target)
-        const rel = abs.startsWith(rootStr) ? abs.slice(rootStr.length + 1) : entry.name
-        found.push({
-          name: rel, path: abs, size: entry.size || 0,
-          ext: entry.name.slice(entry.name.lastIndexOf('.') + 1).toLowerCase(),
-        })
+        const abs = pathJoin(dir, entry.name)
+        try {
+          if (entry.isDir) { await walk(abs, depth + 1); continue }
+          if (!isAudioName(entry.name)) continue
+          const st = statSync(abs)
+          if (!st.isFile()) continue
+          const rel = abs.startsWith(rootStr) ? abs.slice(rootStr.length + 1) : entry.name
+          found.push({
+            name: rel, path: abs, size: st.size || 0,
+            ext: entry.name.slice(entry.name.lastIndexOf('.') + 1).toLowerCase(),
+          })
+        } catch {
+          // unreadable entry: skip it, keep walking the rest
+        }
       }
     }
-    await walk(target, 0)
+    await walk(rootStr, 0)
     found.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
     return { rootPath: rootStr, found }
   }
@@ -129,7 +146,9 @@ export function apply(ctx) {
   }
   const init = async () => {
     const h = await getHome()
-    let root = h === null ? null : h + '/Music'
+    // Use path.join so the default root uses the platform separator; on Windows
+    // a bare h + '/Music' produced a mixed "C:\Users\x/Music" root.
+    let root = h === null ? null : pathJoin(h, 'Music')
     // Restore the user's last chosen directory; validate it so a deleted or
     // renamed directory falls back to the default instead of erroring.
     const stored = await loadStoredRoot()
@@ -153,6 +172,29 @@ export function apply(ctx) {
   }
   const ensureStarted = () => { if (startupPromise === null) startupPromise = init(); return startupPromise }
 
+  // Tolerant directory listing for the picker and the scan. dsh-fs-local's
+  // listDir is all-or-nothing: one unreadable child (pagefile.sys, System
+  // Volume Information, ...) aborts the entire listing, which made drive roots
+  // (and any dir containing protected entries) show up empty. Enumerate with
+  // node:fs instead, skip entries that cannot be stat'd, and report every
+  // entry with an isDir flag so callers can filter (picker: dirs only;
+  // scan: dirs to recurse + audio files to collect).
+  const listEntries = (dirPath) => {
+    let dirents = []
+    try { dirents = readdirSync(dirPath, { withFileTypes: true, encoding: 'utf8' }) } catch { return [] }
+    const out = []
+    for (const ent of dirents) {
+      try {
+        const isDir = ent.isDirectory() || (ent.isSymbolicLink() && statSync(pathJoin(dirPath, ent.name)).isDirectory())
+        out.push({ name: ent.name, isDir })
+      } catch {
+        // unreadable entry (EPERM/EBUSY/...): skip it, keep listing the rest
+      }
+    }
+    out.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
+    return out
+  }
+
   // ---- shared HTTP helpers ----
   const writeJson = (res, value, status) => {
     res.writeHead(status || 200, { 'content-type': 'application/json; charset=utf-8' })
@@ -203,6 +245,24 @@ export function apply(ctx) {
         await ensureStarted()
         const raw = url.searchParams.get('path') || ''
         try {
+          // Windows has no single root that lists every drive, so expose a
+          // sentinel ("__drives__") that enumerates the available drive roots.
+          // Browsing "up" from a drive root (e.g. C:\) lands here so users can
+          // switch to another drive.
+          if (raw === '__drives__') {
+            const isWin = typeof process !== 'undefined' && process.platform === 'win32'
+            if (isWin) {
+              const roots = []
+              for (const letter of 'ABCDEFGHIJKLMNOPQRSTUVWXYZ') {
+                const root = letter + ':\\'
+                try { if (existsSync(root)) roots.push({ name: root, path: root }) } catch {}
+              }
+              writeJson(res, { path: '__drives__', name: '\u672c\u673a\u78c1\u76d8', up: null, dirs: roots })
+            } else {
+              writeJson(res, { path: '/', name: '/', up: null, dirs: [] })
+            }
+            return
+          }
           const base = raw === '' ? ((await getHome()) || '/') : raw
           const expanded = base.startsWith('~/') ? ((await getHome()) || '') + '/' + base.slice(2) : base
           const target = await ctx.fs.resolve(expanded)
@@ -212,13 +272,22 @@ export function apply(ctx) {
             return
           }
           const abs = ctx.fs.processPath(target)
-          let entries = []
-          try { entries = await ctx.fs.listDir(target) } catch { entries = [] }
-          const dirs = entries
-            .filter((e) => e.type === 'directory')
-            .map((e) => ({ name: e.name, path: ctx.fs.processPath(e.target) }))
-            .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
-          writeJson(res, { path: abs, name: abs.slice(abs.lastIndexOf('/') + 1) || abs, dirs })
+          // Parent / name computation must use the host filesystem's separators
+          // (Windows uses "\" and drive roots like C:\, POSIX uses "/"), so do it
+          // with node:path rather than guessing a separator in the browser.
+          const atRoot = pathParse(abs).dir === abs
+          // On Windows, "up" from a drive root goes to the drive-list sentinel so
+          // users can switch drives; at the POSIX root there is nowhere to go.
+          const up = atRoot
+            ? (process.platform === 'win32' ? '__drives__' : null)
+            : dirname(abs)
+          // Tolerant listing (see listEntries): skip unreadable entries so
+          // drive roots like C:\ still show their normal folders instead of an
+          // empty list. Only directories are offered by the picker.
+          const dirs = listEntries(abs)
+            .filter((e) => e.isDir)
+            .map((e) => ({ name: e.name, path: pathJoin(abs, e.name) }))
+          writeJson(res, { path: abs, name: basename(abs) || abs, up, dirs })
         } catch (err) {
           writeJson(res, { error: String((err && err.message) || err) }, 500)
         }
@@ -284,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 : '音乐库为空') }]
@@ -303,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 + ' 首）。浏览器可能拦截自动播放，请在页面播放条上点击一次▶解锁。',
       }
     },
   }
@@ -327,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.2",
+  "version": "0.1.4",
   "description": "DeepSeek Harness 本地音乐库播放器：Host 扫描音乐目录并以 HTTP 流式提供音频，浏览器侧提供播放条/播放面板/设置页与实时频谱，并注册 music_play 模型工具",
   "type": "module",
   "main": "lib/index.js",