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

package/lib/index.js

@@ -983,6 +983,36 @@ var UserManager = class {
     }
     return { allowed: true, isAdmin: false };
   }
+  // 原子性地检查并预留额度（防止并发绕过）
+  async checkAndReserveQuota(userId, userName, numImages, config) {
+    if (this.isAdmin(userId, config)) {
+      return { allowed: true, reservationId: "admin" };
+    }
+    const rateLimitCheck = this.checkRateLimit(userId, config);
+    if (!rateLimitCheck.allowed) {
+      return { ...rateLimitCheck };
+    }
+    this.updateRateLimit(userId);
+    return await this.dataLock.acquire(async () => {
+      const userData = await this.getUserData(userId, userName);
+      const today = (/* @__PURE__ */ new Date()).toDateString();
+      const lastReset = new Date(userData.lastDailyReset || userData.createdAt).toDateString();
+      let dailyCount = userData.dailyUsageCount;
+      if (today !== lastReset) {
+        dailyCount = 0;
+      }
+      const remainingToday = Math.max(0, config.dailyFreeLimit - dailyCount);
+      const totalAvailable = remainingToday + userData.remainingPurchasedCount;
+      if (totalAvailable < numImages) {
+        return {
+          allowed: false,
+          message: `生成 ${numImages} 张图片需要 ${numImages} 次可用次数，但您的可用次数不足（今日免费剩余：${remainingToday}次，充值剩余：${userData.remainingPurchasedCount}次，共${totalAvailable}次）`
+        };
+      }
+      const reservationId = `${userId}_${Date.now()}_${Math.random()}`;
+      return { allowed: true, reservationId };
+    });
+  }
   // 扣减额度并记录使用
   async consumeQuota(userId, userName, commandName, numImages, config) {
     return await this.dataLock.acquire(async () => {
@@ -1059,7 +1089,7 @@ var UserManager = class {
     if (blockCount >= config.securityBlockWarningThreshold && !hasWarning) {
       this.securityWarningMap.set(userId, true);
       shouldWarn = true;
-    } else if (hasWarning) {
+    } else if (blockCount > config.securityBlockWarningThreshold) {
       shouldDeduct = true;
     }
     return { shouldWarn, shouldDeduct, blockCount };
@@ -1318,34 +1348,36 @@ function apply(ctx, config) {
     return input || null;
   }
   __name(getPromptInput, "getPromptInput");
-  async function recordUserUsage(session, commandName, numImages = 1) {
-    const userId = session.userId;
-    const userName = session.username || session.userId || "未知用户";
-    if (!userId) return;
-    const { userData, consumptionType, freeUsed, purchasedUsed } = await userManager.consumeQuota(userId, userName, commandName, numImages, config);
-    if (userManager.isAdmin(userId, config)) {
-      await session.send(`📊 使用统计 [管理员]
+  function buildStatsMessage(userData, numImages, consumptionType, freeUsed, purchasedUsed, config2) {
+    if (userManager.isAdmin(userData.userId, config2)) {
+      return `📊 使用统计 [管理员]
 用户：${userData.userName}
 总调用次数：${userData.totalUsageCount}次
-状态：无限制使用`);
+状态：无限制使用`;
+    }
+    const remainingToday = Math.max(0, config2.dailyFreeLimit - userData.dailyUsageCount);
+    let consumptionText = "";
+    if (consumptionType === "mixed") {
+      consumptionText = `每日免费次数 -${freeUsed}，充值次数 -${purchasedUsed}`;
+    } else if (consumptionType === "free") {
+      consumptionText = `每日免费次数 -${freeUsed}`;
     } else {
-      const remainingToday = Math.max(0, config.dailyFreeLimit - userData.dailyUsageCount);
-      let consumptionText = "";
-      if (consumptionType === "mixed") {
-        consumptionText = `每日免费次数 -${freeUsed}，充值次数 -${purchasedUsed}`;
-      } else if (consumptionType === "free") {
-        consumptionText = `每日免费次数 -${freeUsed}`;
-      } else {
-        consumptionText = `充值次数 -${purchasedUsed}`;
-      }
-      await session.send(`📊 使用统计
+      consumptionText = `充值次数 -${purchasedUsed}`;
+    }
+    return `📊 使用统计
 用户：${userData.userName}
 本次生成：${numImages}张图片
 本次消费：${consumptionText}
 总调用次数：${userData.totalUsageCount}次
 今日剩余免费：${remainingToday}次
-充值剩余：${userData.remainingPurchasedCount}次`);
-    }
+充值剩余：${userData.remainingPurchasedCount}次`;
+  }
+  __name(buildStatsMessage, "buildStatsMessage");
+  async function recordUserUsage(session, commandName, numImages = 1) {
+    const userId = session.userId;
+    const userName = session.username || session.userId || "未知用户";
+    if (!userId) return;
+    const { userData, consumptionType, freeUsed, purchasedUsed } = await userManager.consumeQuota(userId, userName, commandName, numImages, config);
     logger.info("用户调用记录", {
       userId,
       userName: userData.userName,
@@ -1359,6 +1391,12 @@ 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) });
+    }
   }
   __name(recordUserUsage, "recordUserUsage");
   async function recordSecurityBlock(session, numImages = 1) {
@@ -1493,7 +1531,6 @@ function apply(ctx, config) {
         }, config.commandTimeout * 1e3)
       )
     ]).catch(async (error) => {
-      if (userId) userManager.endTask(userId);
       const sanitizedError = sanitizeError(error);
       logger.error("图像处理超时或失败", { userId, error: sanitizedError });
       if (error?.message !== "命令执行超时") {
@@ -1580,6 +1617,8 @@ ${infoParts.join("\n")}`;
       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;
@@ -1588,7 +1627,6 @@ ${infoParts.join("\n")}`;
           await new Promise((resolve) => setTimeout(resolve, 1e3));
         }
       }
-      await recordUserUsage(session, styleName, images.length);
     } finally {
       userManager.endTask(userId);
     }
@@ -1674,11 +1712,9 @@ ${infoParts.join("\n")}`;
     if (!userManager.startTask(userId)) {
       return "您有一个图像处理任务正在进行中，请等待完成";
     }
-    userManager.endTask(userId);
     let isTimeout = false;
     return Promise.race([
       (async () => {
-        if (!userManager.startTask(userId)) return "您有一个图像处理任务正在进行中";
         try {
           await session.send("多张图片+描述");
           const collectedImages = [];
@@ -1742,6 +1778,8 @@ Prompt: ${prompt}`);
           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;
@@ -1750,7 +1788,6 @@ Prompt: ${prompt}`);
               await new Promise((resolve) => setTimeout(resolve, 1e3));
             }
           }
-          await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
         } finally {
           userManager.endTask(userId);
         }
@@ -1762,7 +1799,6 @@ Prompt: ${prompt}`);
         }, config.commandTimeout * 1e3)
       )
     ]).catch(async (error) => {
-      if (userId) userManager.endTask(userId);
       const sanitizedError = sanitizeError(error);
       logger.error("图片合成超时或失败", { userId, error: sanitizedError });
       if (error?.message !== "命令执行超时") {

package/lib/services/UserManager.d.ts

@@ -74,6 +74,11 @@ export declare class UserManager {
         message?: string;
         isAdmin?: boolean;
     }>;
+    checkAndReserveQuota(userId: string, userName: string, numImages: number, config: Config): Promise<{
+        allowed: boolean;
+        message?: string;
+        reservationId?: string;
+    }>;
     consumeQuota(userId: string, userName: string, commandName: string, numImages: number, config: Config): Promise<{
         userData: UserData;
         consumptionType: 'free' | 'purchased' | 'mixed';

package/package.json

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