@waterwx/dsh-novel-forge 1.6.0 → 1.7.0

package/lib/index.js

@@ -2948,14 +2948,66 @@ async function breakdownBook(ctx, config, project, outputDir, scope = "recent",
 		usedTokens
 	};
 }
-async function generateRoleReferenceImage(ctx, config, project, outputDir, name, style = "") {
+/** 生图接口连通性测试（设置页模型条目用）：GET {baseURL}/models，计时返回延迟。 */
+async function testImageEndpoint(baseURL, apiKey, model) {
+	const trimmed = baseURL.trim();
+	if (trimmed === "") return {
+		ok: false,
+		ms: 0,
+		message: "接口地址不能为空"
+	};
+	const url = trimmed.replace(/\/+$/, "") + "/models";
+	const start = Date.now();
+	try {
+		const res = await fetch(url, {
+			method: "GET",
+			headers: {
+				Authorization: "Bearer " + apiKey,
+				"Content-Type": "application/json"
+			}
+		});
+		const ms = Date.now() - start;
+		if (!res.ok) {
+			const text = (await res.text().catch(() => "")).slice(0, 200);
+			return {
+				ok: false,
+				ms,
+				message: "HTTP " + res.status + (text !== "" ? "：" + text : "")
+			};
+		}
+		let modelFound;
+		if (model !== void 0 && model !== "") {
+			const list = (await res.json().catch(() => null))?.data;
+			if (Array.isArray(list)) modelFound = list.some((m) => {
+				if (typeof m !== "object" || m === null) return false;
+				const o = m;
+				return o.id === model || o.model === model;
+			});
+		}
+		return {
+			ok: true,
+			ms,
+			modelFound
+		};
+	} catch (err) {
+		return {
+			ok: false,
+			ms: Date.now() - start,
+			message: err.message
+		};
+	}
+}
+async function generateRoleReferenceImage(ctx, config, project, outputDir, name, style = "", modelId) {
 	const role = project.roles?.find((r) => r.name === name);
 	if (role === void 0) throw new Error(`角色 ${name} 不存在`);
 	if (role.imagePrompt === void 0) throw new Error(`角色 ${name} 还没有形象锚点，请先生成锚点`);
-	if (config.imageApiEnabled !== true) throw new Error("豆包生图未启用，请在设置中开启");
-	const apiKey = config.imageApiKey;
-	const model = config.imageApiModel;
-	if (apiKey === void 0 || apiKey === "" || model === void 0 || model === "") throw new Error("请先在设置中配置豆包 API Key 和生图模型");
+	if (config.imageApiEnabled !== true) throw new Error("生图未启用，请在设置中启用一个生图模型");
+	const activeImage = (modelId !== void 0 && modelId !== "" ? (config.imageModels ?? []).find((m) => m.id === modelId) : void 0) ?? (config.imageModels ?? []).find((m) => m.enabled) ?? (config.imageModels ?? [])[0];
+	const apiKey = activeImage?.apiKey ?? config.imageApiKey;
+	const model = activeImage?.model ?? config.imageApiModel;
+	const baseURL = (activeImage?.baseURL ?? config.imageBaseUrl ?? "").replace(/\/+$/, "");
+	if (baseURL === "") throw new Error("请先在设置中填写生图接口地址");
+	if (apiKey === void 0 || apiKey === "" || model === void 0 || model === "") throw new Error("请先在设置中配置生图模型的 API Key 和模型 id");
 	const stylePrompt = getComicStylePrompt(style);
 	const prompt = [
 		role.imagePrompt.zh,
@@ -2964,7 +3016,7 @@ async function generateRoleReferenceImage(ctx, config, project, outputDir, name,
 		stylePrompt,
 		"character reference sheet, front view, clean background, consistent design"
 	].filter(Boolean).join(", ");
-	const res = await fetch("https://ark.cn-beijing.volces.com/api/v3/images/generations", {
+	const res = await fetch(baseURL + "/images/generations", {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -2981,12 +3033,12 @@ async function generateRoleReferenceImage(ctx, config, project, outputDir, name,
 	});
 	if (!res.ok) {
 		const text = await res.text();
-		throw new Error(`豆包生图失败（${res.status}）：${text}`);
+		throw new Error(`生图失败（${res.status}）：${text}`);
 	}
 	const url = (await res.json()).data?.[0]?.url;
-	if (url === void 0 || url === "") throw new Error("豆包生图未返回图片 URL");
+	if (url === void 0 || url === "") throw new Error("生图接口未返回图片 URL");
 	const imgRes = await fetch(url);
-	if (!imgRes.ok) throw new Error("下载豆包图片失败");
+	if (!imgRes.ok) throw new Error("下载生图结果失败");
 	const buf = Buffer.from(await imgRes.arrayBuffer());
 	const dataUrl = `data:${imgRes.headers.get("content-type") || "image/jpeg"};base64,${buf.toString("base64")}`;
 	role.imageUrl = dataUrl;
@@ -4729,6 +4781,8 @@ const NOVEL_API = {
 	storyboardTable: "/api/dsh-novel-forge/storyboard/table",
 	/** 分镜·提示词级：分镜表 → 即梦可粘贴视频提示词。 */
 	storyboardPrompts: "/api/dsh-novel-forge/storyboard/prompts",
+	/** 生图接口连通性测试（设置页每个模型条目用）。 */
+	imageTest: "/api/dsh-novel-forge/image-test",
 	/** 重置项目（可选携带新大纲）：清空设定/卷/章节/伏笔/资产/事实库。 */
 	reset: "/api/dsh-novel-forge/reset",
 	/** 全书一致性质检：LLM 扫描已生成章节，输出矛盾问题清单。 */
@@ -7186,7 +7240,7 @@ function makeRoutes(deps) {
 					return;
 				}
 				try {
-					const imageUrl = await generateRoleReferenceImage(ctx, config, project, config.outputDir, name, body?.style ?? "");
+					const imageUrl = await generateRoleReferenceImage(ctx, config, project, config.outputDir, name, body?.style ?? "", body?.modelId);
 					project.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 					saveProject(config.outputDir, project);
 					writeJson(res, 200, {
@@ -7521,6 +7575,24 @@ function makeRoutes(deps) {
 			}
 		}
 	};
+	/** 生图接口连通性测试：GET {baseURL}/models + 计时（设置页模型条目用）。 */
+	const imageTestRoute = {
+		kind: "exact",
+		path: NOVEL_API.imageTest,
+		handler: async (req, res) => {
+			if (!guard(req, res, "POST")) return;
+			const body = await readJsonBody(req);
+			if (body?.baseURL === void 0 || body?.apiKey === void 0) {
+				writeJson(res, 400, { error: "baseURL 与 apiKey 必填" });
+				return;
+			}
+			try {
+				writeJson(res, 200, await testImageEndpoint(body.baseURL, body.apiKey, body.model));
+			} catch (error) {
+				writeJson(res, 500, { error: `测试失败：${error.message}` });
+			}
+		}
+	};
 	/** 分镜·导演级：骨架 → 分镜表（镜头级）。 */
 	const storyboardTableRoute = {
 		kind: "exact",
@@ -7825,6 +7897,7 @@ function makeRoutes(deps) {
 		manhuaPlansRoute,
 		styleImageRoute,
 		storyboardSkeletonRoute,
+		imageTestRoute,
 		storyboardTableRoute,
 		storyboardPromptsRoute,
 		breakdownRoute,
@@ -7933,6 +8006,14 @@ const Config = z.object({
 	autoReview: z.boolean().default(true),
 	autoAuthorReview: z.boolean().default(true),
 	autoReviewAfterRevise: z.boolean().default(true),
+	imageModels: z.array(z.object({
+		id: z.string().default(""),
+		name: z.string().default(""),
+		baseURL: z.string().default(""),
+		apiKey: z.string().default(""),
+		model: z.string().default(""),
+		enabled: z.boolean().default(false)
+	})).default([]),
 	imageApiKey: z.string().default(""),
 	imageApiModel: z.string().default(""),
 	imageApiEnabled: z.boolean().default(false)
@@ -7970,11 +8051,29 @@ function resolveConfig(value) {
 		autoReview: value?.autoReview ?? DEFAULT_AUTO_REVIEW,
 		autoAuthorReview: value?.autoAuthorReview ?? DEFAULT_AUTO_AUTHOR_REVIEW,
 		autoReviewAfterRevise: value?.autoReviewAfterRevise ?? DEFAULT_AUTO_REVIEW_AFTER_REVISE,
-		imageApiKey: value?.imageApiKey,
-		imageApiModel: value?.imageApiModel,
+		imageModels: value?.imageModels !== void 0 ? value.imageModels : value?.imageApiKey !== void 0 && value.imageApiKey !== "" ? [{
+			id: "img-legacy",
+			name: "豆包（旧配置）",
+			baseURL: DEFAULT_IMAGE_BASE,
+			apiKey: value.imageApiKey,
+			model: value.imageApiModel ?? "",
+			enabled: true
+		}] : [],
+		imageBaseUrl: (() => {
+			const active = (value?.imageModels ?? []).find((m) => m.enabled) ?? (value?.imageModels ?? [])[0];
+			return active?.baseURL !== void 0 && active.baseURL !== "" ? active.baseURL : value?.imageApiKey !== void 0 && value.imageApiKey !== "" ? DEFAULT_IMAGE_BASE : void 0;
+		})(),
+		imageApiKey: (() => {
+			return ((value?.imageModels ?? []).find((m) => m.enabled) ?? (value?.imageModels ?? [])[0])?.apiKey ?? value?.imageApiKey;
+		})(),
+		imageApiModel: (() => {
+			return ((value?.imageModels ?? []).find((m) => m.enabled) ?? (value?.imageModels ?? [])[0])?.model ?? value?.imageApiModel;
+		})(),
 		imageApiEnabled: value?.imageApiEnabled ?? false
 	};
 }
+/** 生图默认接口地址（豆包 ark，OpenAI 兼容）。 */
+const DEFAULT_IMAGE_BASE = "https://ark.cn-beijing.volces.com/api/v3";
 /**
 * Mount the routes and announcement.
 * @param ctx - host plugin context carrying webServer/llm/systemPrompt.