koishi-plugin-aka-ai-generator 0.7.10 → 0.7.12

package/lib/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -28,6 +38,7 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi2 = require("koishi");
 
 // src/providers/utils.ts
+var import_jimp = __toESM(require("jimp"));
 function sanitizeError(error) {
   if (!error) return error;
   if (typeof error === "string") {
@@ -92,6 +103,23 @@ async function downloadImageAsBase64(ctx, url, timeout, logger, maxSize = 10 * 1
         mimeType = "image/gif";
       }
     }
+    if (mimeType === "image/gif") {
+      try {
+        logger.debug("检测到 GIF 图片，正在转换为 PNG", { url });
+        const image = await import_jimp.default.read(buffer);
+        const pngBuffer = await image.getBufferAsync(import_jimp.default.MIME_PNG);
+        const pngBase64 = pngBuffer.toString("base64");
+        logger.info("GIF 已转换为 PNG", {
+          originalSize: buffer.length,
+          newSize: pngBuffer.length,
+          width: image.getWidth(),
+          height: image.getHeight()
+        });
+        return { data: pngBase64, mimeType: "image/png" };
+      } catch (conversionError) {
+        logger.warn("GIF 转换失败，尝试原样发送", { error: conversionError?.message });
+      }
+    }
     logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
     return { data: base64, mimeType };
   } catch (error) {
@@ -600,10 +628,21 @@ function parseGeminiResponse(response, logger) {
             safetyRatings: candidate.safetyRatings
           });
           if (candidate.finishReason === "SAFETY" || candidate.finishReason === "RECITATION") {
-            throw new Error(`内容被阻止: ${candidate.finishReason}，可能包含不安全的内容`);
+            let msg = `内容被阻止: ${candidate.finishReason}，可能包含不安全的内容`;
+            if (candidate.finishMessage) {
+              msg += ` (详细信息: ${candidate.finishMessage})`;
+            }
+            throw new Error(msg);
           }
-          if (candidate.finishReason !== "MAX_TOKENS") {
-            logger?.warn("Gemini 响应可能不完整", { finishReason: candidate.finishReason });
+          if (candidate.finishReason === "IMAGE_OTHER" || candidate.finishReason !== "MAX_TOKENS" && candidate.finishReason !== "STOP") {
+            let msg = `生成失败: ${candidate.finishReason}`;
+            if (candidate.finishMessage) {
+              msg += `，原因: ${candidate.finishMessage}`;
+            }
+            logger?.warn("Gemini 生成未完成", { finishReason: candidate.finishReason, finishMessage: candidate.finishMessage });
+            if (!candidate.content || !candidate.content.parts || candidate.content.parts.length === 0) {
+              throw new Error(msg);
+            }
           }
         }
         if (candidate.content && candidate.content.parts) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,5 +24,8 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9"
+  },
+  "dependencies": {
+    "jimp": "^0.22.10"
   }
-}
+}