koishi-plugin-best-cave 2.7.22 → 2.7.24

package/lib/index.js

@@ -103,9 +103,9 @@ var FileManager = class {
       });
       await this.s3Client.send(command);
     } else {
-      await fs.mkdir(this.resourceDir, { recursive: true }).catch((error) => {
-        this.logger.error(`创建资源目录失败 ${this.resourceDir}:`, error);
-        throw error;
+      await fs.mkdir(this.resourceDir, { recursive: true }).catch((error2) => {
+        this.logger.error(`创建资源目录失败 ${this.resourceDir}:`, error2);
+        throw error2;
       });
       const filePath = path.join(this.resourceDir, fileName);
       await this.withLock(filePath, () => fs.writeFile(filePath, data));
@@ -139,9 +139,9 @@ var FileManager = class {
         const filePath = path.join(this.resourceDir, fileIdentifier);
         await this.withLock(filePath, () => fs.unlink(filePath));
       }
-    } catch (error) {
-      if (error.code !== "ENOENT" && error.name !== "NoSuchKey") {
-        this.logger.warn(`删除文件 ${fileIdentifier} 失败:`, error);
+    } catch (error2) {
+      if (error2.code !== "ENOENT" && error2.name !== "NoSuchKey") {
+        this.logger.warn(`删除文件 ${fileIdentifier} 失败:`, error2);
       }
     }
   }
@@ -238,8 +238,8 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
             return resultNodes;
           }));
           return (0, import_koishi.h)("message", { forward: true }, messageNodes.flat());
-        } catch (error) {
-          logger2.warn(`解析回声洞（${cave.id}）合并转发内容失败:`, error);
+        } catch (error2) {
+          logger2.warn(`解析回声洞（${cave.id}）合并转发内容失败:`, error2);
           return import_koishi.h.text("[合并转发]");
         }
       }
@@ -252,8 +252,8 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
           const data2 = await fileManager.readFile(fileName);
           const mimeType = mimeTypeMap[path2.extname(fileName).toLowerCase()] || "application/octet-stream";
           return (0, import_koishi.h)(el.type, { ...el, src: `data:${mimeType};base64,${data2.toString("base64")}` });
-        } catch (error) {
-          logger2.warn(`转换文件 ${fileName} 为 Base64 失败:`, error);
+        } catch (error2) {
+          logger2.warn(`转换文件 ${fileName} 为 Base64 失败:`, error2);
           return (0, import_koishi.h)("p", {}, `[${el.type}]`);
         }
       }
@@ -332,8 +332,8 @@ async function cleanupPendingDeletions(ctx, config, fileManager, logger2, reusab
     await ctx.database.remove("cave", { id: { $in: idsToDelete } });
     await ctx.database.remove("cave_hash", { cave: { $in: idsToDelete } });
     if (config.enableAI) await ctx.database.remove("cave_meta", { cave: { $in: idsToDelete } });
-  } catch (error) {
-    logger2.error("清理回声洞时发生错误:", error);
+  } catch (error2) {
+    logger2.error("清理回声洞时发生错误:", error2);
   }
 }
 __name(cleanupPendingDeletions, "cleanupPendingDeletions");
@@ -481,8 +481,8 @@ async function performSimilarityChecks(ctx, config, hashManager, logger2, finalE
       }
     }
     return { duplicate: false, textHashesToStore, imageHashesToStore };
-  } catch (error) {
-    logger2.warn("相似度比较失败:", error);
+  } catch (error2) {
+    logger2.warn("相似度比较失败:", error2);
     return { duplicate: false, textHashesToStore: [], imageHashesToStore: [] };
   }
 }
@@ -578,9 +578,9 @@ var DataManager = class {
       try {
         await session.send("正在处理，请稍候...");
         return await action();
-      } catch (error) {
-        this.logger.error("数据操作时发生错误:", error);
-        return `操作失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("数据操作时发生错误:", error2);
+        return `操作失败: ${error2.message}`;
       }
     }, "commandAction");
     cave.subcommand(".export", "导出回声洞数据", { hidden: true, authority: 4 }).usage("将所有回声洞数据导出到 cave.json 中。").action(commandAction(() => this.exportData()));
@@ -607,8 +607,8 @@ var DataManager = class {
       const fileContent = await this.fileManager.readFile(fileName);
       importedCaves = JSON.parse(fileContent.toString("utf-8"));
       if (!Array.isArray(importedCaves) || !importedCaves.length) throw new Error("导入文件格式无效或为空");
-    } catch (error) {
-      throw new Error(`读取导入文件失败: ${error.message}`);
+    } catch (error2) {
+      throw new Error(`读取导入文件失败: ${error2.message}`);
     }
     const allDbCaves = await this.ctx.database.get("cave", {}, { fields: ["id"] });
     const existingIds = new Set(allDbCaves.map((c) => c.id));
@@ -703,9 +703,9 @@ ${pendingCaves.map((c) => c.id).join("|")}`;
         await this.ctx.database.upsert("cave", processedIds.map((id) => ({ id, status: targetStatus })));
         if (targetStatus === "delete") cleanupPendingDeletions(this.ctx, this.config, this.fileManager, this.logger, this.reusableIds);
         return `已${actionText}回声洞（${processedIds.join("|")}）`;
-      } catch (error) {
-        this.logger.error(`审核操作失败:`, error);
-        return `操作失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error(`审核操作失败:`, error2);
+        return `操作失败: ${error2.message}`;
       }
     }, "createPendAction");
     pend.subcommand(".Y [...ids:posint]", "通过审核").usage("通过一个或多个指定 ID 的回声洞审核。若不指定 ID，则通过所有待审核的回声洞。").action(createPendAction("approve"));
@@ -725,8 +725,8 @@ ${pendingCaves.map((c) => c.id).join("|")}`;
       const [platform] = this.config.adminChannel.split(":", 1);
       const caveMessages = await buildCaveMessage(cave, this.config, this.fileManager, this.logger, platform, "待审核");
       for (const message of caveMessages) if (message.length > 0) await this.ctx.broadcast([this.config.adminChannel], import_koishi2.h.normalize(message));
-    } catch (error) {
-      this.logger.error(`发送回声洞（${cave.id}）审核消息失败:`, error);
+    } catch (error2) {
+      this.logger.error(`发送回声洞（${cave.id}）审核消息失败:`, error2);
     }
   }
 };
@@ -809,17 +809,17 @@ var HashManager = class {
             const newHashesForCave = tempHashes;
             if (newHashesForCave.length > 0) hashesToInsert.push(...newHashesForCave);
             if (hashesToInsert.length >= 100) await flushBatch();
-          } catch (error) {
+          } catch (error2) {
             errorCount++;
-            this.logger.warn(`补全回声洞（${cave2.id}）哈希时出错: ${error.message}`);
+            this.logger.warn(`补全回声洞（${cave2.id}）哈希时出错: ${error2.message}`);
           }
         }
         await flushBatch();
         const successCount = processedCaveCount - errorCount;
         return `已补全 ${successCount} 个回声洞的 ${totalHashesGenerated} 条哈希（失败 ${errorCount} 条）`;
-      } catch (error) {
-        this.logger.error("补全哈希失败:", error);
-        return `操作失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("补全哈希失败:", error2);
+        return `操作失败: ${error2.message}`;
       }
     });
     cave.subcommand(".check", "检查相似度", { hidden: true }).usage("检查所有回声洞，找出相似度过高的内容。").option("textThreshold", "-t <threshold:number> 文本相似度阈值 (%)").option("imageThreshold", "-i <threshold:number> 图片相似度阈值 (%)").action(async ({ session, options }) => {
@@ -903,9 +903,9 @@ ${textResult.reportLines.join("\n")}`;
 ${imageResult.reportLines.join("\n")}`;
         }
         return report.trim();
-      } catch (error) {
-        this.logger.error("检查相似度失败:", error);
-        return `检查失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("检查相似度失败:", error2);
+        return `检查失败: ${error2.message}`;
       }
     });
     cave.subcommand(".fix [...ids:posint]", "修复回声洞", { hidden: true, authority: 3 }).usage("扫描并修复回声洞中的图片，可指定一个或多个 ID。").action(async ({ session }, ...ids) => {
@@ -931,18 +931,18 @@ ${imageResult.reportLines.join("\n")}`;
                 await this.fileManager.saveFile(element.file, sanitizedBuffer);
                 fixedFiles++;
               }
-            } catch (error) {
-              if (error.code !== "ENOENT" && error.name !== "NoSuchKey") {
-                this.logger.warn(`无法修复回声洞（${cave2.id}）的图片（${element.file}）:`, error);
+            } catch (error2) {
+              if (error2.code !== "ENOENT" && error2.name !== "NoSuchKey") {
+                this.logger.warn(`无法修复回声洞（${cave2.id}）的图片（${element.file}）:`, error2);
                 errorCount++;
               }
             }
           }
         }
         return `已修复 ${cavesToProcess.length} 个回声洞的 ${fixedFiles} 张图片（失败 ${errorCount} 条）`;
-      } catch (error) {
-        this.logger.error("修复图像文件时发生严重错误:", error);
-        return `操作失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("修复图像文件时发生严重错误:", error2);
+        return `操作失败: ${error2.message}`;
       }
     });
   }
@@ -1083,6 +1083,7 @@ ${imageResult.reportLines.join("\n")}`;
 
 // src/AIManager.ts
 var path3 = __toESM(require("path"));
+var import_console = require("console");
 var AIManager = class {
   /**
    * @constructor
@@ -1165,9 +1166,9 @@ var AIManager = class {
           }
         }
         return `已分析 ${successCount} 个回声洞`;
-      } catch (error) {
-        this.logger.error("分析回声洞失败:", error);
-        return `操作失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("分析回声洞失败:", error2);
+        return `操作失败: ${error2.message}`;
       }
     });
     cave.subcommand(".compare", "比较重复性", { hidden: true }).usage("检查回声洞，找出可能重复的内容。").action(async ({ session }) => {
@@ -1212,9 +1213,9 @@ var AIManager = class {
 - ${sortedCluster.join("|")}`;
         });
         return report;
-      } catch (error) {
-        this.logger.error("检查重复性失败:", error);
-        return `检查失败: ${error.message}`;
+      } catch (error2) {
+        this.logger.error("检查重复性失败:", error2);
+        return `检查失败: ${error2.message}`;
       }
     });
   }
@@ -1240,8 +1241,8 @@ var AIManager = class {
       });
       const duplicateIds = (await Promise.all(comparisonPromises)).filter((id) => id !== null);
       return { duplicate: duplicateIds.length > 0, ids: duplicateIds };
-    } catch (error) {
-      this.logger.error("查重回声洞出错:", error);
+    } catch (error2) {
+      this.logger.error("查重回声洞出错:", error2);
       return { duplicate: false };
     }
   }
@@ -1264,8 +1265,8 @@ var AIManager = class {
               type: "image_url",
               image_url: { url: `data:${mimeType};base64,${buffer.toString("base64")}` }
             };
-          } catch (error) {
-            this.logger.warn(`读取文件（${el.file}）失败:`, error);
+          } catch (error2) {
+            this.logger.warn(`读取文件（${el.file}）失败:`, error2);
           }
         })
       );
@@ -1305,8 +1306,8 @@ ${combinedText}` }, ...images];
       const userMessage = { role: "user", content: JSON.stringify(userMessageContent) };
       const response = await this.requestAI([userMessage], this.DUPLICATE_CHECK_SYSTEM_PROMPT);
       return response?.duplicate || false;
-    } catch (error) {
-      this.logger.error(`比较回声洞（${caveA.id}）与（${caveB.id}）失败:`, error);
+    } catch (error2) {
+      this.logger.error(`比较回声洞（${caveA.id}）与（${caveB.id}）失败:`, error2);
       return false;
     }
   }
