koishi-plugin-aka-ai-generator 0.2.5 → 0.2.7

package/lib/index.js

@@ -432,100 +432,135 @@ var GptGodProvider = class {
         }
       ]
     };
-    try {
-      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
+    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
+          });
         }
-      );
-      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;
+        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
+          }
+        );
+        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;
+          }
+          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 (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
+        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"
           });
-          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 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.warn("生成的图片数量不足", warnData);
+          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(" ") : "";
+            if (contentText && !contentText.match(/https?:\/\//)) {
+              const shortError = contentText.length > 50 ? contentText.substring(0, 50) + "..." : contentText;
+              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
           });
-          const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
-          throw new Error(`处理失败：${shortError}`);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          continue;
         }
-      }
-      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"
+        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
         });
-      }
-      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);
+        if (error?.cause?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed")) {
+          throw new Error("图像处理失败：服务器连接中断，可能是服务器负载过高或网络不稳定，请稍后重试");
         }
-        logger.warn("生成的图片数量不足", warnData);
-        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(" ") : "";
-          if (contentText && !contentText.match(/https?:\/\//)) {
-            const shortError = contentText.length > 50 ? contentText.substring(0, 50) + "..." : contentText;
-            throw new Error(`生成失败：${shortError}`);
-          }
+        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调用失败");
       }
-      return images;
-    } catch (error) {
-      if (error?.message && (error.message.includes("内容被安全策略拦截") || error.message.includes("生成失败") || error.message.includes("处理失败"))) {
-        throw error;
-      }
-      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,
-        // 如果是 axios 错误，通常会有 config 和 request 信息
-        url: error?.config?.url,
-        method: error?.config?.method,
-        headers: error?.config?.headers
-      });
-      if (error?.message?.includes("fetch") && error?.message?.includes(GPTGOD_DEFAULT_API_URL)) {
-        throw new Error("图像处理失败：无法连接 GPTGod API 服务器，请稍后重试");
-      }
-      throw new Error("图像处理API调用失败");
     }
+    throw lastError;
   }
 };
 
@@ -666,6 +701,35 @@ function apply(ctx, config) {
     return value?.replace(/^\-+/, "").trim().toLowerCase();
   }
   __name(normalizeSuffix, "normalizeSuffix");
+  function parseNumImagesFromPrompt(prompt) {
+    if (!prompt || typeof prompt !== "string") {
+      return { numImages: void 0, cleanedPrompt: prompt };
+    }
+    const patterns = [
+      /生成\s*([1-4])\s*张(?:图片)?/i,
+      /([1-4])\s*张(?:图片)?/,
+      /生成\s*([1-4])\s*个(?:图片)?/i,
+      /([1-4])\s*个(?:图片)?/,
+      /num[:\s]*([1-4])/i,
+      /数量[:\s]*([1-4])/i
+    ];
+    let numImages = void 0;
+    let cleanedPrompt = prompt;
+    for (const pattern of patterns) {
+      const match = prompt.match(pattern);
+      if (match) {
+        const num = parseInt(match[1], 10);
+        if (num >= 1 && num <= 4) {
+          numImages = num;
+          cleanedPrompt = prompt.replace(pattern, "").trim();
+          cleanedPrompt = cleanedPrompt.replace(/\s+/g, " ").replace(/[，,]\s*$/, "").trim();
+          break;
+        }
+      }
+    }
+    return { numImages, cleanedPrompt };
+  }
+  __name(parseNumImagesFromPrompt, "parseNumImagesFromPrompt");
   function buildModelMappingIndex(mappings) {
     const map = /* @__PURE__ */ new Map();
     if (!Array.isArray(mappings)) return map;
@@ -1149,16 +1213,33 @@ ${infoParts.join("\n")}`;
             return limitCheck.message;
           }
           const modifiers = parseStyleCommandModifiers(argv, img);
-          const promptSegments = [style.prompt];
+          let userPromptParts = [];
           if (modifiers.customAdditions?.length) {
-            promptSegments.push(...modifiers.customAdditions);
+            userPromptParts.push(...modifiers.customAdditions);
           }
           if (modifiers.customPromptSuffix) {
-            promptSegments.push(modifiers.customPromptSuffix);
+            userPromptParts.push(modifiers.customPromptSuffix);
+          }
+          const userPromptText = userPromptParts.join(" - ");
+          let promptNumImages = void 0;
+          let cleanedUserPrompt = userPromptText;
+          if (userPromptText) {
+            const parsed = parseNumImagesFromPrompt(userPromptText);
+            if (parsed.numImages) {
+              promptNumImages = parsed.numImages;
+              cleanedUserPrompt = parsed.cleanedPrompt;
+              if (config.logLevel === "debug") {
+                logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt: cleanedUserPrompt });
+              }
+            }
+          }
+          const promptSegments = [style.prompt];
+          if (cleanedUserPrompt) {
+            promptSegments.push(cleanedUserPrompt);
           }
           const mergedPrompt = promptSegments.filter(Boolean).join(" - ");
           const requestContext = {
-            numImages: options?.num
+            numImages: options?.num || promptNumImages
           };
           if (modifiers.modelMapping?.provider) {
             requestContext.provider = modifiers.modelMapping.provider;
@@ -1240,8 +1321,15 @@ ${infoParts.join("\n")}`;
         if (!prompt) {
           return "未检测到prompt描述，请重新发送";
         }
+        const { numImages: promptNumImages, cleanedPrompt } = parseNumImagesFromPrompt(prompt);
+        if (promptNumImages) {
+          prompt = cleanedPrompt;
+          if (config.logLevel === "debug") {
+            logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt });
+          }
+        }
         const imageUrl = collectedImages[0];
-        const imageCount = options?.num || config.defaultNumImages;
+        const imageCount = options?.num || promptNumImages || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
@@ -1339,7 +1427,14 @@ Prompt: ${prompt}`);
         if (!prompt) {
           return "未检测到prompt描述，请重新发送";
         }
-        const imageCount = options?.num || config.defaultNumImages;
+        const { numImages: promptNumImages, cleanedPrompt } = parseNumImagesFromPrompt(prompt);
+        if (promptNumImages) {
+          prompt = cleanedPrompt;
+          if (config.logLevel === "debug") {
+            logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt });
+          }
+        }
+        const imageCount = options?.num || promptNumImages || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }

package/package.json

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