koishi-plugin-custom-image 0.2.1 → 0.2.3

package/lib/index.d.ts

@@ -17,6 +17,7 @@ export interface Config {
     downloadImageBeforeSend: boolean;
     messageBufferDelay: number;
     tempDir: string;
+    useImageUrlInsteadOfFile: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -12,8 +12,26 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const promises_1 = require("stream/promises");
 const worker_threads_1 = require("worker_threads");
-const zh_CN_yml_1 = __importDefault(require("./locales/zh-CN.yml"));
-const currentFilePath = path_1.default.join(process.cwd(), 'src', 'index.ts');
+const locales = {
+    'zh-CN': {
+        'messages.repeatRequest': '请求过于频繁，请稍后再试',
+        'messages.fetchFailed': '图片获取失败',
+        'messages.partialFailed': '部分图片获取失败：',
+        'messages.allFailed': '所有图片获取失败：',
+        'messages.fetchSuccess': '图片获取成功！',
+        'messages.fetchWaiting': '正在获取图片，请稍候...',
+        'messages.inputError': '输入内容不能为空！',
+        'messages.cacheCleared': '✅ 图片缓存已清空',
+        'commands.random-image': '随机获取图片',
+        'commands.random-image.options.api': '指定图片API地址',
+        'commands.hsjp': '生成黑丝举牌图片',
+        'commands.dmjp': '生成动漫举牌图片',
+        'commands.clear-image-cache': '清空图片缓存'
+    }
+};
+const currentFilePath = worker_threads_1.isMainThread
+    ? __filename
+    : path_1.default.join(process.cwd(), worker_threads_1.isMainThread ? 'src/index.ts' : 'lib/index.js');
 exports.name = 'custom-image';
 exports.Config = koishi_1.Schema.object({
     enable: koishi_1.Schema.boolean()
@@ -63,15 +81,18 @@ exports.Config = koishi_1.Schema.object({
         .min(0)
         .description('【缓存设置】自动清理缓存间隔（分钟）'),
     downloadImageBeforeSend: koishi_1.Schema.boolean()
-        .default(true)
-        .description('【展示设置】发送前下载图片：发送前先下载图片到本地，再发送文件（仅OneBot）'),
+        .default(false)
+        .description('【展示设置】发送前下载图片（关闭可解决OneBot文件上传问题）'),
     messageBufferDelay: koishi_1.Schema.number()
         .default(0)
         .min(0)
         .description('【性能设置】消息缓冲延迟：合并短时间内的多个图片请求（秒）'),
     tempDir: koishi_1.Schema.string()
         .default(path_1.default.join(process.cwd(), 'temp_images'))
-        .description('【文件设置】临时图片保存目录')
+        .description('【文件设置】临时图片保存目录'),
+    useImageUrlInsteadOfFile: koishi_1.Schema.boolean()
+        .default(true)
+        .description('【兼容设置】强制使用图片URL发送（避免OneBot文件上传错误）')
 });
 if (!worker_threads_1.isMainThread) {
     const { url, filePath } = worker_threads_1.workerData;
@@ -97,8 +118,17 @@ if (!worker_threads_1.isMainThread) {
 const processedApi = new Map();
 const imageBuffer = new Map();
 const delay = (ms) => new Promise(r => setTimeout(r, ms));
+function getI18nText(session, key) {
+    if (session?.text) {
+        return session.text(key);
+    }
+    const lang = 'zh-CN';
+    return locales[lang][key] || key;
+}
 async function sendTimeout(session, content, config) {
-    const text = typeof content === 'string' ? session.text(content) : content;
+    const text = typeof content === 'string'
+        ? getI18nText(session, content)
+        : content;
     if (config.imageSendTimeout <= 0) {
         return session.send(text).catch(() => null);
     }
@@ -110,7 +140,7 @@ async function sendTimeout(session, content, config) {
 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 });
+            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 } });
@@ -194,20 +224,24 @@ 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: session.text('messages.repeatRequest') };
+        return { success: false, msg: getI18nText(session, 'messages.repeatRequest') };
     }
     processedApi.set(hash, now);
     const result = await fetchImage(apiUrl, config);
     if (!result.success) {
-        return { success: false, msg: session.text('messages.fetchFailed') };
+        return { success: false, msg: getI18nText(session, 'messages.fetchFailed') };
     }
     let imageElem;
