koishi-plugin-imgdraw-selfuse 0.0.6 → 0.0.8

package/lib/index.d.ts

@@ -26,6 +26,11 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     txt2imgModel: Schema<string, string>;
     img2imgModel: Schema<string, string>;
     maxImages: Schema<number, number>;
+    enableImgCompress: Schema<boolean, boolean>;
+    imgMaxWidth: Schema<number, number>;
+    imgMaxHeight: Schema<number, number>;
+    imgQuality: Schema<number, number>;
+    imgMaxFileSize: Schema<number, number>;
     apiList: Schema<Schemastery.ObjectS<{
         enable: Schema<boolean, boolean>;
         apiKey: Schema<string, string>;
@@ -105,6 +110,11 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     txt2imgModel: Schema<string, string>;
     img2imgModel: Schema<string, string>;
     maxImages: Schema<number, number>;
+    enableImgCompress: Schema<boolean, boolean>;
+    imgMaxWidth: Schema<number, number>;
+    imgMaxHeight: Schema<number, number>;
+    imgQuality: Schema<number, number>;
+    imgMaxFileSize: Schema<number, number>;
     apiList: Schema<Schemastery.ObjectS<{
         enable: Schema<boolean, boolean>;
         apiKey: Schema<string, string>;

package/lib/index.js

@@ -10,6 +10,14 @@ const axios_1 = __importDefault(require("axios"));
 const yaml_1 = __importDefault(require("yaml"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+// 尝试导入 sharp，如果未安装则给出提示
+let sharp;
+try {
+    sharp = require('sharp');
+}
+catch {
+    sharp = null;
+}
 exports.name = 'ai-image';
 exports.inject = {
     required: ['console', 'i18n', 'database'],
@@ -30,6 +38,13 @@ exports.Config = koishi_1.Schema.object({
     txt2imgModel: koishi_1.Schema.string().default('').description('文生图专用模型，留空则使用通用模型'),
     img2imgModel: koishi_1.Schema.string().default('').description('图生图专用模型，留空则使用通用模型'),
     maxImages: koishi_1.Schema.number().default(5).description('图生图最大支持图片数量'),
+    // ==================== 新增：图片压缩配置 ====================
+    enableImgCompress: koishi_1.Schema.boolean().default(true).description('启用图生图图片压缩（推荐开启，可防止大图超时）'),
+    imgMaxWidth: koishi_1.Schema.number().default(1536).description('图片压缩最大宽度（像素）'),
+    imgMaxHeight: koishi_1.Schema.number().default(1536).description('图片压缩最大高度（像素）'),
+    imgQuality: koishi_1.Schema.number().default(85).description('JPEG 压缩质量 1-100（越高越清晰，建议 80-90）'),
+    imgMaxFileSize: koishi_1.Schema.number().default(3).description('图片最大体积（MB），超过会进一步压缩'),
+    // ==========================================================
     apiList: koishi_1.Schema.array(koishi_1.Schema.object({
         enable: koishi_1.Schema.boolean().default(true).description('启用此 API'),
         apiKey: koishi_1.Schema.string().description('API Key'),
@@ -74,6 +89,11 @@ exports.Config = koishi_1.Schema.object({
 // ==================== 主函数 ====================
 async function apply(ctx, cfg) {
     const debug = cfg.debug;
+    // 检查 sharp 是否安装
+    if (cfg.enableImgCompress && !sharp) {
+        logger.warn('图片压缩已启用，但未检测到 sharp 库。请运行：npm install sharp');
+        logger.warn('在未安装 sharp 的情况下，将跳过压缩，可能导致大图超时');
+    }
     // 加载本地化文件
     try {
         const loc = path_1.default.join(__dirname, 'locales', 'zh-CN.yml');
@@ -121,8 +141,19 @@ async function apply(ctx, cfg) {
         apiIdx.val++;
         return api;
     }
+    // ==================== 修复：增强 HTML/XML 清理 ====================
     function cleanHtmlTags(str) {
-        return str.replace(/<<[^>]+>/g, '').trim();
+        if (!str)
+            return '';
+        // 1. 清理标准 HTML 标签
+        let cleaned = str.replace(/<[^>]+>/g, ' ');
+        // 2. 清理 QQ XML 图片标签（如 <img src="..." file="..."/>）
+        cleaned = cleaned.replace(/<img\s+[^>]+\/>/gi, ' ');
+        // 3. 清理其他 XML 标签
+        cleaned = cleaned.replace(/<[^>]+>/g, ' ');
+        // 4. 清理多余空格和换行
+        cleaned = cleaned.replace(/\s+/g, ' ').trim();
+        return cleaned;
     }
     // 增强图片提取函数
     function getImageUrlFromContent(text) {
@@ -142,11 +173,74 @@ async function apply(ctx, cfg) {
             return markdownMatch[1];
         return null;
     }
-    // ==================== 新增：URL 转 base64 ====================
+    // ==================== 新增：图片压缩函数 ====================
+    async function compressImage(buffer) {
+        if (!sharp || !cfg.enableImgCompress) {
+            return buffer;
+        }
+        try {
+            let image = sharp(buffer);
+            const metadata = await image.metadata();
+            // 计算缩放比例
+            let width = metadata.width || cfg.imgMaxWidth;
+            let height = metadata.height || cfg.imgMaxHeight;
+            const ratio = Math.min(cfg.imgMaxWidth / width, cfg.imgMaxHeight / height, 1 // 不放大
+            );
+            if (ratio < 1) {
+                width = Math.round(width * ratio);
+                height = Math.round(height * ratio);
+                image = image.resize(width, height, { fit: 'inside' });
+            }
+            // 压缩并转换格式
+            let quality = Math.max(1, Math.min(100, cfg.imgQuality));
+            let compressed = await image
+                .jpeg({ quality, progressive: true, mozjpeg: true })
+                .toBuffer();
+            // 如果还超过限制，进一步降低质量
+            const maxBytes = cfg.imgMaxFileSize * 1024 * 1024;
+            while (compressed.length > maxBytes && quality > 40) {
+                quality -= 5;
+                compressed = await image
+                    .jpeg({ quality, progressive: true, mozjpeg: true })
+                    .toBuffer();
+            }
+            if (debug) {
+                logger.info(`图片压缩: ${buffer.length} -> ${compressed.length} bytes ` +
+                    `(${Math.round(compressed.length / buffer.length * 100)}%), ` +
+                    `尺寸: ${Math.round(width)}x${Math.round(height)}, 质量: ${quality}`);
+            }
+            return compressed;
+        }
+        catch (e) {
+            logger.error('图片压缩失败，使用原图', e);
+            return buffer;
+        }
+    }
+    async function compressBase64Image(base64Url) {
+        if (!sharp || !cfg.enableImgCompress) {
+            return base64Url;
+        }
+        try {
+            const base64Data = base64Url.split(',')[1];
+            const buffer = Buffer.from(base64Data, 'base64');
+            const compressed = await compressImage(buffer);
+            return `data:image/jpeg;base64,${compressed.toString('base64')}`;
+        }
+        catch (e) {
+            logger.error('base64 图片压缩失败，使用原图', e);
+            return base64Url;
+        }
+    }
+    // ==========================================================
+    // ==================== 修改：URL 转 base64（带压缩）====================
     async function urlToBase64(url) {
         if (!url)
             return null;
         if (url.startsWith('data:image/')) {
+            // 如果已经是 base64，检查是否需要压缩
+            if (cfg.enableImgCompress && sharp) {
+                return await compressBase64Image(url);
+            }
             return url;
         }
         try {
@@ -154,9 +248,9 @@ async function apply(ctx, cfg) {
                 responseType: 'arraybuffer',
                 timeout: 30000,
             });
-            const base64 = Buffer.from(res.data).toString('base64');
-            const mime = res.headers['content-type'] || 'image/jpeg';
-            return `data:${mime};base64,${base64}`;
+            // 压缩图片
+            const compressed = await compressImage(Buffer.from(res.data));
+            return `data:image/jpeg;base64,${compressed.toString('base64')}`;
         }
         catch (e) {
             logger.error('图片转 base64 失败', e);
@@ -471,6 +565,18 @@ async function apply(ctx, cfg) {
         await safeSend(session, cfg.messages.generating);
         await generateWithMultipleImages(session, finalPrompt, finalUrls, cfg.img2imgModel || cfg.model);
     }
+    // ==================== 新增：从 session.elements 提取纯文本 ====================
+    function extractTextFromElements(elements) {
+        if (!elements || !Array.isArray(elements))
+            return '';
+        const textParts = [];
+        for (const el of elements) {
+            if (el.type === 'text') {
+                textParts.push(el.attrs?.content || el.attrs?.text || '');
+            }
+        }
+        return cleanHtmlTags(textParts.join(' '));
+    }
     // ==================== 命令注册 ====================
     const cmd = ctx.command(`${cfg.command} <raw:text>`, 'draw');
     cfg.aliases.forEach((alias) => cmd.alias(alias));
@@ -507,13 +613,24 @@ async function apply(ctx, cfg) {
                 return safeSend(session, cfg.messages.blacklisted);
             if (!cfg.enableImg2Img)
                 return safeSend(session, cfg.messages.img2imgDisabled);
-            const prompt = cleanHtmlTags(raw || '');
+            // ==================== 修复：从 elements 提取纯文本，避免 XML 污染 ====================
+            let prompt = '';
+            if (session.elements && session.elements.length > 0) {
+                // 有 elements，从中提取纯文本（排除图片等）
+                prompt = extractTextFromElements(session.elements);
+                if (debug)
+                    logger.info('从 elements 提取的 prompt:', prompt);
+            }
+            // 如果 elements 没有文本，回退到 raw
+            if (!prompt && raw) {
+                prompt = cleanHtmlTags(raw);
+            }
             // 检查消息中是否包含图片（QQ 合并消息）
             const messageImages = session.elements ? koishi_1.h.select(session.elements, 'img') : [];
             if (messageImages.length > 0) {
                 // 合并消息：同时包含文字和图片，直接处理
                 if (debug)
-                    logger.info(`检测到合并消息，包含 ${messageImages.length} 张图片`);
+                    logger.info(`检测到合并消息，包含 ${messageImages.length} 张图片，prompt: "${prompt}"`);
                 if (!prompt) {
                     // 如果没有文字 prompt，使用默认提示
                     await processImg2ImgWithImages(session, '请根据图片内容进行编辑', messageImages);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-imgdraw-selfuse",
-  "description": "修改自ai-image的画图插件,支持openai兼容api,增加base64转换以适配GPTimg2，支持合并消息图生图",
-  "version": "0.0.6",
+  "description": "修改自ai-image的画图插件,支持openai兼容api,增加base64转换以适配GPTimg2，支持发送合并消息图生图",
+  "version": "0.0.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [