koishi-plugin-aka-ai-generator 0.2.12 → 0.2.13

package/lib/index.js

@@ -883,7 +883,7 @@ function apply(ctx, config) {
     rateLimitMap.set(userId, userTimestamps);
   }
   __name(updateRateLimit, "updateRateLimit");
-  async function checkDailyLimit(userId) {
+  async function checkDailyLimit(userId, numImages = 1) {
     if (isAdmin(userId)) {
       return { allowed: true, isAdmin: true };
     }
@@ -894,25 +894,33 @@ function apply(ctx, config) {
     const usersData = await loadUsersData();
     const userData = usersData[userId];
     if (!userData) {
+      if (numImages > config.dailyFreeLimit) {
+        return {
+          allowed: false,
+          message: `生成 ${numImages} 张图片需要 ${numImages} 次可用次数，但您的可用次数不足（今日免费：${config.dailyFreeLimit}次，充值：0次）`,
+          isAdmin: false
+        };
+      }
       return { allowed: true, isAdmin: false };
     }
     const today = (/* @__PURE__ */ new Date()).toDateString();
     const lastReset = new Date(userData.lastDailyReset || userData.createdAt).toDateString();
+    let dailyCount = userData.dailyUsageCount;
     if (today !== lastReset) {
+      dailyCount = 0;
       userData.dailyUsageCount = 0;
       userData.lastDailyReset = (/* @__PURE__ */ new Date()).toISOString();
     }
-    if (userData.dailyUsageCount < config.dailyFreeLimit) {
-      return { allowed: true, isAdmin: false };
-    }
-    if (userData.remainingPurchasedCount > 0) {
-      return { allowed: true, isAdmin: false };
+    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}次）`,
+        isAdmin: false
+      };
     }
-    return {
-      allowed: false,
-      message: `今日免费次数已用完（${config.dailyFreeLimit}次），充值次数也已用完。请联系管理员充值或明天再试`,
-      isAdmin: false
-    };
+    return { allowed: true, isAdmin: false };
   }
   __name(checkDailyLimit, "checkDailyLimit");
   async function getPromptInput(session, message) {
@@ -1002,7 +1010,7 @@ function apply(ctx, config) {
     return usersData[userId];
   }
   __name(getUserData, "getUserData");
-  async function updateUserData(userId, userName, commandName) {
+  async function updateUserData(userId, userName, commandName, numImages = 1) {
     const usersData = await loadUsersData();
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const today = (/* @__PURE__ */ new Date()).toDateString();
@@ -1010,8 +1018,8 @@ function apply(ctx, config) {
       usersData[userId] = {
         userId,
         userName: userId,
-        totalUsageCount: 1,
-        dailyUsageCount: 1,
+        totalUsageCount: numImages,
+        dailyUsageCount: numImages,
         lastDailyReset: now,
         purchasedCount: 0,
         remainingPurchasedCount: 0,
@@ -1021,35 +1029,49 @@ function apply(ctx, config) {
         createdAt: now
       };
       await saveUsersData(usersData);
-      return { userData: usersData[userId], consumptionType: "free" };
+      return { userData: usersData[userId], consumptionType: "free", freeUsed: numImages, purchasedUsed: 0 };
     }
-    usersData[userId].totalUsageCount += 1;
+    usersData[userId].totalUsageCount += numImages;
     usersData[userId].lastUsed = now;
     const lastReset = new Date(usersData[userId].lastDailyReset || usersData[userId].createdAt).toDateString();
     if (today !== lastReset) {
       usersData[userId].dailyUsageCount = 0;
       usersData[userId].lastDailyReset = now;
     }
-    if (usersData[userId].dailyUsageCount < config.dailyFreeLimit) {
-      usersData[userId].dailyUsageCount += 1;
-      await saveUsersData(usersData);
-      return { userData: usersData[userId], consumptionType: "free" };
-    }
-    if (usersData[userId].remainingPurchasedCount > 0) {
-      usersData[userId].remainingPurchasedCount -= 1;
-      await saveUsersData(usersData);
-      return { userData: usersData[userId], consumptionType: "purchased" };
+    let remainingToConsume = numImages;
+    let freeUsed = 0;
+    let purchasedUsed = 0;
+    const availableFree = Math.max(0, config.dailyFreeLimit - usersData[userId].dailyUsageCount);
+    if (availableFree > 0) {
+      const freeToUse = Math.min(availableFree, remainingToConsume);
+      usersData[userId].dailyUsageCount += freeToUse;
+      freeUsed = freeToUse;
+      remainingToConsume -= freeToUse;
+    }
+    if (remainingToConsume > 0) {
+      const purchasedToUse = Math.min(usersData[userId].remainingPurchasedCount, remainingToConsume);
+      usersData[userId].remainingPurchasedCount -= purchasedToUse;
+      purchasedUsed = purchasedToUse;
+      remainingToConsume -= purchasedToUse;
     }
     await saveUsersData(usersData);
-    return { userData: usersData[userId], consumptionType: "free" };
+    let consumptionType;
+    if (freeUsed > 0 && purchasedUsed > 0) {
+      consumptionType = "mixed";
+    } else if (freeUsed > 0) {
+      consumptionType = "free";
+    } else {
+      consumptionType = "purchased";
+    }
+    return { userData: usersData[userId], consumptionType, freeUsed, purchasedUsed };
   }
   __name(updateUserData, "updateUserData");
-  async function recordUserUsage(session, commandName) {
+  async function recordUserUsage(session, commandName, numImages = 1) {
     const userId = session.userId;
     const userName = session.username || session.userId || "未知用户";
     if (!userId) return;
     updateRateLimit(userId);
-    const { userData, consumptionType } = await updateUserData(userId, userName, commandName);
+    const { userData, consumptionType, freeUsed, purchasedUsed } = await updateUserData(userId, userName, commandName, numImages);
     if (isAdmin(userId)) {
       await session.send(`📊 使用统计 [管理员]
 用户：${userData.userName}
@@ -1057,10 +1079,18 @@ function apply(ctx, config) {
 状态：无限制使用`);
     } else {
       const remainingToday = Math.max(0, config.dailyFreeLimit - userData.dailyUsageCount);
-      const consumptionText = consumptionType === "free" ? "每日免费次数" : "充值次数";
+      let consumptionText = "";
+      if (consumptionType === "mixed") {
+        consumptionText = `每日免费次数 -${freeUsed}，充值次数 -${purchasedUsed}`;
+      } else if (consumptionType === "free") {
+        consumptionText = `每日免费次数 -${freeUsed}`;
+      } else {
+        consumptionText = `充值次数 -${purchasedUsed}`;
+      }
       await session.send(`📊 使用统计
 用户：${userData.userName}
-本次消费：${consumptionText} -1
+本次生成：${numImages}张图片
+本次消费：${consumptionText}
 总调用次数：${userData.totalUsageCount}次
 今日剩余免费：${remainingToday}次
 充值剩余：${userData.remainingPurchasedCount}次`);
@@ -1069,10 +1099,13 @@ function apply(ctx, config) {
       userId,
       userName: userData.userName,
       commandName,
+      numImages,
+      consumptionType,
+      freeUsed,
+      purchasedUsed,
       totalUsageCount: userData.totalUsageCount,
       dailyUsageCount: userData.dailyUsageCount,
       remainingPurchasedCount: userData.remainingPurchasedCount,
-      consumptionType,
       isAdmin: isAdmin(userId)
     });
   }
@@ -1207,7 +1240,7 @@ ${infoParts.join("\n")}`;
           await new Promise((resolve) => setTimeout(resolve, 1e3));
         }
       }
-      await recordUserUsage(session, styleName);
+      await recordUserUsage(session, styleName, images.length);
       activeTasks.delete(userId);
     } catch (error) {
       activeTasks.delete(userId);
@@ -1225,10 +1258,6 @@ ${infoParts.join("\n")}`;
         ctx.command(`${style.commandName} [img:text]`, "图像风格转换").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async (argv, img) => {
           const { session, options } = argv;
           if (!session?.userId) return "会话无效";
-          const limitCheck = await checkDailyLimit(session.userId);
-          if (!limitCheck.allowed) {
-            return limitCheck.message;
-          }
           const modifiers = parseStyleCommandModifiers(argv, img);
           let userPromptParts = [];
           if (modifiers.customAdditions?.length) {
@@ -1250,13 +1279,18 @@ ${infoParts.join("\n")}`;
               }
             }
           }