-    if (result.type === 'url' && config.downloadImageBeforeSend) {
+    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);
-            imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+            fs_1.default.chmodSync(absPath, 0o777);
+            imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
         }
         catch (error) {
             imageElem = koishi_1.h.image(result.data);
@@ -215,18 +249,18 @@ async function processCustomImage(session, apiUrl, config) {
     }
     else if (result.type === 'buffer') {
         if (!fs_1.default.existsSync(config.tempDir)) {
-            fs_1.default.mkdirSync(config.tempDir, { recursive: true });
+            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);
-        imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+        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: session.text('messages.fetchSuccess'), image: imageElem } };
+    return { success: true, msg: 'ok', data: { text: getI18nText(session, 'messages.fetchSuccess'), image: imageElem } };
 }
 async function flush(session, config, manualApi) {
     const key = `${session.platform}:${session.userId}:${session.channelId}`;
@@ -250,12 +284,12 @@ async function flush(session, config, manualApi) {
         }
     }
     if (errs.length && !config.ignoreSendError) {
-        const errorMsg = `${session.text('messages.partialFailed')}\n${errs.join('\n')}`;
+        const errorMsg = `${getI18nText(session, 'messages.partialFailed')}\n${errs.join('\n')}`;
         await sendTimeout(session, errorMsg, config);
         await delay(600);
     }
     if (items.length === 0) {
-        const failMsg = `${session.text('messages.allFailed')}\n${errs.join('\n')}`;
+        const failMsg = `${getI18nText(session, 'messages.allFailed')}\n${errs.join('\n')}`;
         if (!config.ignoreSendError) {
             await sendTimeout(session, failMsg, config);
         }
@@ -271,11 +305,13 @@ async function flush(session, config, manualApi) {
 function apply(ctx, config) {
     if (!worker_threads_1.isMainThread)
         return;
-    ctx.i18n.define('zh-CN', zh_CN_yml_1.default);
+    Object.keys(locales).forEach(lang => {
+        ctx.i18n.define(lang, locales[lang]);
+    });
     clearAllCache(config);
     ctx.logger.info('[custom-image] 插件已加载');
-    ctx.command('random-image [apis...]', '#commands.random-image')
-        .option('api', '-a <api> #commands.random-image.options.api')
+    ctx.command('random-image [apis...]', locales['zh-CN']['commands.random-image'])
+        .option('api', `-a <api> ${locales['zh-CN']['commands.random-image.options.api']}`)
         .action(async ({ session, options = {} }, ...apis) => {
         if (!config.enable || !config.customImageEnabled || !session)
             return;
@@ -304,7 +340,7 @@ function apply(ctx, config) {
             }
         }
     });
-    ctx.command('hsjp <msg> [msg1] [msg2]', '#commands.hsjp')
+    ctx.command('hsjp <msg> [msg1] [msg2]', locales['zh-CN']['commands.hsjp'])
         .action(async ({ session }, msg, msg1 = '', msg2 = '') => {
         if (!config.enable || !config.hsjpEnabled || !session)
             return;
@@ -318,12 +354,16 @@ function apply(ctx, config) {
         const result = await fetchHsjpImage(msg, msg1, msg2, config);
         if (result.success) {
             let imageElem;
-            if (result.type === 'url' && config.downloadImageBeforeSend) {
+            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);
-                    imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+                    fs_1.default.chmodSync(absPath, 0o777);
+                    imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
                 }
                 catch (error) {
                     imageElem = koishi_1.h.image(result.data);
@@ -331,13 +371,13 @@ function apply(ctx, config) {
             }
             else if (result.type === 'buffer') {
                 if (!fs_1.default.existsSync(config.tempDir)) {
-                    fs_1.default.mkdirSync(config.tempDir, { recursive: true });
+                    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);
-                imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+                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);
@@ -346,7 +386,7 @@ function apply(ctx, config) {
             await sendTimeout(session, imageElem, config);
         }
     });
-    ctx.command('dmjp <text>', '#commands.dmjp')
+    ctx.command('dmjp <text>', locales['zh-CN']['commands.dmjp'])
         .action(async ({ session }, text) => {
         if (!config.enable || !config.dmjpEnabled || !session)
             return;
@@ -360,12 +400,16 @@ function apply(ctx, config) {
         const result = await fetchDmjpImage(text, config);
         if (result.success) {
             let imageElem;
-            if (result.type === 'url' && config.downloadImageBeforeSend) {
+            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);
-                    imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+                    fs_1.default.chmodSync(absPath, 0o777);
+                    imageElem = koishi_1.h.file(`file://${absPath.replace(/\\/g, '/')}`);
                 }
                 catch (error) {
                     imageElem = koishi_1.h.image(result.data);
@@ -373,13 +417,13 @@ function apply(ctx, config) {
             }
             else if (result.type === 'buffer') {
                 if (!fs_1.default.existsSync(config.tempDir)) {
-                    fs_1.default.mkdirSync(config.tempDir, { recursive: true });
+                    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);
-                imageElem = koishi_1.h.file(`file:///${absPath.replace(/\\/g, '/')}`);
+                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);
@@ -388,10 +432,10 @@ function apply(ctx, config) {
             await sendTimeout(session, imageElem, config);
         }
     });
-    ctx.command('clear-image-cache', '#commands.clear-image-cache')
+    ctx.command('clear-image-cache', locales['zh-CN']['commands.clear-image-cache'])
         .action(({ session }) => {
         clearAllCache(config);
-        return session ? session.text('messages.cacheCleared') : '✅ 图片缓存已清空';
+        return session ? getI18nText(session, 'messages.cacheCleared') : '✅ 图片缓存已清空';
     });
     setInterval(() => {
         const now = Date.now();

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "koishi-plugin-custom-image",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Koishi自定义图片API插件（內置支持黑丝/动漫举牌）",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
-    "lib",
-    "src",
-    "src/locales"
+    "lib"
   ],
   "scripts": {
     "build": "tsc",
@@ -18,22 +16,16 @@
     "koishi": "^4.0.0"
   },
   "dependencies": {
-    "axios": "^1.6.8",
-    "yaml": "^2.4.1"
+    "axios": "^1.6.8"
   },
   "devDependencies": {
     "typescript": "^5.3.3",
-    "@types/node": "^20.11.17",
-    "@koishijs/typings": "^4.0.0",
-    "@types/yaml": "^1.9.7"
+    "@types/node": "^20.11.17"
   },
   "koishi": {
     "description": {
       "zh-CN": "自定义图片API调用 + 內置黑丝/动漫举牌功能"
-    },
-    "locales": [
-      "zh-CN"
-    ]
+    }
   },
   "keywords": [
     "koishi",

package/src/index.ts

@@ -1,471 +0,0 @@
-import { Context, Schema, h, Session } from 'koishi'
-import axios from 'axios'
-import crypto from 'crypto'
-import fs from 'fs'
-import path from 'path'
-import { pipeline } from 'stream/promises'
-import { isMainThread, Worker, workerData, parentPort } from 'worker_threads'
-
-import zhCN from './locales/zh-CN.yml'
-
-const currentFilePath = path.join(process.cwd(), 'src', 'index.ts');
-
-export 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
-}
-
-export const Config: Schema<Config> = Schema.object({
-  enable: Schema.boolean()
-    .default(true)
-    .description('【基础设置】启用插件'),
-  showWaitingTip: Schema.boolean()
-    .default(true)
-    .description('【基础设置】请求图片时显示等待提示'),
-  sameImageApiInterval: Schema.number()
-    .default(60)
-    .min(0)
-    .description('【基础设置】重复API调用间隔（秒）'),
-  timeout: Schema.number()
-    .default(10000)
-    .min(0)
-    .description('【基础设置】API请求超时时间（毫秒）'),
-  customImageApis: Schema.array(Schema.string())
-    .default([])
-    .role('textarea')
-    .description('【基础设置】自定义图片API列表（每行一个地址）'),
-  customImageEnabled: Schema.boolean()
-    .default(true)
-    .description('【功能开关】启用自定义图片API功能'),
-  hsjpEnabled: Schema.boolean()
-    .default(true)
-    .description('【功能开关】启用黑丝举牌功能'),
-  dmjpEnabled: Schema.boolean()
-    .default(true)
-    .description('【功能开关】启用动漫举牌功能'),
-  ignoreSendError: Schema.boolean()
-    .default(true)
-    .description('【容错设置】忽略发送错误'),
-  retryTimes: Schema.number()
-    .default(1)
-    .min(0)
-    .description('【容错设置】API重试次数'),
-  retryInterval: Schema.number()
-    .default(500)
-    .min(0)
-    .description('【容错设置】重试间隔（毫秒）'),
-  imageSendTimeout: Schema.number()
-    .default(15000)
-    .min(0)
-    .description('【容错设置】图片发送超时（毫秒）'),
-  autoClearCacheInterval: Schema.number()
-    .default(60)
-    .min(0)
-    .description('【缓存设置】自动清理缓存间隔（分钟）'),
-  downloadImageBeforeSend: Schema.boolean()
-    .default(true)
-    .description('【展示设置】发送前下载图片：发送前先下载图片到本地，再发送文件（仅OneBot）'),
-  messageBufferDelay: Schema.number()
-    .default(0)
-    .min(0)
-    .description('【性能设置】消息缓冲延迟：合并短时间内的多个图片请求（秒）'),
-  tempDir: Schema.string()
-    .default(path.join(process.cwd(), 'temp_images'))
-    .description('【文件设置】临时图片保存目录')
-})
-
-if (!isMainThread) {
-  const { url, filePath } = workerData;
-  (async () => {
-    try {
-      const response = await axios({
-        url,
-        method: 'GET',
-        responseType: 'stream',
-        timeout: 60000,
-        headers: {
-          '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'
-        }
-      });
-
-      await pipeline(response.data, fs.createWriteStream(filePath));
-      parentPort?.postMessage({ success: true, filePath });
-    } catch (error) {
-      parentPort?.postMessage({ success: false, error: (error as Error).message });
-    }
-  })();
-}
-
-const processedApi = new Map<string, number>()
-const imageBuffer = new Map<string, { apis: string[], timer: NodeJS.Timeout, tipMsgId?: string | number }>()
-const delay = (ms: number) => new Promise(r => setTimeout(r, ms))
-
-async function sendTimeout(session: Session, content: string | any, config: Config) {
-  const text = typeof content === 'string' ? session.text(content) : content;
-  if (config.imageSendTimeout <= 0) {
-    return session.send(text).catch(() => null);
-  }
-  return Promise.race([
-    session.send(text),
-    new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), config.imageSendTimeout))
-  ]).catch(() => null);
-}
-
-async function downloadImageWithThreads(url: string, filename: string, config: Config): Promise<string> {
-  return new Promise((resolve, reject) => {
-    if (!fs.existsSync(config.tempDir)) {
-      fs.mkdirSync(config.tempDir, { recursive: true });
-    }
-    const filePath = path.join(config.tempDir, `${filename}.jpg`);
-
-    const worker = new Worker(currentFilePath, { workerData: { url, filePath } });
-    worker.on('message', (result: { success: boolean, filePath?: string, error?: string }) => {
-      if (result.success && result.filePath) {
-        resolve(result.filePath);
-      } else {
-        reject(new Error(result.error || '图片获取失败'));
-      }
-    });
-    worker.on('error', reject);
-    worker.on('exit', (code: number) => {
-      if (code !== 0) reject(new Error('图片下载线程异常'));
-    });
-  });
-}
-
-function clearAllCache(config: Config) {
-  processedApi.clear();
-  imageBuffer.forEach(buf => clearTimeout(buf.timer));
-  imageBuffer.clear();
-
-  if (fs.existsSync(config.tempDir)) {
-    fs.readdirSync(config.tempDir).forEach(file => {
-      try {
-        const filePath = path.join(config.tempDir, file);
-        const stat = fs.statSync(filePath);
-        if (Date.now() - stat.mtimeMs > 3600000) {
-          fs.unlinkSync(filePath);
-        }
-      } catch (error) {}
-    });
-  }
-  return true;
-}
-
-function randomSelectApi(customImageApis: string[]): string | null {
-  const validApis = customImageApis.filter(api => api.trim());
-  if (validApis.length === 0) return null;
-  return validApis[Math.floor(Math.random() * validApis.length)];
-}
-
-async function fetchImage(url: string, config: Config) {
-  const http = axios.create({
-    timeout: config.timeout,
-    headers: {
-      '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 };
-      }
-    } catch (error) {
-      if (retry === config.retryTimes) return { success: false, type: '', data: '' };
-      await delay(config.retryInterval);
-    }
-  }
-
-  return { success: false, type: '', data: '' };
-}
-
-async function fetchHsjpImage(msg: string, msg1: string, msg2: string, config: Config) {
-  const encodedMsg = encodeURIComponent(msg);
-  const encodedMsg1 = encodeURIComponent(msg1);
-  const encodedMsg2 = encodeURIComponent(msg2);
-  const url = `https://api.suyanw.cn/api/hsjp/?msg=${encodedMsg}&msg1=${encodedMsg1}&msg2=${encodedMsg2}`;
-  return fetchImage(url, config);
-}
-
-async function fetchDmjpImage(text: string, config: Config) {
-  const encodedText = encodeURIComponent(text);
-  const url = `https://api.suyanw.cn/api/dmjp.php?text=${encodedText}`;
-  return fetchImage(url, config);
-}
-
-async function processCustomImage(session: Session, apiUrl: string, config: Config) {
-  const hash = crypto.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: session.text('messages.repeatRequest') };
-  }
-  processedApi.set(hash, now);
-
-  const result = await fetchImage(apiUrl, config);
-  if (!result.success) {
-    return { success: false, msg: session.text('messages.fetchFailed') };
-  }
-
-  let imageElem: any;
-  if (result.type === 'url' && config.downloadImageBeforeSend) {
-    try {
-      const filename = crypto.createHash('md5').update(result.data as string).digest('hex');
-      const filePath = await downloadImageWithThreads(result.data as string, filename, config);
-      const absPath = path.resolve(filePath);
-      imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-    } catch (error) {
-      imageElem = h.image(result.data as string);
-    }
-  } else if (result.type === 'buffer') {
-    if (!fs.existsSync(config.tempDir)) {
-      fs.mkdirSync(config.tempDir, { recursive: true });
-    }
-    const filename = crypto.randomUUID();
-    const filePath = path.join(config.tempDir, `${filename}.jpg`);
-    const absPath = path.resolve(filePath);
-    fs.writeFileSync(absPath, result.data as Buffer);
-    imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-  } else {
-    imageElem = h.image(result.data as string);
-  }
-
-  return { success: true, msg: 'ok', data: { text: session.text('messages.fetchSuccess'), image: imageElem } };
-}
-
-async function flush(session: Session, config: Config, manualApi?: string) {
-  const key = `${session.platform}:${session.userId}:${session.channelId}`;
-  const buf = imageBuffer.get(key);
-  const apis = manualApi ? [manualApi] : buf?.apis || [];
-
-  if (buf) {
-    clearTimeout(buf.timer);
-    imageBuffer.delete(key);
-  }
-
-  if (!config.customImageEnabled || !apis.length) return;
-
-  const items: any[] = [];
-  const errs: string[] = [];
-
-  for (const apiUrl of apis) {
-    const result = await processCustomImage(session, apiUrl, config);
-    if (result.success && result.data) {
-      items.push(result.data);
-    } else {
-      errs.push(`【${apiUrl.slice(0, 22)}...】：${result.msg}`);
-    }
-  }
-
-  if (errs.length && !config.ignoreSendError) {
-    const errorMsg = `${session.text('messages.partialFailed')}\n${errs.join('\n')}`;
-    await sendTimeout(session, errorMsg, config);
-    await delay(600);
-  }
-
-  if (items.length === 0) {
-    const failMsg = `${session.text('messages.allFailed')}\n${errs.join('\n')}`;
-    if (!config.ignoreSendError) {
-      await sendTimeout(session, failMsg, config);
-    }
-    return;
-  }
-
-  for (const item of items) {
-    await sendTimeout(session, item.text, config);
-    await delay(300);
-    await sendTimeout(session, item.image, config);
-    await delay(1000);
-  }
-}
-
-export function apply(ctx: Context, config: Config) {
-  if (!isMainThread) return;
-
-  ctx.i18n.define('zh-CN', zhCN);
-
-  clearAllCache(config);
-  ctx.logger.info('[custom-image] 插件已加载');
-
-  ctx.command('random-image [apis...]', '#commands.random-image')
-    .option('api', '-a <api> #commands.random-image.options.api')
-    .action(async ({ session, options = {} }, ...apis) => {
-      if (!config.enable || !config.customImageEnabled || !session) return;
-
-      const targetApi = options.api || (apis.length ? apis.join(' ') : null);
-      if (targetApi) {
-        await flush(session, config, targetApi);
-      } else {
-        const key = `${session.platform}:${session.userId}:${session.channelId}`;
-        
-        let tipId;
-        if (config.showWaitingTip) {
-          const tip = await sendTimeout(session, 'messages.fetchWaiting', config);
-          tipId = (tip as any)?.messageId || (tip as any)?.id || tip;
-        }
-
-        if (imageBuffer.has(key)) {
-          const b = imageBuffer.get(key)!;
-          clearTimeout(b.timer);
-          b.timer = setTimeout(() => flush(session, config), config.messageBufferDelay * 1000);
-        } else {
-          imageBuffer.set(key, {
-            apis: config.customImageApis,
-            timer: setTimeout(() => flush(session, config), config.messageBufferDelay * 1000),
-            tipMsgId: tipId
-          });
-        }
-      }
-    });
-
-  ctx.command('hsjp <msg> [msg1] [msg2]', '#commands.hsjp')
-    .action(async ({ session }, msg, msg1 = '', msg2 = '') => {
-      if (!config.enable || !config.hsjpEnabled || !session) return;
-      
-      if (!msg || msg.trim().length === 0) {
-        await sendTimeout(session, 'messages.inputError', config);
-        return;
-      }
-
-      if (config.showWaitingTip) {
-        await sendTimeout(session, 'messages.fetchWaiting', config);
-      }
-
-      const result = await fetchHsjpImage(msg, msg1, msg2, config);
-      if (result.success) {
-        let imageElem: any;
-        if (result.type === 'url' && config.downloadImageBeforeSend) {
-          try {
-            const filename = crypto.createHash('md5').update(result.data as string).digest('hex');
-            const filePath = await downloadImageWithThreads(result.data as string, filename, config);
-            const absPath = path.resolve(filePath);
-            imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-          } catch (error) {
-            imageElem = h.image(result.data as string);
-          }
-        } else if (result.type === 'buffer') {
-          if (!fs.existsSync(config.tempDir)) {
-            fs.mkdirSync(config.tempDir, { recursive: true });
-          }
-          const filename = crypto.randomUUID();
-          const filePath = path.join(config.tempDir, `${filename}.jpg`);
-          const absPath = path.resolve(filePath);
-          fs.writeFileSync(absPath, result.data as Buffer);
-          imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-        } else {
-          imageElem = h.image(result.data as string);
-        }
-        await sendTimeout(session, 'messages.fetchSuccess', config);
-        await sendTimeout(session, imageElem, config);
-      }
-    });
-
-  ctx.command('dmjp <text>', '#commands.dmjp')
-    .action(async ({ session }, text) => {
-      if (!config.enable || !config.dmjpEnabled || !session) return;
-      
-      if (!text || text.trim().length === 0) {
-        await sendTimeout(session, 'messages.inputError', config);
-        return;
-      }
-
-      if (config.showWaitingTip) {
-        await sendTimeout(session, 'messages.fetchWaiting', config);
-      }
-
-      const result = await fetchDmjpImage(text, config);
-      if (result.success) {
-        let imageElem: any;
-        if (result.type === 'url' && config.downloadImageBeforeSend) {
-          try {
-            const filename = crypto.createHash('md5').update(result.data as string).digest('hex');
-            const filePath = await downloadImageWithThreads(result.data as string, filename, config);
-            const absPath = path.resolve(filePath);
-            imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-          } catch (error) {
-            imageElem = h.image(result.data as string);
-          }
-        } else if (result.type === 'buffer') {
-          if (!fs.existsSync(config.tempDir)) {
-            fs.mkdirSync(config.tempDir, { recursive: true });
-          }
-          const filename = crypto.randomUUID();
-          const filePath = path.join(config.tempDir, `${filename}.jpg`);
-          const absPath = path.resolve(filePath);
-          fs.writeFileSync(absPath, result.data as Buffer);
-          imageElem = h.file(`file:///${absPath.replace(/\\/g, '/')}`);
-        } else {
-          imageElem = h.image(result.data as string);
-        }
-        await sendTimeout(session, 'messages.fetchSuccess', config);
-        await sendTimeout(session, imageElem, config);
-      }
-    });
-
-  ctx.command('clear-image-cache', '#commands.clear-image-cache')
-    .action(({ session }) => {
-      clearAllCache(config);
-      return session ? session.text('messages.cacheCleared') : '✅ 图片缓存已清空';
-    });
-
-  setInterval(() => {
-    const now = Date.now();
-    processedApi.forEach((timestamp, hash) => {
-      if (now - timestamp > 86400000) processedApi.delete(hash);
-    });
-  }, 3600000);
-
-  setInterval(() => {
-    if (!fs.existsSync(config.tempDir)) return;
-
-    const now = Date.now();
-    fs.readdirSync(config.tempDir).forEach(file => {
-      try {
-        const stat = fs.statSync(path.join(config.tempDir, file));
-        if (now - stat.mtimeMs > 3600000) {
-          fs.unlinkSync(path.join(config.tempDir, file));
-        }
-      } catch (error) {}
-    });
-  }, 1800000);
-
-  if (config.autoClearCacheInterval > 0) {
-    setInterval(() => {
-      clearAllCache(config);
-      ctx.logger.info('[custom-image] 缓存已自动清理');
-    }, config.autoClearCacheInterval * 60000);
-  }
-
-  process.on('exit', () => {
-    clearAllCache(config);
-    ctx.logger.info('[custom-image] 插件缓存已清理');
-  });
-}
-
-export const inject = {
-  optional: ['i18n']
-}
-
-export const using = [] as const

package/src/locales/zh-CN.yml

@@ -1,16 +0,0 @@
-commands:
-  random-image: 随机获取自定义图片
-  random-image.options.api: 指定单个API地址
-  hsjp: 生成黑丝举牌图片
-  dmjp: 生成动漫举牌图片
-  clear-image-cache: 清空图片缓存
-
-messages:
-  inputError: ❌ 指令输入错误：请输入举牌文字
-  cacheCleared: ✅ 图片缓存已清空
-  fetchSuccess: ✅ 图片获取成功
-  fetchWaiting: 正在获取图片，请稍候...
-  repeatRequest: 请勿重复请求
-  fetchFailed: 图片获取失败
-  partialFailed: ⚠️ 部分图片获取失败
-  allFailed: ❌ 所有图片获取失败

package/src/shims.d.ts

@@ -1,9 +0,0 @@
-declare module '*.yml' {
-  const content: Record<string, any>;
-  export default content;
-}
-
-declare module '*.yaml' {
-  const content: Record<string, any>;
-  export default content;
-}