dsh-audiogen 0.4.1 → 0.4.2

package/lib/index.js

@@ -22,6 +22,8 @@ const SETTINGS_API = {
 };
 /** The audio-generation proxy route. */
 const GENERATE_API = "/api/dsh-audiogen/generate";
+/** Loopback-only task cancellation route (aborts the host-side upstream call). */
+const TASK_API = { cancel: "/api/dsh-audiogen/task/cancel" };
 /** Host-mediated built-in provider catalog (channels the user can instantiate). */
 const PRESETS_API = "/api/dsh-audiogen/presets";
 /** Host-mediated model/voice discovery endpoint. */
@@ -52,6 +54,63 @@ const LIBRARY_TYPES = [
 	"tts"
 ];
 //#endregion
+//#region src/audio-scheduler.ts
+function createGenerationBudget(limit) {
+	let active = 0;
+	const waiting = [];
+	const clampLimit = () => {
+		const raw = Number(limit());
+		if (!Number.isFinite(raw) || raw < 1) return 5;
+		return Math.min(20, Math.floor(raw));
+	};
+	const pump = () => {
+		const max = clampLimit();
+		while (active < max && waiting.length > 0) {
+			const entry = waiting.shift();
+			if (entry.signal?.aborted === true) {
+				entry.reject(new DOMException("The operation was aborted.", "AbortError"));
+				continue;
+			}
+			entry.cleanup?.();
+			active += 1;
+			let released = false;
+			entry.resolve(() => {
+				if (released) return;
+				released = true;
+				active = Math.max(0, active - 1);
+				pump();
+			});
+		}
+	};
+	const acquire = (signal) => new Promise((resolve, reject) => {
+		const entry = {
+			resolve,
+			reject,
+			signal
+		};
+		const onAbort = () => {
+			const index = waiting.indexOf(entry);
+			if (index < 0) return;
+			waiting.splice(index, 1);
+			entry.cleanup = void 0;
+			reject(new DOMException("The operation was aborted.", "AbortError"));
+		};
+		entry.cleanup = () => {
+			signal?.removeEventListener("abort", onAbort);
+		};
+		if (signal !== void 0) {
+			if (signal.aborted === true) {
+				reject(new DOMException("The operation was aborted.", "AbortError"));
+				return;
+			}
+			signal.addEventListener("abort", onAbort, { once: true });
+		}
+		waiting.push(entry);
+		pump();
+	});
+	return { acquire };
+}
+//#endregion
 //#region src/audio-engine.ts
 /** An audio generation failure with a user-presentable message. */
 var AudioGenError = class extends Error {
@@ -1462,6 +1521,8 @@ const LIBRARY_TYPES_VALID = [
 //#endregion
 //#region src/routes.ts
 const MAX_JSON_BODY_BYTES = 16 * 1024 * 1024;
+/** 宿主侧任务取消注册表：taskId → 该任务当前在途请求的 AbortController 集合。 */
+const taskAborts = /* @__PURE__ */ new Map();
 function isLoopbackRequest(request) {
 	const address = request.socket.remoteAddress;
 	if (address !== "127.0.0.1" && address !== "::1" && address !== "::ffff:127.0.0.1") return false;
@@ -1865,8 +1926,21 @@ function makeRoutes(deps) {
 				}
 				const request = resolved.request;
 				const channel = view.channels.find((candidate) => candidate.id === request.channelId);
+				const taskId = typeof body?.taskId === "string" && body.taskId.trim() !== "" ? body.taskId.trim() : "";
+				const controller = new AbortController();
+				if (taskId !== "") {
+					const set = taskAborts.get(taskId) ?? /* @__PURE__ */ new Set();
+					set.add(controller);
+					taskAborts.set(taskId, set);
+				}
 				try {
-					const outputs = await generateAudio(channel, request);
+					const release = await deps.budget.acquire(controller.signal);
+					let outputs;
+					try {
+						outputs = await generateAudio(channel, request, controller.signal);
+					} finally {
+						release();
+					}
 					const generated = [];
 					for (const [index, output] of outputs.entries()) {
 						const saved = await saveAudioFile(output.data, output.mime, `generated-${index + 1}`);
@@ -1937,7 +2011,39 @@ function makeRoutes(deps) {
 						code: error instanceof AudioGenError ? error.code : "generate-failed",
 						message: messageOf(error)
 					});
+				} finally {
+					if (taskId !== "") {
+						const set = taskAborts.get(taskId);
+						set?.delete(controller);
+						if (set !== void 0 && set.size === 0) taskAborts.delete(taskId);
+					}
+				}
+			}
+		},
+		{
+			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 !== void 0) {
+					for (const controller of controllers) controller.abort();
+					taskAborts.delete(taskId);
+				}
+				writeJson(res, 200, {
+					ok: true,
+					aborted: controllers !== void 0 ? controllers.size : 0
+				});
 			}
 		},
 		{
@@ -2620,7 +2726,13 @@ function registerAgentAudioTools(ctx, resolve) {
 			const runOne = async (picked) => {
 				const request = buildRequest(picked);
 				try {
-					const outputs = await generateAudio(picked.channel, request, exec.signal);
+					const release = await (config.budget?.acquire(exec.signal) ?? Promise.resolve(() => {}));
+					let outputs;
+					try {
+						outputs = await generateAudio(picked.channel, request, exec.signal);
+					} finally {
+						release();
+					}
 					const audio = [];
 					const saved = [];
 					for (const [index, output] of outputs.entries()) {
@@ -2904,6 +3016,7 @@ const name = "audiogen";
 const inject = ["webServer", "systemPrompt"];
 /** The branded settings namespace of this plugin. */
 const AudioGenSettingsNamespace = settingsNamespace(AUDIOGEN_SETTINGS_NAMESPACE);
+const DEFAULT_MAX_CONCURRENT = 5;
 const Config = z.object({
 	enabled: z.boolean().default(true),
 	announceToAgent: z.boolean().default(true),
@@ -2921,7 +3034,8 @@ const Config = z.object({
 	channelSecrets: z.dict(z.string().role("secret")).default({}),
 	defaultChannelId: z.string().default(""),
 	defaultModel: z.string().default(""),
-	autoSaveToLibrary: z.boolean().default(false)
+	autoSaveToLibrary: z.boolean().default(false),
+	maxConcurrentGenerations: z.number().default(DEFAULT_MAX_CONCURRENT)
 });
 const DEFAULT_ENABLED = true;
 const DEFAULT_ANNOUNCE = true;
@@ -3014,9 +3128,11 @@ function apply(ctx, config) {
 			})),
 			defaultChannelId,
 			defaultModel: typeof value.defaultModel === "string" ? value.defaultModel.trim() : "",
-			autoSaveToLibrary: value.autoSaveToLibrary === true
+			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
 		};
 	};
+	const budget = createGenerationBudget(() => resolve().maxConcurrentGenerations);
 	const channelsView = () => {
 		const value = resolve();
 		return {
@@ -3030,7 +3146,8 @@ function apply(ctx, config) {
 			const disposers = makeRoutes({
 				settings: seam,
 				resolveChannels: channelsView,
-				autoSave: () => resolve().autoSaveToLibrary
+				autoSave: () => resolve().autoSaveToLibrary,
+				budget
 			}).map((route) => ctx.webServer.register(route));
 			return () => {
 				for (const dispose of disposers) dispose();
@@ -3045,7 +3162,8 @@ function apply(ctx, config) {
 				allowAgentAudioGeneration: value.allowAgentAudioGeneration,
 				channels: value.channels,
 				defaultChannelId: value.defaultChannelId,
-				autoSaveToLibrary: value.autoSaveToLibrary
+				autoSaveToLibrary: value.autoSaveToLibrary,
+				budget
 			};
 		}), "dsh-audiogen: agent audio tools");
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-audiogen",
   "description": "AI audio generation plugin for the dsh web GUI: multi-vendor TTS/music/sound-effect channels (OpenAI-compatible, ElevenLabs, MiniMax, Stability AI and custom), per-channel model/voice catalogs, Agent tool and a sidebar AI 音频 panel.",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/agent-audio-tools.ts

@@ -9,6 +9,7 @@ import { defineTool } from '@deepseek-ai/dsh-tools'
 import { randomUUID } from 'node:crypto'
 import type { AudioChannel } from './audio-engine.ts'
 import { generateAudio, AudioGenError } from './audio-engine.ts'
+import type { GenerationBudget } from './audio-scheduler.ts'
 import { appendHistory, saveAudioFile, saveToLibrary, listLibrary } from './audio-store.ts'
 import type { AudioMode, GenerateAudioRequest, LibraryType } from './protocol.ts'
 
@@ -18,6 +19,8 @@ export interface AgentAudioToolConfig {
   channels: AudioChannel[]
   defaultChannelId: string
   autoSaveToLibrary: boolean
+  /** 全局并发闸门（与面板路由共享「最大并发生成数」）。 */
+  budget?: GenerationBudget
 }
 
 interface AgentAudioRef {
@@ -300,7 +303,14 @@ export function registerAgentAudioTools(ctx: Context, resolve: () => AgentAudioT
       const runOne = async (picked: { channel: AudioChannel; alias: string; upstream: string }): Promise<AgentAudioGroup> => {
         const request = buildRequest(picked)
         try {
-          const outputs = await generateAudio(picked.channel, request, exec.signal)
+          // 与面板路由共享全局并发闸门（限流时排队；取消时立即出队）。
+          const release = await (config.budget?.acquire(exec.signal) ?? Promise.resolve(() => { /* 默认不限制 */ }))
+          let outputs
+          try {
+            outputs = await generateAudio(picked.channel, request, exec.signal)
+          } finally {
+            release()
+          }
           const audio: AgentAudioRef[] = []
           const saved: SavedAudioRef[] = []
           for (const [index, output] of outputs.entries()) {

package/src/audio-scheduler.ts

@@ -0,0 +1,73 @@
+/**
+ * Global generation budget: a FIFO semaphore shared by every upstream audio
+ * call (panel routes and the Agent tool). The limit comes from the plugin
+ * setting 「最大并发生成数」(default 5): a 3-model compare task takes 3 slots,
+ * other tasks queue or run concurrently up to the same cap.
+ *
+ * Acquire resolves with a release function once a slot is free; aborting the
+ * signal while queued rejects immediately (no slot is occupied).
+ */
+
+export interface GenerationBudget {
+  /** Wait for a free slot; resolves with the release function. */
+  acquire(signal?: AbortSignal): Promise<() => void>
+}
+
+export function createGenerationBudget(limit: () => number): GenerationBudget {
+  let active = 0
+  const waiting: Array<{
+    resolve: (release: () => void) => void
+    reject: (reason: unknown) => void
+    signal?: AbortSignal
+    cleanup?: () => void
+  }> = []
+
+  const clampLimit = (): number => {
+    const raw = Number(limit())
+    if (!Number.isFinite(raw) || raw < 1) return 5
+    return Math.min(20, Math.floor(raw))
+  }
+
+  const pump = (): void => {
+    const max = clampLimit()
+    while (active < max && waiting.length > 0) {
+      const entry = waiting.shift()!
+      if (entry.signal?.aborted === true) {
+        entry.reject(new DOMException('The operation was aborted.', 'AbortError'))
+        continue
+      }
+      entry.cleanup?.()
+      active += 1
+      let released = false
+      entry.resolve(() => {
+        if (released) return
+        released = true
+        active = Math.max(0, active - 1)
+        pump()
+      })
+    }
+  }
+
+  const acquire = (signal?: AbortSignal): Promise<() => void> => new Promise<() => void>((resolve, reject) => {
+    const entry: { resolve: (release: () => void) => void; reject: (reason: unknown) => void; signal?: AbortSignal; cleanup?: () => void } = { resolve, reject, signal }
+    const onAbort = (): void => {
+      const index = waiting.indexOf(entry)
+      if (index < 0) return // 已在运行：由调用方的 signal 中断上游请求
+      waiting.splice(index, 1)
+      entry.cleanup = undefined
+      reject(new DOMException('The operation was aborted.', 'AbortError'))
+    }
+    entry.cleanup = () => { signal?.removeEventListener('abort', onAbort) }
+    if (signal !== undefined) {
+      if (signal.aborted === true) {
+        reject(new DOMException('The operation was aborted.', 'AbortError'))
+        return
+      }
+      signal.addEventListener('abort', onAbort, { once: true })
+    }
+    waiting.push(entry)
+    pump()
+  })
+
+  return { acquire }
+}

package/src/client/SettingsCard.tsx

@@ -28,6 +28,7 @@ export interface AudioGenSettings {
   allowAgentAudioGeneration?: boolean
   defaultModel?: string
   autoSaveToLibrary?: boolean
+  maxConcurrentGenerations?: number
 }
 
 export interface AudioGenSettingsCardState extends CardShell {
@@ -37,6 +38,7 @@ export interface AudioGenSettingsCardState extends CardShell {
   allowAgentAudioGeneration: CardFieldState
   defaultModel: CardFieldState
   autoSaveToLibrary: CardFieldState
+  maxConcurrentGenerations: CardFieldState
 }
 
 export interface AudioGenSettingsCardFace extends CardActions {
@@ -57,6 +59,7 @@ export class AudioGenSettingsCardController {
       booleanField('allowAgentAudioGeneration'),
       textField('defaultModel'),
       booleanField('autoSaveToLibrary'),
+      textField('maxConcurrentGenerations'),
     ])
     this.channelsForm = new ChannelsForm(scope)
   }
@@ -72,6 +75,7 @@ export class AudioGenSettingsCardController {
       allowAgentAudioGeneration: this.form.field('allowAgentAudioGeneration'),
       defaultModel: this.form.field('defaultModel'),
       autoSaveToLibrary: this.form.field('autoSaveToLibrary'),
+      maxConcurrentGenerations: this.form.field('maxConcurrentGenerations'),
     }
   }
 
@@ -723,6 +727,20 @@ export function AudioGenSettingsCard(props: AudioGenSettingsCardProps) {
               <input type="checkbox" checked={state.autoSaveToLibrary.text === 'true'} disabled={!state.writable} onChange={event => props.edit('autoSaveToLibrary', String(event.target.checked))} /> {t('settings.autoSaveLibrary')}
             </label>
           </div>
+          <div className={css.field}>
+            <label className={css.label}>
+              <span>{t('settings.maxConcurrent')}</span>
+              <input
+                type="number"
+                min="1"
+                max="20"
+                className={css.input}
+                value={state.maxConcurrentGenerations.text}
+                disabled={!state.writable}
+                onChange={event => props.edit('maxConcurrentGenerations', event.target.value)}
+              />
+            </label>
+          </div>
           <div className={css.footer}>
             {state.failed ? <p className={css.failed}>保存失败</p> : null}
             <button type="button" className={css.discard} disabled={!state.dirty || state.saving} onClick={() => props.discard()}>{t('settings.discard')}</button>

package/src/client/api.ts

@@ -4,7 +4,7 @@
  */
 
 import {
-  GENERATE_API, HISTORY_API, LIBRARY_API,
+  GENERATE_API, HISTORY_API, LIBRARY_API, TASK_API,
   type GenerateAudioRequest, type GeneratedAudio, type HistoryEntry,
   type LibraryEntry, type LibrarySaveRequest, type LibraryUpdateRequest,
 } from '../protocol.ts'
@@ -20,59 +20,58 @@ export interface GenerateResponse {
   message?: string
 }
 
+/** POST helper: the host API requires the JSON content type on every POST. */
+function postJson(path: string, body: unknown, signal?: AbortSignal): Promise<Response> {
+  return fetch(path, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify(body),
+    ...(signal === undefined ? {} : { signal }),
+  })
+}
+
 export class AudiogenApi {
-  async generate(request: GenerateAudioRequest): Promise<GenerateResponse> {
-    const response = await fetch(GENERATE_API, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(request),
-    })
+  async generate(request: GenerateAudioRequest, signal?: AbortSignal): Promise<GenerateResponse> {
+    const response = await postJson(GENERATE_API, { ...request, taskId: request.taskId }, signal)
     const body = await response.json() as GenerateResponse
     return body
   }
 
+  /** 取消进行中的任务：宿主侧中断全部在途上游调用，剩余模型跳过。 */
+  async cancelTask(taskId: string): Promise<void> {
+    await postJson(TASK_API.cancel, { taskId }).catch(() => { /* best-effort */ })
+  }
+
   async history(): Promise<HistoryEntry[]> {
-    const response = await fetch(HISTORY_API.list, { method: 'POST' })
+    const response = await postJson(HISTORY_API.list, {})
     const body = await response.json() as { ok?: boolean; history?: HistoryEntry[] }
     return body.ok === true ? (body.history ?? []) : []
   }
 
   async clearHistory(): Promise<void> {
-    await fetch(HISTORY_API.clear, { method: 'POST' })
+    await postJson(HISTORY_API.clear, {})
   }
 
   async libraryList(): Promise<LibraryEntry[]> {
-    const response = await fetch(LIBRARY_API.list, { method: 'POST' })
+    const response = await postJson(LIBRARY_API.list, {})
     const body = await response.json() as { ok?: boolean; entries?: LibraryEntry[] }
     return body.ok === true ? (body.entries ?? []) : []
   }
 
   async librarySave(request: LibrarySaveRequest): Promise<{ ok: boolean; entry?: LibraryEntry; message?: string }> {
-    const response = await fetch(LIBRARY_API.save, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(request),
-    })
+    const response = await postJson(LIBRARY_API.save, request)
     const body = await response.json() as { ok?: boolean; entry?: LibraryEntry; message?: string }
     return { ok: body.ok === true, ...(body.entry === undefined ? {} : { entry: body.entry }), ...(body.message === undefined ? {} : { message: body.message }) }
   }
 
   async libraryUpdate(request: LibraryUpdateRequest): Promise<{ ok: boolean; entry?: LibraryEntry; message?: string }> {
-    const response = await fetch(LIBRARY_API.update, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(request),
-    })
+    const response = await postJson(LIBRARY_API.update, request)
     const body = await response.json() as { ok?: boolean; entry?: LibraryEntry; message?: string }
     return { ok: body.ok === true, ...(body.entry === undefined ? {} : { entry: body.entry }), ...(body.message === undefined ? {} : { message: body.message }) }
   }
 
   async libraryRemove(ids: string[]): Promise<{ ok: boolean }> {
-    const response = await fetch(LIBRARY_API.remove, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ ids }),
-    })
+    const response = await postJson(LIBRARY_API.remove, { ids })
     const body = await response.json() as { ok?: boolean }
     return { ok: body.ok === true }
   }