koishi-plugin-aka-ai-generator 0.6.12 → 0.6.15

package/lib/index.js

@@ -1056,8 +1056,12 @@ var UserManager = class {
   }
   // 批量更新用户数据 (用于充值)
   async updateUsersBatch(updates) {
+    await this.loadUsersData();
     await this.dataLock.acquire(async () => {
-      await this.loadUsersData();
+      if (!this.usersCache) {
+        this.logger.error("updateUsersBatch: usersCache 为空，这不应该发生");
+        this.usersCache = {};
+      }
       updates(this.usersCache);
       await this.saveUsersDataInternal();
     });
@@ -1158,20 +1162,26 @@ var UserManager = class {
       return { ...rateLimitCheck };
     }
     this.updateRateLimit(userId);
+    await this.loadUsersData();
+    const userData = await this.getUserData(userId, userName);
     return await this.dataLock.acquire(async () => {
-      const userData = await this.getUserData(userId, userName);
+      if (!this.usersCache) {
+        this.logger.error("checkAndReserveQuota: usersCache 为空，这不应该发生");
+        this.usersCache = {};
+      }
+      const cachedUserData = this.usersCache[userId] || userData;
       const today = (/* @__PURE__ */ new Date()).toDateString();
-      const lastReset = new Date(userData.lastDailyReset || userData.createdAt).toDateString();
-      let dailyCount = userData.dailyUsageCount;
+      const lastReset = new Date(cachedUserData.lastDailyReset || cachedUserData.createdAt).toDateString();
+      let dailyCount = cachedUserData.dailyUsageCount;
       if (today !== lastReset) {
         dailyCount = 0;
       }
       const remainingToday = Math.max(0, config.dailyFreeLimit - dailyCount);
-      const totalAvailable = remainingToday + userData.remainingPurchasedCount;
+      const totalAvailable = remainingToday + cachedUserData.remainingPurchasedCount;
       if (totalAvailable < numImages) {
         return {
           allowed: false,
-          message: `生成 ${numImages} 张图片需要 ${numImages} 次可用次数，但您的可用次数不足（今日免费剩余：${remainingToday}次，充值剩余：${userData.remainingPurchasedCount}次，共${totalAvailable}次）`
+          message: `生成 ${numImages} 张图片需要 ${numImages} 次可用次数，但您的可用次数不足（今日免费剩余：${remainingToday}次，充值剩余：${cachedUserData.remainingPurchasedCount}次，共${totalAvailable}次）`
         };
       }
       const reservationId = `${userId}_${Date.now()}_${Math.random()}`;
@@ -1180,8 +1190,12 @@ var UserManager = class {
   }
   // 扣减额度并记录使用
   async consumeQuota(userId, userName, commandName, numImages, config) {
+    await this.loadUsersData();
     return await this.dataLock.acquire(async () => {
-      await this.loadUsersData();
+      if (!this.usersCache) {
+        this.logger.error("consumeQuota: usersCache 为空，这不应该发生");
+        this.usersCache = {};
+      }
       let userData = this.usersCache[userId];
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const today = (/* @__PURE__ */ new Date()).toDateString();
@@ -1827,12 +1841,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, false);
-            logger.info("流式处理：第一张图片生成，积分已扣除", {
+            logger.info("流式处理：积分已扣除", {
               userId,
               totalImages: total,
               currentIndex: index
@@ -1843,23 +1871,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));
@@ -2061,12 +2074,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, false);
-                logger.info("流式处理：第一张图片生成，积分已扣除 (COMPOSE_IMAGE)", {
+                logger.info("流式处理：积分已扣除 (COMPOSE_IMAGE)", {
                   userId,
                   totalImages: total,
                   currentIndex: index
@@ -2077,23 +2104,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));

package/package.json

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