koishi-plugin-echo-cave 1.14.0 → 1.14.2

package/lib/cave-helper.d.ts

@@ -1,4 +1,4 @@
-import { EchoCave } from './index';
+import { Config, EchoCave } from './index';
 import { Context, Session } from 'koishi';
-export declare function sendCaveMsg(ctx: Context, session: Session, caveMsg: EchoCave): Promise<void>;
+export declare function sendCaveMsg(ctx: Context, session: Session, caveMsg: EchoCave, cfg: Config): Promise<void>;
 export declare function formatDate(date: Date): string;

package/lib/index.cjs

@@ -42,7 +42,7 @@ var require_zh_CN = __commonJS({
         maxVideoSize: "\u6700\u5927\u89C6\u9891\u5927\u5C0F (MB)",
         maxFileSize: "\u6700\u5927\u6587\u4EF6\u5927\u5C0F (MB)",
         maxRecordSize: "\u6700\u5927\u5F55\u97F3\u5927\u5C0F (MB)",
-        useBase64ForMedia: "\u662F\u5426\u4F7F\u7528Base64\u7F16\u7801\u4FDD\u5B58\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u76F4\u63A5\u5B58\u50A8\u6587\u4EF6\u5185\u5BB9\u800C\u975E\u6587\u4EF6\u8DEF\u5F84"
+        useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri"
       },
       "echo-cave": {
         general: {
@@ -151,76 +151,6 @@ function createTextMsg(content) {
   };
 }
 
-// src/onebot-helper.ts
-async function getUserName(ctx, session, userId) {
-  try {
-    const memberInfo = await session.onebot.getGroupMemberInfo(session.channelId, userId);
-    return memberInfo.card || memberInfo.nickname || userId;
-  } catch (error) {
-    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u4FE1\u606F\u5931\u8D25\uFF08userId: ${userId}\uFF09\uFF1A`, error);
-    return userId;
-  }
-}
-
-// src/cave-helper.ts
-async function sendCaveMsg(ctx, session, caveMsg) {
-  const { channelId } = session;
-  const content = JSON.parse(caveMsg.content);
-  const date = formatDate(caveMsg.createTime);
-  const originName = await getUserName(ctx, session, caveMsg.originUserId);
-  const userName = await getUserName(ctx, session, caveMsg.userId);
-  const templateData = {
-    id: caveMsg.id.toString(),
-    date,
-    originName,
-    userName,
-    nl: "\n"
-  };
-  const TEMPLATE_COUNT = 5;
-  if (caveMsg.type === "forward") {
-    const availableTemplates2 = [];
-    for (let i = 0; i < TEMPLATE_COUNT; i++) {
-      const template = session.text(`echo-cave.templates.forward.${i}`, templateData);
-      if (template.trim() !== "") {
-        availableTemplates2.push(template);
-      }
-    }
-    if (availableTemplates2.length === 0) {
-      await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
-      return;
-    }
-    const chosenTemplate2 = availableTemplates2[Math.floor(Math.random() * availableTemplates2.length)];
-    await session.onebot.sendGroupMsg(channelId, [createTextMsg(chosenTemplate2)]);
-    await session.onebot.sendGroupForwardMsg(channelId, content);
-    return;
-  }
-  const availableTemplates = [];
-  for (let i = 0; i < TEMPLATE_COUNT; i++) {
-    const prefix = session.text(`echo-cave.templates.msg.${i}.prefix`, templateData);
-    const suffix = session.text(`echo-cave.templates.msg.${i}.suffix`, templateData);
-    if (prefix.trim() !== "" && suffix.trim() !== "") {
-      availableTemplates.push({ prefix, suffix });
-    }
-  }
-  if (availableTemplates.length === 0) {
-    await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
-    return;
-  }
-  const chosenTemplate = availableTemplates[Math.floor(Math.random() * availableTemplates.length)];
-  const last = content.at(-1);
-  const needsNewline = last?.type === "text";
-  content.unshift(createTextMsg(chosenTemplate.prefix));
-  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${chosenTemplate.suffix}`));
-  await session.onebot.sendGroupMsg(channelId, content);
-}
-function formatDate(date) {
-  return date.toLocaleDateString("zh-CN", {
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit"
-  });
-}
-
 // src/media-helper.ts
 var import_axios = __toESM(require("axios"), 1);
 var import_node_fs = require("node:fs");
@@ -287,9 +217,25 @@ async function processMediaElement(ctx, element, cfg) {
       element.type,
       cfg
     );
-    let fileValue;
-    if (cfg.useBase64ForMedia) {
-      const buffer = await import_node_fs.promises.readFile(savedPath);
+    const fileUri = `file:///${savedPath.replace(/\\/g, "/")}`;
+    return {
+      ...element,
+      data: {
+        ...element.data,
+        file: fileUri,
+        // Remove the url field
+        url: void 0
+      }
+    };
+  }
+  return element;
+}
+async function convertFileUriToBase64(ctx, element) {
+  if (element.type === "image" || element.type === "video" || element.type === "file" || element.type === "record") {
+    const fileUri = element.data.file;
+    const filePath = decodeURIComponent(fileUri.replace("file:///", ""));
+    try {
+      const buffer = await import_node_fs.promises.readFile(filePath);
       const base64 = buffer.toString("base64");
       const mimeTypes = {
         image: "image/jpeg",
@@ -298,20 +244,18 @@ async function processMediaElement(ctx, element, cfg) {
         file: "application/octet-stream"
       };
       const mimeType = mimeTypes[element.type] || "application/octet-stream";
-      fileValue = `data:${mimeType};base64,${base64}`;
-    } else {
-      const fileUri = `file:///${savedPath.replace(/\\/g, "/")}`;
-      fileValue = fileUri;
+      const dataUrl = `data:${mimeType};base64,${base64}`;
+      return {
+        ...element,
+        data: {
+          ...element.data,
+          file: dataUrl
+        }
+      };
+    } catch (err) {
+      ctx.logger.error(`Failed to convert ${element.type} to base64: ${err}`);
+      return element;
     }
-    return {
-      ...element,
-      data: {
-        ...element.data,
-        file: fileValue,
-        // Remove the url field
-        url: void 0
-      }
-    };
   }
   return element;
 }
@@ -382,6 +326,81 @@ async function checkAndCleanMediaFiles(ctx, cfg, type) {
   }
 }
 
