koishi-plugin-aka-ai-generator 0.6.9 → 0.6.10

package/lib/index.js

@@ -295,7 +295,7 @@ var GptGodProvider = class {
   constructor(config) {
     this.config = config;
   }
-  async generateImages(prompt, imageUrls, numImages) {
+  async generateImages(prompt, imageUrls, numImages, onImageGenerated) {
     const urls = Array.isArray(imageUrls) ? imageUrls : [imageUrls];
     const logger = this.config.logger;
     const ctx = this.config.ctx;
@@ -410,7 +410,18 @@ var GptGodProvider = class {
               throw new Error(`生成失败：${shortError}`);
             }
           }
-          allImages.push(...images);
+          for (let imgIdx = 0; imgIdx < images.length; imgIdx++) {
+            const imageUrl = images[imgIdx];
+            const currentIndex = allImages.length;
+            allImages.push(imageUrl);
+            if (onImageGenerated) {
+              try {
+                await onImageGenerated(imageUrl, currentIndex, numImages);
+              } catch (callbackError) {
+                logger.warn("图片生成回调函数执行失败", { error: sanitizeError(callbackError) });
+              }
+            }
+          }
           logger.success("GPTGod 图像编辑 API 调用成功", { current: i + 1, total: numImages });
           success = true;
           break;
@@ -609,7 +620,7 @@ var GeminiProvider = class {
   constructor(config) {
     this.config = config;
   }
-  async generateImages(prompt, imageUrls, numImages) {
+  async generateImages(prompt, imageUrls, numImages, onImageGenerated) {
     let urls = [];
     if (Array.isArray(imageUrls)) {
       urls = imageUrls.filter((url) => url && typeof url === "string" && url.trim());
@@ -682,8 +693,19 @@ var GeminiProvider = class {
           });
         } else {
           logger.success("Gemini API 调用成功", { current: i + 1, total: numImages, imagesCount: images.length });
+          for (let imgIdx = 0; imgIdx < images.length; imgIdx++) {
+            const imageUrl = images[imgIdx];
+            const currentIndex = allImages.length;
+            allImages.push(imageUrl);
+            if (onImageGenerated) {
+              try {
+                await onImageGenerated(imageUrl, currentIndex, numImages);
+              } catch (callbackError) {
+                logger.warn("图片生成回调函数执行失败", { error: sanitizeError(callbackError) });
+              }
+            }
+          }
         }
-        allImages.push(...images);
       } catch (error) {
         const sanitizedError = sanitizeError(error);
         const safeMessage = typeof error?.message === "string" ? sanitizeString(error.message) : "未知错误";
@@ -1505,7 +1527,7 @@ function apply(ctx, config) {
     return { images: collectedImages, text: collectedText };
   }
   __name(getInputData, "getInputData");
-  async function requestProviderImages(prompt, imageUrls, numImages, requestContext) {
+  async function requestProviderImages(prompt, imageUrls, numImages, requestContext, onImageGenerated) {
     const providerType = requestContext?.provider || config.provider;
     const targetModelId = requestContext?.modelId;
     const providerInstance = getProviderInstance(providerType, targetModelId);
@@ -1516,7 +1538,7 @@ function apply(ctx, config) {
         numImages
       });
     }
-    return await providerInstance.generateImages(prompt, imageUrls, numImages);
+    return await providerInstance.generateImages(prompt, imageUrls, numImages, onImageGenerated);
   }
   __name(requestProviderImages, "requestProviderImages");
   async function processImageWithTimeout(session, img, prompt, styleName, requestContext, displayInfo, mode = "single") {
@@ -1612,21 +1634,38 @@ ${infoParts.join("\n")}`;
       }
       statusMessage += "...";
       await session.send(statusMessage);
-      const images = await requestProviderImages(finalPrompt, imageUrls, imageCount, requestContext);
+      const generatedImages = [];
+      let creditDeducted = false;
+      const onImageGenerated = /* @__PURE__ */ __name(async (imageUrl, index, total) => {
+        if (checkTimeout && checkTimeout()) {
+          throw new Error("命令执行超时");
+        }
+        generatedImages.push(imageUrl);
+        if (!creditDeducted && generatedImages.length > 0) {
+          creditDeducted = true;
+          await recordUserUsage(session, styleName, total);
+          logger.info("流式处理：第一张图片生成，积分已扣除", {
+            userId,
+            totalImages: total,
+            currentIndex: index
+          });
+        }
+        await session.send(import_koishi2.h.image(imageUrl));
+        logger.debug("流式处理：图片已发送", { index: index + 1, total });
+        if (total > 1 && index < total - 1) {
+          await new Promise((resolve) => setTimeout(resolve, 1e3));
+        }
+      }, "onImageGenerated");
+      const images = await requestProviderImages(finalPrompt, imageUrls, imageCount, requestContext, onImageGenerated);
       if (checkTimeout && checkTimeout()) throw new Error("命令执行超时");
       if (images.length === 0) {
         return "图像处理失败：未能生成图片";
       }
-      await recordUserUsage(session, styleName, images.length);
-      if (checkTimeout && checkTimeout()) throw new Error("命令执行超时");
-      await session.send("图像处理完成！");
-      for (let i = 0; i < images.length; i++) {
-        if (checkTimeout && checkTimeout()) break;
-        await session.send(import_koishi2.h.image(images[i]));
-        if (images.length > 1 && i < images.length - 1) {
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
-        }
+      if (!creditDeducted) {
+        await recordUserUsage(session, styleName, images.length);
+        logger.warn("流式处理：积分在最后扣除（异常情况）", { userId, imagesCount: images.length });
       }
+      await session.send("图像处理完成！");
     } finally {
       userManager.endTask(userId);
     }
@@ -1648,7 +1687,8 @@ ${infoParts.join("\n")}`;
           }
           const userPromptText = userPromptParts.join(" - ");
           const numImages = options?.num || config.defaultNumImages;
-          const limitCheck = await userManager.checkDailyLimit(session.userId, config, numImages);
+          const userName = session.username || session.userId || "未知用户";
+          const limitCheck = await userManager.checkAndReserveQuota(session.userId, userName, numImages, config);
           if (!limitCheck.allowed) {
             return limitCheck.message;
           }
@@ -1684,7 +1724,8 @@ ${infoParts.join("\n")}`;
   ctx.command(`${COMMANDS.TXT_TO_IMG} [prompt:text]`, "根据文字描述生成图像").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }, prompt) => {
     if (!session?.userId) return "会话无效";
     const numImages = options?.num || config.defaultNumImages;
-    const limitCheck = await userManager.checkDailyLimit(session.userId, config, numImages);
+    const userName = session.username || session.userId || "未知用户";
+    const limitCheck = await userManager.checkAndReserveQuota(session.userId, userName, numImages, config);
     if (!limitCheck.allowed) {
       return limitCheck.message;
     }
@@ -1697,7 +1738,8 @@ ${infoParts.join("\n")}`;
     if (!session?.userId) return "会话无效";
     const numImages = options?.num || config.defaultNumImages;
     const mode = options?.multiple ? "multiple" : "single";
-    const limitCheck = await userManager.checkDailyLimit(session.userId, config, numImages);
+    const userName = session.username || session.userId || "未知用户";
+    const limitCheck = await userManager.checkAndReserveQuota(session.userId, userName, numImages, config);
     if (!limitCheck.allowed) {
       return limitCheck.message;
     }
@@ -1759,7 +1801,8 @@ ${infoParts.join("\n")}`;
           if (imageCount < 1 || imageCount > 4) {
             return "生成数量必须在 1-4 之间";
           }
-          const limitCheck = await userManager.checkDailyLimit(userId, config, imageCount);
+          const userName = session.username || userId || "未知用户";
+          const limitCheck = await userManager.checkAndReserveQuota(userId, userName, imageCount, config);
           if (!limitCheck.allowed) {
             return limitCheck.message;
           }
@@ -1773,21 +1816,38 @@ ${infoParts.join("\n")}`;
           });
           await session.send(`开始合成图（${collectedImages.length}张）...
 Prompt: ${prompt}`);
-          const resultImages = await requestProviderImages(prompt, collectedImages, imageCount);
+          const generatedImages = [];
+          let creditDeducted = false;
+          const onImageGenerated = /* @__PURE__ */ __name(async (imageUrl, index, total) => {
+            if (isTimeout) {
+              throw new Error("命令执行超时");
+            }
+            generatedImages.push(imageUrl);
+            if (!creditDeducted && generatedImages.length > 0) {
+              creditDeducted = true;
+              await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, total);
+              logger.info("流式处理：第一张图片生成，积分已扣除", {
+                userId,
+                totalImages: total,
+                currentIndex: index
+              });
+            }
+            await session.send(import_koishi2.h.image(imageUrl));
+            logger.debug("流式处理：图片已发送", { index: index + 1, total });
+            if (total > 1 && index < total - 1) {
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
+            }
+          }, "onImageGenerated");
+          const resultImages = await requestProviderImages(prompt, collectedImages, imageCount, void 0, onImageGenerated);
           if (isTimeout) throw new Error("命令执行超时");
           if (resultImages.length === 0) {
             return "图片合成失败：未能生成图片";
           }
-          await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
-          if (isTimeout) throw new Error("命令执行超时");
-          await session.send("图片合成完成！");
-          for (let i = 0; i < resultImages.length; i++) {
-            if (isTimeout) break;
-            await session.send(import_koishi2.h.image(resultImages[i]));
-            if (resultImages.length > 1 && i < resultImages.length - 1) {
-              await new Promise((resolve) => setTimeout(resolve, 1e3));
-            }
+          if (!creditDeducted) {
+            await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
+            logger.warn("流式处理：积分在最后扣除（异常情况）", { userId, imagesCount: resultImages.length });
           }
+          await session.send("图片合成完成！");
         } finally {
           userManager.endTask(userId);
         }

package/lib/providers/gemini.d.ts

@@ -7,5 +7,5 @@ export interface GeminiConfig extends ProviderConfig {
 export declare class GeminiProvider implements ImageProvider {
     private config;
     constructor(config: GeminiConfig);
-    generateImages(prompt: string, imageUrls: string | string[], numImages: number): Promise<string[]>;
+    generateImages(prompt: string, imageUrls: string | string[], numImages: number, onImageGenerated?: (imageUrl: string, index: number, total: number) => void | Promise<void>): Promise<string[]>;
 }

package/lib/providers/gptgod.d.ts

@@ -6,5 +6,5 @@ export interface GptGodConfig extends ProviderConfig {
 export declare class GptGodProvider implements ImageProvider {
     private config;
     constructor(config: GptGodConfig);
-    generateImages(prompt: string, imageUrls: string | string[], numImages: number): Promise<string[]>;
+    generateImages(prompt: string, imageUrls: string | string[], numImages: number, onImageGenerated?: (imageUrl: string, index: number, total: number) => void | Promise<void>): Promise<string[]>;
 }

package/lib/providers/types.d.ts

@@ -4,9 +4,10 @@ export interface ImageProvider {
      * @param prompt 提示词
      * @param imageUrls 输入图片 URL 数组
      * @param numImages 需要生成的图片数量
+     * @param onImageGenerated 可选的回调函数，每生成一张图片时调用（用于流式处理）
      * @returns 生成的图片 URL 数组（data: URL 或 http URL）
      */
-    generateImages(prompt: string, imageUrls: string | string[], numImages: number): Promise<string[]>;
+    generateImages(prompt: string, imageUrls: string | string[], numImages: number, onImageGenerated?: (imageUrl: string, index: number, total: number) => void | Promise<void>): Promise<string[]>;
 }
 export interface ProviderConfig {
     apiTimeout: number;

package/package.json

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