koishi-plugin-aka-ai-generator 0.7.11 → 0.8.0

package/lib/index.js

@@ -51,7 +51,7 @@ function sanitizeError(error) {
     const sanitized = {};
     for (const key in error) {
       const lowerKey = key.toLowerCase();
-      if (lowerKey.includes("apikey") || lowerKey.includes("api_key") || lowerKey.includes("apikey") || lowerKey === "key" || lowerKey === "authorization" || lowerKey === "token" || lowerKey === "secret" || lowerKey === "password") {
+      if (lowerKey.includes("apikey") || lowerKey.includes("api_key") || lowerKey.includes("api-key") || lowerKey === "key" || lowerKey === "authorization" || lowerKey === "token" || lowerKey === "secret" || lowerKey === "password") {
         sanitized[key] = "[REDACTED]";
         continue;
       }
@@ -64,7 +64,7 @@ function sanitizeError(error) {
 __name(sanitizeError, "sanitizeError");
 function sanitizeString(str) {
   if (typeof str !== "string") return str;
-  return str.replace(/key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'key="[REDACTED]"').replace(/apikey["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'apikey="[REDACTED]"').replace(/api_key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'api_key="[REDACTED]"').replace(/authorization["\s:=]+(Bearer\s+)?([a-zA-Z0-9_-]{20,})/gi, 'authorization="[REDACTED]"').replace(/Bearer\s+([a-zA-Z0-9_-]{20,})/gi, "Bearer [REDACTED]");
+  return str.replace(/key["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'key="[REDACTED]"').replace(/apikey["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'apikey="[REDACTED]"').replace(/api_key["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'api_key="[REDACTED]"').replace(/api-key["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'api-key="[REDACTED]"').replace(/x-api-key["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'x-api-key="[REDACTED]"').replace(/authorization["'\s:=]+(Bearer\s+)?([a-zA-Z0-9_-]{10,})/gi, 'authorization="[REDACTED]"').replace(/Bearer\s+([a-zA-Z0-9_-]{10,})/gi, "Bearer [REDACTED]").replace(/([?&])key=([a-zA-Z0-9_-]{10,})/gi, "$1key=[REDACTED]").replace(/([?&])apikey=([a-zA-Z0-9_-]{10,})/gi, "$1apikey=[REDACTED]").replace(/([?&])api_key=([a-zA-Z0-9_-]{10,})/gi, "$1api_key=[REDACTED]").replace(/([?&])token=([a-zA-Z0-9_-]{10,})/gi, "$1token=[REDACTED]").replace(/([?&])access_token=([a-zA-Z0-9_-]{10,})/gi, "$1access_token=[REDACTED]").replace(/sk-[a-zA-Z0-9]{20,}/gi, "[REDACTED-SK]").replace(/AIza[a-zA-Z0-9_-]{30,}/gi, "[REDACTED-GAPI]").replace(/secret["'\s:=]+([a-zA-Z0-9_-]{10,})/gi, 'secret="[REDACTED]"').replace(/password["'\s:=]+([^\s"']{4,})/gi, 'password="[REDACTED]"');
 }
 __name(sanitizeString, "sanitizeString");
 async function downloadImageAsBase64(ctx, url, timeout, logger, maxSize = 10 * 1024 * 1024) {
@@ -105,15 +105,17 @@ async function downloadImageAsBase64(ctx, url, timeout, logger, maxSize = 10 * 1
     }
     if (mimeType === "image/gif") {
       try {
-        logger.debug("检测到 GIF 图片，正在转换为 JPEG", { url });
+        logger.debug("检测到 GIF 图片，正在转换为 PNG", { url });
         const image = await import_jimp.default.read(buffer);
-        const jpegBuffer = await image.getBufferAsync(import_jimp.default.MIME_JPEG);
-        const jpegBase64 = jpegBuffer.toString("base64");
-        logger.info("GIF 已转换为 JPEG", {
+        const pngBuffer = await image.getBufferAsync(import_jimp.default.MIME_PNG);
+        const pngBase64 = pngBuffer.toString("base64");
+        logger.info("GIF 已转换为 PNG", {
           originalSize: buffer.length,
-          newSize: jpegBuffer.length
+          newSize: pngBuffer.length,
+          width: image.getWidth(),
+          height: image.getHeight()
         });
-        return { data: jpegBase64, mimeType: "image/jpeg" };
+        return { data: pngBase64, mimeType: "image/png" };
       } catch (conversionError) {
         logger.warn("GIF 转换失败，尝试原样发送", { error: conversionError?.message });
       }
@@ -626,10 +628,21 @@ function parseGeminiResponse(response, logger) {
             safetyRatings: candidate.safetyRatings
           });
           if (candidate.finishReason === "SAFETY" || candidate.finishReason === "RECITATION") {
-            throw new Error(`内容被阻止: ${candidate.finishReason}，可能包含不安全的内容`);
+            let msg = `内容被阻止: ${candidate.finishReason}，可能包含不安全的内容`;
+            if (candidate.finishMessage) {
+              msg += ` (详细信息: ${candidate.finishMessage})`;
+            }
+            throw new Error(msg);
           }
-          if (candidate.finishReason !== "MAX_TOKENS") {
-            logger?.warn("Gemini 响应可能不完整", { finishReason: candidate.finishReason });
+          if (candidate.finishReason === "IMAGE_OTHER" || candidate.finishReason !== "MAX_TOKENS" && candidate.finishReason !== "STOP") {
+            let msg = `生成失败: ${candidate.finishReason}`;
+            if (candidate.finishMessage) {
+              msg += `，原因: ${candidate.finishMessage}`;
+            }
+            logger?.warn("Gemini 生成未完成", { finishReason: candidate.finishReason, finishMessage: candidate.finishMessage });
+            if (!candidate.content || !candidate.content.parts || candidate.content.parts.length === 0) {
+              throw new Error(msg);
+            }
           }
         }
         if (candidate.content && candidate.content.parts) {
@@ -793,7 +806,13 @@ var GeminiProvider = class {
         ],
         generationConfig: {
           responseModalities: ["IMAGE"]
-        }
+        },
+        safetySettings: [
+          { category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_NONE" },
+          { category: "HARM_CATEGORY_HATE_SPEECH", threshold: "BLOCK_NONE" },
+          { category: "HARM_CATEGORY_SEXUALLY_EXPLICIT", threshold: "BLOCK_NONE" },
+          { category: "HARM_CATEGORY_DANGEROUS_CONTENT", threshold: "BLOCK_NONE" }
+        ]
       };
       logger.debug("调用 Gemini API", { prompt, imageCount: urls.length, numImages, current: i + 1, endpoint });
       try {
@@ -1793,49 +1812,90 @@ var StyleItemSchema = import_koishi2.Schema.object({
   prompt: import_koishi2.Schema.string().role("textarea", { rows: 4 }).required().description("生成 prompt")
 });
 var Config = import_koishi2.Schema.intersect([
+  // ===== 1. 供应商选择 =====
   import_koishi2.Schema.object({
     provider: import_koishi2.Schema.union([
       import_koishi2.Schema.const("yunwu").description("云雾 Gemini 服务"),
       import_koishi2.Schema.const("gptgod").description("GPTGod 服务"),
       import_koishi2.Schema.const("gemini").description("Google Gemini 原生")
-    ]).default("yunwu").description("图像生成供应商"),
-    yunwuApiKey: import_koishi2.Schema.string().description("云雾API密钥").role("secret").required(),
-    yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").description("云雾图像生成模型ID"),
-    gptgodApiKey: import_koishi2.Schema.string().description("GPTGod API 密钥").role("secret").default(""),
-    gptgodModelId: import_koishi2.Schema.string().default("nano-banana").description("GPTGod 模型ID"),
-    geminiApiKey: import_koishi2.Schema.string().description("Gemini API 密钥").role("secret").default(""),
-    geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").description("Gemini 模型ID"),
-    geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").description("Gemini API 基础地址"),
-    modelMappings: import_koishi2.Schema.array(import_koishi2.Schema.object({
-      suffix: import_koishi2.Schema.string().required().description("指令后缀（例如 4K，对应输入 -4K）"),
-      provider: import_koishi2.Schema.union([
-        import_koishi2.Schema.const("yunwu").description("云雾 Gemini 服务"),
-        import_koishi2.Schema.const("gptgod").description("GPTGod 服务"),
-        import_koishi2.Schema.const("gemini").description("Google Gemini 原生")
-      ]).description("可选：覆盖供应商"),
-      modelId: import_koishi2.Schema.string().required().description("触发该后缀时使用的模型 ID")
-    })).role("table").default([]).description("根据 -后缀切换模型/供应商"),
+    ]).default("yunwu").description("图像生成供应商")
+  }).description("🎨 供应商选择"),
+  // ===== 2. 云雾 API 配置（条件显示） =====
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      provider: import_koishi2.Schema.const("yunwu").required(),
+      yunwuApiKey: import_koishi2.Schema.string().role("secret").required().description("云雾 API 密钥"),
+      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").description("云雾图像生成模型ID")
+    }),
+    import_koishi2.Schema.object({
+      yunwuApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").hidden()
+    })
+  ]),
+  // ===== 3. GPTGod API 配置（条件显示） =====
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      provider: import_koishi2.Schema.const("gptgod").required(),
+      gptgodApiKey: import_koishi2.Schema.string().role("secret").required().description("GPTGod API 密钥"),
+      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").description("GPTGod 模型ID")
+    }),
+    import_koishi2.Schema.object({
+      gptgodApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").hidden()
+    })
+  ]),
+  // ===== 4. Gemini API 配置（条件显示） =====
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      provider: import_koishi2.Schema.const("gemini").required(),
+      geminiApiKey: import_koishi2.Schema.string().role("secret").required().description("Gemini API 密钥"),
+      geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").description("Gemini 模型ID"),
+      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").description("Gemini API 基础地址")
+    }),
+    import_koishi2.Schema.object({
+      geminiApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").hidden(),
+      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").hidden()
+    })
+  ]),
+  // ===== 5. 通用设置 =====
+  import_koishi2.Schema.object({
     apiTimeout: import_koishi2.Schema.number().default(120).description("API请求超时时间（秒）"),
     commandTimeout: import_koishi2.Schema.number().default(180).description("命令执行总超时时间（秒）"),
-    // 默认设置
-    defaultNumImages: import_koishi2.Schema.number().default(1).min(1).max(4).description("默认生成图片数量"),
-    // 配额设置
+    defaultNumImages: import_koishi2.Schema.number().default(1).min(1).max(4).description("默认生成图片数量")
+  }).description("⚙️ 通用设置"),
+  // ===== 6. 限流与配额 =====
+  import_koishi2.Schema.object({
     dailyFreeLimit: import_koishi2.Schema.number().default(5).min(1).max(100).description("每日免费调用次数"),
-    // 限流设置
     rateLimitWindow: import_koishi2.Schema.number().default(300).min(60).max(3600).description("限流时间窗口（秒）"),
-    rateLimitMax: import_koishi2.Schema.number().default(3).min(1).max(20).description("限流窗口内最大调用次数"),
-    // 管理员设置
+    rateLimitMax: import_koishi2.Schema.number().default(3).min(1).max(20).description("限流窗口内最大调用次数")
+  }).description("🚦 限流与配额"),
+  // ===== 7. 管理员设置 =====
+  import_koishi2.Schema.object({
     adminUsers: import_koishi2.Schema.array(import_koishi2.Schema.string()).default([]).description("管理员用户ID列表（不受每日使用限制）"),
-    // 日志级别设置
     logLevel: import_koishi2.Schema.union([
       import_koishi2.Schema.const("info").description("普通信息"),
       import_koishi2.Schema.const("debug").description("完整的debug信息")
-    ]).default("info").description("日志输出详细程度"),
-    // 安全策略拦截设置
-    securityBlockWindow: import_koishi2.Schema.number().default(600).min(60).max(3600).description("安全策略拦截追踪时间窗口（秒），在此时间窗口内连续触发拦截会被记录"),
-    securityBlockWarningThreshold: import_koishi2.Schema.number().default(3).min(1).max(10).description("安全策略拦截警示阈值，连续触发此次数拦截后将发送警示消息，再次触发将被扣除积分")
-  }),
-  // 自定义风格命令配置
+    ]).default("info").description("日志输出详细程度")
+  }).description("👑 管理员设置"),
+  // ===== 8. 安全策略 =====
+  import_koishi2.Schema.object({
+    securityBlockWindow: import_koishi2.Schema.number().default(600).min(60).max(3600).description("安全策略拦截追踪时间窗口（秒）"),
+    securityBlockWarningThreshold: import_koishi2.Schema.number().default(3).min(1).max(10).description("安全策略拦截警示阈值，连续触发此次数后将发送警示")
+  }).description("🛡️ 安全策略"),
+  // ===== 9. 模型映射 =====
+  import_koishi2.Schema.object({
+    modelMappings: import_koishi2.Schema.array(import_koishi2.Schema.object({
+      suffix: import_koishi2.Schema.string().required().description("指令后缀（例如 4K，对应输入 -4K）"),
+      provider: import_koishi2.Schema.union([
+        import_koishi2.Schema.const("yunwu").description("云雾 Gemini 服务"),
+        import_koishi2.Schema.const("gptgod").description("GPTGod 服务"),
+        import_koishi2.Schema.const("gemini").description("Google Gemini 原生")
+      ]).description("可选：覆盖供应商"),
+      modelId: import_koishi2.Schema.string().required().description("触发该后缀时使用的模型 ID")
+    })).role("table").default([]).description("根据 -后缀切换模型/供应商")
+  }).description("🔀 模型映射"),
+  // ===== 10. 风格命令 =====
   import_koishi2.Schema.object({
     styles: import_koishi2.Schema.array(StyleItemSchema).role("table").default([
       {
@@ -1847,37 +1907,57 @@ var Config = import_koishi2.Schema.intersect([
         prompt: "请根据用户提供的图片，在严格保持主体身份、外观特征与姿态不变的前提下，生成一张照片级真实感的超写实摄影作品。要求：1. 采用专业相机拍摄（如佳能EOS R5），使用85mm f/1.4人像镜头，呈现柯达Portra 400胶片质感，8K超高清画质，HDR高动态范围，电影级打光效果；2. 画面应具有照片级真实感、超现实主义风格和高细节表现，确保光影、皮肤质感、服饰纹理与背景环境都贴近真实世界；3. 使用自然光影营造真实氛围，呈现raw and natural的原始自然感，具有authentic film snapshot的真实胶片质感；4. 整体需具备tactile feel触感质感和simulated texture模拟纹理细节，可以适度优化噪点与瑕疵，但不要改变主体特征或添加额外元素；5. 整体效果需像专业摄影棚拍摄的真实照片，具有电影级画质；6. 如果主体是人物脸部，脸部生成效果应参考欧美混血白人精致美丽帅气英俊的外观特征进行生成，保持精致立体的五官轮廓、健康光泽的肌肤质感、优雅的气质和自然的表情，确保面部特征协调美观。"
       }
     ]).description("自定义风格命令配置")
-  }),
+  }).description("🎭 风格命令"),
+  // ===== 11. 风格分组 =====
   import_koishi2.Schema.object({
     styleGroups: import_koishi2.Schema.dict(import_koishi2.Schema.object({
       prompts: import_koishi2.Schema.array(StyleItemSchema).role("table").default([]).description("属于该类型的 prompt 列表")
     })).role("table").default({}).description("按类型管理的 prompt 组，键名即为分组名称")
-  }),
-  // 视频生成配置（独立于图像生成配置）
+  }).description("📂 风格分组"),
+  // ===== 12. 视频生成（条件显示） =====
   import_koishi2.Schema.object({
-    enableVideoGeneration: import_koishi2.Schema.boolean().default(false).description("启用图生成视频功能（消耗较大，需谨慎开启）"),
-    videoProvider: import_koishi2.Schema.union([
-      import_koishi2.Schema.const("yunwu").description("云雾服务")
-    ]).default("yunwu").description("视频生成供应商（目前只支持云雾）"),
-    videoApiKey: import_koishi2.Schema.string().description("视频生成 API 密钥（独立于图像生成配置）").role("secret").default(""),
-    videoApiBase: import_koishi2.Schema.string().default("https://yunwu.ai").description("视频生成 API 地址"),
-    videoModelId: import_koishi2.Schema.string().default("sora-2").description("视频生成模型ID (sora-2 或 sora-2-pro)"),
-    videoMaxWaitTime: import_koishi2.Schema.number().default(300).min(60).max(600).description("视频生成最大等待时间（秒），超时后可异步查询"),
-    videoCreditsMultiplier: import_koishi2.Schema.number().default(5).min(1).max(20).description("视频生成积分倍数（相对于图片生成，默认5倍）"),
-    videoStyles: import_koishi2.Schema.array(import_koishi2.Schema.object({
-      commandName: import_koishi2.Schema.string().required().description("命令名称").role("table-cell", { width: 100 }),
-      prompt: import_koishi2.Schema.string().role("textarea", { rows: 2 }).required().description("视频描述 prompt"),
-      duration: import_koishi2.Schema.number().default(15).description("视频时长（秒，仅支持 15 或 25）"),
-      aspectRatio: import_koishi2.Schema.string().description("宽高比（如 16:9）")
-    })).role("table").default([
-      {
-        commandName: "变视频",
-        prompt: "将该图片生成一段符合产品展现的流畅视频",
-        duration: 15,
-        aspectRatio: "16:9"
-      }
-    ]).description("视频风格预设")
-  })
+    enableVideoGeneration: import_koishi2.Schema.boolean().default(false).description("启用图生成视频功能（消耗较大，需谨慎开启）")
+  }).description("🎬 视频生成"),
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      enableVideoGeneration: import_koishi2.Schema.const(true).required(),
+      videoProvider: import_koishi2.Schema.union([
+        import_koishi2.Schema.const("yunwu").description("云雾服务")
+      ]).default("yunwu").description("视频生成供应商（目前只支持云雾）"),
+      videoApiKey: import_koishi2.Schema.string().role("secret").default("").description("视频生成 API 密钥（独立于图像生成配置）"),
+      videoApiBase: import_koishi2.Schema.string().default("https://yunwu.ai").description("视频生成 API 地址"),
+      videoModelId: import_koishi2.Schema.string().default("sora-2").description("视频生成模型ID (sora-2 或 sora-2-pro)"),
+      videoMaxWaitTime: import_koishi2.Schema.number().default(300).min(60).max(600).description("视频生成最大等待时间（秒）"),
+      videoCreditsMultiplier: import_koishi2.Schema.number().default(5).min(1).max(20).description("视频生成积分倍数（相对于图片生成，默认5倍）"),
+      videoStyles: import_koishi2.Schema.array(import_koishi2.Schema.object({
+        commandName: import_koishi2.Schema.string().required().description("命令名称").role("table-cell", { width: 100 }),
+        prompt: import_koishi2.Schema.string().role("textarea", { rows: 2 }).required().description("视频描述 prompt"),
+        duration: import_koishi2.Schema.number().default(15).description("视频时长（秒，仅支持 15 或 25）"),
+        aspectRatio: import_koishi2.Schema.string().description("宽高比（如 16:9）")
+      })).role("table").default([
+        {
+          commandName: "变视频",
+          prompt: "将该图片生成一段符合产品展现的流畅视频",
+          duration: 15,
+          aspectRatio: "16:9"
+        }
+      ]).description("视频风格预设")
+    }),
+    import_koishi2.Schema.object({
+      videoProvider: import_koishi2.Schema.union([import_koishi2.Schema.const("yunwu")]).default("yunwu").hidden(),
+      videoApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      videoApiBase: import_koishi2.Schema.string().default("https://yunwu.ai").hidden(),
+      videoModelId: import_koishi2.Schema.string().default("sora-2").hidden(),
+      videoMaxWaitTime: import_koishi2.Schema.number().default(300).hidden(),
+      videoCreditsMultiplier: import_koishi2.Schema.number().default(5).hidden(),
+      videoStyles: import_koishi2.Schema.array(import_koishi2.Schema.object({
+        commandName: import_koishi2.Schema.string().required(),
+        prompt: import_koishi2.Schema.string().required(),
+        duration: import_koishi2.Schema.number().default(15),
+        aspectRatio: import_koishi2.Schema.string()
+      })).default([]).hidden()
+    })
+  ])
 ]);
 function apply(ctx, config) {
   const logger = ctx.logger("aka-ai-generator");

package/package.json

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