dsh-any-audio 0.1.0-beta.0 → 0.1.0

package/lib/client.js

@@ -79,7 +79,8 @@ window.__ModuleLoader__.load({
       '默认音源：{0}': 'Default bank: {0}',
       '未安装音源': 'No bank installed',
       '音源已安装': 'Sound source installed',
-      '开始下载，请保持页面打开': 'Download started — keep this page open',
+      '开始下载，关掉设置页后仍会继续': 'Download started — it keeps running after you close this page',
+      '已有一个下载任务在进行': 'A download is already running',
       '校验通过': 'Verification passed',
       '校验失败：文件与记录不一致': 'Verification failed: file does not match its record',
       '已处理': 'Done',
@@ -322,6 +323,18 @@ window.__ModuleLoader__.load({
       const [customPath, setCustomPath] = useState('')
       const [customUrl, setCustomUrl] = useState('')
 
+      // The job lives on the host, not in this component: reopening the settings
+      // page must pick up an install that is still running.
+      useEffect(() => {
+        let cancelled = false
+        api('/jobs/active?kind=install')
+          .then((data) => {
+            if (!cancelled && data.job) setJob(data.job)
+          })
+          .catch(() => {})
+        return () => { cancelled = true }
+      }, [])
+
       useEffect(() => {
         if (!job || job.status !== 'running') return undefined
         const timer = setInterval(async () => {
@@ -346,7 +359,7 @@ window.__ModuleLoader__.load({
         try {
           const data = await api('/sources/install', { method: 'POST', body })
           setJob(data.job)
-          notify(t('开始下载，请保持页面打开'))
+          notify(data.reused ? t('已有一个下载任务在进行') : t('开始下载，关掉设置页后仍会继续'))
         } catch (error) {
           notify(error.message, 'error')
         } finally {
@@ -408,6 +421,7 @@ window.__ModuleLoader__.load({
 
       const fonts = state.fonts
       const percent = job && job.total ? (job.received / job.total) * 100 : 0
+      const installing = Boolean(job && job.status === 'running')
       return h(Fragment, null,
         h(Card, {
           title: t('音源（SoundFont）'),
@@ -416,7 +430,7 @@ window.__ModuleLoader__.load({
         },
           job ? h('div', { style: { display: 'flex', flexDirection: 'column', gap: 4 } },
             h('div', { style: { ...S.row, justifyContent: 'space-between' } },
-              h('span', { style: S.label }, job.status === 'running' ? `${t('正在安装')}${job.total ? ` ${Math.round(percent)}%` : ''}` : job.status === 'done' ? t('完成：{0}', job.message || t('已安装')) : t('失败：{0}', job.error || '')),
+              h('span', { style: S.label }, job.status === 'running' ? `${t('正在安装')}${job.label ? ` ${job.label}` : ''}${job.total ? ` ${Math.round(percent)}%` : ''}` : job.status === 'done' ? t('完成：{0}', job.message || t('已安装')) : t('失败：{0}', job.error || '')),
               job.total ? h('span', { style: S.mono }, `${bytes(job.received)} / ${bytes(job.total)}`) : null,
             ),
             h('div', { style: S.bar }, h('div', { style: S.barFill(percent) })),
@@ -445,7 +459,7 @@ window.__ModuleLoader__.load({
                   font.suggested && !font.default ? h('span', { style: S.chip }, t('建议安装')) : null,
                   h('span', { style: S.mono }, bytes(font.bytes)),
                   h('span', { style: S.chip }, installed ? (installed.status === 'ok' ? t('已安装') : installed.status === 'modified' ? t('文件被修改') : t('已安装（未登记）')) : t('未安装')),
-                  installed ? null : h(Btn, { kind: 'primary', disabled: busy === `install:${font.id}`, onClick: () => install({ id: font.id }) }, t('下载安装')),
+                  installed ? null : h(Btn, { kind: 'primary', disabled: installing || busy === `install:${font.id}`, onClick: () => install({ id: font.id }) }, t('下载安装')),
                   installed ? h(Btn, { onClick: () => openPreview(installed.path) }, t('试听')) : null,
                   installed ? h(Btn, { onClick: () => act('verify', { path: installed.path }) }, t('校验')) : null,
                   installed ? h(Btn, { onClick: () => act('remove', { path: installed.path, removeFile: false }) }, t('移除记录')) : null,
@@ -462,14 +476,14 @@ window.__ModuleLoader__.load({
             h('div', { style: S.label }, t('从本机文件安装（7z/zip 请先解压出 .sf2/.sf3/.dls）')),
             h('div', { style: S.row },
               h(TextInput, { value: customPath, onChange: setCustomPath, placeholder: 'C:\\Downloads\\Piano.sf2' }),
-              h(Btn, { disabled: !customPath.trim() || busy.startsWith('install:'), onClick: () => install({ fromPath: customPath.trim() }) }, t('安装文件')),
+              h(Btn, { disabled: !customPath.trim() || installing || busy.startsWith('install:'), onClick: () => install({ fromPath: customPath.trim() }) }, t('安装文件')),
             ),
           ),
           h('div', { style: S.item },
             h('div', { style: S.label }, t('从网址安装（直链 .sf2/.sf3/.dls）')),
             h('div', { style: S.row },
               h(TextInput, { value: customUrl, onChange: setCustomUrl, placeholder: 'https://example.com/bank.sf2' }),
-              h(Btn, { disabled: !customUrl.trim() || busy.startsWith('install:'), onClick: () => install({ url: customUrl.trim() }) }, t('下载安装')),
+              h(Btn, { disabled: !customUrl.trim() || installing || busy.startsWith('install:'), onClick: () => install({ url: customUrl.trim() }) }, t('下载安装')),
             ),
           ),
         ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-any-audio",
-  "version": "0.1.0-beta.0",
+  "version": "0.1.0",
   "description": "AnyAudio — an agent-driven audio production toolkit for DeepSeek Harness: music, sound effects, narration and mixing.",
   "type": "module",
   "main": "src/index.js",

package/src/host/routes.js

@@ -61,6 +61,7 @@ function publicJob(job) {
   return {
     id: job.id,
     kind: job.kind,
+    label: job.label ?? null,
     status: job.status,
     received: job.received,
     total: job.total,
@@ -72,9 +73,9 @@ function publicJob(job) {
   }
 }
 
-function startJob(kind, runner) {
+function startJob(kind, runner, label = '') {
   const id = randomUUID()
-  const job = { id, kind, status: 'running', received: 0, total: 0, message: '', startedAt: Date.now(), abort: new AbortController() }
+  const job = { id, kind, label, status: 'running', received: 0, total: 0, message: '', startedAt: Date.now(), abort: new AbortController() }
   jobs.set(id, job)
   runner(job)
     .then((result) => {
@@ -91,6 +92,22 @@ function startJob(kind, runner) {
   return job
 }
 
+function runningJob(kind) {
+  for (const job of jobs.values()) {
+    if (job.kind === kind && job.status === 'running') return job
+  }
+  return null
+}
+
+/** A short name for the progress line; a malformed URL must not break the call. */
+function urlLabel(url) {
+  try {
+    return basename(new URL(url).pathname) || url
+  } catch {
+    return url
+  }
+}
+
 /** Recommended fonts plus whatever is installed, merged for the UI. */
 async function fontState(workspaceRoot) {
   const installed = await listFonts()
@@ -211,6 +228,11 @@ function makeRoutes({ ctx, log, workspaceRoot }) {
     const id = typeof body.id === 'string' && body.id.trim() ? body.id.trim() : 'generaluser'
     const url = typeof body.url === 'string' && body.url.trim() ? body.url.trim() : undefined
     const fromPath = typeof body.fromPath === 'string' && body.fromPath.trim() ? body.fromPath.trim() : undefined
+    // One install at a time: a second request must join the running job instead
+    // of starting a parallel download that would write the same ".part" file.
+    const running = runningJob('install')
+    if (running) return { ok: true, job: publicJob(running), reused: true }
+    const label = url ? urlLabel(url) : fromPath ? basename(fromPath) : findRecommended(id)?.name ?? id
     const job = startJob('install', async (current) => {
       const result = await installFont({
         id,
@@ -234,7 +256,7 @@ function makeRoutes({ ctx, log, workspaceRoot }) {
       })
       current.message = result.alreadyInstalled ? 'already installed' : 'installed'
       return { ...result, name: basename(result.path), id: recommended?.id ?? null }
-    })
+    }, label)
     return { ok: true, job: publicJob(job) }
   }
 
@@ -494,6 +516,10 @@ function makeRoutes({ ctx, log, workspaceRoot }) {
       const job = jobs.get(url.searchParams.get('id') ?? '')
       return json(res, job ? 200 : 404, job ? { ok: true, job: publicJob(job) } : { ok: false, error: 'job not found' })
     }
+    if (method === 'GET' && path === `${PREFIX}/jobs/active`) {
+      const job = runningJob(url.searchParams.get('kind') ?? 'install')
+      return json(res, 200, { ok: true, job: job ? publicJob(job) : null })
+    }
     if (method !== 'POST') return json(res, 405, { ok: false, error: 'method not allowed' })
 
     let body

package/test/settings.mjs

@@ -73,6 +73,25 @@ const server = http.createServer((req, res) => {
   })
 })
 
+// Serves bytes slowly enough that an install is still running while the next
+// request arrives; that is what lets the queueing rules be observed.
+const slowServer = http.createServer((req, res) => {
+  const chunk = Buffer.alloc(64 * 1024, 3)
+  const chunks = 20
+  res.writeHead(200, { 'content-type': 'application/octet-stream', 'content-length': String(chunk.length * chunks) })
+  let sent = 0
+  const timer = setInterval(() => {
+    if (sent >= chunks) {
+      clearInterval(timer)
+      res.end()
+      return
+    }
+    sent++
+    res.write(chunk)
+  }, 40)
+  req.on('close', () => clearInterval(timer))
+})
+
 function assert(condition, message) {
   if (!condition) throw new Error(message)
 }
@@ -251,6 +270,52 @@ server.listen(0, '127.0.0.1', async () => {
     assert((await readFile(outsider, 'utf8')) === 'keep me', 'the file must still exist')
   })
 
+  // One install at a time, and the job must outlive the settings page that
+  // started it: the host owns the download, the page only watches it.
+  await step('a second install joins the running job instead of starting a parallel one', async () => {
+    await new Promise((resolve) => slowServer.listen(0, '127.0.0.1', resolve))
+    const slowPort = slowServer.address().port
+    try {
+      const first = await post('/sources/install', { url: `http://127.0.0.1:${slowPort}/slow-bank.sf2` })
+      assert(first.ok && first.job?.id, first.error ?? 'no job id')
+      assert(first.job.label === 'slow-bank.sf2', `job label should name the file, got ${first.job.label}`)
+      const second = await post('/sources/install', { fromPath: join(testRoot, 'custom-bank.sf2') })
+      assert(second.ok, second.error)
+      assert(second.reused === true, 'a second install must join the running job')
+      assert(second.job.id === first.job.id, `a parallel install started: ${second.job.id} != ${first.job.id}`)
+
+      // No polling happens in between: this is the "settings page was closed" case.
+      const active = await get('/jobs/active?kind=install')
+      assert(active.job?.id === first.job.id, 'a reopened settings page must find the running install')
+      await new Promise((resolve) => setTimeout(resolve, 300))
+      const seen = (await get(`/jobs?id=${encodeURIComponent(first.job.id)}`)).job
+      assert(seen && (seen.status === 'running' || seen.status === 'done'), 'the job must stay queryable without polling')
+      if (seen.status === 'running') {
+        assert(seen.received > 0, 'a restored page must get the progress that already happened')
+      }
+
+      let job = seen
+      for (let i = 0; i < 200 && job.status === 'running'; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 100))
+        job = (await get(`/jobs?id=${encodeURIComponent(first.job.id)}`)).job
+      }
+      assert(job.status === 'done', `job ended as ${job.status}: ${job.error ?? ''}`)
+      assert(job.result.path === join(testFontDir, 'slow-bank.sf2'), `installed to ${job.result.path}`)
+      assert((await get('/jobs/active?kind=install')).job === null, 'no install may still be reported as running')
+      const refreshed = await get('/state')
+      assert(
+        refreshed.fonts.rows.some((row) => row.name === 'slow-bank.sf2'),
+        'the page must see the finished install on its next refresh',
+      )
+      const leftovers = (await readdir(testFontDir)).filter((name) => name.endsWith('.part'))
+      assert(leftovers.length === 0, `partial downloads left behind: ${leftovers.join(', ')}`)
+      const removed = await post('/sources/remove', { path: job.result.path, removeFile: true })
+      assert(removed.ok && removed.removed, removed.error)
+    } finally {
+      slowServer.close()
+    }
+  })
+
   // The four steps below cover the "saved default points at a bank that no longer
   // exists" case: the page and the renderer must always agree.
   const testExec = { agent: { workspaceRoot: root } }