@forgetmelody/koishi-plugin-best-cave 1.0.0 → 1.0.1

package/lib/index.js

@@ -304,7 +304,6 @@ var import_koishi2 = require("koishi");
 var import_koishi = require("koishi");
 var path2 = __toESM(require("path"));
 var crypto = __toESM(require("crypto"));
-var import_jimp = __toESM(require("jimp"));
 var mimeTypeMap = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".mp4": "video/mp4", ".mp3": "audio/mpeg", ".webp": "image/webp" };
 function resolveCaveHeaderFooter(cave, config, prefix) {
   const data = {
@@ -424,10 +423,87 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
 __name(buildCaveMessage, "buildCaveMessage");
 var qqImageCache = /* @__PURE__ */ new Map();
 var qqImageTypes = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp" };
+function detectImageType(buffer) {
+  if (buffer.length >= 24 && buffer[0] === 137 && buffer.toString("ascii", 1, 4) === "PNG") {
+    return { ext: ".png", mime: "image/png" };
+  }
+  if (buffer.length >= 10 && buffer.toString("ascii", 0, 3) === "GIF") {
+    return { ext: ".gif", mime: "image/gif" };
+  }
+  if (buffer.length >= 3 && buffer[0] === 255 && buffer[1] === 216 && buffer[2] === 255) {
+    return { ext: ".jpg", mime: "image/jpeg" };
+  }
+  if (buffer.length >= 12 && buffer.toString("ascii", 0, 4) === "RIFF" && buffer.toString("ascii", 8, 12) === "WEBP") {
+    return { ext: ".webp", mime: "image/webp" };
+  }
+  return null;
+}
+__name(detectImageType, "detectImageType");
+function readUInt24LE(buffer, offset) {
+  return buffer[offset] | buffer[offset + 1] << 8 | buffer[offset + 2] << 16;
+}
+__name(readUInt24LE, "readUInt24LE");
+function getJpegSize(buffer) {
+  let offset = 2;
+  while (offset + 9 < buffer.length) {
+    if (buffer[offset] !== 255) {
+      offset++;
+      continue;
+    }
+    const marker = buffer[offset + 1];
+    if (marker >= 192 && marker <= 207 && ![196, 200, 204].includes(marker)) {
+      return { height: buffer.readUInt16BE(offset + 5), width: buffer.readUInt16BE(offset + 7) };
+    }
+    const length = buffer.readUInt16BE(offset + 2);
+    if (length < 2) break;
+    offset += 2 + length;
+  }
+  return null;
+}
+__name(getJpegSize, "getJpegSize");
+function getWebpSize(buffer) {
+  const chunk = buffer.toString("ascii", 12, 16);
+  if (chunk === "VP8X") {
+    return { width: 1 + readUInt24LE(buffer, 24), height: 1 + readUInt24LE(buffer, 27) };
+  }
+  if (chunk === "VP8 ") {
+    return { width: buffer.readUInt16LE(26) & 16383, height: buffer.readUInt16LE(28) & 16383 };
+  }
+  if (chunk === "VP8L") {
+    const b0 = buffer[21], b1 = buffer[22], b2 = buffer[23], b3 = buffer[24];
+    return { width: 1 + (b0 | (b1 & 63) << 8), height: 1 + (b1 >> 6 | b2 << 2 | (b3 & 15) << 10) };
+  }
+  return null;
+}
+__name(getWebpSize, "getWebpSize");
+function getImageSize(buffer) {
+  const type = detectImageType(buffer);
+  if (!type) return null;
+  if (type.ext === ".png") return { width: buffer.readUInt32BE(16), height: buffer.readUInt32BE(20) };
+  if (type.ext === ".gif") return { width: buffer.readUInt16LE(6), height: buffer.readUInt16LE(8) };
+  if (type.ext === ".jpg") return getJpegSize(buffer);
+  if (type.ext === ".webp") return getWebpSize(buffer);
+  return null;
+}
+__name(getImageSize, "getImageSize");
+async function getImageSizeFromUrl(session, url) {
+  if (!url.startsWith("http")) return null;
+  try {
+    const data = await session.bot.ctx.http.get(url, { responseType: "arraybuffer", timeout: 15e3 });
+    return getImageSize(Buffer.from(data));
+  } catch {
+    return null;
+  }
+}
+__name(getImageSizeFromUrl, "getImageSizeFromUrl");
 async function uploadQQImage(session, buffer, fileName) {
-  const contentType = qqImageTypes[path2.extname(fileName).toLowerCase()];
-  if (!contentType || buffer.length > 10 * 1024 * 1024) return null;
-  const cached = qqImageCache.get(`${session.bot.selfId}:${fileName}`);
+  if (buffer.length > 10 * 1024 * 1024) return null;
+  const detected = detectImageType(buffer);
+  const contentType = detected?.mime ?? qqImageTypes[path2.extname(fileName).toLowerCase()];
+  if (!contentType) return null;
+  const uploadName = detected ? `${path2.basename(fileName, path2.extname(fileName))}${detected.ext}` : fileName;
+  const cacheKey = `${session.bot.selfId}:${fileName}`;
+  const cached = qqImageCache.get(cacheKey);
   if (cached) return cached;
   const bot = session.bot;
   const request = bot.internal.http();
@@ -435,7 +511,7 @@ async function uploadQQImage(session, buffer, fileName) {
   const sha1 = crypto.createHash("sha1").update(buffer).digest("hex");
   const prepared = await request("/v2/media-images/prepare", {
     method: "POST",
-    data: { file_name: fileName, file_size: buffer.length, content_type: contentType, md5, sha1 }
+    data: { file_name: uploadName, file_size: buffer.length, content_type: contentType, md5, sha1 }
   });
   await bot.ctx.http.put(prepared.presigned_url, buffer, { headers: { "Content-Type": contentType } });
   const completed = await request("/v2/media-images/complete", {
@@ -443,19 +519,10 @@ async function uploadQQImage(session, buffer, fileName) {
     data: { upload_id: prepared.upload_id, md5 }
   });
   if (!completed?.url) return null;
-  qqImageCache.set(`${session.bot.selfId}:${fileName}`, completed.url);
+  qqImageCache.set(cacheKey, completed.url);
   return completed.url;
 }
 __name(uploadQQImage, "uploadQQImage");
-async function getImageSize(buffer) {
-  try {
-    const image = await import_jimp.default.read(buffer);
-    return { width: image.bitmap.width, height: image.bitmap.height };
-  } catch {
-    return null;
-  }
-}
-__name(getImageSize, "getImageSize");
 async function buildQQCaveMarkdown(cave, config, fileManager, logger2, session, prefix) {
   const { header, footer } = resolveCaveHeaderFooter(cave, config, prefix);
   const lines = [];
@@ -479,7 +546,8 @@ async function buildQQCaveMarkdown(cave, config, fileManager, logger2, session,
       }
       let url = null;
       if (config.enableS3 && config.publicUrl) {
-        url = new URL(fileName, config.publicUrl).href;
+        const base = config.publicUrl.endsWith("/") ? config.publicUrl : `${config.publicUrl}/`;
+        url = new URL(fileName, base).href;
       } else if (buffer) {
         try {
           url = await uploadQQImage(session, buffer, fileName);
@@ -491,8 +559,13 @@ async function buildQQCaveMarkdown(cave, config, fileManager, logger2, session,
         lines.push("[图片]");
         continue;
       }
-      const size = buffer ? await getImageSize(buffer) : null;
-      lines.push(size ? `![img #${size.width}px #${size.height}px](${url})` : `![img](${url})`);
+      const size = buffer ? getImageSize(buffer) : await getImageSizeFromUrl(session, url);
+      if (!size) {
+        logger2.warn(`无法获取图片 ${fileName} 的尺寸，QQ 端将显示为 [图片]`);
+        lines.push("[图片]");
+        continue;
+      }
+      lines.push(`![img #${size.width}px #${size.height}px](${url})`);
     } else if (el.type === "video") {
       lines.push("[视频]");
     } else if (el.type === "audio") {
@@ -988,7 +1061,7 @@ ${pendingCaves.map((c) => c.id).join("|")}`;
 };
 
 // src/HashManager.ts
-var import_jimp2 = __toESM(require("jimp"));
+var import_jimp = __toESM(require("jimp"));
 var crypto2 = __toESM(require("crypto"));
 var HashManager = class {
   /**
@@ -1278,8 +1351,8 @@ ${imageResult.reportLines.join("\n")}`;
    * @returns 64位十六进制 pHash 字符串。
    */
   async generatePHash(imageBuffer) {
-    const image = await import_jimp2.default.read(imageBuffer);
-    image.resize(32, 32, import_jimp2.default.RESIZE_BILINEAR).greyscale();
+    const image = await import_jimp.default.read(imageBuffer);
+    image.resize(32, 32, import_jimp.default.RESIZE_BILINEAR).greyscale();
     const matrix = Array.from({ length: 32 }, () => new Array(32).fill(0));
     image.scan(0, 0, 32, 32, (x, y, idx) => {
       matrix[y][x] = image.bitmap.data[idx];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@forgetmelody/koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞插件。支持丰富的媒体类型、内容查重、AI分析、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],

package/readme.md

@@ -113,6 +113,18 @@
 | `accessKeyId` | `string` | | **(S3 必填)** S3 访问密钥 ID。 |
 | `secretAccessKey` | `string` | | **(S3 必填)** S3 秘密访问密钥。 |
 
+## 🤖 QQ 官方机器人
+
+插件会自动识别 `qq` 平台的群聊消息，将回声洞改为 **Markdown 消息**（`msg_type: 2`）发送：
+
+- **所有内容同一条消息**：页眉页脚、文字、@ 用户以及该回声洞的全部图片都内联在同一段 Markdown 中（`msg_type: 2` 请求的 `markdown` 与 `keyboard` 字段并列），不会再拆成多条。
+- **图片带真实宽高**：图片按 `![img #宽px #高px](url)` 输出，并直接从文件头解析 PNG / JPEG / GIF / WebP 尺寸，移动端不会显示为 `[图片]` 占位。
+- **S3 图片**：配置了 `enableS3` 和 `publicUrl` 时直接使用公网 URL；未配置 `publicUrl` 时自动上传到 QQ 素材库（单张 ≤10MB，支持 png/jpeg/gif/webp）。若 S3 读取失败但公网可访问，会改从 `publicUrl` 读取尺寸。
+- **按钮**：消息底部附带「再来一个cave」按钮，点击后随机再抽一条，无需申请按钮模板 ID。
+- **不支持内联的元素**：视频、音频、文件、合并转发会显示为 `[视频]`、`[音频]`、`[文件]`、`[合并转发]` 占位文本；多条删除在 QQ 下会逐条发送。
+
+非 QQ 平台仍使用原有消息格式。
+
 ## ⚠️ 注意事项
 
 1. **媒体发送方式**：插件会按以下优先级决定如何发送图片、视频等媒体文件：