koishi-plugin-aka-ai-generator 0.6.1 → 0.6.5

package/lib/index.js

@@ -1182,13 +1182,16 @@ var Config = import_koishi2.Schema.intersect([
       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(),
+    // 所有字段都定义，但根据 provider 在运行时验证必填
+    yunwuApiKey: import_koishi2.Schema.string().description("云雾API密钥").role("secret").default(""),
     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 基础地址"),
+    geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").description("Gemini API 基础地址")
+  }),
+  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([
@@ -1239,6 +1242,15 @@ var Config = import_koishi2.Schema.intersect([
 ]);
 function apply(ctx, config) {
   const logger = ctx.logger("aka-ai-generator");
+  if (config.provider === "yunwu" && !config.yunwuApiKey) {
+    throw new Error('当选择"云雾 Gemini 服务"时，云雾API密钥为必填项');
+  }
+  if (config.provider === "gptgod" && !config.gptgodApiKey) {
+    throw new Error('当选择"GPTGod 服务"时，GPTGod API 密钥为必填项');
+  }
+  if (config.provider === "gemini" && !config.geminiApiKey) {
+    throw new Error('当选择"Google Gemini 原生"时，Gemini API 密钥为必填项');
+  }
   const userManager = new UserManager(ctx.baseDir, logger);
   function getProviderInstance(providerType, modelId) {
     return createImageProvider({
@@ -1514,13 +1526,18 @@ function apply(ctx, config) {
     if (!userManager.startTask(userId)) {
       return "您有一个图像处理任务正在进行中，请等待完成";
     }
+    let taskLockReleased = false;
     try {
       const imageCount = requestContext?.numImages || config.defaultNumImages;
       if (imageCount < 1 || imageCount > 4) {
+        userManager.endTask(userId);
+        taskLockReleased = true;
         return "生成数量必须在 1-4 之间";
       }
       const inputResult = await getInputData(session, img, mode);
       if ("error" in inputResult) {
+        userManager.endTask(userId);
+        taskLockReleased = true;
         return inputResult.error;
       }
       if (checkTimeout && checkTimeout()) throw new Error("命令执行超时");
@@ -1534,17 +1551,23 @@ function apply(ctx, config) {
         await session.send("请发送画面描述");
         const promptMsg = await session.prompt(3e4);
         if (!promptMsg) {
+          userManager.endTask(userId);
+          taskLockReleased = true;
           return "未检测到描述，操作已取消";
         }
         const elements = import_koishi2.h.parse(promptMsg);
         const images2 = import_koishi2.h.select(elements, "img");
         if (images2.length > 0) {
+          userManager.endTask(userId);
+          taskLockReleased = true;
           return "检测到图片，本功能仅支持文字输入";
         }
         const text = import_koishi2.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
         if (text) {
           finalPrompt = text;
         } else {
+          userManager.endTask(userId);
+          taskLockReleased = true;
           return "未检测到有效文字描述，操作已取消";
         }
       }
@@ -1578,26 +1601,41 @@ ${infoParts.join("\n")}`;
       const images = await requestProviderImages(finalPrompt, imageUrls, imageCount, requestContext);
       if (checkTimeout && checkTimeout()) throw new Error("命令执行超时");
       if (images.length === 0) {
+        userManager.endTask(userId);
+        taskLockReleased = true;
         return "图像处理失败：未能生成图片";
       }
       await recordUserUsage(session, styleName, images.length);
-      await session.send("图像处理完成！");
-      for (let i = 0; i < images.length; i++) {
-        if (checkTimeout && checkTimeout()) break;
+      const resultMessage = "图像处理完成！";
+      taskLockReleased = true;
+      setImmediate(async () => {
         try {
-          await Promise.race([
-            session.send(import_koishi2.h.image(images[i])),
-            new Promise((_, reject) => setTimeout(() => reject(new Error("SendTimeout")), 2e4))
-          ]);
+          await session.send(resultMessage);
+          for (let i = 0; i < images.length; i++) {
+            try {
+              await Promise.race([
+                session.send(import_koishi2.h.image(images[i])),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("SendTimeout")), 2e4))
+              ]);
+            } catch (err) {
+              logger.warn(`图片发送可能超时 (用户: ${userId}): ${err instanceof Error ? err.message : String(err)}`);
+            }
+            if (images.length > 1 && i < images.length - 1) {
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
+            }
+          }
         } catch (err) {
-          logger.warn(`图片发送可能超时 (用户: ${userId}): ${err instanceof Error ? err.message : String(err)}`);
-        }
-        if (images.length > 1 && i < images.length - 1) {
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
+          logger.error(`异步发送图片时出错 (用户: ${userId}):`, err);
+        } finally {
+          userManager.endTask(userId);
         }
+      });
+      return resultMessage;
+    } catch (error) {
+      if (!taskLockReleased) {
+        userManager.endTask(userId);
       }
-    } finally {
-      userManager.endTask(userId);
+      throw error;
     }
   }
   __name(processImage, "processImage");
@@ -1750,23 +1788,33 @@ Prompt: ${prompt}`);
             return "图片合成失败：未能生成图片";
           }
           await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
-          await session.send("图片合成完成！");
-          for (let i = 0; i < resultImages.length; i++) {
-            if (isTimeout) break;
+          const resultMessage = "图片合成完成！";
+          setImmediate(async () => {
             try {
-              await Promise.race([
-                session.send(import_koishi2.h.image(resultImages[i])),
-                new Promise((_, reject) => setTimeout(() => reject(new Error("SendTimeout")), 2e4))
-              ]);
+              await session.send(resultMessage);
+              for (let i = 0; i < resultImages.length; i++) {
+                try {
+                  await Promise.race([
+                    session.send(import_koishi2.h.image(resultImages[i])),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("SendTimeout")), 2e4))
+                  ]);
+                } catch (err) {
+                  logger.warn(`图片合成发送可能超时 (用户: ${userId}): ${err instanceof Error ? err.message : String(err)}`);
+                }
+                if (resultImages.length > 1 && i < resultImages.length - 1) {
+                  await new Promise((resolve) => setTimeout(resolve, 1e3));
+                }
+              }
             } catch (err) {
-              logger.warn(`图片合成发送可能超时 (用户: ${userId}): ${err instanceof Error ? err.message : String(err)}`);
-            }
-            if (resultImages.length > 1 && i < resultImages.length - 1) {
-              await new Promise((resolve) => setTimeout(resolve, 1e3));
+              logger.error(`异步发送合成图片时出错 (用户: ${userId}):`, err);
+            } finally {
+              userManager.endTask(userId);
             }
-          }
-        } finally {
+          });
+          return resultMessage;
+        } catch (error) {
           userManager.endTask(userId);
+          throw error;
         }
       })(),
       new Promise(

package/package.json

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