koishi-plugin-imgdraw-selfuse 0.0.2 → 0.0.4

package/lib/index.d.ts

@@ -1,10 +1,21 @@
-import { Schema } from 'koishi';
+import { Context, Schema } from 'koishi';
 export declare const name = "ai-image";
 export declare const inject: {
     required: string[];
     optional: string[];
 };
-type Infer<T> = T extends Schema<infer U> ? U : never;
+declare module 'koishi' {
+    interface Tables {
+        ai_image_blacklist: BlacklistEntry;
+    }
+    interface Context {
+        assets?: any;
+    }
+}
+interface BlacklistEntry {
+    id: string;
+    createdAt: Date;
+}
 export declare const Config: Schema<Schemastery.ObjectS<{
     debug: Schema<boolean, boolean>;
     apiStrategy: Schema<"sequence" | "roundrobin", "sequence" | "roundrobin">;
@@ -164,14 +175,6 @@ export declare const Config: Schema<Schemastery.ObjectS<{
         blacklistListTitle: Schema<string, string>;
     }>>;
 }>>;
-declare module 'koishi' {
-    interface Tables {
-        ai_image_blacklist: AIImageBlacklist;
-    }
-}
-interface AIImageBlacklist {
-    id: string;
-    createdAt: Date;
-}
-export declare function apply(ctx: any, cfg: Infer<typeof Config>): Promise<void>;
+export type Config = any;
+export declare function apply(ctx: Context, cfg: any): Promise<void>;
 export {};

package/lib/index.js

@@ -16,6 +16,7 @@ exports.inject = {
     optional: ['assets'],
 };
 const logger = new koishi_1.Logger('ai-image');