+          const numImages = options?.num || promptNumImages || config.defaultNumImages;
+          const limitCheck = await checkDailyLimit(session.userId, numImages);
+          if (!limitCheck.allowed) {
+            return limitCheck.message;
+          }
           const promptSegments = [style.prompt];
           if (cleanedUserPrompt) {
             promptSegments.push(cleanedUserPrompt);
           }
           const mergedPrompt = promptSegments.filter(Boolean).join(" - ");
           const requestContext = {
-            numImages: options?.num || promptNumImages
+            numImages
           };
           if (modifiers.modelMapping?.provider) {
             requestContext.provider = modifiers.modelMapping.provider;
@@ -1280,10 +1314,6 @@ ${infoParts.join("\n")}`;
   }
   ctx.command(COMMANDS.GENERATE_IMAGE, "使用自定义prompt进行图像处理").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }) => {
     if (!session?.userId) return "会话无效";
-    const limitCheck = await checkDailyLimit(session.userId);
-    if (!limitCheck.allowed) {
-      return limitCheck.message;
-    }
     return Promise.race([
       (async () => {
         const userId = session.userId;
@@ -1350,6 +1380,10 @@ ${infoParts.join("\n")}`;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
+        const limitCheck = await checkDailyLimit(userId, imageCount);
+        if (!limitCheck.allowed) {
+          return limitCheck.message;
+        }
         logger.info("开始自定义图像处理", {
           userId,
           imageUrl,
@@ -1372,7 +1406,7 @@ Prompt: ${prompt}`);
               await new Promise((resolve) => setTimeout(resolve, 1e3));
             }
           }
-          await recordUserUsage(session, COMMANDS.GENERATE_IMAGE);
+          await recordUserUsage(session, COMMANDS.GENERATE_IMAGE, resultImages.length);
           activeTasks.delete(userId);
         } catch (error) {
           activeTasks.delete(userId);
@@ -1395,10 +1429,6 @@ Prompt: ${prompt}`);
   });
   ctx.command(COMMANDS.COMPOSE_IMAGE, "合成多张图片，使用自定义prompt控制合成效果").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }) => {
     if (!session?.userId) return "会话无效";
-    const limitCheck = await checkDailyLimit(session.userId);
-    if (!limitCheck.allowed) {
-      return limitCheck.message;
-    }
     return Promise.race([
       (async () => {
         const userId = session.userId;
@@ -1455,6 +1485,10 @@ Prompt: ${prompt}`);
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
+        const limitCheck = await checkDailyLimit(userId, imageCount);
+        if (!limitCheck.allowed) {
+          return limitCheck.message;
+        }
         logger.info("开始图片合成处理", {
           userId,
           imageUrls: collectedImages,
@@ -1478,7 +1512,7 @@ Prompt: ${prompt}`);
               await new Promise((resolve) => setTimeout(resolve, 1e3));
             }
           }
-          await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE);
+          await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, resultImages.length);
           activeTasks.delete(userId);
         } catch (error) {
           activeTasks.delete(userId);

package/package.json

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