koishi-plugin-best-cave 2.0.8 → 2.0.9

package/lib/Utils.d.ts

@@ -53,3 +53,32 @@ export declare function checkCooldown(session: Session, config: Config, lastUsed
  * @description 更新指定频道的指令使用时间戳。
  */
 export declare function updateCooldownTimestamp(session: Session, config: Config, lastUsed: Map<string, number>): void;
+/**
+ * @description 解析消息元素，分离出文本和待下载的媒体文件。
+ * @param sourceElements - 原始的 Koishi 消息元素数组。
+ * @param newId - 这条回声洞的新 ID。
+ * @param channelId - 频道 ID。
+ * @param userId - 用户 ID。
+ * @returns 一个包含数据库元素和待保存媒体列表的对象。
+ */
+export declare function processMessageElements(sourceElements: h[], newId: number, channelId: string, userId: string): Promise<{
+    finalElementsForDb: StoredElement[];
+    mediaToSave: {
+        sourceUrl: string;
+        fileName: string;
+    }[];
+}>;
+/**
+ * @description 异步处理文件上传和状态更新的后台任务。
+ * @param ctx - Koishi 上下文。
+ * @param config - 插件配置。
+ * @param fileManager - 文件管理器实例。
+ * @param logger - 日志记录器实例。
+ * @param reviewManager - 审核管理器实例 (可能为 null)。
+ * @param cave - 已创建的、状态为 'preload' 的回声洞对象。
+ * @param mediaToSave - 需要下载和保存的媒体文件列表。
+ */
+export declare function handleFileUploads(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, reviewManager: any, cave: CaveObject, mediaToSave: {
+    sourceUrl: string;
+    fileName: string;
+}[]): Promise<void>;

package/lib/index.d.ts

@@ -19,7 +19,7 @@ export interface CaveObject {
     channelId: string;
     userId: string;
     userName: string;
-    status: 'active' | 'delete' | 'pending';
+    status: 'active' | 'delete' | 'pending' | 'preload';
     time: Date;
 }
 declare module 'koishi' {

package/lib/index.js

@@ -38,7 +38,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_koishi3 = require("koishi");
-var path3 = __toESM(require("path"));
 
 // src/FileManager.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
@@ -259,10 +258,14 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
   const [headerFormat, footerFormat = ""] = config.caveFormat.split("|");
   const replacements = { id: cave.id.toString(), name: cave.userName };
   const headerText = headerFormat.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]);
-  if (headerText.trim()) finalMessage.push(headerText);
+  if (headerText.trim()) {
+    finalMessage.push(headerText.trim() + "\n");
+  }
   finalMessage.push(...processedElements);
   const footerText = footerFormat.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]);
-  if (footerText.trim()) finalMessage.push(footerText);
+  if (footerText.trim()) {
+    finalMessage.push("\n" + footerText.trim());
+  }
   return finalMessage;
 }
 __name(buildCaveMessage, "buildCaveMessage");
@@ -312,6 +315,69 @@ function updateCooldownTimestamp(session, config, lastUsed) {
   }
 }
 __name(updateCooldownTimestamp, "updateCooldownTimestamp");
+async function processMessageElements(sourceElements, newId, channelId, userId) {
+  const finalElementsForDb = [];
+  const mediaToSave = [];
+  let mediaIndex = 0;
+  const typeMap = {
+    "img": "image",
+    "image": "image",
+    "video": "video",
+    "audio": "audio",
+    "file": "file",
+    "text": "text"
+  };
+  async function traverse(elements) {
+    for (const el of elements) {
+      const normalizedType = typeMap[el.type];
+      if (!normalizedType) {
+        if (el.children) await traverse(el.children);
+        continue;
+      }
+      if (["image", "video", "audio", "file"].includes(normalizedType) && el.attrs.src) {
+        let fileIdentifier = el.attrs.src;
+        if (fileIdentifier.startsWith("http")) {
+          mediaIndex++;
+          const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
+          const ext = el.attrs.file && path2.extname(el.attrs.file) ? path2.extname(el.attrs.file) : defaultExtMap[normalizedType] || ".dat";
+          const channelIdentifier = channelId || "private";
+          const fileName = `${newId}_${mediaIndex}_${channelIdentifier}_${userId}${ext}`;
+          mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
+          fileIdentifier = fileName;
+        }
+        finalElementsForDb.push({ type: normalizedType, file: fileIdentifier });
+      } else if (normalizedType === "text" && el.attrs.content?.trim()) {
+        finalElementsForDb.push({ type: "text", content: el.attrs.content.trim() });
+      }
+      if (el.children) {
+        await traverse(el.children);
+      }
+    }
+  }
+  __name(traverse, "traverse");
+  await traverse(sourceElements);
+  return { finalElementsForDb, mediaToSave };
+}
+__name(processMessageElements, "processMessageElements");
+async function handleFileUploads(ctx, config, fileManager, logger2, reviewManager, cave, mediaToSave) {
+  try {
+    await Promise.all(mediaToSave.map(async (media) => {
+      const response = await ctx.http.get(media.sourceUrl, { responseType: "arraybuffer", timeout: 3e4 });
+      await fileManager.saveFile(media.fileName, Buffer.from(response));
+    }));
+    const finalStatus = config.enableReview ? "pending" : "active";
+    await ctx.database.upsert("cave", [{ id: cave.id, status: finalStatus }]);
+    if (finalStatus === "pending" && reviewManager) {
+      const [finalCave] = await ctx.database.get("cave", { id: cave.id });
+      if (finalCave) reviewManager.sendForReview(finalCave);
+    }
+  } catch (fileSaveError) {
+    logger2.error(`回声洞（${cave.id}）文件保存失败:`, fileSaveError);
+    await ctx.database.upsert("cave", [{ id: cave.id, status: "delete" }]);
+    await cleanupPendingDeletions(ctx, fileManager, logger2);
+  }
+}
+__name(handleFileUploads, "handleFileUploads");
 
 // src/DataManager.ts
 var DataManager = class {
@@ -337,7 +403,8 @@ var DataManager = class {
    */
   registerCommands(cave) {
     cave.subcommand(".export", "导出回声洞数据").usage("将所有回声洞数据导出到 cave_export.json。").action(async ({ session }) => {
-      if (session.channelId !== this.config.adminChannel) return "此指令仅限在管理群组中使用";
+      const adminChannelId = this.config.adminChannel ? this.config.adminChannel.split(":")[1] : null;
+      if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
       try {
         await session.send("正在导出数据，请稍候...");
         return await this.exportData();
@@ -347,7 +414,8 @@ var DataManager = class {
       }
     });
     cave.subcommand(".import", "导入回声洞数据").usage("从 cave_import.json 中导入回声洞数据。").action(async ({ session }) => {
-      if (session.channelId !== this.config.adminChannel) return "此指令仅限在管理群组中使用";
+      const adminChannelId = this.config.adminChannel ? this.config.adminChannel.split(":")[1] : null;
+      if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
       try {
         await session.send("正在导入数据，请稍候...");
         return await this.importData();
@@ -390,8 +458,7 @@ var DataManager = class {
       const newCave = {
         ...cave,
         id: newId,
-        channelId: cave.channelId || null,
-        // 保证 channelId 存在
+        channelId: cave.channelId,
         status: "active"
       };
       await this.ctx.database.create("cave", newCave);
@@ -426,7 +493,8 @@ var ReviewManager = class {
    */
   registerCommands(cave) {
     cave.subcommand(".review [id:posint] [action:string]", "审核回声洞").usage("查看或审核回声洞，使用 <Y/N> 进行审核。").action(async ({ session }, id, action) => {
-      if (session.channelId !== this.config.adminChannel) return "此指令仅限在管理群组中使用";
+      const adminChannelId = this.config.adminChannel ? this.config.adminChannel.split(":")[1] : null;
+      if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
       if (!id) {
         const pendingCaves = await this.ctx.database.get("cave", { status: "pending" });
         if (pendingCaves.length === 0) return "当前没有需要审核的回声洞";
@@ -453,8 +521,9 @@ ${pendingCaves.map((c) => c.id).join(", ")}`;
    * @param cave 新创建的、状态为 'pending' 的回声洞对象。
    */
   async sendForReview(cave) {
-    if (!this.config.adminChannel) {
-      this.logger.warn(`未配置管理群组，已自动通过回声洞（${cave.id}）`);
+    const channelParts = this.config.adminChannel?.split(":");
+    if (!channelParts || channelParts.length < 2 || !channelParts[1]) {
+      this.logger.warn(`管理群组配置无效，已自动通过回声洞（${cave.id}）`);
       await this.ctx.database.upsert("cave", [{ id: cave.id, status: "active" }]);
       return;
     }
@@ -509,7 +578,7 @@ var Config = import_koishi3.Schema.intersect([
     perChannel: import_koishi3.Schema.boolean().default(false).description("启用分群模式"),
     enableProfile: import_koishi3.Schema.boolean().default(false).description("启用自定义昵称"),
     enableIO: import_koishi3.Schema.boolean().default(false).description("启用导入导出"),
-    adminChannel: import_koishi3.Schema.string().description("管理群组 ID"),
+    adminChannel: import_koishi3.Schema.string().default("onebot:").description("管理群组 ID"),
     caveFormat: import_koishi3.Schema.string().default("回声洞 ——（{id}）|—— {name}").description("自定义文本")
   }).description("基础配置"),
   import_koishi3.Schema.object({
@@ -581,73 +650,46 @@ function apply(ctx, config) {
         idScopeQuery["channelId"] = session.channelId;
       }
       const newId = await getNextCaveId(ctx, idScopeQuery);
-      const finalElementsForDb = [];
-      const mediaToSave = [];
-      let mediaIndex = 0;
-      const typeMap = {
-        "img": "image",
-        "image": "image",
-        "video": "video",
-        "audio": "audio",
-        "file": "file",
-        "text": "text"
-      };
-      async function traverseAndProcess(elements) {
-        for (const el of elements) {
-          const normalizedType = typeMap[el.type];
-          if (!normalizedType) {
-            if (el.children) await traverseAndProcess(el.children);
-            continue;
-          }
-          if (["image", "video", "audio", "file"].includes(normalizedType) && el.attrs.src) {
-            let fileIdentifier = el.attrs.src;
-            if (fileIdentifier.startsWith("http")) {
-              mediaIndex++;
-              const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
-              const ext = el.attrs.file && path3.extname(el.attrs.file) ? path3.extname(el.attrs.file) : defaultExtMap[normalizedType] || ".dat";
-              const channelIdentifier = session.channelId || "private";
-              const fileName = `${newId}_${mediaIndex}_${channelIdentifier}_${session.userId}${ext}`;
-              mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
-              fileIdentifier = fileName;
-            }
-            finalElementsForDb.push({ type: normalizedType, file: fileIdentifier });
-          } else if (normalizedType === "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, mediaToSave } = await processMessageElements(
+        sourceElements,
+        newId,
+        session.channelId,
+        session.userId
+      );
       if (finalElementsForDb.length === 0) return "内容为空，已取消添加";
       const customNickname = config.enableProfile ? await profileManager.getNickname(session.userId) : null;
-      const newCave = {
-        id: newId,
-        elements: finalElementsForDb,
-        channelId: session.channelId,
-        userId: session.userId,
-        userName: customNickname || session.username,
-        status: config.enableReview ? "pending" : "active",
-        time: /* @__PURE__ */ new Date()
-      };
-      await ctx.database.create("cave", newCave);
-      try {
-        await Promise.all(mediaToSave.map(async (media) => {
-          const response = await ctx.http.get(media.sourceUrl, { responseType: "arraybuffer", timeout: 3e4 });
-          await fileManager.saveFile(media.fileName, Buffer.from(response));
-        }));
-      } catch (fileSaveError) {
-        logger.error(`文件保存失败:`, fileSaveError);
-        await ctx.database.remove("cave", { id: newId });
-        throw fileSaveError;
-      }
-      if (newCave.status === "pending") {
-        reviewManager.sendForReview(newCave);
-        return `提交成功，序号为（${newCave.id}）`;
+      const userName = customNickname || session.username;
+      if (mediaToSave.length > 0) {
+        const newCave = {
+          id: newId,
+          elements: finalElementsForDb,
+          channelId: session.channelId,
+          userId: session.userId,
+          userName,
+          status: "preload",
+          time: /* @__PURE__ */ new Date()
+        };
+        await ctx.database.create("cave", newCave);
+        handleFileUploads(ctx, config, fileManager, logger, reviewManager, newCave, mediaToSave);
+        return config.enableReview ? `提交成功，序号为（${newId}）` : `添加成功，序号为（${newId}）`;
+      } else {
+        const finalStatus = config.enableReview ? "pending" : "active";
+        const newCave = {
+          id: newId,
+          elements: finalElementsForDb,
+          channelId: session.channelId,
+          userId: session.userId,
+          userName,
+          status: finalStatus,
+          time: /* @__PURE__ */ new Date()
+        };
+        await ctx.database.create("cave", newCave);
+        if (finalStatus === "pending") {
+          reviewManager.sendForReview(newCave);
+          return `提交成功，序号为（${newId}）`;
+        }
+        return `添加成功，序号为（${newId}）`;
       }
-      return `添加成功，序号为（${newId}）`;
     } catch (error) {
       logger.error("添加回声洞失败:", error);
       return "添加失败，请稍后再试";
@@ -673,7 +715,8 @@ function apply(ctx, config) {
     try {
       const [targetCave] = await ctx.database.get("cave", { id, status: "active" });
       if (!targetCave) return `回声洞（${id}）不存在`;
-      if (targetCave.userId !== session.userId && session.channelId !== config.adminChannel) {
+      const adminChannelId = config.adminChannel ? config.adminChannel.split(":")[1] : null;
+      if (targetCave.userId !== session.userId && session.channelId !== adminChannelId) {
         return "你没有权限删除这条回声洞";
       }
       await ctx.database.upsert("cave", [{ id, status: "delete" }]);

package/package.json

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