koishi-plugin-best-cave 2.6.4 → 2.6.6

package/lib/Utils.d.ts

@@ -44,9 +44,10 @@ export declare function getNextCaveId(ctx: Context, reusableIds: Set<number>): P
  * @param session 触发操作的会话。
  * @param config 插件配置。
  * @param logger 日志实例。
+ * @param creationTime 统一的创建时间戳，用于生成文件名。
  * @returns 包含数据库元素和待保存媒体列表的对象。
  */
-export declare function processMessageElements(sourceElements: h[], newId: number, session: Session, config: Config, logger: Logger): Promise<{
+export declare function processMessageElements(sourceElements: h[], newId: number, session: Session, config: Config, logger: Logger, creationTime: Date): Promise<{
     finalElementsForDb: StoredElement[];
     mediaToSave: {
         sourceUrl: string;

package/lib/index.js

@@ -249,9 +249,8 @@ var DataManager = class {
   async exportData() {
     const fileName = "cave_export.json";
     const cavesToExport = await this.ctx.database.get("cave", { status: "active" });
-    const portableCaves = cavesToExport.map(({ id, ...rest }) => rest);
-    await this.fileManager.saveFile(fileName, Buffer.from(JSON.stringify(portableCaves, null, 2)));
-    return `成功导出 ${portableCaves.length} 条数据`;
+    await this.fileManager.saveFile(fileName, Buffer.from(JSON.stringify(cavesToExport, null, 2)));
+    return `成功导出 ${cavesToExport.length} 条数据`;
   }
   /**
    * @description 从 `cave_import.json` 文件导入回声洞数据。
@@ -267,15 +266,34 @@ var DataManager = class {
     } catch (error) {
       throw new Error(`读取导入文件失败: ${error.message}`);
     }
-    const [lastCave] = await this.ctx.database.get("cave", {}, { sort: { id: "desc" }, limit: 1 });
-    let startId = (lastCave?.id || 0) + 1;
-    const newCavesToInsert = importedCaves.map((cave, index) => ({
-      ...cave,
-      id: startId + index,
-      status: "active"
-    }));
-    await this.ctx.database.upsert("cave", newCavesToInsert);
-    return `成功导入 ${newCavesToInsert.length} 条数据`;
+    const allDbCaves = await this.ctx.database.get("cave", {}, { fields: ["id"] });
+    const existingIds = new Set(allDbCaves.map((c) => c.id));
+    let maxId = allDbCaves.length > 0 ? Math.max(...allDbCaves.map((c) => c.id)) : 0;
+    const nonConflictingCaves = [];
+    const conflictingCaves = [];
+    let invalidCount = 0;
+    for (const importedCave of importedCaves) {
+      if (typeof importedCave.id !== "number" || !Array.isArray(importedCave.elements)) {
+        this.logger.warn(`回声洞（${importedCave.id}）无效: ${JSON.stringify(importedCave)}`);
+        invalidCount++;
+        continue;
+      }
+      if (existingIds.has(importedCave.id)) {
+        conflictingCaves.push(importedCave);
+      } else {
+        nonConflictingCaves.push({ ...importedCave, status: "active" });
+        existingIds.add(importedCave.id);
+        maxId = Math.max(maxId, importedCave.id);
+      }
+    }
+    const newCavesFromConflicts = conflictingCaves.map((cave) => {
+      maxId++;
+      this.logger.info(`回声洞（${cave.id}）已转移至（${maxId}）`);
+      return { ...cave, maxId, status: "active" };
+    });
+    const finalCavesToUpsert = [...nonConflictingCaves, ...newCavesFromConflicts];
+    if (finalCavesToUpsert.length > 0) await this.ctx.database.upsert("cave", finalCavesToUpsert);
+    return `成功导入 ${finalCavesToUpsert.length} 条数据`;
   }
 };
 
@@ -439,7 +457,7 @@ async function getNextCaveId(ctx, reusableIds) {
   return newId;
 }
 __name(getNextCaveId, "getNextCaveId");
-async function processMessageElements(sourceElements, newId, session, config, logger2) {
+async function processMessageElements(sourceElements, newId, session, config, logger2, creationTime) {
   const mediaToSave = [];
   let mediaIndex = 0;
   const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward", "reply": "reply", "face": "face" };
@@ -462,7 +480,7 @@ async function processMessageElements(sourceElements, newId, session, config, lo
           if (fileIdentifier.startsWith("http")) {
             const ext = path2.extname(segment.data.file || "") || defaultExtMap[sType];
             const currentMediaIndex = ++mediaIndex;
-            const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}${ext}`;
+            const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}_${creationTime.getTime()}${ext}`;
             mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
             fileIdentifier = fileName;
           }
@@ -509,7 +527,7 @@ async function processMessageElements(sourceElements, newId, session, config, lo
         if (fileIdentifier.startsWith("http")) {
           const ext = path2.extname(el.attrs.file || "") || defaultExtMap[type];
           const currentMediaIndex = ++mediaIndex;
-          const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}${ext}`;
+          const fileName = `${newId}_${creationTime.getTime()}_${currentMediaIndex}_${session.userId}${ext}`;
           mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
           fileIdentifier = fileName;
         }
@@ -1051,7 +1069,8 @@ function apply(ctx, config) {
         sourceElements = import_koishi3.h.parse(reply);
       }
       const newId = await getNextCaveId(ctx, reusableIds);
-      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger);
+      const creationTime = /* @__PURE__ */ new Date();
+      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger, creationTime);
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {
@@ -1079,7 +1098,7 @@ function apply(ctx, config) {
         userId: session.userId,
         userName,
         status: initialStatus,
-        time: /* @__PURE__ */ new Date()
+        time: creationTime
       });
       if (hasMedia) {
         handleFileUploads(ctx, config, fileManager, logger, reviewManager, newCave, mediaToSave, reusableIds, session, hashManager, textHashesToStore);

package/package.json

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