koishi-plugin-best-cave 2.7.3 → 2.7.4

package/lib/Utils.d.ts

@@ -2,8 +2,6 @@ import { Context, h, Logger, Session } from 'koishi';
 import { CaveObject, Config, StoredElement } from './index';
 import { FileManager } from './FileManager';
 import { HashManager, CaveHashObject } from './HashManager';
-import { PendManager } from './PendManager';
-import { AIManager } from './AIManager';
 /**
  * @description 构建一条用于发送的完整回声洞消息，处理不同存储后端的资源链接。
  * @param cave 回声洞对象。
@@ -69,25 +67,21 @@ export declare function performSimilarityChecks(ctx: Context, config: Config, ha
     imageHashesToStore?: Omit<CaveHashObject, 'cave'>[];
 }>;
 /**
- * @description 异步处理文件上传和状态更新的后台任务。
+ * @description 异步处理文件上传，并在成功后更新回声洞状态。
  * @param ctx - Koishi 上下文。
  * @param config - 插件配置。
  * @param fileManager - FileManager 实例，用于保存文件。
  * @param logger - 日志记录器实例。
- * @param reviewManager - ReviewManager 实例，用于提交审核。
  * @param cave - 刚刚在数据库中创建的 `preload` 状态的回声洞对象。
  * @param downloadedMedia - 需要保存的媒体文件及其 Buffer。
  * @param reusableIds - 可复用 ID 的内存缓存。
- * @param session - 触发此操作的用户会话，用于发送反馈。
- * @param hashManager - HashManager 实例，如果启用则用于哈希计算和比较。
- * @param textHashesToStore - 已预先计算好的、待存入数据库的文本哈希对象数组。
- * @param imageHashesToStore - 已预先计算好的、待存入数据库的图片哈希对象数组。
- * @param aiManager - AIManager 实例，如果启用则用于 AI 分析。
+ * @param session - 触发此操作的用户会话。
+ * @returns 成功则返回最终状态 ('pending' or 'active')，失败则返回 'delete'。
  */
