mcp-duojie-image 0.5.3 → 0.5.5

package/dist/provider.js

@@ -46,18 +46,57 @@ function mapSize(size) {
 function isOpenAIImageModel(model) {
     return model === "gpt-image-2";
 }
+function normalizeAspectRatio(aspectRatio) {
+    const normalized = aspectRatio?.trim().replace("：", ":").replace(/\s+/g, "");
+    const match = normalized?.match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
+    if (!match)
+        return undefined;
+    const width = Number(match[1]);
+    const height = Number(match[2]);
+    if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
+        return undefined;
+    }
+    return `${match[1]}:${match[2]}`;
+}
+function parseAspectRatio(aspectRatio) {
+    const normalized = normalizeAspectRatio(aspectRatio);
+    const match = normalized?.match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
+    if (!match)
+        return [1, 1];
+    return [Number(match[1]), Number(match[2])];
+}
+function mapOpenAI4KSize(aspectRatio) {
+    const [ratioWidth, ratioHeight] = parseAspectRatio(aspectRatio);
+    const maxPixels = 3840 * 2160;
+    const maxEdge = 3840;
+    let width = Math.floor(Math.sqrt((maxPixels * ratioWidth) / ratioHeight));
+    let height = Math.floor((width * ratioHeight) / ratioWidth);
+    if (width > maxEdge) {
+        width = maxEdge;
+        height = Math.floor((width * ratioHeight) / ratioWidth);
+    }
+    if (height > maxEdge) {
+        height = maxEdge;
+        width = Math.floor((height * ratioWidth) / ratioHeight);
+    }
+    width = Math.floor(width / 8) * 8;
+    height = Math.floor(height / 8) * 8;
+    return `${width}x${height}`;
+}
 function mapOpenAISize(size, aspectRatio) {
     const squareBySize = {
         "512px": "512x512",
         "1K": "1024x1024",
         "2K": "2048x2048",
-        "4K": "4096x4096",
     };
-    if (aspectRatio === "16:9" || aspectRatio === "3:2" || aspectRatio === "4:3") {
-        return size === "2K" ? "2048x1536" : size === "4K" ? "4096x3072" : "1536x1024";
+    if (size === "4K")
+        return mapOpenAI4KSize(aspectRatio);
+    const [ratioWidth, ratioHeight] = parseAspectRatio(aspectRatio);
+    if (ratioWidth > ratioHeight) {
+        return size === "2K" ? "2048x1536" : "1536x1024";
     }
-    if (aspectRatio === "9:16" || aspectRatio === "2:3" || aspectRatio === "3:4") {
-        return size === "2K" ? "1536x2048" : size === "4K" ? "3072x4096" : "1024x1536";
+    if (ratioHeight > ratioWidth) {
+        return size === "2K" ? "1536x2048" : "1024x1536";
     }
     return squareBySize[size] ?? "1024x1024";
 }
@@ -124,7 +163,8 @@ async function generateGeminiImage(config, opts) {
 async function generateOpenAIImage(config, opts) {
     const model = opts.model ?? config.model;
     const prompt = opts.negativePrompt ? `${opts.prompt}\n\nAvoid: ${opts.negativePrompt}` : opts.prompt;
-    const size = mapOpenAISize(opts.size ?? "1K", opts.aspectRatio);
+    const aspectRatio = normalizeAspectRatio(opts.aspectRatio);
+    const size = mapOpenAISize(opts.size ?? "1K", aspectRatio);
     const hasReferenceImages = Boolean(opts.referenceImages?.length);
     const url = `${config.baseUrl}${hasReferenceImages ? "/v1/images/edits" : "/v1/images/generations"}`;
     let body;
@@ -136,6 +176,9 @@ async function generateOpenAIImage(config, opts) {
         form.set("model", model);
         form.set("prompt", prompt);
         form.set("size", size);
+        if (aspectRatio) {
+            form.set("aspect_ratio", aspectRatio);
+        }
         for (const [index, imgPath] of opts.referenceImages.entries()) {
             const data = await resizeIfNeeded(imgPath);
             const bytes = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
@@ -145,7 +188,7 @@ async function generateOpenAIImage(config, opts) {
     }
     else {
         headers = { ...headers, "Content-Type": "application/json" };
-        body = JSON.stringify({ model, prompt, size });
+        body = JSON.stringify({ model, prompt, size, ...(aspectRatio ? { aspect_ratio: aspectRatio } : {}) });
     }
     const res = await fetchWithRetry(url, {
         method: "POST",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-duojie-image",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "MCP server for image generation via duojie.games",
   "type": "module",
   "main": "dist/index.js",