koishi-plugin-best-cave 1.5.1 → 1.5.3

package/lib/index.js

@@ -346,14 +346,20 @@ var IdManager = class {
       throw new Error("IdManager not initialized");
     }
     let nextId;
-    if (this.deletedIds.size === 0) {
-      nextId = ++this.maxId;
+    if (this.deletedIds.size > 0) {
+      const minDeletedId = Math.min(...Array.from(this.deletedIds));
+      if (!isNaN(minDeletedId) && minDeletedId > 0) {
+        nextId = minDeletedId;
+        this.deletedIds.delete(nextId);
+      } else {
+        nextId = this.maxId + 1;
+      }
     } else {
-      nextId = Math.min(...Array.from(this.deletedIds));
-      this.deletedIds.delete(nextId);
+      nextId = this.maxId + 1;
     }
-    while (this.usedIds.has(nextId)) {
-      nextId = ++this.maxId;
+    while (isNaN(nextId) || nextId <= 0 || this.usedIds.has(nextId)) {
+      nextId = this.maxId + 1;
+      this.maxId++;
     }
     this.usedIds.add(nextId);
     this.saveStatus().catch(
@@ -1342,13 +1348,16 @@ async function apply(ctx, config) {
   async function processAdd(ctx2, config2, caveFilePath, resourceDir, pendingFilePath, session, content) {
     let caveId;
     try {
+      caveId = await idManager.getNextId();
+      if (isNaN(caveId) || caveId <= 0) {
+        throw new Error("Invalid ID generated");
+      }
       const inputContent = content.length > 0 ? content.join("\n") : await (async () => {
         await sendMessage(session, "commands.cave.add.noContent", [], true, 6e4);
         const reply = await session.prompt({ timeout: 6e4 });
-        if (!reply) throw new Error(session.text("commands.cave.add.operationTimeout"));
+        if (!reply) sendMessage(session, "commands.cave.add.operationTimeout", [], true);
         return reply;
       })();
-      caveId = await idManager.getNextId();
       if (inputContent.includes("/app/.config/QQ/")) {
         return sendMessage(session, "commands.cave.add.localFileNotAllowed", [], true);
       }
@@ -1384,6 +1393,7 @@ async function apply(ctx, config) {
       ]);
       const newCave = {
         cave_id: caveId,
+        // 确保使用有效的数字ID
         elements: [
           ...textParts,
           ...imageElements.map((el, idx) => ({
@@ -1392,9 +1402,11 @@ async function apply(ctx, config) {
             // 保持原始文本和图片的相对位置
             index: el.index
           }))
-        ].sort((a, b) => a.index - a.index),
-        contributor_number: session.userId,
-        contributor_name: session.username
+        ].sort((a, b) => a.index - b.index),
+        contributor_number: session.userId || "100000",
+        // 添加默认值
+        contributor_name: session.username || "User"
+        // 添加默认值
       };
       if (videoUrls.length > 0 && savedVideos.length > 0) {
         newCave.elements.push({
@@ -1430,34 +1442,24 @@ async function apply(ctx, config) {
         elements: cleanElementsForSave(newCave.elements, false)
       });
       if (config2.enableImageDuplicate || config2.enableTextDuplicate) {
-        try {
-          const duplicateResults = await contentHashManager.findDuplicates({
-            images: config2.enableImageDuplicate ? imageBuffers : void 0,
-            texts: config2.enableTextDuplicate ? textParts.filter((p) => p.type === "text").map((p) => p.content) : void 0
-          }, {
-            image: config2.imageDuplicateThreshold,
-            text: config2.textDuplicateThreshold
-          });
-          for (const result of duplicateResults) {
-            if (!result) continue;
-            const originalCave = data.find((item) => item.cave_id === result.caveId);
-            if (!originalCave) continue;
-            await idManager.markDeleted(caveId);
-            const duplicateMessage = session.text(
-              "commands.cave.error.similarDuplicateFound",
-              [(result.similarity * 100).toFixed(1)]
-            );
-            await session.send(duplicateMessage + await buildMessage(originalCave, resourceDir, session));
-            throw new Error("duplicate_found");
-          }
-        } catch (error) {
-          if (error.message !== "duplicate_found") {
-            await idManager.markDeleted(caveId);
-          }
-          if (error.message === "duplicate_found") {
-            return "";
-          }
-          return sendMessage(session, "commands.cave.error.addFailed", [], true);
+        const duplicateResults = await contentHashManager.findDuplicates({
+          images: config2.enableImageDuplicate ? imageBuffers : void 0,
+          texts: config2.enableTextDuplicate ? textParts.filter((p) => p.type === "text").map((p) => p.content) : void 0
+        }, {
+          image: config2.imageDuplicateThreshold,
+          text: config2.textDuplicateThreshold
+        });
+        for (const result of duplicateResults) {
+          if (!result) continue;
+          const originalCave = data.find((item) => item.cave_id === result.caveId);
+          if (!originalCave) continue;
+          await idManager.markDeleted(caveId);
+          const duplicateMessage = session.text(
+            "commands.cave.error.similarDuplicateFound",
+            [(result.similarity * 100).toFixed(1)]
+          );
+          await session.send(duplicateMessage + await buildMessage(originalCave, resourceDir, session));
+          throw new Error("duplicate_found");
         }
       }
       await Promise.all([
@@ -1470,7 +1472,7 @@ async function apply(ctx, config) {
       await idManager.addStat(session.userId, caveId);
       return sendMessage(session, "commands.cave.add.addSuccess", [caveId], false);
     } catch (error) {
-      if (error.message !== "duplicate_found") {
+      if (typeof caveId === "number" && !isNaN(caveId) && caveId > 0) {
         await idManager.markDeleted(caveId);
       }
       if (error.message === "duplicate_found") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "最好的 cave 插件，可开关的审核系统，可引用添加，支持图文混合内容，可查阅投稿列表，完美复刻你的 .cave 体验！",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],