koishi-plugin-best-cave 2.0.2 → 2.0.4

package/lib/Utils.d.ts

@@ -25,6 +25,21 @@ export declare function mediaElementToBase64(element: h, fileManager: FileManage
  * @returns 一个包含 h() 元素和字符串的消息数组。
  */
 export declare function buildCaveMessage(cave: CaveObject, config: Config, fileManager: FileManager, logger: Logger): Promise<(string | h)[]>;
+/**
+ * 遍历消息元素，将其转换为可存储的格式，并识别需要下载的媒体文件。
+ * @param sourceElements - 源消息中的 h() 元素数组。
+ * @param newId - 新回声洞的 ID。
+ * @param channelId - 频道 ID。
+ * @param userId - 用户 ID。
+ * @returns 包含待存储元素和待下载媒体列表的对象。
+ */
+export declare function prepareElementsForStorage(sourceElements: h[], newId: number, channelId: string, userId: string): Promise<{
+    finalElementsForDb: StoredElement[];
+    mediaToDownload: {
+        url: string;
+        fileName: string;
+    }[];
+}>;
 /**
  * 清理数据库中所有被标记为 'delete' 状态的回声洞及其关联的文件。
  * @param ctx - Koishi 上下文。

package/lib/index.d.ts

@@ -9,7 +9,7 @@ export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px so
  * @property file - 文件标识符（本地文件名或 S3 Key），用于媒体类型。
  */
 export interface StoredElement {
-    type: 'text' | 'img' | 'video' | 'audio' | 'file';
+    type: 'text' | 'image' | 'video' | 'audio' | 'file';
     content?: string;
     file?: string;
 }

package/lib/index.js

@@ -37,7 +37,7 @@ __export(index_exports, {
   usage: () => usage
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi3 = require("koishi");
+var import_koishi2 = require("koishi");
 
 // src/FileManager.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
@@ -271,8 +271,7 @@ function storedFormatToHElements(elements) {
     switch (el.type) {
       case "text":
         return import_koishi.h.text(el.content);
-      case "img":
-        return (0, import_koishi.h)("image", { src: el.file });
+      case "image":
       case "video":
       case "audio":
       case "file":
@@ -292,7 +291,7 @@ async function mediaElementToBase64(element, fileManager, logger2) {
     return (0, import_koishi.h)(element.type, { ...element.attrs, src: `data:${mimeType};base64,${data.toString("base64")}` });
   } catch (error) {
     logger2.warn(`转换本地文件 ${fileName} 为 Base64 失败:`, error);
-    return (0, import_koishi.h)("p", {}, `[${element.type}]`);
+    return import_koishi.h.text(`[${element.type}]`);
   }
 }
 __name(mediaElementToBase64, "mediaElementToBase64");
@@ -327,13 +326,45 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
     footerFormat = formatString.substring(separatorIndex + 1);
   }
   const headerText = headerFormat.replace("{id}", cave.id.toString()).replace("{name}", cave.userName);
-  if (headerText.trim()) finalMessage.push((0, import_koishi.h)("p", {}, headerText));
+  if (headerText.trim()) finalMessage.push(headerText);
   finalMessage.push(...processedElements);
   const footerText = footerFormat.replace("{id}", cave.id.toString()).replace("{name}", cave.userName);
-  if (footerText.trim()) finalMessage.push((0, import_koishi.h)("p", {}, footerText));
+  if (footerText.trim()) finalMessage.push(footerText);
   return finalMessage;
 }
 __name(buildCaveMessage, "buildCaveMessage");
+async function prepareElementsForStorage(sourceElements, newId, channelId, userId) {
+  const finalElementsForDb = [];
+  const mediaToDownload = [];
+  let mediaIndex = 0;
+  const stack = [...sourceElements].reverse();
+  while (stack.length > 0) {
+    const el = stack.pop();
+    const elementType = el.type;
+    if (el.children) {
+      stack.push(...[...el.children].reverse());
+    }
+    if (["image", "video", "audio", "file"].includes(elementType) && el.attrs.src) {
+      const fileIdentifier = el.attrs.src;
+      if (fileIdentifier.startsWith("http")) {
+        mediaIndex++;
+        const originalName = el.attrs.file;
+        const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
+        const ext = originalName ? path2.extname(originalName) : "";
+        const finalExt = ext || defaultExtMap[elementType] || ".dat";
+        const generatedFileName = `${newId}_${mediaIndex}_${channelId}_${userId}${finalExt}`;
+        finalElementsForDb.push({ type: elementType, file: generatedFileName });
+        mediaToDownload.push({ url: fileIdentifier, fileName: generatedFileName });
+      } else {
+        finalElementsForDb.push({ type: elementType, file: fileIdentifier });
+      }
+    } else if (elementType === "text" && el.attrs.content?.trim()) {
+      finalElementsForDb.push({ type: "text", content: el.attrs.content.trim() });
+    }
+  }
+  return { finalElementsForDb, mediaToDownload };
+}
+__name(prepareElementsForStorage, "prepareElementsForStorage");
 async function cleanupPendingDeletions(ctx, fileManager, logger2) {
   try {
     const cavesToDelete = await ctx.database.get("cave", { status: "delete" });
@@ -366,15 +397,6 @@ async function getNextCaveId(ctx, query = {}) {
   return newId;
 }
 __name(getNextCaveId, "getNextCaveId");
-async function downloadMedia(ctx, fileManager, url, originalName, type, caveId, index, channelId, userId) {
-  const defaultExtMap = { "img": ".jpg", "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
-  const ext = originalName ? path2.extname(originalName) : "";
-  const finalExt = ext || defaultExtMap[type] || ".dat";
-  const fileName = `${caveId}_${index}_${channelId}_${userId}${finalExt}`;
-  const response = await ctx.http.get(url, { responseType: "arraybuffer", timeout: 3e4 });
-  return fileManager.saveFile(fileName, Buffer.from(response));
-}
-__name(downloadMedia, "downloadMedia");
 function checkCooldown(session, config, lastUsed) {
   if (config.coolDown <= 0 || !session.channelId || config.adminUsers.includes(session.userId)) {
     return null;
@@ -490,7 +512,6 @@ var DataManager = class {
 };
 
 // src/ReviewManager.ts
-var import_koishi2 = require("koishi");
 var ReviewManager = class {
   /**
    * 创建一个 ReviewManager 实例。
@@ -574,10 +595,7 @@ ${pendingIds}`;
    */
   async buildReviewMessage(cave) {
     const caveContent = await buildCaveMessage(cave, this.config, this.fileManager, this.logger);
-    return [
-      (0, import_koishi2.h)("p", `以下内容待审核：`),
-      ...caveContent
-    ];
+    return [`待审核`, ...caveContent];
   }
   /**
    * 处理管理员的审核决定（通过或拒绝）。
@@ -601,7 +619,7 @@ ${pendingIds}`;
       resultMessage = `回声洞（${caveId}）已拒绝`;
       const caveContent = await buildCaveMessage(cave, this.config, this.fileManager, this.logger);
       broadcastMessage = [
-        (0, import_koishi2.h)("p", `回声洞（${caveId}）已由管理员 "${adminUserName}" 拒绝`),
+        `回声洞（${caveId}）已由管理员 "${adminUserName}" 拒绝`,
         ...caveContent
       ];
     }
@@ -630,28 +648,28 @@ var usage = `
   <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
 </div>
 `;
-var logger = new import_koishi3.Logger("best-cave");
-var Config = import_koishi3.Schema.intersect([
-  import_koishi3.Schema.object({
-    coolDown: import_koishi3.Schema.number().default(10).description("冷却时间（秒）"),
-    perChannel: import_koishi3.Schema.boolean().default(false).description("启用分群模式"),
-    enableProfile: import_koishi3.Schema.boolean().default(false).description("启用自定义昵称"),
-    enableIO: import_koishi3.Schema.boolean().default(false).description("启用导入导出"),
-    caveFormat: import_koishi3.Schema.string().default("回声洞 ——（{id}）|—— {name}").required().description("自定义文本"),
-    adminUsers: import_koishi3.Schema.array(import_koishi3.Schema.string()).default([]).description("管理员 ID 列表")
+var logger = new import_koishi2.Logger("best-cave");
+var Config = import_koishi2.Schema.intersect([
+  import_koishi2.Schema.object({
+    coolDown: import_koishi2.Schema.number().default(10).description("冷却时间（秒）"),
+    perChannel: import_koishi2.Schema.boolean().default(false).description("启用分群模式"),
+    enableProfile: import_koishi2.Schema.boolean().default(false).description("启用自定义昵称"),
+    enableIO: import_koishi2.Schema.boolean().default(false).description("启用导入导出"),
+    caveFormat: import_koishi2.Schema.string().default("回声洞 ——（{id}）|—— {name}").description("自定义文本"),
+    adminUsers: import_koishi2.Schema.array(import_koishi2.Schema.string()).default([]).description("管理员 ID 列表")
   }).description("基础配置"),
-  import_koishi3.Schema.object({
-    enableReview: import_koishi3.Schema.boolean().default(false).description("启用审核")
+  import_koishi2.Schema.object({
+    enableReview: import_koishi2.Schema.boolean().default(false).description("启用审核")
   }).description("审核配置"),
-  import_koishi3.Schema.object({
-    localPath: import_koishi3.Schema.string().description("文件映射路径"),
-    enableS3: import_koishi3.Schema.boolean().default(false).description("启用 S3 存储"),
-    publicUrl: import_koishi3.Schema.string().description("公共访问 URL").role("link"),
-    endpoint: import_koishi3.Schema.string().description("端点 (Endpoint)").role("link"),
-    bucket: import_koishi3.Schema.string().description("存储桶 (Bucket)"),
-    region: import_koishi3.Schema.string().default("auto").description("区域 (Region)"),
-    accessKeyId: import_koishi3.Schema.string().description("Access Key ID").role("secret"),
-    secretAccessKey: import_koishi3.Schema.string().description("Secret Access Key").role("secret")
+  import_koishi2.Schema.object({
+    localPath: import_koishi2.Schema.string().description("文件映射路径"),
+    enableS3: import_koishi2.Schema.boolean().default(false).description("启用 S3 存储"),
+    publicUrl: import_koishi2.Schema.string().description("公共访问 URL").role("link"),
+    endpoint: import_koishi2.Schema.string().description("端点 (Endpoint)").role("link"),
+    bucket: import_koishi2.Schema.string().description("存储桶 (Bucket)"),
+    region: import_koishi2.Schema.string().default("auto").description("区域 (Region)"),
+    accessKeyId: import_koishi2.Schema.string().description("Access Key ID").role("secret"),
+    secretAccessKey: import_koishi2.Schema.string().description("Secret Access Key").role("secret")
   }).description("存储配置")
 ]);
 function apply(ctx, config) {
@@ -702,45 +720,21 @@ function apply(ctx, config) {
     }
   });
   cave.subcommand(".add [content:text]", "添加回声洞").usage("添加一条回声洞。可以直接发送内容，也可以回复或引用一条消息。").action(async ({ session }, content) => {
-    cleanupPendingDeletions(ctx, fileManager, logger);
-    const savedFileIdentifiers = [];
     try {
       let sourceElements;
       if (session.quote?.elements) {
         sourceElements = session.quote.elements;
       } else if (content?.trim()) {
-        sourceElements = import_koishi3.h.parse(content);
+        sourceElements = import_koishi2.h.parse(content);
       } else {
         await session.send("请在一分钟内发送你要添加的内容");
         const reply = await session.prompt(6e4);
         if (!reply) return "操作超时，已取消添加";
-        sourceElements = import_koishi3.h.parse(reply);
+        sourceElements = import_koishi2.h.parse(reply);
       }
       const scopeQuery = getScopeQuery(session, config);
       const newId = await getNextCaveId(ctx, scopeQuery);
-      const finalElementsForDb = [];
-      let mediaIndex = 1;
-      async function traverseAndProcess(elements) {
-        for (const el of elements) {
-          const elementType = el.type === "image" ? "img" : el.type;
-          if (["img", "video", "audio", "file"].includes(elementType) && el.attrs.src) {
-            let fileIdentifier = el.attrs.src;
-            if (fileIdentifier.startsWith("http")) {
-              mediaIndex++;
-              const originalName = el.attrs.file;
-              const savedId = await downloadMedia(ctx, fileManager, fileIdentifier, originalName, elementType, newId, mediaIndex, session.channelId, session.userId);
-              savedFileIdentifiers.push(savedId);
-              fileIdentifier = savedId;
-            }
-            finalElementsForDb.push({ type: elementType, file: fileIdentifier });
-          } else if (elementType === "text" && el.attrs.content?.trim()) {
-            finalElementsForDb.push({ type: "text", content: el.attrs.content.trim() });
-          }
-          if (el.children) await traverseAndProcess(el.children);
-        }
-      }
-      __name(traverseAndProcess, "traverseAndProcess");
-      await traverseAndProcess(sourceElements);
+      const { finalElementsForDb, mediaToDownload } = await prepareElementsForStorage(sourceElements, newId, session.channelId, session.userId);
       if (finalElementsForDb.length === 0) return "内容为空，已取消添加";
       let userName = session.username;
       if (config.enableProfile) {
@@ -756,6 +750,16 @@ function apply(ctx, config) {
         time: /* @__PURE__ */ new Date()
       };
       await ctx.database.create("cave", newCave);
+      try {
+        const downloadPromises = mediaToDownload.map(async (media) => {
+          const response = await ctx.http.get(media.url, { responseType: "arraybuffer", timeout: 3e4 });
+          await fileManager.saveFile(media.fileName, Buffer.from(response));
+        });
+        await Promise.all(downloadPromises);
+      } catch (fileError) {
+        await ctx.database.remove("cave", { id: newId });
+        throw fileError;
+      }
       if (newCave.status === "pending") {
         reviewManager.sendForReview(newCave);
         return `提交成功，序号为（${newCave.id}）`;
@@ -763,10 +767,6 @@ function apply(ctx, config) {
       return `添加成功，序号为（${newId}）`;
     } catch (error) {
       logger.error("添加回声洞失败:", error);
-      if (savedFileIdentifiers.length > 0) {
-        logger.info(`添加失败，回滚并删除 ${savedFileIdentifiers.length} 个文件...`);
-        await Promise.all(savedFileIdentifiers.map((fileId) => fileManager.deleteFile(fileId)));
-      }
       return "添加失败，请稍后再试";
     }
   });
@@ -797,13 +797,10 @@ function apply(ctx, config) {
       if (!isOwner && !isAdmin) {
         return "抱歉，你没有权限删除这条回声洞";
       }
+      const caveMessage = await buildCaveMessage(targetCave, config, fileManager, logger);
       await ctx.database.upsert("cave", [{ id, status: "delete" }]);
+      session.send([`已删除`, ...caveMessage]);
       cleanupPendingDeletions(ctx, fileManager, logger);
-      const caveMessage = await buildCaveMessage(targetCave, config, fileManager, logger);
-      return [
-        (0, import_koishi3.h)("p", {}, `以下内容已删除`),
-        ...caveMessage
-      ];
     } catch (error) {
       logger.error(`标记回声洞（${id}）失败:`, error);
       return "删除失败，请稍后再试";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "最强大的回声洞现已重构完成啦！注意数据格式需要使用脚本转换哦~",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],