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

package/lib/index.js

@@ -39,18 +39,13 @@ async function downloadImageAsBase64(ctx, url, timeout, logger) {
     const buffer = Buffer.from(response);
     const base64 = buffer.toString("base64");
     let mimeType = "image/jpeg";
-    const contentType = response.headers?.["content-type"] || response.headers?.["Content-Type"];
-    if (contentType && contentType.startsWith("image/")) {
-      mimeType = contentType;
-    } else {
-      const urlLower = url.toLowerCase();
-      if (urlLower.endsWith(".png")) {
-        mimeType = "image/png";
-      } else if (urlLower.endsWith(".webp")) {
-        mimeType = "image/webp";
-      } else if (urlLower.endsWith(".gif")) {
-        mimeType = "image/gif";
-      }
+    const urlLower = url.toLowerCase();
+    if (urlLower.endsWith(".png")) {
+      mimeType = "image/png";
+    } else if (urlLower.endsWith(".webp")) {
+      mimeType = "image/webp";
+    } else if (urlLower.endsWith(".gif")) {
+      mimeType = "image/gif";
     }
     logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
     return { data: base64, mimeType };
@@ -184,18 +179,13 @@ async function downloadImageAsBase642(ctx, url, timeout, logger) {
     const buffer = Buffer.from(response);
     const base64 = buffer.toString("base64");
     let mimeType = "image/jpeg";
-    const contentType = response.headers?.["content-type"] || response.headers?.["Content-Type"];
-    if (contentType && contentType.startsWith("image/")) {
-      mimeType = contentType;
-    } else {
-      const urlLower = url.toLowerCase();
-      if (urlLower.endsWith(".png")) {
-        mimeType = "image/png";
-      } else if (urlLower.endsWith(".webp")) {
-        mimeType = "image/webp";
-      } else if (urlLower.endsWith(".gif")) {
-        mimeType = "image/gif";
-      }
+    const urlLower = url.toLowerCase();
+    if (urlLower.endsWith(".png")) {
+      mimeType = "image/png";
+    } else if (urlLower.endsWith(".webp")) {
+      mimeType = "image/webp";
+    } else if (urlLower.endsWith(".gif")) {
+      mimeType = "image/gif";
     }
     if (logger) {
       logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
@@ -404,13 +394,7 @@ var GptGodProvider = class {
     if (this.config.logLevel === "debug") {
       logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages });
     }
-    const contentParts = [
-      {
-        type: "text",
-        text: `${prompt}
-请生成 ${numImages} 张图片。`
-      }
-    ];
+    const imageParts = [];
     for (const url of urls) {
       const imagePart = await buildImageContentPart(
         ctx,
@@ -418,91 +402,91 @@ var GptGodProvider = class {
         this.config.apiTimeout,
         logger
       );
-      contentParts.push(imagePart);
-    }
-    const requestData = {
-      model: this.config.modelId,
-      stream: false,
-      n: numImages,
-      // 使用 n 参数指定生成数量
-      messages: [
+      imageParts.push(imagePart);
+    }
+    const allImages = [];
+    for (let i = 0; i < numImages; i++) {
+      const contentParts = [
         {
-          role: "user",
-          content: contentParts
-        }
-      ]
-    };
-    const maxRetries = 3;
-    let lastError = null;
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        const requestBodySize = JSON.stringify(requestData).length;
-        if (this.config.logLevel === "debug") {
-          logger.debug(`GPTGod API 请求 (尝试 ${attempt}/${maxRetries})`, {
-            requestBodySize: `${(requestBodySize / 1024).toFixed(2)} KB`,
-            imageCount: urls.length
-          });
-        }
-        const response = await ctx.http.post(
-          GPTGOD_DEFAULT_API_URL,
-          requestData,
+          type: "text",
+          text: prompt
+        },
+        ...imageParts
+      ];
+      const requestData = {
+        model: this.config.modelId,
+        stream: false,
+        messages: [
           {
-            headers: {
-              "Content-Type": "application/json",
-              "Authorization": `Bearer ${this.config.apiKey}`
-            },
-            timeout: this.config.apiTimeout * 1e3
-          }
-        );
-        logger.success("GPTGod 图像编辑 API 调用成功");
-        if (response?.choices?.length > 0) {
-          const firstChoice = response.choices[0];
-          const messageContent = firstChoice.message?.content;
-          let errorMessage = "";
-          if (typeof messageContent === "string") {
-            errorMessage = messageContent;
-          } else if (Array.isArray(messageContent)) {
-            const textParts = messageContent.filter((part) => part?.type === "text" && part?.text).map((part) => part.text).join(" ");
-            errorMessage = textParts;
-          } else if (messageContent?.text) {
-            errorMessage = messageContent.text;
+            role: "user",
+            content: contentParts
           }
-          if (errorMessage && (errorMessage.includes("PROHIBITED_CONTENT") || errorMessage.includes("blocked by Google Gemini") || errorMessage.includes("prohibited under official usage policies") || errorMessage.toLowerCase().includes("content is prohibited"))) {
-            logger.error("内容被 Google Gemini 政策拦截", {
-              errorMessage: errorMessage.substring(0, 200),
-              finishReason: firstChoice.finish_reason
+        ]
+      };
+      logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages, current: i + 1 });
+      const maxRetries = 3;
+      let lastError = null;
+      let success = false;
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          const requestBodySize = JSON.stringify(requestData).length;
+          if (this.config.logLevel === "debug") {
+            logger.debug(`GPTGod API 请求 (尝试 ${attempt}/${maxRetries})`, {
+              requestBodySize: `${(requestBodySize / 1024).toFixed(2)} KB`,
+              imageCount: urls.length,
+              current: i + 1
             });
-            throw new Error("内容被安全策略拦截");
           }
-          if (errorMessage && (errorMessage.toLowerCase().includes("error") || errorMessage.toLowerCase().includes("failed") || errorMessage.toLowerCase().includes("blocked")) && !errorMessage.match(/https?:\/\//)) {
-            logger.error("API 返回错误消息", {
-              errorMessage: errorMessage.substring(0, 200),
-              finishReason: firstChoice.finish_reason
-            });
-            const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
-            throw new Error(`处理失败：${shortError}`);
+          const response = await ctx.http.post(
+            GPTGOD_DEFAULT_API_URL,
+            requestData,
+            {
+              headers: {
+                "Content-Type": "application/json",
+                "Authorization": `Bearer ${this.config.apiKey}`
+              },
+              timeout: this.config.apiTimeout * 1e3
+            }
+          );
+          if (response?.choices?.length > 0) {
+            const firstChoice = response.choices[0];
+            const messageContent = firstChoice.message?.content;
+            let errorMessage = "";
+            if (typeof messageContent === "string") {
+              errorMessage = messageContent;
+            } else if (Array.isArray(messageContent)) {
+              const textParts = messageContent.filter((part) => part?.type === "text" && part?.text).map((part) => part.text).join(" ");
+              errorMessage = textParts;
+            } else if (messageContent?.text) {
+              errorMessage = messageContent.text;
+            }
+            if (errorMessage && (errorMessage.includes("PROHIBITED_CONTENT") || errorMessage.includes("blocked by Google Gemini") || errorMessage.includes("prohibited under official usage policies") || errorMessage.toLowerCase().includes("content is prohibited"))) {
+              logger.error("内容被 Google Gemini 政策拦截", {
+                errorMessage: errorMessage.substring(0, 200),
+                finishReason: firstChoice.finish_reason
+              });
+              throw new Error("内容被安全策略拦截");
+            }
+            if (errorMessage && (errorMessage.toLowerCase().includes("error") || errorMessage.toLowerCase().includes("failed") || errorMessage.toLowerCase().includes("blocked")) && !errorMessage.match(/https?:\/\//)) {
+              logger.error("API 返回错误消息", {
+                errorMessage: errorMessage.substring(0, 200),
+                finishReason: firstChoice.finish_reason
+              });
+              const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
+              throw new Error(`处理失败：${shortError}`);
+            }
           }
-        }
-        if (this.config.logLevel === "debug") {
-          logger.debug("GPTGod API 响应结构", {
-            hasChoices: !!response?.choices,
-            choicesLength: response?.choices?.length,
-            hasImages: !!response?.images,
-            hasImage: !!response?.image,
-            responseKeys: Object.keys(response || {}),
-            firstChoiceContent: response?.choices?.[0]?.message?.content ? typeof response.choices[0].message.content === "string" ? response.choices[0].message.content.substring(0, 200) : JSON.stringify(response.choices[0].message.content).substring(0, 200) : "none"
-          });
-        }
-        const images = parseGptGodResponse(response, this.config.logLevel === "debug" ? logger : null);
-        if (images.length < numImages) {
-          const warnData = {
-            requested: numImages,
-            received: images.length
-          };
           if (this.config.logLevel === "debug") {
-            warnData.responsePreview = JSON.stringify(response).substring(0, 500);
+            logger.debug("GPTGod API 响应结构", {
+              hasChoices: !!response?.choices,
+              choicesLength: response?.choices?.length,
+              hasImages: !!response?.images,
+              hasImage: !!response?.image,
+              responseKeys: Object.keys(response || {}),
+              firstChoiceContent: response?.choices?.[0]?.message?.content ? typeof response.choices[0].message.content === "string" ? response.choices[0].message.content.substring(0, 200) : JSON.stringify(response.choices[0].message.content).substring(0, 200) : "none"
+            });
           }
-          logger.warn("生成的图片数量不足", warnData);
+          const images = parseGptGodResponse(response, this.config.logLevel === "debug" ? logger : null);
           if (images.length === 0 && response?.choices?.[0]?.message?.content) {
             const content = response.choices[0].message.content;
             const contentText = typeof content === "string" ? content : Array.isArray(content) ? content.map((p) => p?.text || "").join(" ") : "";
@@ -511,56 +495,69 @@ var GptGodProvider = class {
               throw new Error(`生成失败：${shortError}`);
             }
           }
-        }
-        return images;
-      } catch (error) {
-        lastError = error;
-        if (error?.message && (error.message.includes("内容被安全策略拦截") || error.message.includes("生成失败") || error.message.includes("处理失败"))) {
-          throw error;
-        }
-        const isRetryableError = error?.cause?.code === "UND_ERR_SOCKET" || // Socket 错误
-        error?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed") || error?.message?.includes("fetch failed") || error?.message?.includes("ECONNRESET") || error?.message?.includes("ETIMEDOUT") || error?.response?.status >= 500 && error?.response?.status < 600;
-        if (isRetryableError && attempt < maxRetries) {
-          const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 5e3);
-          logger.warn(`GPTGod API 调用失败，将在 ${delay}ms 后重试 (${attempt}/${maxRetries})`, {
-            error: error?.message || error?.cause?.message || "连接错误",
-            code: error?.code || error?.cause?.code
+          allImages.push(...images);
+          logger.success("GPTGod 图像编辑 API 调用成功", { current: i + 1, total: numImages });
+          success = true;
+          break;
+        } catch (error) {
+          lastError = error;
+          if (error?.message && (error.message.includes("内容被安全策略拦截") || error.message.includes("生成失败") || error.message.includes("处理失败"))) {
+            throw error;
+          }
+          const isRetryableError = error?.cause?.code === "UND_ERR_SOCKET" || // Socket 错误
+          error?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed") || error?.message?.includes("fetch failed") || error?.message?.includes("ECONNRESET") || error?.message?.includes("ETIMEDOUT") || error?.response?.status >= 500 && error?.response?.status < 600;
+          if (isRetryableError && attempt < maxRetries) {
+            const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 5e3);
+            logger.warn(`GPTGod API 调用失败，将在 ${delay}ms 后重试 (${attempt}/${maxRetries})`, {
+              error: error?.message || error?.cause?.message || "连接错误",
+              code: error?.code || error?.cause?.code,
+              current: i + 1
+            });
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            continue;
+          }
+          logger.error("GPTGod 图像编辑 API 调用失败", {
+            message: error?.message || "未知错误",
+            name: error?.name,
+            code: error?.code,
+            status: error?.response?.status,
+            statusText: error?.response?.statusText,
+            data: error?.response?.data,
+            stack: error?.stack,
+            cause: error?.cause,
+            attempt,
+            maxRetries,
+            current: i + 1,
+            total: numImages,
+            // 如果是 axios 错误，通常会有 config 和 request 信息
+            url: error?.config?.url,
+            method: error?.config?.method,
+            headers: error?.config?.headers
           });
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          continue;
-        }
-        logger.error("GPTGod 图像编辑 API 调用失败", {
-          message: error?.message || "未知错误",
-          name: error?.name,
-          code: error?.code,
-          status: error?.response?.status,
-          statusText: error?.response?.statusText,
-          data: error?.response?.data,
-          stack: error?.stack,
-          cause: error?.cause,
-          attempt,
-          maxRetries,
-          // 如果是 axios 错误，通常会有 config 和 request 信息
-          url: error?.config?.url,
-          method: error?.config?.method,
-          headers: error?.config?.headers
-        });
-        if (error?.cause?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed")) {
-          throw new Error("图像处理失败：服务器连接中断，可能是服务器负载过高或网络不稳定，请稍后重试");
-        }
-        if (error?.message?.includes("fetch") && error?.message?.includes(GPTGOD_DEFAULT_API_URL)) {
-          throw new Error("图像处理失败：无法连接 GPTGod API 服务器，请检查网络连接或稍后重试");
-        }
-        if (error?.response?.status === 413) {
-          throw new Error("图像处理失败：请求体过大，请尝试使用较小的图片");
+          if (error?.cause?.code === "UND_ERR_SOCKET" || error?.message?.includes("other side closed")) {
+            throw new Error("图像处理失败：服务器连接中断，可能是服务器负载过高或网络不稳定，请稍后重试");
+          }
+          if (error?.message?.includes("fetch") && error?.message?.includes(GPTGOD_DEFAULT_API_URL)) {
+            throw new Error("图像处理失败：无法连接 GPTGod API 服务器，请检查网络连接或稍后重试");
+          }
+          if (error?.response?.status === 413) {
+            throw new Error("图像处理失败：请求体过大，请尝试使用较小的图片");
+          }
+          if (error?.response?.status === 429) {
+            throw new Error("图像处理失败：请求过于频繁，请稍后重试");
+          }
+          throw new Error("图像处理API调用失败");
         }
-        if (error?.response?.status === 429) {
-          throw new Error("图像处理失败：请求过于频繁，请稍后重试");
+      }
+      if (!success) {
+        if (allImages.length > 0) {
+          logger.warn("部分图片生成失败，返回已生成的图片", { generated: allImages.length, requested: numImages });
+          break;
         }
-        throw new Error("图像处理API调用失败");
+        throw lastError;
       }
     }
-    throw lastError;
+    return allImages;
   }
 };
 
@@ -886,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 };
     }
@@ -897,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) {
@@ -1005,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();
@@ -1013,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,
@@ -1024,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}
@@ -1060,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}次`);
@@ -1072,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)
     });
   }
@@ -1210,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);
@@ -1228,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) {
@@ -1253,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;
@@ -1283,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;
@@ -1353,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,
@@ -1375,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);
@@ -1398,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;
@@ -1458,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,
@@ -1481,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.10",
+  "version": "0.2.13",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [