koishi-plugin-best-cave 2.3.7 → 2.3.9

package/lib/Utils.d.ts

@@ -50,9 +50,11 @@ export declare function updateCooldownTimestamp(session: Session, config: Config
  * @param sourceElements 原始的 Koishi 消息元素数组。
  * @param newId 这条回声洞的新 ID。
  * @param session 触发操作的会话。
+ * @param config 插件配置。
+ * @param logger 日志实例。
  * @returns 包含数据库元素和待保存媒体列表的对象。
  */
-export declare function processMessageElements(sourceElements: h[], newId: number, session: Session): Promise<{
+export declare function processMessageElements(sourceElements: h[], newId: number, session: Session, config: Config, logger: Logger): Promise<{
     finalElementsForDb: StoredElement[];
     mediaToSave: {
         sourceUrl: string;

package/lib/index.d.ts

@@ -48,6 +48,7 @@ export interface Config {
     secretAccessKey?: string;
     bucket?: string;
     publicUrl?: string;
+    debug: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -406,57 +406,46 @@ function updateCooldownTimestamp(session, config, lastUsed) {
   }
 }
 __name(updateCooldownTimestamp, "updateCooldownTimestamp");
-async function processMessageElements(sourceElements, newId, session) {
+async function processMessageElements(sourceElements, newId, session, config, logger2) {
   const mediaToSave = [];
   let mediaIndex = 0;
-  async function transform(elements, logger2 = new import_koishi.Logger("best-cave:transform")) {
+  async function transform(elements) {
     const result = [];
     const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward" };
     const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
     for (const el of elements) {
       const type = typeMap[el.type];
+      if (config.debug) logger2.info(`正在处理元素 <${el.type}>, 映射类型: ${type || "无"}`);
       if (!type) {
-        if (el.children) result.push(...await transform(el.children, logger2));
+        if (el.children) result.push(...await transform(el.children));
         continue;
       }
       if (type === "text" && el.attrs.content?.trim()) {
-        result.push({ type: "text", content: el.attrs.content.trim() });
+        const content = el.attrs.content.trim();
+        if (config.debug) logger2.info(`发现 [text] 元素，内容: "${content}"`);
+        result.push({ type: "text", content });
       } else if (type === "at" && el.attrs.id) {
+        if (config.debug) logger2.info(`发现 [at] 元素，ID: "${el.attrs.id}"`);
         result.push({ type: "at", content: el.attrs.id });
-      } else if (type === "forward") {
-        const childrenToProcess = [...el.children || []];
-        if (childrenToProcess.length === 0 && Array.isArray(el.attrs.content)) {
-          for (const node of el.attrs.content) {
-            if (!node) continue;
-            const contentToNormalize = node.message;
-            if (contentToNormalize) {
-              try {
-                childrenToProcess.push(...import_koishi.h.normalize(contentToNormalize));
-              } catch (error) {
-                logger2.warn(`跳过无法解析的转发节点内容: ${error}`);
-                childrenToProcess.push(import_koishi.h.text("[内容解析失败]"));
-              }
-            }
-          }
-        }
-        if (childrenToProcess.length > 0) {
-          const transformedChildren = await transform(childrenToProcess, logger2);
-          if (transformedChildren.length > 0) {
-            result.push({ type: "forward", content: JSON.stringify(transformedChildren) });
-          }
-        }
+      } else if (type === "forward" && el.children?.length) {
+        if (config.debug) logger2.info(`发现 [forward] 元素，开始递归解析子元素...`);
+        const transformedChildren = await transform(el.children);
+        result.push({ type: "forward", content: JSON.stringify(transformedChildren) });
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
+        if (config.debug) logger2.info(`发现 [${type}] 元素，src: "${fileIdentifier}"`);
         if (fileIdentifier.startsWith("http")) {
           const ext = path2.extname(el.attrs.file || "") || defaultExtMap[type];
           const currentMediaIndex = ++mediaIndex;
           const fileName = `${newId}_${currentMediaIndex}_${session.channelId || "private"}_${session.userId}${ext}`;
+          if (config.debug) logger2.info(`[${type}] 是远程文件，文件名: "${fileName}"`);
           mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
           fileIdentifier = fileName;
         }
         result.push({ type, file: fileIdentifier });
       } else if (el.children) {
-        result.push(...await transform(el.children, logger2));
+        if (config.debug) logger2.info(`元素 <${el.type}> 无直接内容，递归其子元素...`);
+        result.push(...await transform(el.children));
       }
     }
     return result;
@@ -472,7 +461,6 @@ async function handleFileUploads(ctx, config, fileManager, logger2, reviewManage
     const imageHashesToStore = [];
     const allExistingImageHashes = hashManager ? await ctx.database.get("cave_hash", { type: { $ne: "simhash" } }) : [];
     const existingGlobalHashes = allExistingImageHashes.filter((h4) => h4.type === "phash_g");
-    const existingQuadrantHashes = allExistingImageHashes.filter((h4) => h4.type.startsWith("phash_q"));
     for (const media of mediaToToSave) {
       const buffer = Buffer.from(await ctx.http.get(media.sourceUrl, { responseType: "arraybuffer", timeout: 3e4 }));
       downloadedMedia.push({ fileName: media.fileName, buffer });
@@ -487,16 +475,6 @@ async function handleFileUploads(ctx, config, fileManager, logger2, reviewManage
             return;
           }
         }
-        const notifiedPartialCaves = /* @__PURE__ */ new Set();
-        for (const newSubHash of Object.values(quadrantHashes)) {
-          for (const existing of existingQuadrantHashes) {
-            if (notifiedPartialCaves.has(existing.cave)) continue;
-            if (newSubHash === existing.hash) {
-              await session.send(`图片与回声洞（${existing.cave}）局部相同`);
-              notifiedPartialCaves.add(existing.cave);
-            }
-          }
-        }
         imageHashesToStore.push({ hash: globalHash, type: "phash_g" });
         imageHashesToStore.push({ hash: quadrantHashes.q1, type: "phash_q1" });
         imageHashesToStore.push({ hash: quadrantHashes.q2, type: "phash_q2" });
@@ -1027,7 +1005,10 @@ var Config = import_koishi3.Schema.intersect([
     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")
-  }).description("存储配置")
+  }).description("存储配置"),
+  import_koishi3.Schema.object({
+    debug: import_koishi3.Schema.boolean().default(false).description("启用调试模式，将在控制台输出详细的操作日志。")
+  }).description("开发配置")
 ]);
 function apply(ctx, config) {
   ctx.model.extend("cave", {
@@ -1070,18 +1051,36 @@ function apply(ctx, config) {
   });
   cave.subcommand(".add [content:text]", "添加回声洞").usage("添加一条回声洞。可直接发送内容，也可回复或引用消息。").action(async ({ session }, content) => {
     try {
-      let sourceElements = session.quote?.elements;
-      if (!sourceElements && content?.trim()) {
+      let sourceElements;
+      let sourceOrigin = "";
+      if (session.quote?.elements) {
+        sourceElements = session.quote.elements;
+        sourceOrigin = "引用(quote)";
+      } else if (content?.trim()) {
         sourceElements = import_koishi3.h.parse(content);
-      }
-      if (!sourceElements) {
+        sourceOrigin = `指令参数(content)`;
+      } else {
         await session.send("请在一分钟内发送你要添加的内容");
         const reply = await session.prompt(6e4);
         if (!reply) return "等待操作超时";
         sourceElements = import_koishi3.h.parse(reply);
+        sourceOrigin = `用户回复(prompt)`;
+      }
+      if (config.debug) {
+        logger.info(`内容来源: ${sourceOrigin}`);
+        logger.info(`获取到的消息内容 (sourceElements): 
+${JSON.stringify(sourceElements, null, 2)}`);
+        logger.info(`完整的会话对象 (session): 
+${JSON.stringify(session, null, 2)}`);
       }
       const newId = await getNextCaveId(ctx, getScopeQuery(session, config, false), reusableIds);
-      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session);
+      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger);
+      if (config.debug) {
+        logger.info(`提取后数据库元素(finalElementsForDb): 
+${JSON.stringify(finalElementsForDb, null, 2)}`);
+        logger.info(`提取后待存媒体(mediaToSave): 
+${JSON.stringify(mediaToSave, null, 2)}`);
+      }
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {

package/package.json

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