koishi-plugin-aka-ai-generator 0.2.10 → 0.2.12

package/lib/index.js

@@ -39,18 +39,13 @@ async function downloadImageAsBase64(ctx, url, timeout, logger) {
     const buffer = Buffer.from(response);
     const base64 = buffer.toString("base64");
     let mimeType = "image/jpeg";
-    const contentType = response.headers?.["content-type"] || response.headers?.["Content-Type"];
-    if (contentType && contentType.startsWith("image/")) {
-      mimeType = contentType;
-    } else {
-      const urlLower = url.toLowerCase();
-      if (urlLower.endsWith(".png")) {
-        mimeType = "image/png";
-      } else if (urlLower.endsWith(".webp")) {
-        mimeType = "image/webp";
-      } else if (urlLower.endsWith(".gif")) {
-        mimeType = "image/gif";
-      }
+    const urlLower = url.toLowerCase();
+    if (urlLower.endsWith(".png")) {
+      mimeType = "image/png";
+    } else if (urlLower.endsWith(".webp")) {
+      mimeType = "image/webp";
+    } else if (urlLower.endsWith(".gif")) {
+      mimeType = "image/gif";
     }
     logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
     return { data: base64, mimeType };
@@ -184,18 +179,13 @@ async function downloadImageAsBase642(ctx, url, timeout, logger) {
     const buffer = Buffer.from(response);
     const base64 = buffer.toString("base64");
     let mimeType = "image/jpeg";
-    const contentType = response.headers?.["content-type"] || response.headers?.["Content-Type"];
-    if (contentType && contentType.startsWith("image/")) {
-      mimeType = contentType;
-    } else {
-      const urlLower = url.toLowerCase();
-      if (urlLower.endsWith(".png")) {
-        mimeType = "image/png";
-      } else if (urlLower.endsWith(".webp")) {
-        mimeType = "image/webp";
-      } else if (urlLower.endsWith(".gif")) {
-        mimeType = "image/gif";
-      }
+    const urlLower = url.toLowerCase();
+    if (urlLower.endsWith(".png")) {
+      mimeType = "image/png";
+    } else if (urlLower.endsWith(".webp")) {
+      mimeType = "image/webp";
+    } else if (urlLower.endsWith(".gif")) {
+      mimeType = "image/gif";
     }
     if (logger) {
       logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
@@ -404,13 +394,7 @@ var GptGodProvider = class {
     if (this.config.logLevel === "debug") {
       logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages });
     }
-    const contentParts = [
-      {
-        type: "text",
-        text: `${prompt}
-请生成 ${numImages} 张图片。`
-      }
-    ];
+    const imageParts = [];
     for (const url of urls) {
       const imagePart = await buildImageContentPart(
         ctx,
@@ -418,91 +402,91 @@ var GptGodProvider = class {
         this.config.apiTimeout,
         logger
       );
-      contentParts.push(imagePart);
-    }
-    const requestData = {
-      model: this.config.modelId,
-      stream: false,
-      n: numImages,
-      // 使用 n 参数指定生成数量
-      messages: [
+      imageParts.push(imagePart);
+    }
+    const allImages = [];
+    for (let i = 0; i < numImages; i++) {
+      const contentParts = [
         {
-          role: "user",
-          content: contentParts
-        }
-      ]
-    };
-    const maxRetries = 3;
-    let lastError = null;
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        const requestBodySize = JSON.stringify(requestData).length;
-        if (this.config.logLevel === "debug") {
-          logger.debug(`GPTGod API 请求 (尝试 ${attempt}/${maxRetries})`, {
-            requestBodySize: `${(requestBodySize / 1024).toFixed(2)} KB`,
-            imageCount: urls.length
-          });
-        }
-        const response = await ctx.http.post(
-          GPTGOD_DEFAULT_API_URL,
-          requestData,
+          type: "text",
+          text: prompt
+        },
+        ...imageParts
+      ];
+      const requestData = {
+        model: this.config.modelId,
+        stream: false,
+        messages: [
           {
-            headers: {
-              "Content-Type": "application/json",
-              "Authorization": `Bearer ${this.config.apiKey}`
-            },
-            timeout: this.config.apiTimeout * 1e3
-          }
-        );
-        logger.success("GPTGod 图像编辑 API 调用成功");
-        if (response?.choices?.length > 0) {
-          const firstChoice = response.choices[0];
-          const messageContent = firstChoice.message?.content;
-          let errorMessage = "";
-          if (typeof messageContent === "string") {
-            errorMessage = messageContent;
-          } else if (Array.isArray(messageContent)) {
-            const textParts = messageContent.filter((part) => part?.type === "text" && part?.text).map((part) => part.text).join(" ");
-            errorMessage = textParts;
-          } else if (messageContent?.text) {
-            errorMessage = messageContent.text;
+            role: "user",
+            content: contentParts
           }
-          if (errorMessage && (errorMessage.includes("PROHIBITED_CONTENT") || errorMessage.includes("blocked by Google Gemini") || errorMessage.includes("prohibited under official usage policies") || errorMessage.toLowerCase().includes("content is prohibited"))) {
-            logger.error("内容被 Google Gemini 政策拦截", {
-              errorMessage: errorMessage.substring(0, 200),
-              finishReason: firstChoice.finish_reason
+        ]
+      };
+      logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages, current: i + 1 });
+      const maxRetries = 3;
+      let lastError = null;
+      let success = false;
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          const requestBodySize = JSON.stringify(requestData).length;
+          if (this.config.logLevel === "debug") {
+            logger.debug(`GPTGod API 请求 (尝试 ${attempt}/${maxRetries})`, {
+              requestBodySize: `${(requestBodySize / 1024).toFixed(2)} KB`,
+              imageCount: urls.length,
+              current: i + 1
             });
-            throw new Error("内容被安全策略拦截");
           }
-          if (errorMessage && (errorMessage.toLowerCase().includes("error") || errorMessage.toLowerCase().includes("failed") || errorMessage.toLowerCase().includes("blocked")) && !errorMessage.match(/https?:\/\//)) {
-            logger.error("API 返回错误消息", {
-              errorMessage: errorMessage.substring(0, 200),
-              finishReason: firstChoice.finish_reason
-            });
-            const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
-            throw new Error(`处理失败：${shortError}`);
+          const response = await ctx.http.post(
+            GPTGOD_DEFAULT_API_URL,
+            requestData,
+            {
+              headers: {
+                "Content-Type": "application/json",
+                "Authorization": `Bearer ${this.config.apiKey}`
+              },
+              timeout: this.config.apiTimeout * 1e3
+            }
+          );
+          if (response?.choices?.length > 0) {
+            const firstChoice = response.choices[0];
+            const messageContent = firstChoice.message?.content;
+            let errorMessage = "";
+            if (typeof messageContent === "string") {
+              errorMessage = messageContent;
+            } else if (Array.isArray(messageContent)) {
+              const textParts = messageContent.filter((part) => part?.type === "text" && part?.text).map((part) => part.text).join(" ");
+              errorMessage = textParts;
+            } else if (messageContent?.text) {
+              errorMessage = messageContent.text;
+            }
+            if (errorMessage && (errorMessage.includes("PROHIBITED_CONTENT") || errorMessage.includes("blocked by Google Gemini") || errorMessage.includes("prohibited under official usage policies") || errorMessage.toLowerCase().includes("content is prohibited"))) {
+              logger.error("内容被 Google Gemini 政策拦截", {
+                errorMessage: errorMessage.substring(0, 200),
+                finishReason: firstChoice.finish_reason
+              });
+              throw new Error("内容被安全策略拦截");
+            }
+            if (errorMessage && (errorMessage.toLowerCase().includes("error") || errorMessage.toLowerCase().includes("failed") || errorMessage.toLowerCase().includes("blocked")) && !errorMessage.match(/https?:\/\//)) {
+              logger.error("API 返回错误消息", {
+                errorMessage: errorMessage.substring(0, 200),
+                finishReason: firstChoice.finish_reason
+              });
+              const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
+              throw new Error(`处理失败：${shortError}`);
+            }
           }
-        }
-        if (this.config.logLevel === "debug") {
-          logger.debug("GPTGod API 响应结构", {
-            hasChoices: !!response?.choices,
-            choicesLength: response?.choices?.length,
-            hasImages: !!response?.images,
-            hasImage: !!response?.image,
-            responseKeys: Object.keys(response || {}),
-            firstChoiceContent: response?.choices?.[0]?.message?.content ? typeof response.choices[0].message.content === "string" ? response.choices[0].message.content.substring(0, 200) : JSON.stringify(response.choices[0].message.content).substring(0, 200) : "none"
-          });
-        }
-        const images = parseGptGodResponse(response, this.config.logLevel === "debug" ? logger : null);
-        if (images.length < numImages) {
-          const warnData = {
-            requested: numImages,
-            received: images.length
-          };
           if (this.config.logLevel === "debug") {
-            warnData.responsePreview = JSON.stringify(response).substring(0, 500);
+            logger.debug("GPTGod API 响应结构", {
+              hasChoices: !!response?.choices,
+              choicesLength: response?.choices?.length,
+              hasImages: !!response?.images,
+              hasImage: !!response?.image,
+              responseKeys: Object.keys(response || {}),
+              firstChoiceContent: response?.choices?.[0]?.message?.content ? typeof response.choices[0].message.content === "string" ? response.choices[0].message.content.substring(0, 200) : JSON.stringify(response.choices[0].message.content).substring(0, 200) : "none"
+            });
           }
-          logger.warn("生成的图片数量不足", warnData);
+          const images = parseGptGodResponse(response, this.config.logLevel === "debug" ? logger : null);
           if (images.length === 0 && response?.choices?.[0]?.message?.content) {
             const content = response.choices[0].message.content;
             const contentText = typeof content === "string" ? content : Array.isArray(content) ? content.map((p) => p?.text || "").join(" ") : "";
@@ -511,56 +495,69 @@ var GptGodProvider = class {
               throw new Error(`生成失败：${shortError}`);
             }
           }
-        }
-        return images;
-      } catch (error) {
-        lastError = error;
-        if (error?.message && (error.message.includes("内容被安全策略拦截") || error.message.includes("生成失败") || error.message.includes("处理失败"))) {
-          throw error;
-        }
-        const isRetryableError = error?.cause?.code === "UND_ERR_SOCKET" || // Socket 错误
-        error?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed") || error?.message?.includes("fetch failed") || error?.message?.includes("ECONNRESET") || error?.message?.includes("ETIMEDOUT") || error?.response?.status >= 500 && error?.response?.status < 600;
-        if (isRetryableError && attempt < maxRetries) {
-          const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 5e3);
-          logger.warn(`GPTGod API 调用失败，将在 ${delay}ms 后重试 (${attempt}/${maxRetries})`, {
-            error: error?.message || error?.cause?.message || "连接错误",
-            code: error?.code || error?.cause?.code
+          allImages.push(...images);
+          logger.success("GPTGod 图像编辑 API 调用成功", { current: i + 1, total: numImages });
+          success = true;
+          break;
+        } catch (error) {
+          lastError = error;
+          if (error?.message && (error.message.includes("内容被安全策略拦截") || error.message.includes("生成失败") || error.message.includes("处理失败"))) {
+            throw error;
+          }
+          const isRetryableError = error?.cause?.code === "UND_ERR_SOCKET" || // Socket 错误
+          error?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed") || error?.message?.includes("fetch failed") || error?.message?.includes("ECONNRESET") || error?.message?.includes("ETIMEDOUT") || error?.response?.status >= 500 && error?.response?.status < 600;
+          if (isRetryableError && attempt < maxRetries) {
+            const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 5e3);
+            logger.warn(`GPTGod API 调用失败，将在 ${delay}ms 后重试 (${attempt}/${maxRetries})`, {
+              error: error?.message || error?.cause?.message || "连接错误",
+              code: error?.code || error?.cause?.code,
+              current: i + 1
+            });
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            continue;
+          }
+          logger.error("GPTGod 图像编辑 API 调用失败", {
+            message: error?.message || "未知错误",
+            name: error?.name,
+            code: error?.code,
+            status: error?.response?.status,
+            statusText: error?.response?.statusText,
+            data: error?.response?.data,
+            stack: error?.stack,
+            cause: error?.cause,
+            attempt,
+            maxRetries,
+            current: i + 1,
+            total: numImages,
+            // 如果是 axios 错误，通常会有 config 和 request 信息
+            url: error?.config?.url,
+            method: error?.config?.method,
+            headers: error?.config?.headers
           });
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          continue;
-        }
-        logger.error("GPTGod 图像编辑 API 调用失败", {
-          message: error?.message || "未知错误",
-          name: error?.name,
-          code: error?.code,
-          status: error?.response?.status,
-          statusText: error?.response?.statusText,
-          data: error?.response?.data,
-          stack: error?.stack,
-          cause: error?.cause,
-          attempt,
-          maxRetries,
-          // 如果是 axios 错误，通常会有 config 和 request 信息
-          url: error?.config?.url,
-          method: error?.config?.method,
-          headers: error?.config?.headers
-        });
-        if (error?.cause?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed")) {
-          throw new Error("图像处理失败：服务器连接中断，可能是服务器负载过高或网络不稳定，请稍后重试");
-        }
-        if (error?.message?.includes("fetch") && error?.message?.includes(GPTGOD_DEFAULT_API_URL)) {
-          throw new Error("图像处理失败：无法连接 GPTGod API 服务器，请检查网络连接或稍后重试");
-        }
-        if (error?.response?.status === 413) {
-          throw new Error("图像处理失败：请求体过大，请尝试使用较小的图片");
+          if (error?.cause?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed")) {
+            throw new Error("图像处理失败：服务器连接中断，可能是服务器负载过高或网络不稳定，请稍后重试");
+          }
+          if (error?.message?.includes("fetch") && error?.message?.includes(GPTGOD_DEFAULT_API_URL)) {
+            throw new Error("图像处理失败：无法连接 GPTGod API 服务器，请检查网络连接或稍后重试");
+          }
+          if (error?.response?.status === 413) {
+            throw new Error("图像处理失败：请求体过大，请尝试使用较小的图片");
+          }
+          if (error?.response?.status === 429) {
+            throw new Error("图像处理失败：请求过于频繁，请稍后重试");
+          }
+          throw new Error("图像处理API调用失败");
         }
-        if (error?.response?.status === 429) {
-          throw new Error("图像处理失败：请求过于频繁，请稍后重试");
+      }
+      if (!success) {
+        if (allImages.length > 0) {
+          logger.warn("部分图片生成失败，返回已生成的图片", { generated: allImages.length, requested: numImages });
+          break;
         }
-        throw new Error("图像处理API调用失败");
+        throw lastError;
       }
     }
-    throw lastError;
+    return allImages;
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [