@dickpy/dsh-imagegen 1.5.5 → 1.5.6

package/lib/index.js

@@ -41,7 +41,7 @@ function installSettingsSectionCompat(ctx, ns, schema, entry, hooks) {
 /** Settings namespace this plugin owns (host settings seam + bridge). */
 const IMAGEGEN_SETTINGS_NAMESPACE = "dsh-imagegen";
 /** Published package version shared by the host updater and the client UI. */
-const PLUGIN_VERSION = "1.5.5";
+const PLUGIN_VERSION = "1.5.6";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -881,15 +881,24 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 	let body;
 	if (request.mode === "edit") {
 		if (typeof request.image !== "string" || request.image === "") throw new ImageGenError("图生图需要上传参考图片", "edit-image-missing");
-		const parsed = parseDataUrl(request.image);
-		if (parsed === void 0) throw new ImageGenError("参考图片格式无效", "edit-image-invalid");
-		let bytes;
-		try {
-			bytes = Buffer.from(parsed.base64, "base64");
-		} catch {
-			throw new ImageGenError("参考图片数据无法解码", "edit-image-invalid");
-		}
-		if (bytes.byteLength > MAX_EDIT_IMAGE_BYTES) throw new ImageGenError("参考图片超过 10MB 上限", "edit-image-too-large");
+		const decodeReference = (dataUrl) => {
+			const parsed = parseDataUrl(dataUrl);
+			if (parsed === void 0) throw new ImageGenError("参考图片格式无效", "edit-image-invalid");
+			let bytes;
+			try {
+				bytes = Buffer.from(parsed.base64, "base64");
+			} catch {
+				throw new ImageGenError("参考图片数据无法解码", "edit-image-invalid");
+			}
+			if (bytes.byteLength > MAX_EDIT_IMAGE_BYTES) throw new ImageGenError("参考图片超过 10MB 上限", "edit-image-too-large");
+			return {
+				bytes,
+				mime: parsed.mime,
+				filename: `reference.${extensionOf$3(parsed.mime)}`
+			};
+		};
+		const primary = decodeReference(request.image);
+		const extras = (request.images ?? []).filter((img) => typeof img === "string" && img !== "").slice(0, 4).map(decodeReference);
 		if (isGrokImagine(params.model)) {
 			headers["content-type"] = "application/json";
 			body = JSON.stringify({
@@ -904,7 +913,7 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 			});
 		} else if (isNanoBanana(params.model)) {
 			const form = new FormData();
-			form.append("image", new Blob([bytes], { type: parsed.mime }), `reference.${extensionOf$3(parsed.mime)}`);
+			form.append("image", new Blob([primary.bytes], { type: primary.mime }), primary.filename);
 			form.append("prompt", request.prompt);
 			form.append("model", params.model);
 			if (params.aspect_ratio !== void 0) form.append("aspect_ratio", params.aspect_ratio);
@@ -915,14 +924,15 @@ async function requestOneImage(baseUrl, upstream, request, params, signal) {
 			body = JSON.stringify({
 				model: params.model,
 				prompt: request.prompt,
-				image: [request.image],
+				image: [request.image, ...(request.images ?? []).filter((img) => typeof img === "string" && img !== "").slice(0, 4)],
 				...params.size !== void 0 ? { size: params.size } : {},
 				...params.resolution !== void 0 ? { resolution: params.resolution } : {},
 				response_format: isVolcSeedream(params.model) ? "url" : "b64_json"
 			});
 		} else {
 			const form = new FormData();
-			form.append("image", new Blob([bytes], { type: parsed.mime }), `reference.${extensionOf$3(parsed.mime)}`);
+			if (extras.length > 0) for (const [index, reference] of [primary, ...extras].entries()) form.append("image[]", new Blob([reference.bytes], { type: reference.mime }), `reference-${index}.${extensionOf$3(reference.mime)}`);
+			else form.append("image", new Blob([primary.bytes], { type: primary.mime }), primary.filename);
 			form.append("prompt", request.prompt);
 			form.append("model", params.model);
 			if (params.size !== void 0) form.append("size", params.size);
@@ -1178,6 +1188,17 @@ async function testStorage(config) {
 	};
 }
 //#endregion
+//#region src/image-storage-path.ts
+const DEFAULT_ROOT = path.join(process.env.DSH_HOME?.trim() || path.join(homedir(), ".dsh"), "dsh-imagegen");
+let root = DEFAULT_ROOT;
+function imageDataRoot() {
+	return root;
+}
+function setImageDataRoot(value) {
+	const trimmed = value?.trim();
+	root = trimmed === void 0 || trimmed === "" ? DEFAULT_ROOT : path.resolve(trimmed);
+}
+//#endregion
 //#region src/history-store.ts
 /**
 * Host-persisted generation history: images are stored as individual files
@@ -1188,9 +1209,15 @@ async function testStorage(config) {
 *
 * Framework-free (node:fs only) so the route layer can drive it directly.
 */
-const HISTORY_DIR$1 = path.join(homedir(), ".dsh", "dsh-imagegen");
-const INDEX_PATH$1 = path.join(HISTORY_DIR$1, "index.json");
-const IMAGES_DIR$1 = path.join(HISTORY_DIR$1, "images");
+function historyDir() {
+	return imageDataRoot();
+}
+function indexPath$1() {
+	return path.join(historyDir(), "index.json");
+}
+function imagesDir$1() {
+	return path.join(historyDir(), "images");
+}
 let pendingMutation$1 = Promise.resolve();
 function mutateHistory(operation) {
 	const next = pendingMutation$1.then(operation, operation);
@@ -1223,12 +1250,12 @@ function safeId$2(id) {
 }
 /** Ensure the storage directories exist. */
 async function ensureDirs$1() {
-	await promises.mkdir(IMAGES_DIR$1, { recursive: true });
+	await promises.mkdir(imagesDir$1(), { recursive: true });
 }
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex$1() {
 	try {
-		const raw = await promises.readFile(INDEX_PATH$1, "utf8");
+		const raw = await promises.readFile(indexPath$1(), "utf8");
 		const parsed = JSON.parse(raw);
 		if (parsed === null || typeof parsed !== "object") return [];
 		const entries = parsed.entries;
@@ -1242,9 +1269,9 @@ async function readIndex$1() {
 async function writeIndex$1(entries) {
 	await ensureDirs$1();
 	const payload = { entries };
-	const tmp = `${INDEX_PATH$1}.tmp-${process.pid}`;
+	const tmp = `${indexPath$1()}.tmp-${process.pid}`;
 	await promises.writeFile(tmp, JSON.stringify(payload), "utf8");
-	await promises.rename(tmp, INDEX_PATH$1);
+	await promises.rename(tmp, indexPath$1());
 }
 /** Structural guard for a stored entry. */
 function isStoredEntry$1(value) {
@@ -1259,7 +1286,7 @@ function isStoredEntry$1(value) {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles$1(entry) {
 	for (const image of entry.images) try {
-		await promises.rm(path.join(IMAGES_DIR$1, image.file), { force: true });
+		await promises.rm(path.join(imagesDir$1(), image.file), { force: true });
 	} catch {}
 }
 /** Project a stored entry onto the wire shape (image URLs). */
@@ -1306,8 +1333,8 @@ async function appendHistory(input) {
 			for (let index = 0; index < input.images.length; index++) {
 				const image = input.images[index];
 				const file = `${prefix}-${index}.${extensionOf$2(image.mime)}`;
-				await promises.writeFile(path.join(IMAGES_DIR$1, file), Buffer.from(image.b64, "base64"));
-				notifyImageSaved("history", path.join(IMAGES_DIR$1, file));
+				await promises.writeFile(path.join(imagesDir$1(), file), Buffer.from(image.b64, "base64"));
+				notifyImageSaved("history", path.join(imagesDir$1(), file));
 				storedImages.push({
 					file,
 					mime: image.mime,
@@ -1372,7 +1399,7 @@ async function readHistoryImage(file) {
 	if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return void 0;
 	try {
 		return {
-			data: await promises.readFile(path.join(IMAGES_DIR$1, file)),
+			data: await promises.readFile(path.join(imagesDir$1(), file)),
 			mime: mimeOfFile$2(file)
 		};
 	} catch {
@@ -1389,7 +1416,6 @@ var GenerationTaskQueue = class {
 	controllers = /* @__PURE__ */ new Map();
 	listeners = /* @__PURE__ */ new Set();
 	running = 0;
-	serialRunning = false;
 	constructor(run, concurrency = 1) {
 		this.run = run;
 		this.concurrency = concurrency;
@@ -1430,15 +1456,16 @@ var GenerationTaskQueue = class {
 		const previous = this.tasks.find((item) => item.id === id);
 		return previous === void 0 ? void 0 : this.submit(previous.request);
 	}
+	/** Start queued tasks while capacity remains. Plain submissions and
+	* comparison batches alike run in parallel up to the host-wide limit, so one
+	* slow upstream can no longer hold back unrelated generations. */
 	drain() {
 		while (this.running < Math.max(1, this.concurrency)) {
-			const task = this.tasks.find((item) => item.status === "queued" && (this.running === 0 || item.request.comparisonId !== void 0 && !this.serialRunning));
+			const task = this.tasks.find((item) => item.status === "queued");
 			if (task === void 0) return;
 			this.running += 1;
-			if (task.request.comparisonId === void 0) this.serialRunning = true;
 			this.runTask(task).finally(() => {
 				this.running -= 1;
-				if (task.request.comparisonId === void 0) this.serialRunning = false;
 				this.drain();
 			});
 		}
@@ -1558,10 +1585,15 @@ var ImageGenerationRuntime = class {
 * Framework-free (node:fs + node:crypto only) so the route layer can drive it
 * directly.
 */
-const HISTORY_DIR = path.join(homedir(), ".dsh", "dsh-imagegen");
-const GALLERY_DIR = path.join(HISTORY_DIR, "gallery");
-const INDEX_PATH = path.join(GALLERY_DIR, "index.json");
-const IMAGES_DIR = path.join(GALLERY_DIR, "images");
+function galleryDir() {
+	return path.join(imageDataRoot(), "gallery");
+}
+function indexPath() {
+	return path.join(galleryDir(), "index.json");
+}
+function imagesDir() {
+	return path.join(galleryDir(), "images");
+}
 let pendingMutation = Promise.resolve();
 function mutateGallery(operation) {
 	const next = pendingMutation.then(operation, operation);
@@ -1600,12 +1632,12 @@ function fingerprint(input) {
 }
 /** Ensure the storage directories exist. */
 async function ensureDirs() {
-	await promises.mkdir(IMAGES_DIR, { recursive: true });
+	await promises.mkdir(imagesDir(), { recursive: true });
 }
 /** Read the index, tolerating a missing/corrupt file. */
 async function readIndex() {
 	try {
-		const raw = await promises.readFile(INDEX_PATH, "utf8");
+		const raw = await promises.readFile(indexPath(), "utf8");
 		const parsed = JSON.parse(raw);
 		if (parsed === null || typeof parsed !== "object") return [];
 		const entries = parsed.entries;
@@ -1619,9 +1651,9 @@ async function readIndex() {
 async function writeIndex(entries) {
 	await ensureDirs();
 	const payload = { entries };
-	const tmp = `${INDEX_PATH}.tmp-${process.pid}`;
+	const tmp = `${indexPath()}.tmp-${process.pid}`;
 	await promises.writeFile(tmp, JSON.stringify(payload), "utf8");
-	await promises.rename(tmp, INDEX_PATH);
+	await promises.rename(tmp, indexPath());
 }
 /** Structural guard for a stored entry. */
 function isStoredEntry(value) {
@@ -1636,7 +1668,7 @@ function isStoredEntry(value) {
 /** Remove one entry's image files (best effort). */
 async function removeEntryFiles(entry) {
 	for (const image of entry.images) try {
-		await promises.rm(path.join(IMAGES_DIR, image.file), { force: true });
+		await promises.rm(path.join(imagesDir(), image.file), { force: true });
 	} catch {}
 }
 /** Project a stored entry onto the wire shape (image URLs). */
@@ -1692,8 +1724,8 @@ async function appendGallery(input) {
 			for (let index = 0; index < input.images.length; index++) {
 				const image = input.images[index];
 				const file = `${prefix}-${index}.${extensionOf$1(image.mime)}`;
-				await promises.writeFile(path.join(IMAGES_DIR, file), Buffer.from(image.b64, "base64"));
-				notifyImageSaved("gallery", path.join(IMAGES_DIR, file));
+				await promises.writeFile(path.join(imagesDir(), file), Buffer.from(image.b64, "base64"));
+				notifyImageSaved("gallery", path.join(imagesDir(), file));
 				storedImages.push({
 					file,
 					mime: image.mime,
@@ -1769,7 +1801,7 @@ async function readGalleryImage(file) {
 	if (!/^[a-zA-Z0-9][a-zA-Z0-9-]*-[0-9]+\.(png|jpg|jpeg|webp|gif)$/.test(file)) return void 0;
 	try {
 		return {
-			data: await promises.readFile(path.join(IMAGES_DIR, file)),
+			data: await promises.readFile(path.join(imagesDir(), file)),
 			mime: mimeOfFile$1(file)
 		};
 	} catch {
@@ -1779,11 +1811,6 @@ async function readGalleryImage(file) {
 //#endregion
 //#region src/canvas-store.ts
 /** Host-persisted infinite canvas documents and content-addressed assets. */
-const DATA_ROOT = process.env.DSH_HOME?.trim() || path.join(homedir(), ".dsh");
-const CANVAS_ROOT = path.join(DATA_ROOT, "dsh-imagegen", "canvas");
-path.join(CANVAS_ROOT, "pages");
-path.join(CANVAS_ROOT, "assets");
-path.join(CANVAS_ROOT, "index.json");
 var CanvasConflictError = class extends Error {
 	code = "canvas-conflict";
 	constructor(message = "画布已在其他窗口更新，请重新加载后再保存。") {
@@ -1867,7 +1894,7 @@ function isNode(value) {
 function isDocument(value) {
 	if (value === null || typeof value !== "object") return false;
 	const document = value;
-	return document.version === 2 && typeof document.id === "string" && typeof document.title === "string" && typeof document.revision === "number" && document.viewport !== null && typeof document.viewport === "object" && typeof document.viewport.x === "number" && typeof document.viewport.y === "number" && typeof document.viewport.k === "number" && (document.background === "dots" || document.background === "lines" || document.background === "blank") && Array.isArray(document.nodes) && document.nodes.every(isNode) && Array.isArray(document.connections);
+	return document.version === 2 && typeof document.id === "string" && typeof document.title === "string" && typeof document.revision === "number" && document.viewport !== null && typeof document.viewport === "object" && typeof document.viewport.x === "number" && typeof document.viewport.y === "number" && typeof document.viewport.k === "number" && (document.background === "dots" || document.background === "lines" || document.background === "diagonal" || document.background === "checker" || document.background === "blank" || document.background === "image") && (document.backgroundImage === void 0 || typeof document.backgroundImage === "string") && Array.isArray(document.nodes) && document.nodes.every(isNode) && Array.isArray(document.connections);
 }
 /** Upgrade a v1 (image/text/annotation + edges) document to the v2 node-graph model.
 * Images and text notes keep their geometry; annotation prompt cards become plain
@@ -1987,17 +2014,17 @@ function serialize(operation) {
 }
 var CanvasStore = class {
 	root;
-	constructor(root = CANVAS_ROOT) {
+	constructor(root) {
 		this.root = root;
 	}
 	pagesDir() {
-		return path.join(this.root, "pages");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "pages");
 	}
 	assetsDir() {
-		return path.join(this.root, "assets");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "assets");
 	}
 	indexPath() {
-		return path.join(this.root, "index.json");
+		return path.join(this.root ?? path.join(imageDataRoot(), "canvas"), "index.json");
 	}
 	async ensure() {
 		await promises.mkdir(this.pagesDir(), { recursive: true });
@@ -2861,6 +2888,7 @@ function parseGenerateRequest(body) {
 		n: typeof body.n === "number" ? body.n : 1,
 		detail: typeof body.detail === "string" ? body.detail : "",
 		...typeof body.image === "string" && body.image !== "" ? { image: body.image } : {},
+		...Array.isArray(body.images) ? { images: body.images.filter((item) => typeof item === "string" && item !== "").slice(0, 4) } : {},
 		...typeof body.refName === "string" && body.refName !== "" ? { refName: body.refName } : {},
 		...typeof body.channelId === "string" && body.channelId !== "" ? { channelId: body.channelId } : {},
 		...typeof body.comparisonId === "string" && body.comparisonId !== "" ? { comparisonId: body.comparisonId } : {},
@@ -4976,6 +5004,7 @@ const Config = z.object({
 	promptApiUrl: z.string().default(""),
 	promptApiKey: z.string().role("secret").default(""),
 	promptModel: z.string().default(""),
+	localStoragePath: z.string().default(""),
 	storageEnabled: z.boolean().default(false),
 	storageEndpoint: z.string().default(""),
 	storageRegion: z.string().default(""),
@@ -5048,6 +5077,7 @@ function apply(ctx, config) {
 	let current = () => config ?? {};
 	const resolve = () => {
 		const value = current() ?? {};
+		setImageDataRoot(value.localStoragePath);
 		let channels = normalizeChannels(value.channels);
 		const secrets = { ...value.channelSecrets ?? {} };
 		if (channels.length === 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dickpy/dsh-imagegen",
   "description": "AI image generation plugin for the dsh web GUI: text-to-image and image-to-image through configurable provider channels (gpt-image-2 / grok-imagine-image / nanobanana series / seedream-5.0-pro / dall-e-3, with native xAI Grok Imagine, Google Nano Banana and ByteDance Seedream request shaping), with per-channel model catalogs and a New Session / Image Generation tab entry opening a three-column studio beside the native conversation.",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/canvas-store.ts

@@ -2,15 +2,11 @@
 
 import { promises as fs } from 'node:fs'
 import { createHash, randomUUID } from 'node:crypto'
-import { homedir } from 'node:os'
 import path from 'node:path'
 import type { CanvasAssetRef, CanvasDocument, CanvasNode, CanvasSummary } from './protocol.ts'
+import { imageDataRoot } from './image-storage-path.ts'
+
 
-const DATA_ROOT = (process.env.DSH_HOME?.trim() || path.join(homedir(), '.dsh'))
-const CANVAS_ROOT = path.join(DATA_ROOT, 'dsh-imagegen', 'canvas')
-const PAGES_DIR = path.join(CANVAS_ROOT, 'pages')
-const ASSETS_DIR = path.join(CANVAS_ROOT, 'assets')
-const INDEX_PATH = path.join(CANVAS_ROOT, 'index.json')
 
 export interface CanvasImageInput {
   data: Uint8Array
@@ -61,20 +57,21 @@ function safeId(value: string): string {
 }
 
 function pagePath(id: string): string {
-  return path.join(PAGES_DIR, `${safeId(id)}.json`)
+  return path.join(path.join(imageDataRoot(), 'canvas', 'pages'), `${safeId(id)}.json`)
 }
 
 function assetFilePath(id: string): string | undefined {
   if (!/^[a-f0-9]{64}\.(png|jpg|jpeg|webp|gif)$/.test(id)) return undefined
-  const file = path.join(ASSETS_DIR, id)
-  const relative = path.relative(ASSETS_DIR, file)
+  const root = path.join(imageDataRoot(), 'canvas', 'assets')
+  const file = path.join(root, id)
+  const relative = path.relative(root, file)
   if (relative.startsWith('..') || path.isAbsolute(relative)) return undefined
   return file
 }
 
 async function ensureDirs(): Promise<void> {
-  await fs.mkdir(PAGES_DIR, { recursive: true })
-  await fs.mkdir(ASSETS_DIR, { recursive: true })
+  await fs.mkdir(path.join(imageDataRoot(), 'canvas', 'pages'), { recursive: true })
+  await fs.mkdir(path.join(imageDataRoot(), 'canvas', 'assets'), { recursive: true })
 }
 
 async function writeJsonAtomic(file: string, value: unknown): Promise<void> {
@@ -138,7 +135,9 @@ function isDocument(value: unknown): value is CanvasDocument {
     && typeof (document.viewport as { x?: unknown }).x === 'number'
     && typeof (document.viewport as { y?: unknown }).y === 'number'
     && typeof (document.viewport as { k?: unknown }).k === 'number'
-    && (document.background === 'dots' || document.background === 'lines' || document.background === 'blank')
+    && (document.background === 'dots' || document.background === 'lines' || document.background === 'diagonal'
+      || document.background === 'checker' || document.background === 'blank' || document.background === 'image')
+    && (document.backgroundImage === undefined || typeof document.backgroundImage === 'string')
     && Array.isArray(document.nodes) && document.nodes.every(isNode)
     && Array.isArray(document.connections)
 }
@@ -245,11 +244,11 @@ function serialize<T>(operation: () => Promise<T>): Promise<T> {
 }
 
 export class CanvasStore {
-  constructor(private readonly root = CANVAS_ROOT) {}
+  constructor(private readonly root?: string) {}
 
-  private pagesDir(): string { return path.join(this.root, 'pages') }
-  private assetsDir(): string { return path.join(this.root, 'assets') }
-  private indexPath(): string { return path.join(this.root, 'index.json') }
+  private pagesDir(): string { return path.join(this.root ?? path.join(imageDataRoot(), 'canvas'), 'pages') }
+  private assetsDir(): string { return path.join(this.root ?? path.join(imageDataRoot(), 'canvas'), 'assets') }
+  private indexPath(): string { return path.join(this.root ?? path.join(imageDataRoot(), 'canvas'), 'index.json') }
 
   private async ensure(): Promise<void> {
     await fs.mkdir(this.pagesDir(), { recursive: true })