+// src/onebot-helper.ts
+async function getUserName(ctx, session, userId) {
+  try {
+    const memberInfo = await session.onebot.getGroupMemberInfo(session.channelId, userId);
+    return memberInfo.card || memberInfo.nickname || userId;
+  } catch (error) {
+    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u4FE1\u606F\u5931\u8D25\uFF08userId: ${userId}\uFF09\uFF1A`, error);
+    return userId;
+  }
+}
+
+// src/cave-helper.ts
+async function sendCaveMsg(ctx, session, caveMsg, cfg) {
+  const { channelId } = session;
+  let content = JSON.parse(caveMsg.content);
+  if (cfg.useBase64ForMedia) {
+    content = await Promise.all(
+      content.map(async (element) => await convertFileUriToBase64(ctx, element))
+    );
+  }
+  const date = formatDate(caveMsg.createTime);
+  const originName = await getUserName(ctx, session, caveMsg.originUserId);
+  const userName = await getUserName(ctx, session, caveMsg.userId);
+  const templateData = {
+    id: caveMsg.id.toString(),
+    date,
+    originName,
+    userName,
+    nl: "\n"
+  };
+  const TEMPLATE_COUNT = 5;
+  if (caveMsg.type === "forward") {
+    const availableTemplates2 = [];
+    for (let i = 0; i < TEMPLATE_COUNT; i++) {
+      const template = session.text(`echo-cave.templates.forward.${i}`, templateData);
+      if (template.trim() !== "") {
+        availableTemplates2.push(template);
+      }
+    }
+    if (availableTemplates2.length === 0) {
+      await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
+      return;
+    }
+    const chosenTemplate2 = availableTemplates2[Math.floor(Math.random() * availableTemplates2.length)];
+    await session.onebot.sendGroupMsg(channelId, [createTextMsg(chosenTemplate2)]);
+    await session.onebot.sendGroupForwardMsg(channelId, content);
+    return;
+  }
+  const availableTemplates = [];
+  for (let i = 0; i < TEMPLATE_COUNT; i++) {
+    const prefix = session.text(`echo-cave.templates.msg.${i}.prefix`, templateData);
+    const suffix = session.text(`echo-cave.templates.msg.${i}.suffix`, templateData);
+    if (prefix.trim() !== "" && suffix.trim() !== "") {
+      availableTemplates.push({ prefix, suffix });
+    }
+  }
+  if (availableTemplates.length === 0) {
+    await session.send(session.text("echo-cave.general.noTemplatesConfigured"));
+    return;
+  }
+  const chosenTemplate = availableTemplates[Math.floor(Math.random() * availableTemplates.length)];
+  const last = content.at(-1);
+  const needsNewline = last?.type === "text";
+  content.unshift(createTextMsg(chosenTemplate.prefix));
+  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${chosenTemplate.suffix}`));
+  await session.onebot.sendGroupMsg(channelId, content);
+}
+function formatDate(date) {
+  return date.toLocaleDateString("zh-CN", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  });
+}
+
 // src/forward-helper.ts
 async function reconstructForwardMsg(ctx, session, message, cfg) {
   return Promise.all(
@@ -473,7 +492,7 @@ function apply(ctx, cfg) {
     }
   );
   ctx.command("cave [id:number]").action(
-    async ({ session }, id) => await getCave(ctx, session, id)
+    async ({ session }, id) => await getCave(ctx, session, cfg, id)
   );
   ctx.command("cave.echo").action(async ({ session }) => await addCave(ctx, session, cfg));
   ctx.command("cave.wipe <id:number>").action(
@@ -520,7 +539,7 @@ async function getCaveListByOriginUser(ctx, session) {
   }
   return response;
 }
-async function getCave(ctx, session, id) {
+async function getCave(ctx, session, cfg, id) {
   if (!session.guildId) {
     return session.text("echo-cave.general.privateChatReminder");
   }
@@ -544,7 +563,7 @@ async function getCave(ctx, session, id) {
     }
     caveMsg = caves[0];
   }
-  await sendCaveMsg(ctx, session, caveMsg);
+  await sendCaveMsg(ctx, session, caveMsg, cfg);
 }
 async function deleteCave(ctx, session, cfg, id) {
   if (!session.guildId) {

package/lib/media-helper.d.ts

@@ -2,4 +2,5 @@ import { Config } from './index';
 import { Context } from 'koishi';
 export declare function saveMedia(ctx: Context, mediaElement: Record<string, any>, type: 'image' | 'video' | 'file' | 'record', cfg: Config): Promise<string>;
 export declare function processMediaElement(ctx: Context, element: any, cfg: Config): Promise<any>;
+export declare function convertFileUriToBase64(ctx: Context, element: any): Promise<any>;
 export declare function checkAndCleanMediaFiles(ctx: Context, cfg: Config, type: 'image' | 'video' | 'file' | 'record'): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",