koishi-plugin-best-cave 2.7.27 → 2.7.29

package/lib/AIManager.d.ts

@@ -69,7 +69,6 @@ export declare class AIManager {
      * @param {CaveObject} caveA - 第一个回声洞对象。
      * @param {CaveObject} caveB - 第二个回声洞对象。
      * @returns {Promise<boolean>} 如果内容被 AI 判断为重复，则返回 true，否则返回 false。
-     * @throws {Error} 当 AI 请求失败时抛出。
      * @private
      */
     private isContentDuplicateAI;

package/lib/index.js

@@ -1155,7 +1155,6 @@ var AIManager = class {
         await session.send(`开始分析 ${cavesToAnalyze.length} 个回声洞...`);
         let successCount = 0;
         let failedCount = 0;
-        let consecutiveFailures = 0;
         for (let i = 0; i < cavesToAnalyze.length; i += 25) {
           const batch = cavesToAnalyze.slice(i, i + 25);
           this.logger.info(`[${i + 1}/${cavesToAnalyze.length}] 正在分析 ${batch.length} 个回声洞...`);
@@ -1167,10 +1166,8 @@ var AIManager = class {
             const cave2 = batch[j];
             if (result.status === "fulfilled" && result.value.length > 0) {
               successfulAnalyses.push(result.value[0]);
-              consecutiveFailures = 0;
             } else {
               failedCount++;
-              consecutiveFailures++;
               if (result.status === "rejected") this.logger.error(`分析回声洞（${cave2.id}）失败:`, result.reason);
             }
           }
@@ -1178,7 +1175,6 @@ var AIManager = class {
             await this.ctx.database.upsert("cave_meta", successfulAnalyses);
             successCount += successfulAnalyses.length;
           }
-          if (consecutiveFailures >= 3) break;
         }
         return `已分析 ${successCount} 个回声洞（失败 ${failedCount} 个）`;
       } catch (error) {
@@ -1194,8 +1190,12 @@ var AIManager = class {
         if (allMeta.length < 2) return "无可比较数据";
         const candidatePairs = generateFromLSH(allMeta, (meta) => ({ id: meta.cave, keys: meta.keywords }));
         if (candidatePairs.size === 0) return "未发现相似内容";
-        const allCaves = new Map((await this.ctx.database.get("cave", { status: "active" })).map((c) => [c.id, c]));
-        const duplicatePairs = [];
+        const idsToCompare = /* @__PURE__ */ new Set();
+        candidatePairs.forEach((pairKey) => {
+          pairKey.split("-").map(Number).forEach((id) => idsToCompare.add(id));
+        });
+        const caveData = await this.ctx.database.get("cave", { id: { $in: Array.from(idsToCompare) }, status: "active" });
+        const allCaves = new Map(caveData.map((c) => [c.id, c]));
         const comparisonPromises = Array.from(candidatePairs).map(async (pairKey) => {
           const [id1, id2] = pairKey.split("-").map(Number);
           const cave1 = allCaves.get(id1);
@@ -1204,7 +1204,7 @@ var AIManager = class {
           return null;
         });
         const results = await Promise.all(comparisonPromises);
-        duplicatePairs.push(...results.filter(Boolean));
+        const duplicatePairs = results.filter(Boolean);
         if (duplicatePairs.length === 0) return "未发现高重复性的内容";
         const dsu = new DSU();
         const allIds = /* @__PURE__ */ new Set();
@@ -1270,38 +1270,45 @@ var AIManager = class {
   async analyze(caves, mediaBuffers) {
     const mediaMap = mediaBuffers ? new Map(mediaBuffers.map((m) => [m.fileName, m.buffer])) : void 0;
     const analysisPromises = caves.map(async (cave) => {
-      const combinedText = cave.elements.filter((el) => el.type === "text" && el.content).map((el) => el.content).join("\n");
-      const imageElements = await Promise.all(
-        cave.elements.filter((el) => el.type === "image" && el.file).map(async (el) => {
-          try {
-            const buffer = mediaMap?.get(el.file) ?? await this.fileManager.readFile(el.file);
-            const mimeType = path3.extname(el.file).toLowerCase() === ".png" ? "image/png" : "image/jpeg";
-            return {
-              type: "image_url",
-              image_url: { url: `data:${mimeType};base64,${buffer.toString("base64")}` }
-            };
-          } catch (error) {
-            this.logger.warn(`读取文件（${el.file}）失败:`, error);
-            return null;
-          }
-        })
-      );
-      const images = imageElements.filter(Boolean);
-      if (!combinedText.trim() && images.length === 0) return null;
-      const contentForAI = [];
-      if (combinedText.trim()) contentForAI.push({ type: "text", text: `请分析以下内容：
+      try {
+        const combinedText = cave.elements.filter((el) => el.type === "text" && el.content).map((el) => el.content).join("\n");
+        const imageElements = await Promise.all(
+          cave.elements.filter((el) => el.type === "image" && el.file).map(async (el) => {
+            try {
+              const buffer = mediaMap?.get(el.file) ?? await this.fileManager.readFile(el.file);
+              const mimeType = path3.extname(el.file).toLowerCase() === ".png" ? "image/png" : "image/jpeg";
+              return {
+                type: "image_url",
+                image_url: { url: `data:${mimeType};base64,${buffer.toString("base64")}` }
+              };
+            } catch (error) {
+              this.logger.warn(`读取文件（${el.file}）失败:`, error);
+              return null;
+            }
+          })
+        );
+        const images = imageElements.filter(Boolean);
+        if (!combinedText.trim() && images.length === 0) return null;
+        const contentForAI = [];
+        if (combinedText.trim()) contentForAI.push({ type: "text", text: `请分析以下内容：
 
 ${combinedText}` });
-      contentForAI.push(...images);
-      const userMessage = { role: "user", content: contentForAI };
-      const response = await this.requestAI([userMessage], this.ANALYSIS_SYSTEM_PROMPT);
-      if (response) return {
-        cave: cave.id,
-        keywords: response.keywords || [],
-        description: response.description || "",
-        rating: Math.max(0, Math.min(100, response.rating || 0))
-      };
-      return null;
+        contentForAI.push(...images);
+        const userMessage = { role: "user", content: contentForAI };
+        const response = await this.requestAI([userMessage], this.ANALYSIS_SYSTEM_PROMPT);
+        if (response) {
+          return {
+            cave: cave.id,
+            keywords: response.keywords || [],
+            description: response.description || "",
+            rating: Math.max(0, Math.min(100, response.rating || 0))
+          };
+        }
+        return null;
+      } catch (error) {
+        this.logger.error(`分析回声洞（${cave.id}）失败:`, error);
+        return null;
+      }
     });
     const results = await Promise.all(analysisPromises);
     return results.filter((result) => !!result);
@@ -1311,7 +1318,6 @@ ${combinedText}` });
    * @param {CaveObject} caveA - 第一个回声洞对象。
    * @param {CaveObject} caveB - 第二个回声洞对象。
    * @returns {Promise<boolean>} 如果内容被 AI 判断为重复，则返回 true，否则返回 false。
-   * @throws {Error} 当 AI 请求失败时抛出。
    * @private
    */
   async isContentDuplicateAI(caveA, caveB) {
@@ -1364,28 +1370,21 @@ ${combinedText}` });
       "Content-Type": "application/json",
       "Authorization": `Bearer ${this.config.aiApiKey}`
     };
-    try {
-      const response = await this.http.post(fullUrl, payload, { headers, timeout: 6e5 });
-      const content = response?.choices?.[0]?.message?.content;
-      if (!content?.trim()) throw new 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 (parseError) {
-        }
-      }
-      this.logger.error("解析失败", "原始响应:", JSON.stringify(response, null, 2));
-      throw new Error();
-    } catch (e) {
-      throw e;
+    const response = await this.http.post(fullUrl, payload, { headers, timeout: 6e5 });
+    const content = response?.choices?.[0]?.message?.content;
+    if (!content?.trim()) throw new 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 (parseError) {
     }
+    this.logger.error("原始响应:", JSON.stringify(response, null, 2));
   }
 };
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞插件。支持丰富的媒体类型、内容查重、AI分析、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.7.27",
+  "version": "2.7.29",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],
-  "homepage": "https://github.com/YisRime/koishi-plugin-best-cave",
+  "homepage": "https://github.com//Koishi-Plugin/best-cave",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/YisRime/koishi-plugin-best-cave.git"
+    "url": "git+https://github.com//Koishi-Plugin/best-cave.git"
   },
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",