-export declare function handleFileUploads(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, reviewManager: PendManager, cave: CaveObject, downloadedMedia: {
+export declare function handleFileUploads(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, cave: CaveObject, downloadedMedia: {
     fileName: string;
     buffer: Buffer;
-}[], reusableIds: Set<number>, session: Session, hashManager: HashManager, textHashesToStore: Omit<CaveHashObject, 'cave'>[], imageHashesToStore: Omit<CaveHashObject, 'cave'>[], aiManager: AIManager | null): Promise<void>;
+}[], reusableIds: Set<number>, session: Session): Promise<'pending' | 'active' | 'delete'>;
 /**
  * @description 校验会话是否来自指定的管理群组。
  * @param session 当前会话。

package/lib/index.js

@@ -482,25 +482,18 @@ async function performSimilarityChecks(ctx, config, hashManager, finalElementsFo
   return { duplicate: false, textHashesToStore, imageHashesToStore };
 }
 __name(performSimilarityChecks, "performSimilarityChecks");
-async function handleFileUploads(ctx, config, fileManager, logger2, reviewManager, cave, downloadedMedia, reusableIds, session, hashManager, textHashesToStore, imageHashesToStore, aiManager) {
+async function handleFileUploads(ctx, config, fileManager, logger2, cave, downloadedMedia, reusableIds, session) {
   try {
-    if (aiManager) await aiManager.analyzeAndStore(cave, downloadedMedia);
     await Promise.all(downloadedMedia.map((item) => fileManager.saveFile(item.fileName, item.buffer)));
     const needsReview = config.enablePend && session.channelId !== config.adminChannel?.split(":")[1];
     const finalStatus = needsReview ? "pending" : "active";
     await ctx.database.upsert("cave", [{ id: cave.id, status: finalStatus }]);
-    if (hashManager) {
-      const allHashesToInsert = [...textHashesToStore, ...imageHashesToStore].map((h5) => ({ ...h5, cave: cave.id }));
-      if (allHashesToInsert.length > 0) await ctx.database.upsert("cave_hash", allHashesToInsert);
-    }
-    if (finalStatus === "pending" && reviewManager) {
-      const [finalCave] = await ctx.database.get("cave", { id: cave.id });
-      if (finalCave) reviewManager.sendForPend(finalCave);
-    }
+    return finalStatus;
   } catch (fileProcessingError) {
     logger2.error(`回声洞（${cave.id}）文件处理失败:`, fileProcessingError);
     await ctx.database.upsert("cave", [{ id: cave.id, status: "delete" }]);
     cleanupPendingDeletions(ctx, fileManager, logger2, reusableIds);
+    return "delete";
   }
 }
 __name(handleFileUploads, "handleFileUploads");
@@ -1164,9 +1157,17 @@ var AIManager = class {
     if (parts.length <= 1) return { payload: {} };
     try {
       const schema = JSON.parse(schemaString);
-      return { payload: { contents: [{ parts }], generationConfig: { response_schema: schema } } };
+      return {
+        payload: {
+          contents: [{ parts }],
+          generationConfig: {
+            responseMimeType: "application/json",
+            responseSchema: schema
+          }
+        }
+      };
     } catch (error) {
-      this.logger.error("解析JSON Schema失败:", error);
+      this.logger.error("分析 JSON Schema 解析失败:", error);
       return { payload: {} };
     }
   }
@@ -1182,15 +1183,20 @@ var AIManager = class {
       new_content: { text: formatContent(newElements) },
       existing_contents: existingCaves.map((cave) => ({ id: cave.id, text: formatContent(cave.elements) }))
     });
-    const fullPrompt = `${this.config.aiCheckPrompt}
-
-以下是需要处理的数据:
-${payloadContent}`;
+    const parts = [{ text: this.config.aiCheckPrompt }, { text: payloadContent }];
     try {
       const schema = JSON.parse(this.config.aiCheckSchema);
-      return { payload: { contents: [{ parts: [{ text: fullPrompt }] }], generationConfig: { response_schema: schema } } };
+      return {
+        payload: {
+          contents: [{ parts }],
+          generationConfig: {
+            responseMimeType: "application/json",
+            responseSchema: schema
+          }
+        }
+      };
     } catch (error) {
-      this.logger.error("解析查重JSON Schema失败:", error);
+      this.logger.error("查重 JSON Schema 解析失败:", error);
       return { payload: {} };
     }
   }
@@ -1201,6 +1207,7 @@ ${payloadContent}`;
    */
   parseAnalysisResponse(response) {
     try {
+      if (!response?.candidates?.[0]?.content?.parts?.[0]?.text) throw new Error("分析响应解析失败");
       const content = response.candidates[0].content.parts[0].text;
       const parsed = JSON.parse(content);
       const keywords = Array.isArray(parsed.keywords) ? parsed.keywords : [];
@@ -1211,7 +1218,7 @@ ${payloadContent}`;
       };
     } catch (error) {
       this.logger.error("分析响应解析失败:", error, "原始响应:", JSON.stringify(response));
-      return { keywords: [], description: "解析失败", rating: 0 };
+      throw error;
     }
   }
   /**
@@ -1221,13 +1228,14 @@ ${payloadContent}`;
    */
   parseDedupeResponse(response) {
     try {
+      if (!response?.candidates?.[0]?.content?.parts?.[0]?.text) throw new Error("查重响应解析失败");
       const content = response.candidates[0].content.parts[0].text;
       const parsed = JSON.parse(content);
       if (parsed.duplicate === true && parsed.id) return { duplicate: true, id: Number(parsed.id) };
       return { duplicate: false };
     } catch (error) {
       this.logger.error("查重响应解析失败:", error, "原始响应:", JSON.stringify(response));
-      return { duplicate: false };
+      throw error;
     }
   }
 };
@@ -1409,22 +1417,25 @@ function apply(ctx, config) {
       }
       const userName = (config.enableName ? await profileManager.getNickname(session.userId) : null) || session.username;
       const needsReview = config.enablePend && session.channelId !== config.adminChannel?.split(":")[1];
-      const initialStatus = hasMedia ? "preload" : needsReview ? "pending" : "active";
+      let finalStatus = hasMedia ? "preload" : needsReview ? "pending" : "active";
       const newCave = await ctx.database.create("cave", {
         id: newId,
         elements: finalElementsForDb,
         channelId: session.channelId,
         userId: session.userId,
         userName,
-        status: initialStatus,
+        status: finalStatus,
         time: creationTime
       });
-      if (hasMedia) {
-        handleFileUploads(ctx, config, fileManager, logger, reviewManager, newCave, downloadedMedia, reusableIds, session, hashManager, textHashesToStore, imageHashesToStore, aiManager);
-      } else {
-        if (aiManager) await aiManager.analyzeAndStore(newCave);
-        if (hashManager && textHashesToStore.length > 0) await ctx.database.upsert("cave_hash", textHashesToStore.map((h5) => ({ ...h5, cave: newCave.id })));
-        if (initialStatus === "pending") reviewManager.sendForPend(newCave);
+      if (hasMedia) finalStatus = await handleFileUploads(ctx, config, fileManager, logger, newCave, downloadedMedia, reusableIds, session);
+      if (finalStatus !== "preload" && finalStatus !== "delete") {
+        newCave.status = finalStatus;
+        if (aiManager) await aiManager.analyzeAndStore(newCave, downloadedMedia);
+        if (hashManager) {
+          const allHashesToInsert = [...textHashesToStore, ...imageHashesToStore].map((h5) => ({ ...h5, cave: newCave.id }));
+          if (allHashesToInsert.length > 0) await ctx.database.upsert("cave_hash", allHashesToInsert);
+        }
+        if (finalStatus === "pending" && reviewManager) reviewManager.sendForPend(newCave);
       }
       return needsReview ? `提交成功，序号为（${newCave.id}）` : `添加成功，序号为（${newCave.id}）`;
     } catch (error) {

package/package.json

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