koishi-plugin-aka-ai-generator 0.3.8 → 0.4.0

package/lib/index.d.ts

@@ -53,7 +53,7 @@ export interface Config {
 export interface RechargeRecord {
     id: string;
     timestamp: string;
-    type: 'single' | 'batch';
+    type: 'single' | 'batch' | 'all';
     operator: {
         userId: string;
         userName: string;

package/lib/index.js

@@ -587,11 +587,31 @@ async function downloadImageAsBase643(ctx, url, timeout, logger) {
   }
 }
 __name(downloadImageAsBase643, "downloadImageAsBase64");
-function parseGeminiResponse(response) {
+function parseGeminiResponse(response, logger) {
   try {
     const images = [];
+    if (!response) {
+      logger?.error("Gemini API 响应为空");
+      return [];
+    }
+    if (response.error) {
+      logger?.error("Gemini API 返回错误", { error: response.error });
+      throw new Error(`Gemini API 错误: ${response.error.message || JSON.stringify(response.error)}`);
+    }
     if (response.candidates && response.candidates.length > 0) {
       for (const candidate of response.candidates) {
+        if (candidate.finishReason && candidate.finishReason !== "STOP") {
+          logger?.warn("Gemini 响应 finishReason 异常", {
+            finishReason: candidate.finishReason,
+            safetyRatings: candidate.safetyRatings
+          });
+          if (candidate.finishReason === "SAFETY" || candidate.finishReason === "RECITATION") {
+            throw new Error(`内容被阻止: ${candidate.finishReason}，可能包含不安全的内容`);
+          }
+          if (candidate.finishReason !== "MAX_TOKENS") {
+            logger?.warn("Gemini 响应可能不完整", { finishReason: candidate.finishReason });
+          }
+        }
         if (candidate.content && candidate.content.parts) {
           for (const part of candidate.content.parts) {
             if (part.inlineData && part.inlineData.data) {
@@ -599,21 +619,39 @@ function parseGeminiResponse(response) {
               const mimeType = part.inlineData.mimeType || "image/jpeg";
               const dataUrl = `data:${mimeType};base64,${base64Data}`;
               images.push(dataUrl);
+              logger?.debug("从响应中提取到图片 (inlineData)", { mimeType, dataLength: base64Data.length });
             } else if (part.inline_data && part.inline_data.data) {
               const base64Data = part.inline_data.data;
               const mimeType = part.inline_data.mime_type || "image/jpeg";
               const dataUrl = `data:${mimeType};base64,${base64Data}`;
               images.push(dataUrl);
+              logger?.debug("从响应中提取到图片 (inline_data)", { mimeType, dataLength: base64Data.length });
             } else if (part.fileData && part.fileData.fileUri) {
               images.push(part.fileData.fileUri);
+              logger?.debug("从响应中提取到图片 (fileData)", { fileUri: part.fileData.fileUri });
+            } else if (part.text) {
+              logger?.warn("响应中包含文本而非图片", { text: part.text.substring(0, 100) });
             }
           }
+        } else {
+          logger?.warn("候选响应中没有 content.parts", { candidate: JSON.stringify(candidate).substring(0, 200) });
         }
       }
+    } else {
+      logger?.warn("Gemini API 响应中没有 candidates", { response: JSON.stringify(response).substring(0, 500) });
+    }
+    if (images.length === 0) {
+      logger?.error("未能从 Gemini API 响应中提取到任何图片", {
+        hasCandidates: !!response.candidates,
+        candidatesCount: response.candidates?.length || 0,
+        responseKeys: Object.keys(response),
+        firstCandidate: response.candidates?.[0] ? JSON.stringify(response.candidates[0]).substring(0, 300) : null
+      });
     }
     return images;
   } catch (error) {
-    return [];
+    logger?.error("解析 Gemini 响应时出错", { error: error.message, stack: error.stack });
+    throw error;
   }
 }
 __name(parseGeminiResponse, "parseGeminiResponse");
@@ -626,12 +664,18 @@ var GeminiProvider = class {
     this.config = config;
   }
   async generateImages(prompt, imageUrls, numImages) {
-    const urls = Array.isArray(imageUrls) ? imageUrls : [imageUrls];
+    let urls = [];
+    if (Array.isArray(imageUrls)) {
+      urls = imageUrls.filter((url) => url && typeof url === "string" && url.trim());
+    } else if (imageUrls && typeof imageUrls === "string" && imageUrls.trim()) {
+      urls = [imageUrls];
+    }
     const logger = this.config.logger;
     const ctx = this.config.ctx;
-    logger.debug("开始下载图片并转换为Base64", { urls });
+    logger.debug("开始处理图片输入", { urls, promptLength: prompt.length, isTextToImage: urls.length === 0 });
     const imageParts = [];
     for (const url of urls) {
+      if (!url || !url.trim()) continue;
       const { data, mimeType } = await downloadImageAsBase643(
         ctx,
         url,
@@ -678,14 +722,24 @@ var GeminiProvider = class {
             timeout: this.config.apiTimeout * 1e3
           }
         );
-        const images = parseGeminiResponse(response);
+        const images = parseGeminiResponse(response, logger);
+        if (images.length === 0) {
+          logger.warn("Gemini API 调用成功但未解析到图片", {
+            current: i + 1,
+            total: numImages,
+            responseHasCandidates: !!response.candidates,
+            responseKeys: Object.keys(response)
+          });
+        } else {
+          logger.success("Gemini API 调用成功", { current: i + 1, total: numImages, imagesCount: images.length });
+        }
         allImages.push(...images);
-        logger.success("Gemini API 调用成功", { current: i + 1, total: numImages });
       } catch (error) {
         logger.error("Gemini API 调用失败", {
           message: error?.message || "未知错误",
           code: error?.code,
           status: error?.response?.status,
+          responseData: error?.response?.data ? JSON.stringify(error.response.data).substring(0, 500) : void 0,
           current: i + 1,
           total: numImages
         });
@@ -696,6 +750,10 @@ var GeminiProvider = class {
         throw new Error(`图像处理API调用失败: ${error?.message || "未知错误"}`);
       }
     }
+    if (allImages.length === 0) {
+      logger.error("所有 Gemini API 调用都未生成图片", { numImages });
+      throw new Error("未能从 Gemini API 生成图片，请检查 prompt 和模型配置");
+    }
     return allImages;
   }
 };
@@ -748,6 +806,7 @@ var COMMANDS = {
   PIXELATE: "变像素",
   QUERY_QUOTA: "图像额度",
   RECHARGE: "图像充值",
+  RECHARGE_ALL: "活动充值",
   RECHARGE_HISTORY: "图像充值记录",
   FUNCTION_LIST: "图像功能",
   IMAGE_COMMANDS: "图像指令"
@@ -979,6 +1038,7 @@ function apply(ctx, config) {
     // 管理员指令
     adminCommands: [
       { name: COMMANDS.RECHARGE, description: "为用户充值次数（仅管理员）" },
+      { name: COMMANDS.RECHARGE_ALL, description: "为所有用户充值次数（活动派发，仅管理员）" },
       { name: COMMANDS.RECHARGE_HISTORY, description: "查看充值历史记录（仅管理员）" }
     ]
   };
@@ -1622,102 +1682,19 @@ Prompt: ${prompt}`);
       return error.message === "命令执行超时" ? "图片合成超时，请重试" : `图片合成失败：${error.message}`;
     });
   });
-  ctx.command(`${COMMANDS.RECHARGE} [content:text]`, "为用户充值次数（仅管理员）").option("all", "-all 对所有使用过插件的用户充值").action(async ({ session, options }, content) => {
+  ctx.command(`${COMMANDS.RECHARGE} [content:text]`, "为用户充值次数（仅管理员）").action(async ({ session }, content) => {
     if (!session?.userId) return "会话无效";
     if (!isAdmin(session.userId)) {
       return "权限不足，仅管理员可操作";
     }
-    let useAll = options?.all;
-    let inputContent = content;
-    if (!useAll && inputContent) {
-      const contentStr = typeof inputContent === "string" ? inputContent : inputContent ? import_koishi.h.select(import_koishi.h.parse(inputContent), "text").map((e) => e.attrs.content).join(" ") : "";
-      if (contentStr && /-all\b/i.test(contentStr)) {
-        useAll = true;
-        inputContent = contentStr.replace(/-all\s*/gi, "").trim();
-      }
-    }
-    if (useAll) {
-      if (!inputContent || typeof inputContent === "string" && !inputContent.trim()) {
-        inputContent = await getPromptInput(session, "请输入充值次数 [备注]，例如：20 或 20 活动奖励");
-      }
-      if (!inputContent) return "输入超时或无效";
-      let text2 = "";
-      if (typeof inputContent === "string") {
-        text2 = inputContent.trim();
-      } else {
-        const elements2 = import_koishi.h.parse(inputContent);
-        const textElements2 = import_koishi.h.select(elements2, "text");
-        text2 = textElements2.map((el) => el.attrs.content).join(" ").trim();
-      }
-      const parts2 = text2.split(/\s+/).filter((p) => p);
-      if (parts2.length === 0) {
-        return "请输入充值次数，例如：图像充值 -all 20";
-      }
-      const amount2 = parseInt(parts2[0]);
-      const note2 = parts2.slice(1).join(" ") || "全员充值";
-      if (!amount2 || amount2 <= 0) {
-        return "充值次数必须大于0";
-      }
-      try {
-        const usersData = await loadUsersData();
-        const rechargeHistory = await loadRechargeHistory();
-        const now = (/* @__PURE__ */ new Date()).toISOString();
-        const recordId = `recharge_${now.replace(/[-:T.]/g, "").slice(0, 14)}_${Math.random().toString(36).substr(2, 3)}`;
-        const targets = [];
-        const allUserIds = Object.keys(usersData);
-        if (allUserIds.length === 0) {
-          return "当前没有使用过插件的用户";
-        }
-        for (const userId of allUserIds) {
-          if (!userId) continue;
-          const userData = usersData[userId];
-          const userName = userData.userName || userId;
-          const beforeBalance = userData.remainingPurchasedCount;
-          userData.purchasedCount += amount2;
-          userData.remainingPurchasedCount += amount2;
-          targets.push({
-            userId,
-            userName,
-            amount: amount2,
-            beforeBalance,
-            afterBalance: userData.remainingPurchasedCount
-          });
-        }
-        await saveUsersData(usersData);
-        const record = {
-          id: recordId,
-          timestamp: now,
-          type: "batch",
-          operator: {
-            userId: session.userId,
-            userName: session.username || session.userId
-          },
-          targets,
-          totalAmount: amount2 * allUserIds.length,
-          note: note2 || "全员充值",
-          metadata: { all: true }
-        };
-        rechargeHistory.records.push(record);
-        await saveRechargeHistory(rechargeHistory);
-        return `✅ 全员充值成功
-目标用户数：${allUserIds.length}人
-充值次数：${amount2}次/人
-总充值：${record.totalAmount}次
-操作员：${record.operator.userName}
-备注：${record.note}`;
-      } catch (error) {
-        logger.error("全员充值操作失败", error);
-        return "充值失败，请稍后重试";
-      }
-    }
-    const rechargeContent = content || await getPromptInput(session, "请输入充值信息，格式：\n@用户1 @用户2 充值次数 [备注]");
-    if (!rechargeContent) return "输入超时或无效";
-    const elements = import_koishi.h.parse(rechargeContent);
+    const inputContent = content || await getPromptInput(session, "请输入充值信息，格式：\n@用户1 @用户2 充值次数 [备注]");
+    if (!inputContent) return "输入超时或无效";
+    const elements = import_koishi.h.parse(inputContent);
     const atElements = import_koishi.h.select(elements, "at");
     const textElements = import_koishi.h.select(elements, "text");
     const text = textElements.map((el) => el.attrs.content).join(" ").trim();
     if (atElements.length === 0) {
-      return "未找到@用户，请使用@用户的方式，或使用 -all 参数进行全员充值";
+      return "未找到@用户，请使用@用户的方式";
     }
     const parts = text.split(/\s+/).filter((p) => p);
     if (parts.length === 0) {
@@ -1798,6 +1775,77 @@ Prompt: ${prompt}`);
       return "充值失败，请稍后重试";
     }
   });