@@ -1345,18 +1346,22 @@ ${combinedText}` }, ...images];
       "Content-Type": "application/json",
       "Authorization": `Bearer ${this.config.aiApiKey}`
     };
-    const response = await this.http.post(fullUrl, payload, { headers, timeout: 18e4 });
+    const response = await this.http.post(fullUrl, payload, { headers, timeout: 6e5 });
     const content = response?.choices?.[0]?.message?.content;
-    if (typeof content !== "string" || !content.trim()) throw new Error();
-    try {
-      const jsonRegex = /```json\s*([\s\S]*?)\s*```/i;
-      const match = content.match(jsonRegex);
-      const jsonString = match && match[1] ? match[1] : content;
-      return JSON.parse(jsonString);
-    } catch (error) {
-      this.logger.error("解析失败:", error, "原始响应:", JSON.stringify(response, null, 2));
-      throw error;
+    if (!content?.trim()) throw import_console.error;
+    const candidates = [];
+    const jsonBlockMatch = content.match(/```json\s*([\s\S]*?)\s*```/i);
+    if (jsonBlockMatch && jsonBlockMatch[1]) candidates.push(jsonBlockMatch[1]);
+    candidates.push(content);
+    const firstBrace = content.indexOf("{");
+    const lastBrace = content.lastIndexOf("}");
+    if (firstBrace !== -1 && lastBrace > firstBrace) candidates.push(content.substring(firstBrace, lastBrace + 1));
+    for (const candidate of [...new Set(candidates)]) try {
+      return JSON.parse(candidate);
+    } catch {
     }
+    this.logger.error("解析失败:", import_console.error, "原始响应:", JSON.stringify(response, null, 2));
+    throw import_console.error;
   }
 };
 
@@ -1435,8 +1440,8 @@ function apply(ctx, config) {
         await ctx.database.upsert("cave", idsToMark);
         await cleanupPendingDeletions(ctx, config, fileManager, logger, reusableIds);
       }
-    } catch (error) {
-      logger.error("清理残留回声洞时发生错误:", error);
+    } catch (error2) {
+      logger.error("清理残留回声洞时发生错误:", error2);
     }
   });
   const cave = ctx.command("cave", "回声洞").option("add", "-a <content:text> 添加回声洞").option("view", "-g <id:posint> 查看指定回声洞").option("delete", "-r <id:posint> 删除指定回声洞").option("list", "-l 查询投稿统计").usage("随机抽取一条已添加的回声洞。").action(async ({ session, options }) => {
@@ -1452,8 +1457,8 @@ function apply(ctx, config) {
       const [randomCave] = await ctx.database.get("cave", { ...query, id: randomId });
       const messages = await buildCaveMessage(randomCave, config, fileManager, logger, session.platform);
       for (const message of messages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
-    } catch (error) {
-      logger.error("随机获取回声洞失败:", error);
+    } catch (error2) {
+      logger.error("随机获取回声洞失败:", error2);
       return "随机获取回声洞失败";
     }
   });
@@ -1529,11 +1534,11 @@ function apply(ctx, config) {
           if (allHashesToInsert.length > 0) await ctx.database.upsert("cave_hash", allHashesToInsert);
         }
         if (finalStatus === "pending" && reviewManager) reviewManager.sendForPend(newCave);
-      } catch (error) {
-        logger.error(`回声洞（${newId}）处理失败:`, error);
+      } catch (error2) {
+        logger.error(`回声洞（${newId}）处理失败:`, error2);
         await ctx.database.upsert("cave", [{ id: newId, status: "delete" }]);
         await cleanupPendingDeletions(ctx, config, fileManager, logger, reusableIds);
-        await session.send(`回声洞（${newId}）处理失败: ${error.message}`);
+        await session.send(`回声洞（${newId}）处理失败: ${error2.message}`);
       }
     })();
   });
@@ -1544,8 +1549,8 @@ function apply(ctx, config) {
       if (!targetCave) return `回声洞（${id}）不存在`;
       const messages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform);
       for (const message of messages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
-    } catch (error) {
-      logger.error(`查看回声洞（${id}）失败:`, error);
+    } catch (error2) {
+      logger.error(`查看回声洞（${id}）失败:`, error2);
       return "查看失败，请稍后再试";
     }
   });
@@ -1561,8 +1566,8 @@ function apply(ctx, config) {
       const caveMessages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform, "已删除");
       for (const message of caveMessages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
       cleanupPendingDeletions(ctx, config, fileManager, logger, reusableIds);
-    } catch (error) {
-      logger.error(`标记回声洞（${id}）失败:`, error);
+    } catch (error2) {
+      logger.error(`标记回声洞（${id}）失败:`, error2);
       return "删除失败，请稍后再试";
     }
   });
@@ -1591,8 +1596,8 @@ function apply(ctx, config) {
 `;
         });
         return report.trim();
-      } catch (error) {
-        logger.error("查询排行失败:", error);
+      } catch (error2) {
+        logger.error("查询排行失败:", error2);
         return "查询失败，请稍后再试";
       }
     }

package/package.json

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