koishi-plugin-custom-image 0.2.3 → 0.2.4

package/lib/index.d.ts

@@ -3,21 +3,16 @@ export declare const name = "custom-image";
 export interface Config {
     enable: boolean;
     showWaitingTip: boolean;
-    sameImageApiInterval: number;
     timeout: number;
     customImageApis: string[];
     customImageEnabled: boolean;
     hsjpEnabled: boolean;
     dmjpEnabled: boolean;
-    ignoreSendError: boolean;
-    retryTimes: number;
-    retryInterval: number;
     imageSendTimeout: number;
     autoClearCacheInterval: number;
-    downloadImageBeforeSend: boolean;
-    messageBufferDelay: number;
     tempDir: string;
-    useImageUrlInsteadOfFile: boolean;
+    showSuccessTip: boolean;
+    showTimeoutTip: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -7,7 +7,6 @@ exports.using = exports.inject = exports.Config = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
-const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const promises_1 = require("stream/promises");
@@ -40,10 +39,6 @@ exports.Config = koishi_1.Schema.object({
     showWaitingTip: koishi_1.Schema.boolean()
         .default(true)
         .description('【基础设置】请求图片时显示等待提示'),
-    sameImageApiInterval: koishi_1.Schema.number()
-        .default(60)
-        .min(0)
-        .description('【基础设置】重复API调用间隔（秒）'),
     timeout: koishi_1.Schema.number()
         .default(10000)
         .min(0)
@@ -61,38 +56,23 @@ exports.Config = koishi_1.Schema.object({
     dmjpEnabled: koishi_1.Schema.boolean()
         .default(true)
         .description('【功能开关】启用动漫举牌功能'),
-    ignoreSendError: koishi_1.Schema.boolean()
-        .default(true)
-        .description('【容错设置】忽略发送错误'),
-    retryTimes: koishi_1.Schema.number()
-        .default(1)
-        .min(0)
-        .description('【容错设置】API重试次数'),
-    retryInterval: koishi_1.Schema.number()
-        .default(500)
-        .min(0)
-        .description('【容错设置】重试间隔（毫秒）'),
     imageSendTimeout: koishi_1.Schema.number()
         .default(15000)
         .min(0)
-        .description('【容错设置】图片发送超时（毫秒）'),
+        .description('【基础设置】图片发送超时（毫秒）'),
     autoClearCacheInterval: koishi_1.Schema.number()
         .default(60)
         .min(0)
-        .description('【缓存设置】自动清理缓存间隔（分钟）'),
-    downloadImageBeforeSend: koishi_1.Schema.boolean()
-        .default(false)
-        .description('【展示设置】发送前下载图片（关闭可解决OneBot文件上传问题）'),
-    messageBufferDelay: koishi_1.Schema.number()
-        .default(0)
-        .min(0)
-        .description('【性能设置】消息缓冲延迟：合并短时间内的多个图片请求（秒）'),
+        .description('【基础设置】自动清理缓存间隔（分钟）'),
     tempDir: koishi_1.Schema.string()
         .default(path_1.default.join(process.cwd(), 'temp_images'))
-        .description('【文件设置】临时图片保存目录'),
-    useImageUrlInsteadOfFile: koishi_1.Schema.boolean()
+        .description('【基础设置】临时图片保存目录'),
+    showSuccessTip: koishi_1.Schema.boolean()
+        .default(true)
+        .description('【提示设置】请求图片成功时显示提示'),
+    showTimeoutTip: koishi_1.Schema.boolean()
         .default(true)
-        .description('【兼容设置】强制使用图片URL发送（避免OneBot文件上传错误）')
+        .description('【提示设置】API请求超时后给用户提示')
 });
 if (!worker_threads_1.isMainThread) {
     const { url, filePath } = worker_threads_1.workerData;
@@ -137,28 +117,6 @@ async function sendTimeout(session, content, config) {
         new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), config.imageSendTimeout))
     ]).catch(() => null);
 }
-async function downloadImageWithThreads(url, filename, config) {
-    return new Promise((resolve, reject) => {
-        if (!fs_1.default.existsSync(config.tempDir)) {
-            fs_1.default.mkdirSync(config.tempDir, { recursive: true, mode: 0o777 });
-        }
-        const filePath = path_1.default.join(config.tempDir, `${filename}.jpg`);
-        const worker = new worker_threads_1.Worker(currentFilePath, { workerData: { url, filePath } });
-        worker.on('message', (result) => {
-            if (result.success && result.filePath) {
-                resolve(result.filePath);
-            }
-            else {
-                reject(new Error(result.error || '图片获取失败'));
-            }
-        });
-        worker.on('error', reject);
-        worker.on('exit', (code) => {
-            if (code !== 0)
-                reject(new Error('图片下载线程异常'));
-        });
-    });
-}
 function clearAllCache(config) {
     processedApi.clear();
     imageBuffer.forEach(buf => clearTimeout(buf.timer));
@@ -190,23 +148,20 @@ async function fetchImage(url, config) {
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
         }
     });
