koishi-plugin-aka-ai-generator 0.6.11 → 0.6.13

package/lib/index.js

@@ -1538,7 +1538,7 @@ function apply(ctx, config) {
 充值剩余：${userData.remainingPurchasedCount}次`;
   }
   __name(buildStatsMessage, "buildStatsMessage");
-  async function recordUserUsage(session, commandName, numImages = 1) {
+  async function recordUserUsage(session, commandName, numImages = 1, sendStatsImmediately = true) {
     const userId = session.userId;
     const userName = session.username || session.userId || "未知用户";
     if (!userId) return;
@@ -1556,11 +1556,23 @@ function apply(ctx, config) {
       remainingPurchasedCount: userData.remainingPurchasedCount,
       isAdmin: userManager.isAdmin(userId, config)
     });
-    try {
-      const statsMessage = buildStatsMessage(userData, numImages, consumptionType, freeUsed, purchasedUsed, config);
-      await session.send(statsMessage);
-    } catch (error) {
-      logger.warn("发送统计信息失败", { userId, error: sanitizeError(error) });
+    if (sendStatsImmediately) {
+      try {
+        const statsMessage = buildStatsMessage(userData, numImages, consumptionType, freeUsed, purchasedUsed, config);
+        await session.send(statsMessage);
+      } catch (error) {
+        logger.warn("发送统计信息失败", { userId, error: sanitizeError(error) });
+      }
+    } else {
+      setImmediate(async () => {
+        try {
+          const statsMessage = buildStatsMessage(userData, numImages, consumptionType, freeUsed, purchasedUsed, config);
+          await session.send(statsMessage);
+          logger.debug("统计信息已异步发送", { userId, commandName });
+        } catch (error) {
+          logger.warn("异步发送统计信息失败", { userId, error: sanitizeError(error) });
+        }
+      });
     }
   }
   __name(recordUserUsage, "recordUserUsage");
@@ -1815,12 +1827,26 @@ ${infoParts.join("\n")}`;
           index,
           total
         });
+        logger.info("准备发送图片", { userId, index: index + 1, total, imageUrlLength: imageUrl?.length || 0 });
+        try {
+          await session.send(import_koishi2.h.image(imageUrl));
+          logger.info("流式处理：图片已发送", { index: index + 1, total, userId });
+        } catch (sendError) {
+          logger.error("发送图片失败", {
+            userId,
+            error: sanitizeError(sendError),
+            errorMessage: sendError?.message,
+            index: index + 1,
+            total
+          });
+          throw sendError;
+        }
         if (!creditDeducted && generatedImages.length > 0) {
           creditDeducted = true;
           logger.info("准备扣除积分", { userId, totalImages: total, currentIndex: index });
           try {
-            await recordUserUsage(session, styleName, total);
-            logger.info("流式处理：第一张图片生成，积分已扣除", {
+            await recordUserUsage(session, styleName, total, false);
+            logger.info("流式处理：积分已扣除", {
               userId,
               totalImages: total,
               currentIndex: index
@@ -1831,23 +1857,8 @@ ${infoParts.join("\n")}`;
               error: sanitizeError(creditError),
               totalImages: total
             });
-            throw creditError;
           }
         }
-        logger.info("准备发送图片", { userId, index: index + 1, total, imageUrlLength: imageUrl?.length || 0 });
-        try {
-          await session.send(import_koishi2.h.image(imageUrl));
-          logger.info("流式处理：图片已发送", { index: index + 1, total, userId });
-        } catch (sendError) {
-          logger.error("发送图片失败", {
-            userId,
-            error: sanitizeError(sendError),
-            errorMessage: sendError?.message,
-            index: index + 1,
-            total
-          });
-          throw sendError;
-        }
         if (total > 1 && index < total - 1) {
           logger.debug("多张图片，添加延时", { index, total });
           await new Promise((resolve) => setTimeout(resolve, 1e3));
@@ -1872,7 +1883,7 @@ ${infoParts.join("\n")}`;
         return "图像处理失败：未能生成图片";
       }
       if (!creditDeducted) {
-        await recordUserUsage(session, styleName, images.length);
+        await recordUserUsage(session, styleName, images.length, false);
         logger.warn("流式处理：积分在最后扣除（异常情况）", { userId, imagesCount: images.length });
       }
       await session.send("图像处理完成！");
@@ -2049,12 +2060,26 @@ Prompt: ${prompt}`);
               index,
               total
             });
+            logger.info("准备发送图片 (COMPOSE_IMAGE)", { userId, index: index + 1, total, imageUrlLength: imageUrl?.length || 0 });
+            try {
+              await session.send(import_koishi2.h.image(imageUrl));
+              logger.info("流式处理：图片已发送 (COMPOSE_IMAGE)", { index: index + 1, total, userId });
+            } catch (sendError) {
+              logger.error("发送图片失败 (COMPOSE_IMAGE)", {
+                userId,
+                error: sanitizeError(sendError),
+                errorMessage: sendError?.message,
+                index: index + 1,
+                total
+              });
+              throw sendError;
+            }
             if (!creditDeducted && generatedImages.length > 0) {
               creditDeducted = true;
               logger.info("准备扣除积分 (COMPOSE_IMAGE)", { userId, totalImages: total, currentIndex: index });
               try {
-                await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, total);
-                logger.info("流式处理：第一张图片生成，积分已扣除 (COMPOSE_IMAGE)", {
+                await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, total, false);
+                logger.info("流式处理：积分已扣除 (COMPOSE_IMAGE)", {
                   userId,
                   totalImages: total,
                   currentIndex: index
@@ -2065,23 +2090,8 @@ Prompt: ${prompt}`);
                   error: sanitizeError(creditError),
                   totalImages: total
                 });
-                throw creditError;
               }
             }
-            logger.info("准备发送图片 (COMPOSE_IMAGE)", { userId, index: index + 1, total, imageUrlLength: imageUrl?.length || 0 });
-            try {
-              await session.send(import_koishi2.h.image(imageUrl));
-              logger.info("流式处理：图片已发送 (COMPOSE_IMAGE)", { index: index + 1, total, userId });
-            } catch (sendError) {
-              logger.error("发送图片失败 (COMPOSE_IMAGE)", {
-                userId,
-                error: sanitizeError(sendError),
-                errorMessage: sendError?.message,
-                index: index + 1,
-                total
-              });
-              throw sendError;
-            }
             if (total > 1 && index < total - 1) {
               logger.debug("多张图片，添加延时 (COMPOSE_IMAGE)", { index, total });
               await new Promise((resolve) => setTimeout(resolve, 1e3));
@@ -2106,7 +2116,7 @@ Prompt: ${prompt}`);
             return "图片合成失败：未能生成图片";
           }
           if (!creditDeducted) {
-            await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
+            await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length, false);
             logger.warn("流式处理：积分在最后扣除（异常情况）", { userId, imagesCount: resultImages.length });
           }
           await session.send("图片合成完成！");

package/package.json

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