dsh-audiogen 0.4.1 → 0.4.2

package/src/index.ts

@@ -17,6 +17,7 @@ import type {} from '@deepseek-ai/dsh-host-webserver'
 import type {} from '@deepseek-ai/dsh-system-prompt'
 import type {} from '@deepseek-ai/dsh-tools'
 import { AUDIOGEN_SETTINGS_NAMESPACE, type ChannelConfig, type ModelMapping } from './protocol.ts'
+import { createGenerationBudget } from './audio-scheduler.ts'
 import { makeRoutes, type ChannelsView, type SettingsSeam } from './routes.ts'
 import type { AudioChannel } from './audio-engine.ts'
 import { registerAgentAudioTools, type AgentAudioToolConfig } from './agent-audio-tools.ts'
@@ -40,8 +41,11 @@ export interface Config {
   defaultChannelId?: string
   defaultModel?: string
   autoSaveToLibrary?: boolean
+  maxConcurrentGenerations?: number
 }
 
+const DEFAULT_MAX_CONCURRENT = 5
+
 export const Config: z<Config> = z.object({
   enabled: z.boolean().default(true),
   announceToAgent: z.boolean().default(true),
@@ -60,6 +64,7 @@ export const Config: z<Config> = z.object({
   defaultChannelId: z.string().default(''),
   defaultModel: z.string().default(''),
   autoSaveToLibrary: z.boolean().default(false),
+  maxConcurrentGenerations: z.number().default(DEFAULT_MAX_CONCURRENT),
 })
 
 const DEFAULT_ENABLED = true
@@ -150,6 +155,7 @@ export interface EffectiveConfig {
   defaultChannelId: string
   defaultModel: string
   autoSaveToLibrary: boolean
+  maxConcurrentGenerations: number
 }
 
 export function apply(ctx: Context, config?: Config): void {
@@ -178,9 +184,15 @@ export function apply(ctx: Context, config?: Config): void {
       defaultChannelId,
       defaultModel: typeof value.defaultModel === 'string' ? value.defaultModel.trim() : '',
       autoSaveToLibrary: value.autoSaveToLibrary === true,
+      maxConcurrentGenerations: typeof value.maxConcurrentGenerations === 'number' && Number.isFinite(value.maxConcurrentGenerations)
+        ? Math.max(1, Math.min(20, Math.floor(value.maxConcurrentGenerations)))
+        : DEFAULT_MAX_CONCURRENT,
     }
   }
 
+  // 全局并发闸门：所有上游调用（面板路由 + Agent 工具）共享「最大并发生成数」。
+  const budget = createGenerationBudget(() => resolve().maxConcurrentGenerations)
+
   const channelsView = (): ChannelsView => {
     const value = resolve()
     return { channels: value.channels, defaultChannelId: value.defaultChannelId }
@@ -193,6 +205,7 @@ export function apply(ctx: Context, config?: Config): void {
         settings: seam,
         resolveChannels: channelsView,
         autoSave: () => resolve().autoSaveToLibrary,
+        budget,
       })
       const disposers = routes.map(route => ctx.webServer.register(route))
       return () => { for (const dispose of disposers) dispose() }
@@ -208,6 +221,7 @@ export function apply(ctx: Context, config?: Config): void {
         channels: value.channels,
         defaultChannelId: value.defaultChannelId,
         autoSaveToLibrary: value.autoSaveToLibrary,
+        budget,
       }
     }), 'dsh-audiogen: agent audio tools')
   })

package/src/protocol.ts

@@ -8,7 +8,7 @@
 export const AUDIOGEN_SETTINGS_NAMESPACE = 'dsh-audiogen'
 
 /** Published package version shared by the host updater and the client UI. */