+// ==================== 配置 Schema ====================
 exports.Config = koishi_1.Schema.object({
     debug: koishi_1.Schema.boolean().default(false).description('开启调试模式，输出完整请求日志'),
     apiStrategy: koishi_1.Schema.union([
@@ -70,8 +71,10 @@ exports.Config = koishi_1.Schema.object({
         blacklistListTitle: koishi_1.Schema.string().default('📋 当前黑名单：'),
     }).description('提示文案配置'),
 }).description('AI 绘图插件配置');
+// ==================== 主函数 ====================
 async function apply(ctx, cfg) {
     const debug = cfg.debug;
+    // 加载本地化文件
     try {
         const loc = path_1.default.join(__dirname, 'locales', 'zh-CN.yml');
         if (fs_1.default.existsSync(loc)) {
@@ -82,18 +85,21 @@ async function apply(ctx, cfg) {
     const waitingMap = new Map();
     const apiIdx = { val: 0 };
     const apiCallTimestamps = [];
+    // 扩展数据库表
     ctx.model.extend('ai_image_blacklist', {
         id: 'string',
         createdAt: 'date',
     }, {
         primary: 'id',
     });
+    // 清理定时器
     ctx.on('dispose', () => {
         for (const [, task] of waitingMap) {
             clearTimeout(task.timer);
         }
         waitingMap.clear();
     });
+    // ==================== 工具函数 ====================
     function checkRateLimit() {
         const now = Date.now();
         const oneHourAgo = now - 3600000;
@@ -106,7 +112,7 @@ async function apply(ctx, cfg) {
         apiCallTimestamps.push(Date.now());
     }
     function getApi() {
-        const list = cfg.apiList.filter(v => v.enable && v.apiKey && v.baseUrl);
+        const list = cfg.apiList.filter((v) => v.enable && v.apiKey && v.baseUrl);
         if (!list.length)
             return null;
         if (cfg.apiStrategy === 'sequence')
@@ -116,46 +122,61 @@ async function apply(ctx, cfg) {
         return api;
     }
     function cleanHtmlTags(str) {
-        return str.replace(/<[^>]+>/g, '').trim();
+        return str.replace(/<<[^>]+>/g, '').trim();
     }
-    // ==================== 修复：增强图片提取函数 ====================
+    // 增强图片提取函数
     function getImageUrlFromContent(text) {
         if (!text)
             return null;
-        // 1. 匹配标准 http/https URL
         const httpReg = /https?:\/\/[^<> \n\r()\[\]]+\.(png|jpg|jpeg|gif|webp)/i;
         const httpMatch = text.match(httpReg);
         if (httpMatch)
             return httpMatch[0];
-        // 2. 匹配 base64 data URI（gpt-image-2 等模型返回的格式）
         const base64Reg = /data:image\/(png|jpg|jpeg|gif|webp);base64,[A-Za-z0-9+/=]+/;
         const base64Match = text.match(base64Reg);
         if (base64Match)
             return base64Match[0];
-        // 3. 匹配 markdown 图片语法 ![alt](url) 中的任意 URL
         const markdownReg = /!\[.*?\]\((.*?)\)/;
         const markdownMatch = text.match(markdownReg);
         if (markdownMatch)
             return markdownMatch[1];
         return null;
     }
-    // ==================== 新增：统一发送图片函数 ====================
+    // ==================== 新增：URL 转 base64 ====================
+    async function urlToBase64(url) {
+        if (!url)
+            return null;
+        if (url.startsWith('data:image/')) {
+            return url;
+        }
+        try {
+            const res = await axios_1.default.get(url, {
+                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}`;
+        }
+        catch (e) {
+            logger.error('图片转 base64 失败', e);
+            throw new Error('图片下载失败，请检查 selfUrl 是否可访问');
+        }
+    }
+    // 统一发送图片函数
     async function sendImage(session, imgUrl) {
         const trimmed = imgUrl.trim();
         if (trimmed.startsWith('data:image/')) {
-            // base64 图片：使用 h 元素直接发送
             if (debug)
                 logger.info('发送 base64 图片，长度:', trimmed.length);
             await safeSend(session, (0, koishi_1.h)('img', { src: trimmed }));
         }
         else if (/^https?:\/\//.test(trimmed)) {
-            // http/https URL：使用 segment.image
             if (debug)
                 logger.info('发送 URL 图片:', trimmed.slice(0, 100));
             await safeSend(session, koishi_1.segment.image(trimmed));
         }
         else {
-            // 未知格式，当作文本发送并记录日志
             logger.warn('未知的图片格式:', trimmed.slice(0, 100));
             await safeSend(session, cfg.messages.fail + '（图片格式异常）');
         }
@@ -286,6 +307,7 @@ async function apply(ctx, cfg) {
         }
         return { success, fail };
     }
+    // ==================== 核心生成函数 ====================
     async function generate(session, prompt, imageUrl, modelOverride) {
         if (!checkRateLimit()) {
             await safeSend(session, cfg.messages.rateLimit);
@@ -301,9 +323,14 @@ async function apply(ctx, cfg) {
         const model = modelOverride || cfg.model;
         let content;
         if (imageUrl) {
+            const base64Url = await urlToBase64(imageUrl);
+            if (!base64Url) {
+                await safeSend(session, cfg.messages.fail + '（图片转换失败）');
+                return;
+            }
             content = [
                 { type: 'text', text: prompt },
-                { type: 'image_url', image_url: { url: imageUrl } },
+                { type: 'image_url', image_url: { url: base64Url } },
             ];
         }
         else {
@@ -323,14 +350,12 @@ async function apply(ctx, cfg) {
             });
             if (debug)
                 logger.info('API返回:', JSON.stringify(res.data, null, 2));
-            // ==================== 修复：增强图片提取逻辑 ====================
             let imgUrl = res.data?.data?.[0]?.url || null;
             if (!imgUrl) {
                 const contentText = res.data?.choices?.[0]?.message?.content || '';
                 imgUrl = getImageUrlFromContent(contentText);
             }
             if (imgUrl) {
-                // 使用统一的发送函数处理 URL 和 base64
                 await sendImage(session, imgUrl);
             }
             else {
@@ -364,9 +389,14 @@ async function apply(ctx, cfg) {
         }
         const model = modelOverride || cfg.model;
         const finalPrompt = prompt.replace('{url}', imageUrls.join(', '));
+        const base64Urls = (await Promise.all(imageUrls.map(url => urlToBase64(url)))).filter((url) => url !== null);
+        if (base64Urls.length === 0) {
+            await safeSend(session, cfg.messages.fail + '（图片转换失败）');
+            return;
+        }
         const content = [
             { type: 'text', text: finalPrompt },
-            ...imageUrls.map(url => ({ type: 'image_url', image_url: { url } })),
+            ...base64Urls.map(url => ({ type: 'image_url', image_url: { url } })),
         ];
         const body = {
             model,
@@ -382,14 +412,12 @@ async function apply(ctx, cfg) {
             });
             if (debug)
                 logger.info('API返回:', JSON.stringify(res.data, null, 2));
-            // ==================== 修复：增强图片提取逻辑 ====================
             let imgUrl = res.data?.data?.[0]?.url || null;
             if (!imgUrl) {
                 const contentText = res.data?.choices?.[0]?.message?.content || '';
                 imgUrl = getImageUrlFromContent(contentText);
             }
             if (imgUrl) {
-                // 使用统一的发送函数处理 URL 和 base64
                 await sendImage(session, imgUrl);
             }
             else {
@@ -412,8 +440,9 @@ async function apply(ctx, cfg) {
             deleteAllCachedFiles(imageUrls);
         }
     }
+    // ==================== 命令注册 ====================
     const cmd = ctx.command(`${cfg.command} <raw:text>`, 'draw');
-    cfg.aliases.forEach(alias => cmd.alias(alias));
+    cfg.aliases.forEach((alias) => cmd.alias(alias));
     cmd.action(async ({ session }, raw) => {
         try {
             if (!session)
@@ -436,7 +465,7 @@ async function apply(ctx, cfg) {
         }
     });
     const imgCmd = ctx.command(`${cfg.img2imgCommand} <raw:text>`, 'imgdraw');
-    cfg.img2imgAliases.forEach(alias => imgCmd.alias(alias));
+    cfg.img2imgAliases.forEach((alias) => imgCmd.alias(alias));
     imgCmd.action(async ({ session }, raw) => {
         try {
             if (!session)
@@ -476,6 +505,7 @@ async function apply(ctx, cfg) {
             await safeSend(session, cfg.messages.fail);
         }
     });
+    // 消息监听
     ctx.on('message', async (session) => {
         try {
             if (!session.elements)
@@ -493,7 +523,7 @@ async function apply(ctx, cfg) {
                     await safeSend(session, cfg.messages.needAssets);
                     return;
                 }
-                const uploadResults = await Promise.allSettled(imgs.map(img => assets.upload(img.attrs.src, 'ref_image.jpg')));
+                const uploadResults = await Promise.allSettled(imgs.map((img) => assets.upload(img.attrs.src, 'ref_image.jpg')));
                 const newUrls = [];
                 for (const res of uploadResults) {
                     if (res.status === 'fulfilled' && /^https?:\/\//.test(res.value)) {
@@ -544,6 +574,7 @@ async function apply(ctx, cfg) {
             await safeSend(session, cfg.messages.fail);
         }
     });
+    // ==================== 黑名单命令 ====================
     const blacklistCmd = ctx.command('blacklist', 'blacklist');
     blacklistCmd.subcommand('.list', 'blacklist.list').action(async ({ session }) => {
         if (!session)
@@ -556,7 +587,7 @@ async function apply(ctx, cfg) {
             if (entries.length === 0) {
                 return safeSend(session, cfg.messages.blacklistListEmpty);
             }
-            const list = entries.map(e => e.id).join('\n');
+            const list = entries.map((e) => e.id).join('\n');
             return safeSend(session, `${cfg.messages.blacklistListTitle}\n${list}`);
         }
         catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-imgdraw-selfuse",
   "description": "画图",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [