koishi-plugin-aka-ai-generator 0.5.0 → 0.5.2

package/lib/index.d.ts

@@ -25,8 +25,6 @@ export interface UserData {
     donationAmount: number;
     lastUsed: string;
     createdAt: string;
-    safetyBlockCount: number;
-    safetyBlockHistory: string[];
 }
 export interface UsersData {
     [userId: string]: UserData;
@@ -51,6 +49,8 @@ export interface Config {
     styles: StyleConfig[];
     styleGroups?: Record<string, StyleGroupConfig>;
     logLevel: 'info' | 'debug';
+    securityBlockWindow: number;
+    securityBlockWarningThreshold: number;
 }
 export interface RechargeRecord {
     id: string;

package/lib/index.js

@@ -771,8 +771,8 @@ var GeminiProvider = class {
         logger
       );
       imageParts.push({
-        inline_data: {
-          mime_type: mimeType,
+        inlineData: {
+          mimeType,
           data
         }
       });
@@ -792,7 +792,11 @@ var GeminiProvider = class {
           }
         ],
         generationConfig: {
-          responseModalities: ["IMAGE"]
+          responseModalities: ["IMAGE"],
+          imageConfig: {
+            aspectRatio: "16:9",
+            imageSize: "4K"
+          }
         }
       };
       logger.debug("调用 Gemini API", { prompt, imageCount: urls.length, numImages, current: i + 1, endpoint });
@@ -802,10 +806,8 @@ var GeminiProvider = class {
           requestData,
           {
             headers: {
-              "Content-Type": "application/json"
-            },
-            params: {
-              key: this.config.apiKey
+              "Content-Type": "application/json",
+              "x-goog-api-key": this.config.apiKey
             },
             timeout: this.config.apiTimeout * 1e3
           }
@@ -943,7 +945,10 @@ var Config = import_koishi.Schema.intersect([
     logLevel: import_koishi.Schema.union([
       import_koishi.Schema.const("info").description("普通信息"),
       import_koishi.Schema.const("debug").description("完整的debug信息")
-    ]).default("info").description("日志输出详细程度")
+    ]).default("info").description("日志输出详细程度"),
+    // 安全策略拦截设置
+    securityBlockWindow: import_koishi.Schema.number().default(600).min(60).max(3600).description("安全策略拦截追踪时间窗口（秒），在此时间窗口内连续触发拦截会被记录"),
+    securityBlockWarningThreshold: import_koishi.Schema.number().default(3).min(1).max(10).description("安全策略拦截警示阈值，连续触发此次数拦截后将发送警示消息，再次触发将被扣除积分")
   }),
   // 自定义风格命令配置
   import_koishi.Schema.object({
@@ -968,6 +973,8 @@ function apply(ctx, config) {
   const logger = ctx.logger("aka-ai-generator");
   const activeTasks = /* @__PURE__ */ new Map();
   const rateLimitMap = /* @__PURE__ */ new Map();
+  const securityBlockMap = /* @__PURE__ */ new Map();
+  const securityWarningMap = /* @__PURE__ */ new Map();
   const providerCache = /* @__PURE__ */ new Map();
   function getProviderInstance(providerType, modelId) {
     const cacheKey = `${providerType}:${modelId || "default"}`;
@@ -1207,46 +1214,6 @@ function apply(ctx, config) {
     return { allowed: true, isAdmin: false };
   }
   __name(checkDailyLimit, "checkDailyLimit");
-  function isSafetyBlockError(error) {
-    if (!error) return false;
-    const errorMessage = typeof error === "string" ? error : error?.message || "";
-    if (!errorMessage) return false;
-    const lowerMessage = errorMessage.toLowerCase();
-    const safetyKeywords = [
-      "安全策略",
-      "被阻止",
-      "被拦截",
-      "blocked",
-      "safety",
-      "prohibited",
-      "recitation",
-      "内容被阻止",
-      "内容被拦截",
-      "安全策略阻止",
-      "安全策略拦截"
-    ];
-    return safetyKeywords.some((keyword) => lowerMessage.includes(keyword.toLowerCase()));
-  }
-  __name(isSafetyBlockError, "isSafetyBlockError");
-  async function checkSafetyBlockLimit(userId) {
-    const usersData = await loadUsersData();
-    const userData = usersData[userId];
-    if (!userData || !userData.safetyBlockHistory || userData.safetyBlockHistory.length === 0) {
-      return { allowed: true };
-    }
-    const windowSize = 10;
-    const recentBlocks = userData.safetyBlockHistory.slice(-windowSize);
-    const blockRate = recentBlocks.length / windowSize;
-    const threshold = 0.5;
-    if (blockRate > threshold) {
-      return {
-        allowed: false,
-        message: `检测到您最近多次发送被安全策略拦截的内容（拦截率：${(blockRate * 100).toFixed(0)}%），请检查您的内容是否符合使用规范。如继续发送违规内容，可能会被进一步限制。`
-      };
-    }
-    return { allowed: true };
-  }
-  __name(checkSafetyBlockLimit, "checkSafetyBlockLimit");
   async function getPromptInput(session, message) {
     await session.send(message);
     const input = await session.prompt(3e4);
@@ -1326,24 +1293,15 @@ function apply(ctx, config) {
         donationCount: 0,
         donationAmount: 0,
         lastUsed: (/* @__PURE__ */ new Date()).toISOString(),
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        safetyBlockCount: 0,
-        safetyBlockHistory: []
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       await saveUsersData(usersData);
       logger.info("创建新用户数据", { userId, userName });
-    } else {
-      if (usersData[userId].safetyBlockCount === void 0) {
-        usersData[userId].safetyBlockCount = 0;
-      }
-      if (usersData[userId].safetyBlockHistory === void 0) {
-        usersData[userId].safetyBlockHistory = [];
-      }
     }
     return usersData[userId];
   }
   __name(getUserData, "getUserData");
-  async function updateUserData(userId, userName, commandName, numImages = 1, isSafetyBlock = false) {
+  async function updateUserData(userId, userName, commandName, numImages = 1) {
     const usersData = await loadUsersData();
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const today = (/* @__PURE__ */ new Date()).toDateString();
@@ -1359,19 +1317,11 @@ function apply(ctx, config) {
         donationCount: 0,
         donationAmount: 0,
         lastUsed: now,
-        createdAt: now,
-        safetyBlockCount: isSafetyBlock ? numImages : 0,
-        safetyBlockHistory: isSafetyBlock ? [now] : []
+        createdAt: now
       };
       await saveUsersData(usersData);
       return { userData: usersData[userId], consumptionType: "free", freeUsed: numImages, purchasedUsed: 0 };
     }
-    if (usersData[userId].safetyBlockCount === void 0) {
-      usersData[userId].safetyBlockCount = 0;
-    }
-    if (usersData[userId].safetyBlockHistory === void 0) {
-      usersData[userId].safetyBlockHistory = [];
-    }
     usersData[userId].totalUsageCount += numImages;
     usersData[userId].lastUsed = now;
     const lastReset = new Date(usersData[userId].lastDailyReset || usersData[userId].createdAt).toDateString();
@@ -1395,13 +1345,6 @@ function apply(ctx, config) {
       purchasedUsed = purchasedToUse;
       remainingToConsume -= purchasedToUse;
     }
-    if (isSafetyBlock) {
-      usersData[userId].safetyBlockCount += numImages;
-      usersData[userId].safetyBlockHistory.push(now);
-      if (usersData[userId].safetyBlockHistory.length > 20) {
-        usersData[userId].safetyBlockHistory = usersData[userId].safetyBlockHistory.slice(-20);
-      }
-    }
     await saveUsersData(usersData);
     let consumptionType;
     if (freeUsed > 0 && purchasedUsed > 0) {
@@ -1414,17 +1357,16 @@ function apply(ctx, config) {
     return { userData: usersData[userId], consumptionType, freeUsed, purchasedUsed };
   }
   __name(updateUserData, "updateUserData");
-  async function recordUserUsage(session, commandName, numImages = 1, isSafetyBlock = false) {
+  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 updateUserData(userId, userName, commandName, numImages, isSafetyBlock);
+    const { userData, consumptionType, freeUsed, purchasedUsed } = await updateUserData(userId, userName, commandName, numImages);
     if (isAdmin(userId)) {
-      const blockInfo = isSafetyBlock ? "\n⚠️ 本次请求被安全策略拦截，已扣除使用次数" : "";
       await session.send(`📊 使用统计 [管理员]
 用户：${userData.userName}
 总调用次数：${userData.totalUsageCount}次
-状态：无限制使用${blockInfo}`);
+状态：无限制使用`);
     } else {
       const remainingToday = Math.max(0, config.dailyFreeLimit - userData.dailyUsageCount);
       let consumptionText = "";
@@ -1435,14 +1377,13 @@ function apply(ctx, config) {
       } else {
         consumptionText = `充值次数 -${purchasedUsed}`;
       }
-      const blockInfo = isSafetyBlock ? "\n⚠️ 本次请求被安全策略拦截，已扣除使用次数。请检查内容是否符合使用规范。" : "";
       await session.send(`📊 使用统计
 用户：${userData.userName}
 本次生成：${numImages}张图片
 本次消费：${consumptionText}
 总调用次数：${userData.totalUsageCount}次
 今日剩余免费：${remainingToday}次
-充值剩余：${userData.remainingPurchasedCount}次${blockInfo}`);
+充值剩余：${userData.remainingPurchasedCount}次`);
     }
     logger.info("用户调用记录", {
       userId,
@@ -1455,12 +1396,44 @@ function apply(ctx, config) {
       totalUsageCount: userData.totalUsageCount,
       dailyUsageCount: userData.dailyUsageCount,
       remainingPurchasedCount: userData.remainingPurchasedCount,
-      isSafetyBlock,
-      safetyBlockCount: userData.safetyBlockCount,
       isAdmin: isAdmin(userId)
     });
   }
   __name(recordUserUsage, "recordUserUsage");
+  async function recordSecurityBlock(session, numImages = 1) {
+    const userId = session.userId;
+    if (!userId) return;
+    if (isAdmin(userId)) {
+      return;
+    }
+    const now = Date.now();
+    const windowMs = config.securityBlockWindow * 1e3;
+    const windowStart = now - windowMs;
+    let blockTimestamps = securityBlockMap.get(userId) || [];
+    blockTimestamps = blockTimestamps.filter((timestamp) => timestamp > windowStart);
+    blockTimestamps.push(now);
+    securityBlockMap.set(userId, blockTimestamps);
+    const blockCount = blockTimestamps.length;
+    const hasWarning = securityWarningMap.get(userId) || false;
+    logger.info("安全策略拦截记录", {
+      userId,
+      blockCount,
+      threshold: config.securityBlockWarningThreshold,
+      hasWarning,
+      numImages
+    });
+    if (blockCount >= config.securityBlockWarningThreshold && !hasWarning) {
+      securityWarningMap.set(userId, true);
+      await session.send(`⚠️ 安全策略警示
+您已连续${config.securityBlockWarningThreshold}次触发安全策略拦截，再次发送被拦截内容将被扣除积分`);
+      logger.warn("用户收到安全策略警示", { userId, blockCount, threshold: config.securityBlockWarningThreshold });
+    } else if (hasWarning) {
+      const commandName = "安全策略拦截";
+      await recordUserUsage(session, commandName, numImages);
+      logger.warn("用户因安全策略拦截被扣除积分", { userId, numImages });
+    }
+  }
+  __name(recordSecurityBlock, "recordSecurityBlock");
   async function getInputData(session, imgParam, mode) {
     const collectedImages = [];
     let collectedText = "";
@@ -1564,11 +1537,19 @@ function apply(ctx, config) {
       new Promise(
         (_, reject) => setTimeout(() => reject(new Error("命令执行超时")), config.commandTimeout * 1e3)
       )
-    ]).catch((error) => {
+    ]).catch(async (error) => {
       const userId = session.userId;
       if (userId) activeTasks.delete(userId);
       const sanitizedError = sanitizeError(error);
       logger.error("图像处理超时或失败", { userId, error: sanitizedError });
+      if (error?.message !== "命令执行超时") {
+        const errorMessage = error?.message || "";
+        const isSecurityBlock = errorMessage.includes("内容被安全策略拦截") || errorMessage.includes("内容被安全策略阻止") || errorMessage.includes("内容被阻止") || errorMessage.includes("被阻止") || errorMessage.includes("SAFETY") || errorMessage.includes("RECITATION");
+        if (isSecurityBlock) {
+          const imageCount = requestContext?.numImages || config.defaultNumImages;
+          await recordSecurityBlock(session, imageCount);
+        }
+      }
       const safeMessage = typeof error?.message === "string" ? sanitizeString(error.message) : "未知错误";
       return error.message === "命令执行超时" ? "图像处理超时，请重试" : `图像处理失败：${safeMessage}`;
     });
@@ -1657,17 +1638,10 @@ ${infoParts.join("\n")}`;
       activeTasks.delete(userId);
       const sanitizedError = sanitizeError(error);
       logger.error("图像处理失败", { userId, error: sanitizedError });
-      const isSafetyBlock = isSafetyBlockError(error);
-      if (isSafetyBlock) {
-        try {
-          await recordUserUsage(session, styleName, imageCount, true);
-          const blockLimitCheck = await checkSafetyBlockLimit(userId);
-          if (!blockLimitCheck.allowed) {
-            return `图像处理失败：内容被安全策略拦截。${blockLimitCheck.message}`;
-          }
-        } catch (recordError) {
-          logger.error("记录安全拦截使用次数失败", { userId, error: recordError });
-        }
+      const errorMessage = error?.message || "";
+      const isSecurityBlock = errorMessage.includes("内容被安全策略拦截") || errorMessage.includes("内容被安全策略阻止") || errorMessage.includes("内容被阻止") || errorMessage.includes("被阻止") || errorMessage.includes("SAFETY") || errorMessage.includes("RECITATION");
+      if (isSecurityBlock) {
+        await recordSecurityBlock(session, imageCount);
       }
       if (error?.message) {
         const safeMessage = sanitizeString(error.message);
@@ -1835,17 +1809,10 @@ Prompt: ${prompt}`);
           activeTasks.delete(userId);
           const sanitizedError = sanitizeError(error);
           logger.error("图片合成失败", { userId, error: sanitizedError });
-          const isSafetyBlock = isSafetyBlockError(error);
-          if (isSafetyBlock) {
-            try {
-              await recordUserUsage(session, COMMANDS.COMPOSE_IMAGE, imageCount, true);
-              const blockLimitCheck = await checkSafetyBlockLimit(userId);
-              if (!blockLimitCheck.allowed) {
-                return `图片合成失败：内容被安全策略拦截。${blockLimitCheck.message}`;
-              }
-            } catch (recordError) {
-              logger.error("记录安全拦截使用次数失败", { userId, error: recordError });
-            }
+          const errorMessage = error?.message || "";
+          const isSecurityBlock = errorMessage.includes("内容被安全策略拦截") || errorMessage.includes("内容被安全策略阻止") || errorMessage.includes("内容被阻止") || errorMessage.includes("被阻止") || errorMessage.includes("SAFETY") || errorMessage.includes("RECITATION");
+          if (isSecurityBlock) {
+            await recordSecurityBlock(session, imageCount);
           }
           if (error?.message) {
             const safeMessage = sanitizeString(error.message);
@@ -1857,11 +1824,19 @@ Prompt: ${prompt}`);
       new Promise(
         (_, reject) => setTimeout(() => reject(new Error("命令执行超时")), config.commandTimeout * 1e3)
       )
-    ]).catch((error) => {
+    ]).catch(async (error) => {
       const userId = session.userId;
       if (userId) activeTasks.delete(userId);
       const sanitizedError = sanitizeError(error);
       logger.error("图片合成超时或失败", { userId, error: sanitizedError });
+      if (error?.message !== "命令执行超时") {
+        const errorMessage = error?.message || "";
+        const isSecurityBlock = errorMessage.includes("内容被安全策略拦截") || errorMessage.includes("内容被安全策略阻止") || errorMessage.includes("内容被阻止") || errorMessage.includes("被阻止") || errorMessage.includes("SAFETY") || errorMessage.includes("RECITATION");
+        if (isSecurityBlock) {
+          const imageCount = options?.num || config.defaultNumImages;
+          await recordSecurityBlock(session, imageCount);
+        }
+      }
       const safeMessage = typeof error?.message === "string" ? sanitizeString(error.message) : "未知错误";
       return error.message === "命令执行超时" ? "图片合成超时，请重试" : `图片合成失败：${safeMessage}`;
     });
@@ -1917,9 +1892,7 @@ Prompt: ${prompt}`);
             donationCount: 0,
             donationAmount: 0,
             lastUsed: now,
-            createdAt: now,
-            safetyBlockCount: 0,
-            safetyBlockHistory: []
+            createdAt: now
           };
         }
         const beforeBalance = usersData[userId].remainingPurchasedCount;

package/package.json

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