@dsh-plus/image-studio 0.1.2 → 0.1.4

package/lib/index.d.ts

@@ -161,7 +161,7 @@ interface PresetsWire {
 //#endregion
 //#region src/service.d.ts
 declare class ImageStudioService extends Service {
-  static [Context.inject]: string[];
+  static inject: string[];
   private current;
   private readonly runner;
   private readonly log;

package/lib/index.js

@@ -1,5 +1,5 @@
 import z from "@deepseek-ai/schemastery";
-import { Context, Service } from "@deepseek-ai/cordis";
+import { Service } from "@deepseek-ai/cordis";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { request } from "node:http";
 import { request as request$1 } from "node:https";
@@ -339,9 +339,14 @@ function formField(name, value) {
 function formFileHead(name, index, file) {
 	return `--BOUNDARY\r\ncontent-disposition: form-data; name="${name}"; filename="${name}-${index}.${file.mime.split("/")[1] ?? "png"}"\r\ncontent-type: ${file.mime}\r\n\r\n`;
 }
-/** 构造 generations JSON 请求体（纯函数；params 已由 spec 层裁剪）。 */
+/**
+* 构造 generations JSON 请求体（纯函数；params 已由 spec 层裁剪）。
+* model 是请求基础（target 承载，spec 层剥离），必须由本适配器拼回请求体：
+* 缺省时上游（one-api 系）会落到默认模型 dall-e → 503 model_not_found。
+*/
 function buildGenerationBody(request) {
 	return JSON.stringify({
+		model: request.target.model,
 		prompt: request.prompt,
 		n: request.n,
 		...request.params
@@ -351,6 +356,7 @@ function buildGenerationBody(request) {
 function buildEditBody(request) {
 	const chunks = [];
 	const pushText = (text) => chunks.push(Buffer.from(text, "utf8"));
+	pushText(formField("model", request.target.model));
 	pushText(formField("prompt", request.prompt));
 	pushText(formField("n", String(request.n)));
 	for (const [key, value] of Object.entries(request.params)) pushText(formField(key, String(value)));
@@ -438,7 +444,8 @@ async function parseImagesReply(bodyText, fallbackMime, proxy, timeoutMs, signal
 	try {
 		doc = JSON.parse(bodyText);
 	} catch {
-		throw new ProviderError(502, bodyText.slice(0, 500), "上游响应不是合法 JSON");
+		const hint = bodyText.trim().length === 0 ? "上游返回 200 空响应：请检查 baseUrl 是否包含 /v1" : "上游响应不是合法 JSON";
+		throw new ProviderError(502, bodyText.slice(0, 500), hint);
 	}
 	const images = [];
 	for (const item of doc.data ?? []) {
@@ -464,6 +471,18 @@ async function parseImagesReply(bodyText, fallbackMime, proxy, timeoutMs, signal
 		createdAt: typeof doc.created === "number" ? doc.created : null
 	};
 }
+/** 从上游错误响应提取可读摘要（JSON error.message / error 字符串 / 原始截断）。 */
+function upstreamErrorMessage(raw) {
+	const trimmed = raw.trim();
+	if (trimmed.length === 0) return "上游返回空响应";
+	try {
+		const doc = JSON.parse(trimmed);
+		if (typeof doc.error === "string" && doc.error.length > 0) return doc.error;
+		if (typeof doc.error?.message === "string" && doc.error.message.length > 0) return doc.error.message;
+		if (typeof doc.message === "string" && doc.message.length > 0) return doc.message;
+	} catch {}
+	return trimmed.slice(0, 300);
+}
 /** 适配器主入口：构造请求 → 执行 → 解析。 */
 async function generateViaOpenAIImages(request, signal) {
 	const { target } = request;
@@ -490,7 +509,10 @@ async function generateViaOpenAIImages(request, signal) {
 		timeoutMs: target.timeoutMs,
 		signal
 	});
-	if (reply.status !== 200) throw new ProviderError(reply.status, reply.body.toString("utf8").slice(0, 2e3));
+	if (reply.status !== 200) {
+		const raw = reply.body.toString("utf8").slice(0, 2e3);
+		throw new ProviderError(reply.status, raw, `上游返回 HTTP ${reply.status}：${upstreamErrorMessage(raw)}`);
+	}
 	return parseImagesReply(reply.body.toString("utf8"), fallbackMime, target.proxy, target.timeoutMs, signal);
 }
 //#endregion
@@ -996,18 +1018,9 @@ function defaultIdCounter() {
 }
 //#endregion
 //#region src/service.ts
-/**
-* image-studio 服务主体：
-* - settings installSection（三组预设 + 并发/超时/代理/画廊上限）；
-* - TaskRunner 并发生图：提交即排队，成功自动入画廊（元数据 + 图片落盘）；
-* - 提供商预设按 id 即时 resolve credentials（不缓存）；
-* - 端点：generate/tasks/gallery/images/credentials/providers（api.ts 注册）。
-* 红线：开发测试仅指向本地 mock，严禁真实调用产生费用。
-* @module image-studio/service
-*/
 /** 静态 schema 引用（installSection 用；避免循环 import config → service）。 */
 var ImageStudioService = class extends Service {
-	static [Context.inject] = ["credentials"];
+	static inject = ["credentials"];
 	current;
 	runner;
 	log;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/image-studio",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "dsh-plus service+ui plugin: 图像工作室——OpenAI Images 协议文生图/图生图，全参数开关化，双预设体系，并发生图任务与可二次编辑画廊",
   "type": "module",
   "main": "lib/index.js",
@@ -20,23 +20,23 @@
   ],
   "dependencies": {
     "https-proxy-agent": "^9.1.0",
-    "@dsh-plus/shared": "0.1.12"
+    "@dsh-plus/shared": "0.1.13"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "*",
-    "@deepseek-ai/dsh-credentials": "*",
-    "@deepseek-ai/dsh-host-webserver": "*",
-    "@deepseek-ai/dsh-settings": "*",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.5-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-alpha.1",
-    "@deepseek-ai/dsh-credentials": "0.1.5-alpha.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session": "0.1.5-alpha.1",
-    "@deepseek-ai/dsh-settings": "0.1.5-alpha.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-credentials": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-alpha.2",
     "@deepseek-ai/schemastery": "3.18.2",
     "@types/node": "26.4.0",
     "@types/react": "~18.3.31",

package/src/provider/openai-images.ts

@@ -54,9 +54,18 @@ function formFileHead(name: string, index: number, file: InputImage): string {
   )
 }
 
-/** 构造 generations JSON 请求体（纯函数；params 已由 spec 层裁剪）。 */
+/**
+ * 构造 generations JSON 请求体（纯函数；params 已由 spec 层裁剪）。
+ * model 是请求基础（target 承载，spec 层剥离），必须由本适配器拼回请求体：
+ * 缺省时上游（one-api 系）会落到默认模型 dall-e → 503 model_not_found。
+ */
 export function buildGenerationBody(request: NormalizedRequest): string {
-  return JSON.stringify({ prompt: request.prompt, n: request.n, ...request.params })
+  return JSON.stringify({
+    model: request.target.model,
+    prompt: request.prompt,
+    n: request.n,
+    ...request.params,
+  })
 }
 
 /** 构造 edits multipart 请求体（纯函数；image 官方上限 ≤16 张由边界校验）。 */
@@ -66,6 +75,7 @@ export function buildEditBody(request: NormalizedRequest): {
 } {
   const chunks: Buffer[] = []
   const pushText = (text: string): void => chunks.push(Buffer.from(text, 'utf8'))
+  pushText(formField('model', request.target.model))
   pushText(formField('prompt', request.prompt))
   pushText(formField('n', String(request.n)))
   for (const [key, value] of Object.entries(request.params)) {
@@ -199,7 +209,12 @@ async function parseImagesReply(
   try {
     doc = JSON.parse(bodyText) as ImagesReply
   } catch {
-    throw new ProviderError(502, bodyText.slice(0, 500), '上游响应不是合法 JSON')
+    // 空 body/非 JSON：多为网关对错误路径返回 200 空体（如 baseUrl 缺 /v1）。
+    const hint =
+      bodyText.trim().length === 0
+        ? '上游返回 200 空响应：请检查 baseUrl 是否包含 /v1'
+        : '上游响应不是合法 JSON'
+    throw new ProviderError(502, bodyText.slice(0, 500), hint)
   }
   const images: GeneratedImage[] = []
   for (const item of doc.data ?? []) {
@@ -221,6 +236,26 @@ async function parseImagesReply(
   return { images, createdAt: typeof doc.created === 'number' ? doc.created : null }
 }
 
+/** 从上游错误响应提取可读摘要（JSON error.message / error 字符串 / 原始截断）。 */
+function upstreamErrorMessage(raw: string): string {
+  const trimmed = raw.trim()
+  if (trimmed.length === 0) return '上游返回空响应'
+  try {
+    const doc = JSON.parse(trimmed) as {
+      error?: { message?: string } | string
+      message?: string
+    }
+    if (typeof doc.error === 'string' && doc.error.length > 0) return doc.error
+    if (typeof doc.error?.message === 'string' && doc.error.message.length > 0) {
+      return doc.error.message
+    }
+    if (typeof doc.message === 'string' && doc.message.length > 0) return doc.message
+  } catch {
+    // 非 JSON 响应（网关错误页等）：退回原始截断。
+  }
+  return trimmed.slice(0, 300)
+}
+
 /** 适配器主入口：构造请求 → 执行 → 解析。 */
 export async function generateViaOpenAIImages(
   request: NormalizedRequest,
@@ -254,7 +289,12 @@ export async function generateViaOpenAIImages(
           signal,
         })
   if (reply.status !== 200) {
-    throw new ProviderError(reply.status, reply.body.toString('utf8').slice(0, 2000))
+    const raw = reply.body.toString('utf8').slice(0, 2000)
+    throw new ProviderError(
+      reply.status,
+      raw,
+      `上游返回 HTTP ${reply.status}：${upstreamErrorMessage(raw)}`,
+    )
   }
   return parseImagesReply(
     reply.body.toString('utf8'),

package/src/service.ts

@@ -7,7 +7,8 @@
  * 红线：开发测试仅指向本地 mock，严禁真实调用产生费用。
  * @module image-studio/service
  */
-import { Context, type Context as ContextT, Service } from '@deepseek-ai/cordis'
+import type { Context as ContextT } from '@deepseek-ai/cordis'
+import { Service } from '@deepseek-ai/cordis'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import type {} from '@deepseek-ai/dsh-settings'
 import { registerImageStudioApi } from './api.ts'
@@ -66,7 +67,9 @@ interface TaskOutcome {
 }
 
 export class ImageStudioService extends Service {
-  static [Context.inject] = ['credentials']
+  // 普通 static inject：cordis 4.0.2 不存在 Context.inject 符号（computed key
+  // 会失效为 'undefined' 使声明无效）；credentials 时序由该声明保证。
+  static inject = ['credentials']
 
   private current: () => ImageStudioConfig
   private readonly runner: TaskRunner<TaskSnapshot>