-export const PLUGIN_VERSION = '0.4.1'
+export const PLUGIN_VERSION = '0.4.2'
 
 /** Same-origin route family (loopback-only, mirroring dsh-imagegen). */
 export const SETTINGS_API = {
@@ -19,6 +19,11 @@ export const SETTINGS_API = {
 /** The audio-generation proxy route. */
 export const GENERATE_API = '/api/dsh-audiogen/generate' as const
 
+/** Loopback-only task cancellation route (aborts the host-side upstream call). */
+export const TASK_API = {
+  cancel: '/api/dsh-audiogen/task/cancel',
+} as const
+
 /** Host-mediated built-in provider catalog (channels the user can instantiate). */
 export const PRESETS_API = '/api/dsh-audiogen/presets' as const
 
@@ -154,6 +159,8 @@ export interface GenerateAudioRequest {
   channel?: string
   /** Upstream model id actually sent (host-filled from alias mapping). */
   upstream?: string
+  /** 客户端任务 id：宿主按 taskId 聚合 AbortController 支持真取消。 */
+  taskId?: string
 
   // ---- MiniMax TTS 专属字段（其他厂商渠道忽略）——————
   /** MiniMax 音色情绪，如 happy/sad/angry/nervous/fearful/bored；默认按音色自身。 */
@@ -372,4 +379,6 @@ export interface AudiogenConfig {
   defaultModel?: string
   /** 生成完成后自动加入资源库（面板与 Agent 生成均生效；单次可取消勾选）。 */
   autoSaveToLibrary?: boolean
+  /** 最大并发生成数（同时打到上游的请求数，含对比任务内多模型）。默认 5。 */
+  maxConcurrentGenerations?: number
 }

package/src/routes.ts

@@ -11,17 +11,21 @@ import { randomUUID } from 'node:crypto'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import { SettingsConflictError, settingsNamespace, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
 import { generateAudio, AudioGenError, type AudioChannel } from './audio-engine.ts'
+import type { GenerationBudget } from './audio-scheduler.ts'
 import { discoverAudioModels } from './audio-models.ts'
 import { AUDIO_PRESETS } from './audio-presets.ts'
 import { appendHistory, clearHistory, listHistory, readAudioFile, removeHistory, saveAudioFile, listLibrary, saveToLibrary, updateLibraryEntry, removeLibraryEntries, readLibraryFile } from './audio-store.ts'
 import {
-  AUDIO_API, AUDIOGEN_SETTINGS_NAMESPACE, GENERATE_API, HISTORY_API, LIBRARY_API, MODEL_API, PRESETS_API, SETTINGS_API,
+  AUDIO_API, AUDIOGEN_SETTINGS_NAMESPACE, GENERATE_API, HISTORY_API, LIBRARY_API, MODEL_API, PRESETS_API, SETTINGS_API, TASK_API,
   LIBRARY_TYPES,
   type GenerateAudioRequest, type GeneratedAudio, type HistoryEntryInput, type LibraryAudioInput, type LibraryProvenance, type LibraryType,
 } from './protocol.ts'
 
 const MAX_JSON_BODY_BYTES = 16 * 1024 * 1024
 
+/** 宿主侧任务取消注册表：taskId → 该任务当前在途请求的 AbortController 集合。 */
+const taskAborts = new Map<string, Set<AbortController>>()
+
 /** Settings seam face the bridge needs. */
 export interface SettingsSeam {
   describe(options?: { redactSecrets?: boolean }): SettingsDescriptor[]
@@ -41,6 +45,8 @@ export interface AudiogenRoutesDeps {
   resolveChannels: () => ChannelsView
   /** Whether the auto-save-to-library setting is on. */
   autoSave: () => boolean
+  /** Global upstream concurrency gate (maxConcurrentGenerations). */
+  budget: GenerationBudget
 }
 
 function isLoopbackRequest(request: IncomingMessage): boolean {
@@ -416,8 +422,24 @@ export function makeRoutes(deps: AudiogenRoutesDeps): WebRoute[] {
         }
         const request = resolved.request
         const channel = view.channels.find(candidate => candidate.id === request.channelId)!
+        // 任务取消支持：同一 taskId 可能对应多个并行子请求（对比任务），
+        // 宿主侧各自持有 AbortController，取消端点统一 abort。
+        const taskId = typeof body?.taskId === 'string' && body.taskId.trim() !== '' ? body.taskId.trim() : ''
+        const controller = new AbortController()
+        if (taskId !== '') {
+          const set = taskAborts.get(taskId) ?? new Set<AbortController>()
+          set.add(controller)
+          taskAborts.set(taskId, set)
+        }
         try {
-          const outputs = await generateAudio(channel, request)
+          // 全局并发闸门：与 Agent 工具共享「最大并发生成数」上限。
+          const release = await deps.budget.acquire(controller.signal)
+          let outputs
+          try {
+            outputs = await generateAudio(channel, request, controller.signal)
+          } finally {
+            release()
+          }
           const generated: GeneratedAudio[] = []
           for (const [index, output] of outputs.entries()) {
             const saved = await saveAudioFile(output.data, output.mime, `generated-${index + 1}`)
@@ -477,7 +499,33 @@ export function makeRoutes(deps: AudiogenRoutesDeps): WebRoute[] {
         } catch (error) {
           const code = error instanceof AudioGenError ? error.code : 'generate-failed'
           writeJson(res, 200, { ok: false, code, message: messageOf(error) })
+        } finally {
+          if (taskId !== '') {
+            const set = taskAborts.get(taskId)
+            set?.delete(controller)
+            if (set !== undefined && set.size === 0) taskAborts.delete(taskId)
+          }
+        }
+      },
+    },
+    // ---------------------------------------------------------- task cancel
+    {
+      kind: 'exact',
+      path: TASK_API.cancel,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const taskId = typeof body?.taskId === 'string' ? body.taskId.trim() : ''
+        if (taskId === '') {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'taskId is required' })
+          return
+        }
+        const controllers = taskAborts.get(taskId)
+        if (controllers !== undefined) {
+          for (const controller of controllers) controller.abort()
+          taskAborts.delete(taskId)
         }
+        writeJson(res, 200, { ok: true, aborted: controllers !== undefined ? controllers.size : 0 })
       },
     },
     // ----------------------------------------------------------- audio file