-    for (let retry = 0; retry <= config.retryTimes; retry++) {
-        try {
-            if (/^https?:\/\/.+\.(jpg|jpeg|png|gif|webp|bmp)/i.test(url)) {
-                return { success: true, type: 'url', data: url };
-            }
-            const res = await http.get(url, { responseType: 'arraybuffer' });
-            if (res.status === 200 && res.data) {
-                return { success: true, type: 'buffer', data: res.data };
-            }
+    try {
+        if (/^https?:\/\/.+\.(jpg|jpeg|png|gif|webp|bmp)/i.test(url)) {
+            return { success: true, type: 'url', data: url, timeout: false };
         }
-        catch (error) {
-            if (retry === config.retryTimes)
-                return { success: false, type: '', data: '' };
-            await delay(config.retryInterval);
+        const res = await http.get(url, { responseType: 'arraybuffer' });
+        if (res.status === 200 && res.data) {
+            return { success: true, type: 'buffer', data: res.data, timeout: false };
         }
     }
-    return { success: false, type: '', data: '' };
+    catch (error) {
+        const isTimeout = error.message.includes('timeout');
+        return { success: false, type: '', data: '', timeout: isTimeout };
+    }
+    return { success: false, type: '', data: '', timeout: false };
 }
 async function fetchHsjpImage(msg, msg1, msg2, config) {
     const encodedMsg = encodeURIComponent(msg);
@@ -221,46 +176,16 @@ async function fetchDmjpImage(text, config) {
     return fetchImage(url, config);
 }
 async function processCustomImage(session, apiUrl, config) {
-    const hash = crypto_1.default.createHash('md5').update(apiUrl).digest('hex');
-    const now = Date.now();
-    if (processedApi.get(hash) && now - processedApi.get(hash) < config.sameImageApiInterval * 1000) {
-        return { success: false, msg: getI18nText(session, 'messages.repeatRequest') };
-    }
-    processedApi.set(hash, now);
     const result = await fetchImage(apiUrl, config);
+    if (result.timeout && config.showTimeoutTip) {
+        return { success: false, msg: '图片请求超时，请稍后再试' };
+    }
     if (!result.success) {
         return { success: false, msg: getI18nText(session, 'messages.fetchFailed') };
     }
-    let imageElem;
-    if (config.useImageUrlInsteadOfFile) {
-        imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
-    }
-    else if (result.type === 'url' && config.downloadImageBeforeSend) {
-        try {
-            const filename = crypto_1.default.createHash('md5').update(result.data).digest('hex');
-            const filePath = await downloadImageWithThreads(result.data, filename, config);
-            const absPath = path_1.default.resolve(filePath);
-            fs_1.default.chmodSync(absPath, 0o777);
-            imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-        }
-        catch (error) {
-            imageElem = koishi_1.h.image(result.data);
-        }
-    }
-    else if (result.type === 'buffer') {
-        if (!fs_1.default.existsSync(config.tempDir)) {
-            fs_1.default.mkdirSync(config.tempDir, { recursive: true, mode: 0o777 });
-        }
-        const filename = crypto_1.default.randomUUID();
-        const filePath = path_1.default.join(config.tempDir, `${filename}.jpg`);
-        const absPath = path_1.default.resolve(filePath);
-        fs_1.default.writeFileSync(absPath, result.data, { mode: 0o777 });
-        imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-    }
-    else {
-        imageElem = koishi_1.h.image(result.data);
-    }
-    return { success: true, msg: 'ok', data: { text: getI18nText(session, 'messages.fetchSuccess'), image: imageElem } };
+    const imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
+    const successText = config.showSuccessTip ? getI18nText(session, 'messages.fetchSuccess') : '';
+    return { success: true, msg: 'ok', data: { text: successText, image: imageElem } };
 }
 async function flush(session, config, manualApi) {
     const key = `${session.platform}:${session.userId}:${session.channelId}`;
@@ -283,21 +208,21 @@ async function flush(session, config, manualApi) {
             errs.push(`【${apiUrl.slice(0, 22)}...】：${result.msg}`);
         }
     }
-    if (errs.length && !config.ignoreSendError) {
+    if (errs.length) {
         const errorMsg = `${getI18nText(session, 'messages.partialFailed')}\n${errs.join('\n')}`;
         await sendTimeout(session, errorMsg, config);
         await delay(600);
     }
     if (items.length === 0) {
         const failMsg = `${getI18nText(session, 'messages.allFailed')}\n${errs.join('\n')}`;
-        if (!config.ignoreSendError) {
-            await sendTimeout(session, failMsg, config);
-        }
+        await sendTimeout(session, failMsg, config);
         return;
     }
     for (const item of items) {
-        await sendTimeout(session, item.text, config);
-        await delay(300);
+        if (item.text) {
+            await sendTimeout(session, item.text, config);
+            await delay(300);
+        }
         await sendTimeout(session, item.image, config);
         await delay(1000);
     }
@@ -329,12 +254,12 @@ function apply(ctx, config) {
             if (imageBuffer.has(key)) {
                 const b = imageBuffer.get(key);
                 clearTimeout(b.timer);
-                b.timer = setTimeout(() => flush(session, config), config.messageBufferDelay * 1000);
+                b.timer = setTimeout(() => flush(session, config), 0);
             }
             else {
                 imageBuffer.set(key, {
                     apis: config.customImageApis,
-                    timer: setTimeout(() => flush(session, config), config.messageBufferDelay * 1000),
+                    timer: setTimeout(() => flush(session, config), 0),
                     tipMsgId: tipId
                 });
             }
@@ -352,39 +277,21 @@ function apply(ctx, config) {
             await sendTimeout(session, 'messages.fetchWaiting', config);
         }
         const result = await fetchHsjpImage(msg, msg1, msg2, config);
+        if (result.timeout && config.showTimeoutTip) {
+            await sendTimeout(session, '图片请求超时，请稍后再试', config);
+            return;
+        }
         if (result.success) {
-            let imageElem;
-            if (config.useImageUrlInsteadOfFile) {
-                imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
-            }
-            else if (result.type === 'url' && config.downloadImageBeforeSend) {
-                try {
-                    const filename = crypto_1.default.createHash('md5').update(result.data).digest('hex');
-                    const filePath = await downloadImageWithThreads(result.data, filename, config);
-                    const absPath = path_1.default.resolve(filePath);
-                    fs_1.default.chmodSync(absPath, 0o777);
-                    imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-                }
-                catch (error) {
-                    imageElem = koishi_1.h.image(result.data);
-                }
-            }
-            else if (result.type === 'buffer') {
-                if (!fs_1.default.existsSync(config.tempDir)) {
-                    fs_1.default.mkdirSync(config.tempDir, { recursive: true, mode: 0o777 });
-                }
-                const filename = crypto_1.default.randomUUID();
-                const filePath = path_1.default.join(config.tempDir, `${filename}.jpg`);
-                const absPath = path_1.default.resolve(filePath);
-                fs_1.default.writeFileSync(absPath, result.data, { mode: 0o777 });
-                imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-            }
-            else {
-                imageElem = koishi_1.h.image(result.data);
+            const imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
+            if (config.showSuccessTip) {
+                await sendTimeout(session, 'messages.fetchSuccess', config);
+                await delay(300);
             }
-            await sendTimeout(session, 'messages.fetchSuccess', config);
             await sendTimeout(session, imageElem, config);
         }
+        else {
+            await sendTimeout(session, 'messages.fetchFailed', config);
+        }
     });
     ctx.command('dmjp <text>', locales['zh-CN']['commands.dmjp'])
         .action(async ({ session }, text) => {
@@ -398,39 +305,21 @@ function apply(ctx, config) {
             await sendTimeout(session, 'messages.fetchWaiting', config);
         }
         const result = await fetchDmjpImage(text, config);
+        if (result.timeout && config.showTimeoutTip) {
+            await sendTimeout(session, '图片请求超时，请稍后再试', config);
+            return;
+        }
         if (result.success) {
-            let imageElem;
-            if (config.useImageUrlInsteadOfFile) {
-                imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
-            }
-            else if (result.type === 'url' && config.downloadImageBeforeSend) {
-                try {
-                    const filename = crypto_1.default.createHash('md5').update(result.data).digest('hex');
-                    const filePath = await downloadImageWithThreads(result.data, filename, config);
-                    const absPath = path_1.default.resolve(filePath);
-                    fs_1.default.chmodSync(absPath, 0o777);
-                    imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-                }
-                catch (error) {
-                    imageElem = koishi_1.h.image(result.data);
-                }
+            const imageElem = koishi_1.h.image(result.type === 'url' ? result.data : `data:image/jpeg;base64,${Buffer.from(result.data).toString('base64')}`);
+            if (config.showSuccessTip) {
+                await sendTimeout(session, 'messages.fetchSuccess', config);
+                await delay(300);
             }
-            else if (result.type === 'buffer') {
-                if (!fs_1.default.existsSync(config.tempDir)) {
-                    fs_1.default.mkdirSync(config.tempDir, { recursive: true, mode: 0o777 });
-                }
-                const filename = crypto_1.default.randomUUID();
-                const filePath = path_1.default.join(config.tempDir, `${filename}.jpg`);
-                const absPath = path_1.default.resolve(filePath);
-                fs_1.default.writeFileSync(absPath, result.data, { mode: 0o777 });
-                imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
-            }
-            else {
-                imageElem = koishi_1.h.image(result.data);
-            }
-            await sendTimeout(session, 'messages.fetchSuccess', config);
             await sendTimeout(session, imageElem, config);
         }
+        else {
+            await sendTimeout(session, 'messages.fetchFailed', config);
+        }
     });
     ctx.command('clear-image-cache', locales['zh-CN']['commands.clear-image-cache'])
         .action(({ session }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-custom-image",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Koishi自定义图片API插件（內置支持黑丝/动漫举牌）",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",