+  ctx.command(`${COMMANDS.RECHARGE_ALL} [content:text]`, "为所有用户充值次数（活动派发，仅管理员）").action(async ({ session }, content) => {
+    if (!session?.userId) return "会话无效";
+    if (!isAdmin(session.userId)) {
+      return "权限不足，仅管理员可操作";
+    }
+    const inputContent = content || await getPromptInput(session, "请输入活动充值信息，格式：\n充值次数 [备注]\n例如：20 或 20 春节活动奖励");
+    if (!inputContent) return "输入超时或无效";
+    const elements = import_koishi.h.parse(inputContent);
+    const textElements = import_koishi.h.select(elements, "text");
+    const text = textElements.map((el) => el.attrs.content).join(" ").trim();
+    const parts = text.split(/\s+/).filter((p) => p);
+    if (parts.length === 0) {
+      return "请输入充值次数，例如：图像活动充值 20 或 图像活动充值 20 活动名称";
+    }
+    const amount = parseInt(parts[0]);
+    const note = parts.slice(1).join(" ") || "活动充值";
+    if (!amount || amount <= 0) {
+      return "充值次数必须大于0";
+    }
+    try {
+      const usersData = await loadUsersData();
+      const rechargeHistory = await loadRechargeHistory();
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const recordId = `recharge_all_${now.replace(/[-:T.]/g, "").slice(0, 14)}_${Math.random().toString(36).substr(2, 3)}`;
+      const allUserIds = Object.keys(usersData).filter((userId) => userId && usersData[userId]);
+      if (allUserIds.length === 0) {
+        return "当前没有使用过插件的用户，无法进行活动充值";
+      }
+      const targets = [];
+      for (const userId of allUserIds) {
+        if (!userId) continue;
+        const userData = usersData[userId];
+        const userName = userData.userName || userId;
+        const beforeBalance = userData.remainingPurchasedCount;
+        userData.purchasedCount += amount;
+        userData.remainingPurchasedCount += amount;
+        targets.push({
+          userId,
+          userName,
+          amount,
+          beforeBalance,
+          afterBalance: userData.remainingPurchasedCount
+        });
+      }
+      await saveUsersData(usersData);
+      const record = {
+        id: recordId,
+        timestamp: now,
+        type: "all",
+        operator: {
+          userId: session.userId,
+          userName: session.username || session.userId
+        },
+        targets,
+        totalAmount: amount * allUserIds.length,
+        note: note || "活动充值",
+        metadata: { all: true }
+      };
+      rechargeHistory.records.push(record);
+      await saveRechargeHistory(rechargeHistory);
+      return `✅ 活动充值成功
+目标用户数：${allUserIds.length}人
+充值次数：${amount}次/人
+总充值：${record.totalAmount}次
+操作员：${record.operator.userName}
+备注：${record.note}`;
+    } catch (error) {
+      logger.error("活动充值操作失败", error);
+      return "活动充值失败，请稍后重试";
+    }
+  });
   ctx.command(`${COMMANDS.QUERY_QUOTA} [target:text]`, "查询用户额度信息").action(async ({ session }, target) => {
     if (!session?.userId) return "会话无效";
     const userIsAdmin = isAdmin(session.userId);

package/package.json

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