koishi-plugin-aka-ai-generator 0.5.4 → 0.5.5

package/lib/index.js

@@ -42,14 +42,10 @@ function sanitizeError(error) {
     const sanitized = {};
     for (const key in error) {
       const lowerKey = key.toLowerCase();
-      if (lowerKey.includes("apikey") || lowerKey.includes("api_key") || lowerKey === "key" || lowerKey === "authorization" || lowerKey === "token" || lowerKey === "secret" || lowerKey === "password" || lowerKey === "x-goog-api-key") {
+      if (lowerKey.includes("apikey") || lowerKey.includes("api_key") || lowerKey.includes("apikey") || lowerKey === "key" || lowerKey === "authorization" || lowerKey === "token" || lowerKey === "secret" || lowerKey === "password") {
         sanitized[key] = "[REDACTED]";
         continue;
       }
-      if (lowerKey === "url" && typeof error[key] === "string") {
-        sanitized[key] = sanitizeUrl(error[key]);
-        continue;
-      }
       sanitized[key] = sanitizeError(error[key]);
     }
     return sanitized;
@@ -59,26 +55,9 @@ function sanitizeError(error) {
 __name(sanitizeError, "sanitizeError");
 function sanitizeString(str) {
   if (typeof str !== "string") return str;
-  let sanitized = str.replace(/[?&]key=[^&\s"']+/gi, "?key=[REDACTED]").replace(/[?&]apikey=[^&\s"']+/gi, "&apikey=[REDACTED]").replace(/[?&]api_key=[^&\s"']+/gi, "&api_key=[REDACTED]");
-  sanitized = sanitized.replace(/key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'key="[REDACTED]"').replace(/apikey["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'apikey="[REDACTED]"').replace(/api_key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'api_key="[REDACTED]"').replace(/authorization["\s:=]+(Bearer\s+)?([a-zA-Z0-9_-]{20,})/gi, 'authorization="[REDACTED]"').replace(/Bearer\s+([a-zA-Z0-9_-]{20,})/gi, "Bearer [REDACTED]").replace(/x-goog-api-key["\s:]+([a-zA-Z0-9_-]{20,})/gi, "x-goog-api-key: [REDACTED]").replace(/X-Goog-Api-Key["\s:]+([a-zA-Z0-9_-]{20,})/gi, "X-Goog-Api-Key: [REDACTED]");
-  return sanitized;
+  return str.replace(/key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'key="[REDACTED]"').replace(/apikey["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'apikey="[REDACTED]"').replace(/api_key["\s:=]+([a-zA-Z0-9_-]{20,})/gi, 'api_key="[REDACTED]"').replace(/authorization["\s:=]+(Bearer\s+)?([a-zA-Z0-9_-]{20,})/gi, 'authorization="[REDACTED]"').replace(/Bearer\s+([a-zA-Z0-9_-]{20,})/gi, "Bearer [REDACTED]");
 }
 __name(sanitizeString, "sanitizeString");
-function sanitizeUrl(url) {
-  if (typeof url !== "string") return url;
-  try {
-    const urlObj = new URL(url);
-    urlObj.searchParams.delete("key");
-    urlObj.searchParams.delete("apikey");
-    urlObj.searchParams.delete("api_key");
-    urlObj.searchParams.delete("token");
-    urlObj.searchParams.delete("secret");
-    return urlObj.toString();
-  } catch (e) {
-    return sanitizeString(url);
-  }
-}
-__name(sanitizeUrl, "sanitizeUrl");
 
 // src/providers/yunwu.ts
 async function downloadImageAsBase64(ctx, url, timeout, logger) {
@@ -773,9 +752,6 @@ var GeminiProvider = class {
     this.config = config;
   }
   async generateImages(prompt, imageUrls, numImages) {
-    if (!this.config.apiKey || !this.config.apiKey.trim()) {
-      throw new Error("Gemini API key 未配置或为空");
-    }
     let urls = [];
     if (Array.isArray(imageUrls)) {
       urls = imageUrls.filter((url) => url && typeof url === "string" && url.trim());
@@ -795,8 +771,8 @@ var GeminiProvider = class {
         logger
       );
       imageParts.push({
-        inlineData: {
-          mimeType,
+        inline_data: {
+          mime_type: mimeType,
           data
         }
       });
@@ -808,6 +784,7 @@ var GeminiProvider = class {
       const requestData = {
         contents: [
           {
+            role: "user",
             parts: [
               { text: prompt },
               ...imageParts
@@ -815,22 +792,10 @@ var GeminiProvider = class {
           }
         ],
         generationConfig: {
-          responseModalities: ["IMAGE"],
-          imageConfig: {
-            aspectRatio: "16:9"
-          }
+          responseModalities: ["IMAGE"]
         }
       };
-      logger.debug("调用 Gemini API", {
-        prompt: prompt.substring(0, 100),
-        imageCount: urls.length,
-        numImages,
-        current: i + 1,
-        endpoint,
-        hasApiKey: !!this.config.apiKey,
-        apiKeyLength: this.config.apiKey?.length || 0,
-        modelId: this.config.modelId
-      });
+      logger.debug("调用 Gemini API", { prompt, imageCount: urls.length, numImages, current: i + 1, endpoint });
       try {
         const response = await ctx.http.post(
           endpoint,
@@ -860,33 +825,14 @@ var GeminiProvider = class {
       } catch (error) {
         const sanitizedError = sanitizeError(error);
         const safeMessage = typeof error?.message === "string" ? sanitizeString(error.message) : "未知错误";
-        const errorDetails = {
+        logger.error("Gemini API 调用失败", {
           message: safeMessage,
           code: error?.code,
           status: error?.response?.status,
-          statusText: error?.response?.statusText,
+          responseData: error?.response?.data ? sanitizeString(JSON.stringify(error.response.data).substring(0, 500)) : void 0,
           current: i + 1,
-          total: numImages,
-          errorType: error?.name || error?.constructor?.name || "Unknown"
-        };
-        if (error?.response?.data) {
-          try {
-            const responseStr = JSON.stringify(error.response.data);
-            errorDetails.responseData = sanitizeString(responseStr.substring(0, 1e3));
-          } catch (e) {
-            errorDetails.responseData = "无法序列化响应数据";
-          }
-        }
-        if (error?.config) {
-          errorDetails.url = error.config.url ? sanitizeUrl(error.config.url) : void 0;
-          errorDetails.method = error.config.method;
-          errorDetails.hasData = !!error.config.data;
-        }
-        if (error?.code === "ECONNREFUSED" || error?.code === "ETIMEDOUT" || error?.code === "ENOTFOUND") {
-          errorDetails.networkError = true;
-          errorDetails.networkErrorCode = error.code;
-        }
-        logger.error("Gemini API 调用失败", errorDetails);
+          total: numImages
+        });
         if (allImages.length > 0) {
           logger.warn("部分图片生成失败，返回已生成的图片", { generated: allImages.length, requested: numImages });
           break;

package/lib/providers/types.d.ts

@@ -22,7 +22,3 @@ export declare function sanitizeError(error: any): any;
  * 清理字符串中的 API KEY 模式
  */
 export declare function sanitizeString(str: string): string;
-/**
- * 清理 URL 中的敏感查询参数
- */
-export declare function sanitizeUrl(url: string): string;

package/package.json

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