npm - koishi-plugin-echo-cave - Versions diffs - 1.29.9 → 1.29.11 - Mend

koishi-plugin-echo-cave 1.29.9 → 1.29.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +11 -2
package/lib/config/config.d.ts +2 -0
package/lib/core/cave-store.d.ts +29 -0
package/lib/core/command/admin.d.ts +2 -0
package/lib/index.cjs +501 -111
package/lib/index.d.ts +2 -0
package/package.json +3 -3

package/README.md CHANGED Viewed

@@ -23,7 +23,9 @@
 - 🎯 **按人随机抽取**：支持通过 `@用户` 或用户 ID 定向随机抽取该用户相关的回声洞，且不影响全局抽取权重
 - 🧭 **转发绑定体验优化**：转发消息关联用户的详细输入指南仅在用户首次成功完成选择前显示，选择完成或超时后会尝试撤回提示消息
 - 🤖 **特殊转发用户处理**：可配置在检测到转发记录中包含特殊用户 `1094950020` 时直接拒绝存储，或要求二次确认后再存储
-- 🛠️ **回声洞 ID 重排**：提供管理员维护命令，可在写入备份后安全重排现有回声洞 ID
+- 🛠️ **回声洞 ID 重排**：提供管理员维护命令，可在写入备份后安全重排现有回声洞 public ID，而不抬高数据库内部自增主键
+- ♻️ **回声洞备份恢复**：提供管理员维护命令，可从 ID 重排生成的 JSON 备份自动恢复数据库
+- ⏰ **自动重排维护**：可选开启每日定时自动重排，并在执行时输出日志
 - ⚖️ **加权随机抽取**：根据消息被抽取次数动态调整抽取概率，被抽取次数越多，概率越低。使用公式：
   ```
   权重 = 1 / (1 + drawCount * α)
@@ -47,6 +49,7 @@
 | `cave.bind <id> <...userIds>` | 将用户绑定到特定 ID 的回声洞 | 所有人             |
 | `cave.rank [period]`          | 查看回声洞排行榜，支持多种时间段 | 所有人             |
 | `cave.admin.reindex`          | 安全重排所有现有回声洞 ID，并先写入备份 | 管理员（私聊） |
+| `cave.admin.restore-reindex <backupPath>` | 从重排生成的 JSON 备份恢复回声洞数据 | 管理员（私聊） |
 ## 🚀 使用指南
@@ -79,6 +82,8 @@ npm install koishi-plugin-echo-cave
 | `autoBindSingleForwardUser`  | boolean | `false` | 转发消息仅识别到一个用户时，是否默认自动绑定该用户 |
 | `forwardSpecialUserHandlingMode` | `'ignore' \| 'reject' \| 'confirm'` | `'ignore'` | 检测到转发消息中包含用户 `1094950020` 时的处理方式：忽略、提醒后拒绝存储、或提醒并要求确认后再存储 |
 | `alpha`                      | number  | `0.2`   | 加权随机抽取的调整因子，控制抽取次数对概率的影响程度，值越大影响越明显 |
+| `enableAutoReindex`          | boolean | `false` | 是否启用每日自动重整回声洞 public ID |
+| `autoReindexTime`            | string  | `00:00` | 自动重整的每日执行时间，格式为 `HH:mm` |
 ## 📝 注意事项
@@ -93,8 +98,12 @@ npm install koishi-plugin-echo-cave
 - 转发消息可选择相关用户进行绑定，超时后自动跳过
 - 转发消息关联用户的详细示例只会在用户首次成功完成一次选择前显示；如果只是超时，则下次仍会显示
 - 可通过配置项禁用转发消息用户选择、开启单用户自动绑定，或配置检测到特殊用户 `1094950020` 时的处理模式
-- `cave.admin.reindex` 会先在 `logs/` 下写入备份文件，再执行 ID 重排；建议仅在单实例维护时段执行
+- 当前运行时使用 v3 数据表：数据库内部自增主键与对外展示的回声洞 ID 已分离，因此重整不会再把后续插入的主键抬到很大
+- 插件启动后会自动执行 v2 → v3 的 1:1 数据迁移，保留现有回声洞 ID，不会在迁移阶段重排编号
+- `cave.admin.reindex` 会先在 `logs/` 下写入备份文件，再执行 public ID 重排；建议仅在单实例维护时段执行
 - 如果重排前备份写入失败，命令会直接终止，不会开始改写数据库
+- 若开启 `enableAutoReindex`，插件会在 `autoReindexTime` 指定的每日时间自动执行同样的 public ID 重排，并输出日志
+- 如果需要恢复，可执行 `cave.admin.restore-reindex <备份路径>` 读取对应的 JSON 备份并回写数据库
 ## 🤝 贡献指南

package/lib/config/config.d.ts CHANGED Viewed

@@ -34,5 +34,7 @@ export interface Config {
     sendFailureSummaryAdminId?: string;
     sendFailureSummaryTime?: string;
     oversizedMediaCleanupMode?: OversizedMediaCleanupMode;
+    enableAutoReindex?: boolean;
+    autoReindexTime?: string;
 }
 export declare const Config: Schema<Config>;

package/lib/core/cave-store.d.ts ADDED Viewed

@@ -0,0 +1,29 @@
+import { Context } from 'koishi';
+import { EchoCave } from '../index';
+export declare const ACTIVE_CAVE_TABLE: "echo_cave_v3";
+export interface CaveSnapshotRecord {
+    id: number;
+    channelId: string;
+    createTime: Date;
+    userId: string;
+    originUserId: string;
+    type: 'forward' | 'msg';
+    content: string;
+    relatedUsers: string[];
+    drawCount: number;
+}
+export interface CaveBackupRecord extends CaveSnapshotRecord {
+    entryId?: number;
+}
+export declare function toCaveSnapshotRecord<T extends CaveSnapshotRecord>(cave: T): CaveSnapshotRecord;
+export declare function toCaveBackupRecord(cave: EchoCave | CaveSnapshotRecord): CaveBackupRecord;
+export declare function getNextCavePublicId(ctx: Context): Promise<number>;
+export declare function getCaveByPublicId(ctx: Context, id: number, channelId?: string): Promise<EchoCave>;
+export declare function getCavesByPublicIds(ctx: Context, ids: number[]): Promise<EchoCave[]>;
+export declare function removeCaveByEntryId(ctx: Context, entryId: number): Promise<void>;
+export declare function createCaveRecord(ctx: Context, cave: CaveSnapshotRecord): Promise<EchoCave>;
+export declare function updateCaveByEntryId(ctx: Context, entryId: number, data: Partial<Omit<CaveSnapshotRecord, 'id'>> & {
+    id?: number;
+}): Promise<void>;
+export declare function getAllCaves(ctx: Context): Promise<EchoCave[]>;
+export declare function getCavesByChannel(ctx: Context, channelId: string): Promise<EchoCave[]>;

package/lib/core/command/admin.d.ts CHANGED Viewed

@@ -6,3 +6,5 @@ export declare function migrateLegacyLocalMedia(ctx: Context, session: Session,
 export declare function migrateMediaToS3(ctx: Context, session: Session, cfg: Config, keepLocalOption?: string): Promise<string>;
 export declare function inspectMediaRefsForMigration(ctx: Context, session: Session, cfg: Config, idRangesOption?: string): Promise<string>;
 export declare function reindexCaveIds(ctx: Context, session: Session, cfg: Config): Promise<string>;
+export declare function restoreReindexBackup(ctx: Context, session: Session, cfg: Config, backupPathInput?: string): Promise<string>;
+export declare function registerAutoReindexScheduler(ctx: Context, cfg: Config): void;

package/lib/index.cjs CHANGED Viewed

@@ -18017,9 +18017,9 @@ var require_dist_cjs47 = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js
 var require_ruleset = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -18219,9 +18219,9 @@ var require_ruleset = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -18258,9 +18258,9 @@ var require_endpointResolver = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.defaultS3HttpAuthSchemeProvider = exports2.defaultS3HttpAuthSchemeParametersProvider = void 0;
@@ -18387,9 +18387,9 @@ var require_httpAuthSchemeProvider = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js
 var require_S3ServiceException = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.S3ServiceException = exports2.__ServiceException = void 0;
@@ -18407,9 +18407,9 @@ var require_S3ServiceException = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js
 var require_errors = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ObjectAlreadyInActiveTierError = exports2.IdempotencyParameterMismatch = exports2.TooManyParts = exports2.InvalidWriteOffset = exports2.InvalidRequest = exports2.EncryptionTypeMismatch = exports2.NotFound = exports2.NoSuchKey = exports2.InvalidObjectState = exports2.NoSuchBucket = exports2.BucketAlreadyOwnedByYou = exports2.BucketAlreadyExists = exports2.ObjectNotInActiveTierError = exports2.AccessDenied = exports2.NoSuchUpload = void 0;
@@ -18616,9 +18616,9 @@ var require_errors = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js
 var require_schemas_0 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.CreateBucketMetadataTableConfigurationRequest$ = exports2.CreateBucketMetadataConfigurationRequest$ = exports2.CreateBucketConfiguration$ = exports2.CORSRule$ = exports2.CORSConfiguration$ = exports2.CopyPartResult$ = exports2.CopyObjectResult$ = exports2.CopyObjectRequest$ = exports2.CopyObjectOutput$ = exports2.ContinuationEvent$ = exports2.Condition$ = exports2.CompleteMultipartUploadRequest$ = exports2.CompleteMultipartUploadOutput$ = exports2.CompletedPart$ = exports2.CompletedMultipartUpload$ = exports2.CommonPrefix$ = exports2.Checksum$ = exports2.BucketLoggingStatus$ = exports2.BucketLifecycleConfiguration$ = exports2.BucketInfo$ = exports2.Bucket$ = exports2.BlockedEncryptionTypes$ = exports2.AnalyticsS3BucketDestination$ = exports2.AnalyticsExportDestination$ = exports2.AnalyticsConfiguration$ = exports2.AnalyticsAndOperator$ = exports2.AccessControlTranslation$ = exports2.AccessControlPolicy$ = exports2.AccelerateConfiguration$ = exports2.AbortMultipartUploadRequest$ = exports2.AbortMultipartUploadOutput$ = exports2.AbortIncompleteMultipartUpload$ = exports2.AbacStatus$ = exports2.errorTypeRegistries = exports2.TooManyParts$ = exports2.ObjectNotInActiveTierError$ = exports2.ObjectAlreadyInActiveTierError$ = exports2.NotFound$ = exports2.NoSuchUpload$ = exports2.NoSuchKey$ = exports2.NoSuchBucket$ = exports2.InvalidWriteOffset$ = exports2.InvalidRequest$ = exports2.InvalidObjectState$ = exports2.IdempotencyParameterMismatch$ = exports2.EncryptionTypeMismatch$ = exports2.BucketAlreadyOwnedByYou$ = exports2.BucketAlreadyExists$ = exports2.AccessDenied$ = exports2.S3ServiceException$ = void 0;
@@ -23815,13 +23815,13 @@ var require_schemas_0 = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/package.json
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/package.json
 var require_package = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/package.json"(exports2, module2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-s3",
       description: "AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native",
-      version: "3.1027.0",
+      version: "3.1029.0",
       scripts: {
         build: "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
         "build:cjs": "node ../../scripts/compilation/inline client-s3",
@@ -23904,7 +23904,7 @@ var require_package = __commonJS({
         tslib: "^2.6.2"
       },
       devDependencies: {
-        "@aws-sdk/signature-v4-crt": "3.1027.0",
+        "@aws-sdk/signature-v4-crt": "3.1029.0",
         "@smithy/snapshot-testing": "^2.0.5",
         "@tsconfig/node20": "20.1.8",
         "@types/node": "^20.14.8",
@@ -30686,9 +30686,9 @@ var require_dist_cjs67 = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -30748,9 +30748,9 @@ var require_runtimeConfig_shared = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js
 var require_runtimeConfig = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -31098,9 +31098,9 @@ var require_dist_cjs70 = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js
 var require_dist_cjs71 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1027.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js"(exports2) {
     "use strict";
     var middlewareExpectContinue = require_dist_cjs3();
     var middlewareFlexibleChecksums = require_dist_cjs19();
@@ -33321,9 +33321,9 @@ var require_dist_cjs72 = __commonJS({
   }
 });
-// node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1027.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js
+// node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1029.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js
 var require_dist_cjs73 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1027.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+s3-request-presigner@3.1029.0/node_modules/@aws-sdk/s3-request-presigner/dist-cjs/index.js"(exports2) {
     "use strict";
     var utilFormatUrl = require_dist_cjs72();
     var middlewareEndpoint = require_dist_cjs45();
@@ -33458,6 +33458,70 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
+// src/core/cave-store.ts
+var ACTIVE_CAVE_TABLE = "echo_cave_v3";
+function toCaveSnapshotRecord(cave) {
+  return {
+    id: cave.id,
+    channelId: cave.channelId,
+    createTime: new Date(cave.createTime),
+    userId: cave.userId,
+    originUserId: cave.originUserId,
+    type: cave.type,
+    content: cave.content,
+    relatedUsers: [...cave.relatedUsers],
+    drawCount: cave.drawCount
+  };
+}
+function toCaveBackupRecord(cave) {
+  return {
+    entryId: "entryId" in cave ? cave.entryId : void 0,
+    ...toCaveSnapshotRecord(cave)
+  };
+}
+async function getNextCavePublicId(ctx) {
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {}, ["id"]);
+  return caves.reduce((maxId, cave) => Math.max(maxId, cave.id), 0) + 1;
+}
+async function getCaveByPublicId(ctx, id, channelId) {
+  const query = channelId ? { id, channelId } : { id };
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, query);
+  return caves[0] || null;
+}
+async function getCavesByPublicIds(ctx, ids) {
+  if (ids.length === 0) {
+    return [];
+  }
+  const idSet = new Set(ids);
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {});
+  return caves.filter((cave) => idSet.has(cave.id));
+}
+async function removeCaveByEntryId(ctx, entryId) {
+  await ctx.database.remove(ACTIVE_CAVE_TABLE, entryId);
+}
+async function createCaveRecord(ctx, cave) {
+  return await ctx.database.create(ACTIVE_CAVE_TABLE, {
+    id: cave.id,
+    channelId: cave.channelId,
+    createTime: new Date(cave.createTime),
+    userId: cave.userId,
+    originUserId: cave.originUserId,
+    type: cave.type,
+    content: cave.content,
+    relatedUsers: [...cave.relatedUsers],
+    drawCount: cave.drawCount
+  });
+}
+async function updateCaveByEntryId(ctx, entryId, data2) {
+  await ctx.database.set(ACTIVE_CAVE_TABLE, { entryId }, data2);
+}
+async function getAllCaves(ctx) {
+  return await ctx.database.get(ACTIVE_CAVE_TABLE, {});
+}
+async function getCavesByChannel(ctx, channelId) {
+  return await ctx.database.get(ACTIVE_CAVE_TABLE, { channelId });
+}
 // src/adapters/onebot/user.ts
 async function getUserIdFromNickname(session, nickname, userId) {
   const memberInfos = await session.onebot.getGroupMemberList(session.channelId);
@@ -34204,7 +34268,7 @@ async function collectMessageMediaRefs(ctx, content) {
 }
 async function collectCavesReferencingFiles(ctx, targetPaths) {
   const targetSet = new Set(targetPaths.map((filePath) => normalizePathForComparison(filePath)));
-  const caves = await ctx.database.get("echo_cave_v2", {});
+  const caves = await getAllCaves(ctx);
   const matched = [];
   for (const cave of caves) {
     try {
@@ -34228,7 +34292,10 @@ async function deleteCavesForOversizedMedia(ctx, caves, cfg) {
   for (const cave of caves) {
     try {
       await deleteMediaFilesFromMessage(ctx, cave.content, cfg);
-      await ctx.database.remove("echo_cave_v2", cave.id);
+      if (typeof cave.entryId !== "number") {
+        throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+      }
+      await removeCaveByEntryId(ctx, cave.entryId);
       ctx.logger.info(`Deleted cave #${cave.id} because its media exceeded the size limit.`);
     } catch (error2) {
       ctx.logger.warn(`Failed to delete cave #${cave.id} during oversized media cleanup: ${error2}`);
@@ -34236,7 +34303,7 @@ async function deleteCavesForOversizedMedia(ctx, caves, cfg) {
   }
 }
 async function inspectCaveMediaRefs(ctx, shouldInclude) {
-  const caves = await ctx.database.get("echo_cave_v2", {});
+  const caves = await getAllCaves(ctx);
   const results = [];
   for (const cave of caves) {
     if (shouldInclude && !shouldInclude(cave.id)) {
@@ -34631,7 +34698,7 @@ async function deleteMediaFilesFromMessage(ctx, content, cfg) {
   });
 }
 async function migrateLocalMediaToV2(ctx, cfg) {
-  const caves = await ctx.database.get("echo_cave_v2", {});
+  const caves = await getAllCaves(ctx);
   const stats = createEmptyStats();
   const state2 = {
     transferPlans: /* @__PURE__ */ new Map()
@@ -34652,7 +34719,10 @@ async function migrateLocalMediaToV2(ctx, cfg) {
         (fileRef, type) => isLegacyLocalMediaRef(ctx, fileRef, type)
       );
       if (rewritten.content !== cave.content) {
-        await ctx.database.set("echo_cave_v2", cave.id, { content: rewritten.content });
+        if (typeof cave.entryId !== "number") {
+          throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+        }
+        await updateCaveByEntryId(ctx, cave.entryId, { content: rewritten.content });
         await runTransferPlans(rewritten.plans, "commit");
       }
     } catch (error2) {
@@ -34670,7 +34740,7 @@ async function migrateLocalMediaToV2(ctx, cfg) {
   };
 }
 async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
-  const caves = await ctx.database.get("echo_cave_v2", {});
+  const caves = await getAllCaves(ctx);
   const stats = createEmptyStats();
   const state2 = {
     transferPlans: /* @__PURE__ */ new Map()
@@ -34693,7 +34763,10 @@ async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
         hooks
       );
       if (rewritten.content !== cave.content) {
-        await ctx.database.set("echo_cave_v2", cave.id, { content: rewritten.content });
+        if (typeof cave.entryId !== "number") {
+          throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+        }
+        await updateCaveByEntryId(ctx, cave.entryId, { content: rewritten.content });
         await runTransferPlans(rewritten.plans, "commit");
         await hooks?.onMigrationCommitted?.();
       }
@@ -34712,7 +34785,7 @@ async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
   };
 }
 async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, keepSource) {
-  const sourceCaves = await ctx.database.get("echo_cave_v2", { channelId: sourceChannelId });
+  const sourceCaves = await getCavesByChannel(ctx, sourceChannelId);
   const targetMode = getStorageMode(cfg);
   const transferMode = keepSource ? "copy" : "move";
   const stats = createEmptyStats();
@@ -34735,7 +34808,9 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
         stats
       );
       if (keepSource) {
-        await ctx.database.create("echo_cave_v2", {
+        const nextId = await getNextCavePublicId(ctx);
+        await createCaveRecord(ctx, {
+          id: nextId,
           channelId: targetChannelId,
           createTime: cave.createTime,
           userId: cave.userId,
@@ -34746,7 +34821,10 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
           drawCount: cave.drawCount
         });
       } else {
-        await ctx.database.set("echo_cave_v2", cave.id, {
+        if (typeof cave.entryId !== "number") {
+          throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+        }
+        await updateCaveByEntryId(ctx, cave.entryId, {
           channelId: targetChannelId,
           content: rewritten.content
         });
@@ -34852,12 +34930,143 @@ var import_node_fs2 = require("node:fs");
 var import_node_path2 = __toESM(require("node:path"), 1);
 var REINDEX_SPECIAL_OFFSET = 1e6;
 var caveMaintenanceLock = false;
+function cloneCaveRecord(cave, id) {
+  return {
+    ...cave,
+    createTime: new Date(cave.createTime),
+    id,
+    relatedUsers: [...cave.relatedUsers]
+  };
+}
+async function removeCavesByEntryIds(ctx, entryIds) {
+  for (const entryId of entryIds) {
+    await removeCaveByEntryId(ctx, entryId);
+  }
+}
+async function upsertCaves(ctx, caves) {
+  if (caves.length === 0) {
+    return;
+  }
+  for (const cave of caves) {
+    if (typeof cave.entryId === "number") {
+      await ctx.database.upsert(ACTIVE_CAVE_TABLE, [cave], "entryId");
+      continue;
+    }
+    await createCaveRecord(ctx, toCaveSnapshotRecord(cave));
+  }
+}
+async function rollbackCaveReplacement(ctx, currentCaves, nextCaves) {
+  const nextEntryIds = nextCaves.map((cave) => cave.entryId).filter((entryId) => typeof entryId === "number");
+  await removeCavesByEntryIds(ctx, nextEntryIds);
+  await upsertCaves(ctx, currentCaves);
+}
+async function replaceCaveSnapshot(ctx, currentCaves, nextCaves) {
+  try {
+    const currentEntryIds = currentCaves.map((cave) => cave.entryId).filter((entryId) => typeof entryId === "number");
+    await removeCavesByEntryIds(ctx, currentEntryIds);
+    await upsertCaves(ctx, nextCaves);
+  } catch (error2) {
+    await rollbackCaveReplacement(ctx, currentCaves, nextCaves);
+    throw error2;
+  }
+}
+function buildSequentialCaveSnapshot(caves) {
+  return [...caves].sort((a5, b5) => a5.id - b5.id).map((cave, index) => cloneCaveRecord(cave, index + 1));
+}
+function normalizeCaveRecord(cave) {
+  return {
+    channelId: cave.channelId,
+    content: cave.content,
+    createTime: new Date(cave.createTime).toISOString(),
+    drawCount: cave.drawCount,
+    id: cave.id,
+    originUserId: cave.originUserId,
+    relatedUsers: [...cave.relatedUsers],
+    type: cave.type,
+    userId: cave.userId
+  };
+}
+function normalizeBackupRecord(cave) {
+  return {
+    ...normalizeCaveRecord(cave),
+    entryId: cave.entryId
+  };
+}
+function isRecordObject(value) {
+  return typeof value === "object" && value !== null;
+}
+function isEchoCaveRecord(value) {
+  if (!isRecordObject(value)) {
+    return false;
+  }
+  return typeof value.id === "number" && typeof value.channelId === "string" && (value.createTime instanceof Date || typeof value.createTime === "string" || typeof value.createTime === "number") && typeof value.userId === "string" && typeof value.originUserId === "string" && (value.type === "forward" || value.type === "msg") && typeof value.content === "string" && Array.isArray(value.relatedUsers) && value.relatedUsers.every((user) => typeof user === "string") && typeof value.drawCount === "number";
+}
+function isCaveBackupRecord(value) {
+  if (!isEchoCaveRecord(value)) {
+    return false;
+  }
+  return typeof value.entryId === "number" || typeof value.entryId === "undefined";
+}
+function isReindexPlanItem(value) {
+  if (!isRecordObject(value)) {
+    return false;
+  }
+  return typeof value.oldId === "number" && typeof value.newId === "number" && typeof value.tempId === "number";
+}
+function parseReindexBackupPayload(content) {
+  const parsed = JSON.parse(content);
+  if (!isRecordObject(parsed)) {
+    throw new Error("invalid_backup_payload");
+  }
+  if (typeof parsed.createdAt !== "string") {
+    throw new Error("invalid_backup_created_at");
+  }
+  if (!Array.isArray(parsed.records) || !parsed.records.every((record) => isCaveBackupRecord(record))) {
+    throw new Error("invalid_backup_records");
+  }
+  if (!Array.isArray(parsed.mapping) || !parsed.mapping.every((item) => isReindexPlanItem(item))) {
+    throw new Error("invalid_backup_mapping");
+  }
+  return {
+    createdAt: parsed.createdAt,
+    mapping: parsed.mapping,
+    records: parsed.records.map((record) => ({
+      ...toCaveBackupRecord(record),
+      createTime: new Date(record.createTime)
+    }))
+  };
+}
+function resolveBackupPath(backupPath) {
+  return import_node_path2.default.isAbsolute(backupPath) ? backupPath : import_node_path2.default.resolve(process.cwd(), backupPath);
+}
 function getCaveMaintenanceMessage(session) {
   return caveMaintenanceLock ? session.text("echo-cave.general.maintenanceLocked") : null;
 }
 function setCaveMaintenanceLock(value) {
   caveMaintenanceLock = value;
 }
+function parseDailyTime(value) {
+  const match = value.trim().match(/^(\d{1,2}):(\d{2})$/);
+  if (!match) {
+    return null;
+  }
+  const hour = Number(match[1]);
+  const minute = Number(match[2]);
+  if (hour < 0 || hour > 23 || minute < 0 || minute > 59) {
+    return null;
+  }
+  return { hour, minute };
+}
+function getDelayUntilNextRun(time2) {
+  const now = /* @__PURE__ */ new Date();
+  const nextRun = new Date(now);
+  nextRun.setSeconds(0, 0);
+  nextRun.setHours(time2.hour, time2.minute, 0, 0);
+  if (nextRun.getTime() <= now.getTime()) {
+    nextRun.setDate(nextRun.getDate() + 1);
+  }
+  return nextRun.getTime() - now.getTime();
+}
 function ensureAdminPrivateAccess(session, cfg) {
   const maintenanceMessage = getCaveMaintenanceMessage(session);
   if (maintenanceMessage) {
@@ -35010,11 +35219,11 @@ async function mergeCavesBetweenChannels(ctx, session, cfg, sourceChannelId, tar
   if (sourceChannelId === targetChannelId) {
     return session.text("commands.cave.admin.merge.messages.sameChannel");
   }
-  const sourceCaves = await ctx.database.get("echo_cave_v2", { channelId: sourceChannelId });
+  const sourceCaves = await getCavesByChannel(ctx, sourceChannelId);
   if (sourceCaves.length === 0) {
     return session.text("commands.cave.admin.merge.messages.noSourceCaves");
   }
-  const targetCaves = await ctx.database.get("echo_cave_v2", { channelId: targetChannelId });
+  const targetCaves = await getCavesByChannel(ctx, targetChannelId);
   const confirmed = await requestSecondConfirmation(
     ctx,
     session,
@@ -35160,62 +35369,39 @@ async function writeReindexBackup(backupDir, caves, mapping) {
   const backupPath = import_node_path2.default.join(backupDir, `echo-cave-reindex-${timestamp}.json`);
   const payload2 = {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    records: caves,
+    records: caves.map((cave) => toCaveBackupRecord(cave)),
     mapping
   };
   await import_node_fs2.promises.writeFile(backupPath, JSON.stringify(payload2, null, 2), "utf8");
   return backupPath;
 }
-async function applyReindexPlan(ctx, plan) {
-  const descendingPlan = [...plan].sort((a5, b5) => b5.oldId - a5.oldId);
-  for (const item of descendingPlan) {
-    if (item.oldId === item.newId) {
-      continue;
-    }
-    await ctx.database.set("echo_cave_v2", { id: item.oldId }, { id: item.tempId });
+async function verifyCaveSnapshot(ctx, expectedCaves) {
+  const actualCaves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
+  const normalizedExpected = [...expectedCaves].sort((a5, b5) => a5.id - b5.id).map(normalizeCaveRecord);
+  const normalizedActual = actualCaves.map(normalizeCaveRecord);
+  if (normalizedActual.length !== normalizedExpected.length) {
+    throw new Error("record_count_mismatch");
   }
-  const ascendingPlan = [...plan].sort((a5, b5) => a5.newId - b5.newId);
-  for (const item of ascendingPlan) {
-    if (item.oldId === item.newId) {
-      continue;
+  for (let index = 0; index < normalizedActual.length; index++) {
+    const actual = normalizedActual[index];
+    const expected = normalizedExpected[index];
+    if (actual.id !== index + 1) {
+      throw new Error("id_sequence_mismatch");
+    }
+    if (JSON.stringify(actual) !== JSON.stringify(expected)) {
+      throw new Error("record_content_mismatch");
     }
-    await ctx.database.set("echo_cave_v2", { id: item.tempId }, { id: item.newId });
   }
 }
-async function verifyReindexPlan(ctx, originalCaves) {
-  const reindexedCaves = (await ctx.database.get("echo_cave_v2", {})).sort((a5, b5) => a5.id - b5.id);
-  if (reindexedCaves.length !== originalCaves.length) {
+async function verifyRestoredSnapshot(ctx, expectedCaves) {
+  const actualCaves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
+  const normalizedExpected = [...expectedCaves].sort((a5, b5) => a5.id - b5.id).map(normalizeBackupRecord);
+  const normalizedActual = actualCaves.map(normalizeCaveRecord);
+  if (normalizedActual.length !== normalizedExpected.length) {
     throw new Error("record_count_mismatch");
   }
-  const normalizedOriginal = [...originalCaves].sort((a5, b5) => a5.id - b5.id).map((cave) => ({
-    channelId: cave.channelId,
-    content: cave.content,
-    createTime: new Date(cave.createTime).toISOString(),
-    drawCount: cave.drawCount,
-    originUserId: cave.originUserId,
-    relatedUsers: [...cave.relatedUsers],
-    type: cave.type,
-    userId: cave.userId
-  }));
-  const normalizedReindexed = reindexedCaves.map((cave, index) => ({
-    channelId: cave.channelId,
-    content: cave.content,
-    createTime: new Date(cave.createTime).toISOString(),
-    drawCount: cave.drawCount,
-    id: cave.id,
-    originUserId: cave.originUserId,
-    relatedUsers: [...cave.relatedUsers],
-    type: cave.type,
-    userId: cave.userId,
-    expectedId: index + 1
-  }));
-  for (let index = 0; index < normalizedReindexed.length; index++) {
-    const reindexed = normalizedReindexed[index];
-    const original = normalizedOriginal[index];
-    if (reindexed.id !== reindexed.expectedId) {
-      throw new Error("id_sequence_mismatch");
-    }
-    if (reindexed.channelId !== original.channelId || reindexed.content !== original.content || reindexed.createTime !== original.createTime || reindexed.drawCount !== original.drawCount || reindexed.originUserId !== original.originUserId || reindexed.relatedUsers.join(",") !== original.relatedUsers.join(",") || reindexed.type !== original.type || reindexed.userId !== original.userId) {
+  for (let index = 0; index < normalizedActual.length; index++) {
+    if (JSON.stringify(normalizedActual[index]) !== JSON.stringify(normalizedExpected[index])) {
       throw new Error("record_content_mismatch");
     }
   }
@@ -35230,7 +35416,7 @@ async function reindexCaveIds(ctx, session, cfg) {
   if (!cfg.adminIds?.includes(session.userId)) {
     return session.text("echo-cave.general.adminPermissionDenied");
   }
-  const caves = (await ctx.database.get("echo_cave_v2", {})).sort((a5, b5) => a5.id - b5.id);
+  const caves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
   if (caves.length === 0) {
     return session.text("commands.cave.admin.reindex.messages.noCaves");
   }
@@ -35265,8 +35451,14 @@ async function reindexCaveIds(ctx, session, cfg) {
   }
   setCaveMaintenanceLock(true);
   try {
-    await applyReindexPlan(ctx, plan);
-    await verifyReindexPlan(ctx, caves);
+    const reindexedCaves = buildSequentialCaveSnapshot(caves);
+    for (const cave of reindexedCaves) {
+      if (typeof cave.entryId !== "number") {
+        throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+      }
+      await updateCaveByEntryId(ctx, cave.entryId, { id: cave.id });
+    }
+    await verifyCaveSnapshot(ctx, reindexedCaves);
     return session.text("commands.cave.admin.reindex.messages.reindexDone", {
       caveCount: caves.length,
       backupPath
@@ -35281,6 +35473,122 @@ async function reindexCaveIds(ctx, session, cfg) {
     setCaveMaintenanceLock(false);
   }
 }
+async function restoreReindexBackup(ctx, session, cfg, backupPathInput) {
+  const accessError = ensureAdminPrivateAccess(session, cfg);
+  if (accessError) {
+    return accessError;
+  }
+  if (!backupPathInput?.trim()) {
+    return session.text("commands.cave.admin.restore-reindex.messages.missingBackupPath");
+  }
+  const backupPath = resolveBackupPath(backupPathInput.trim());
+  let backup;
+  try {
+    const content = await import_node_fs2.promises.readFile(backupPath, "utf8");
+    backup = parseReindexBackupPayload(content);
+  } catch (error2) {
+    ctx.logger.error(`Failed to read cave reindex backup: ${error2}`);
+    return session.text("commands.cave.admin.restore-reindex.messages.backupReadFailed", {
+      backupPath,
+      error: error2 instanceof Error ? error2.message : String(error2)
+    });
+  }
+  const currentCaves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
+  const confirmed = await requestSecondConfirmation(
+    ctx,
+    session,
+    session.text("commands.cave.admin.restore-reindex.messages.confirmSummary", {
+      backupPath,
+      currentCount: currentCaves.length,
+      backupCount: backup.records.length,
+      backupCreatedAt: backup.createdAt
+    }),
+    session.text("commands.cave.admin.restore-reindex.messages.confirmRetry"),
+    session.text("commands.cave.admin.restore-reindex.messages.confirmTimeout"),
+    session.text("commands.cave.admin.restore-reindex.messages.confirmCancelled")
+  );
+  if (!confirmed) {
+    return;
+  }
+  setCaveMaintenanceLock(true);
+  try {
+    const restoreRecords = backup.records.map((record) => ({
+      ...toCaveSnapshotRecord(record),
+      entryId: record.entryId
+    }));
+    await replaceCaveSnapshot(ctx, currentCaves, restoreRecords);
+    await verifyRestoredSnapshot(ctx, backup.records);
+    return session.text("commands.cave.admin.restore-reindex.messages.restoreDone", {
+      backupPath,
+      caveCount: backup.records.length
+    });
+  } catch (error2) {
+    ctx.logger.error(`Failed to restore cave reindex backup: ${error2}`);
+    return session.text("commands.cave.admin.restore-reindex.messages.restoreFailed", {
+      backupPath,
+      error: error2 instanceof Error ? error2.message : String(error2)
+    });
+  } finally {
+    setCaveMaintenanceLock(false);
+  }
+}
+async function runScheduledReindex(ctx, cfg) {
+  if (caveMaintenanceLock) {
+    ctx.logger.warn("Skipped scheduled cave reindex because another maintenance task is running.");
+    return;
+  }
+  const caves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
+  if (caves.length === 0) {
+    ctx.logger.info("Skipped scheduled cave reindex because there are no cave records.");
+    return;
+  }
+  const plan = buildReindexPlan(caves);
+  if (!hasIdGaps(plan)) {
+    ctx.logger.info("Skipped scheduled cave reindex because IDs are already sequential.");
+    return;
+  }
+  const backupPath = await writeReindexBackup(import_node_path2.default.resolve(process.cwd(), "logs"), caves, plan);
+  setCaveMaintenanceLock(true);
+  try {
+    const reindexedCaves = buildSequentialCaveSnapshot(caves);
+    for (const cave of reindexedCaves) {
+      if (typeof cave.entryId !== "number") {
+        throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+      }
+      await updateCaveByEntryId(ctx, cave.entryId, { id: cave.id });
+    }
+    await verifyCaveSnapshot(ctx, reindexedCaves);
+    ctx.logger.info(
+      `Scheduled cave reindex completed. Processed ${caves.length} records. Backup: ${backupPath}`
+    );
+  } finally {
+    setCaveMaintenanceLock(false);
+  }
+}
+function scheduleNextAutoReindex(ctx, cfg) {
+  const parsedTime = parseDailyTime(cfg.autoReindexTime || "00:00");
+  if (!parsedTime) {
+    ctx.logger.warn(`Invalid autoReindexTime: ${cfg.autoReindexTime}. Expected HH:mm.`);
+    return;
+  }
+  const delay = getDelayUntilNextRun(parsedTime);
+  ctx.setTimeout(async () => {
+    try {
+      await runScheduledReindex(ctx, cfg);
+    } catch (error2) {
+      ctx.logger.error(`Failed to run scheduled cave reindex: ${error2}`);
+    }
+    scheduleNextAutoReindex(ctx, cfg);
+  }, delay);
+}
+function registerAutoReindexScheduler(ctx, cfg) {
+  if (!cfg.enableAutoReindex) {
+    return;
+  }
+  ctx.on("ready", () => {
+    scheduleNextAutoReindex(ctx, cfg);
+  });
+}
 // src/core/parser/forward-parser.ts
 async function reconstructForwardMsg(ctx, session, message, cfg, processMedia = true) {
@@ -35449,7 +35757,9 @@ async function addCave(ctx, session, cfg, userIds) {
     originName
   );
   try {
-    const result = await ctx.database.create("echo_cave_v2", {
+    const nextId = await getNextCavePublicId(ctx);
+    const result = await ctx.database.create(ACTIVE_CAVE_TABLE, {
+      id: nextId,
       channelId,
       createTime: /* @__PURE__ */ new Date(),
       userId,
@@ -35649,7 +35959,10 @@ async function deleteStoredCave(ctx, cfg, caveMsg) {
   if (cfg.deleteMediaWhenDeletingMsg) {
     await deleteMediaFilesFromMessage(ctx, caveMsg.content, cfg);
   }
-  await ctx.database.remove("echo_cave_v2", caveMsg.id);
+  if (typeof caveMsg.entryId !== "number") {
+    throw new Error(`missing_entry_id_for_cave_${caveMsg.id}`);
+  }
+  await removeCaveByEntryId(ctx, caveMsg.entryId);
 }
 async function deleteCave(ctx, session, cfg, id) {
   const guildAccessError = ensureGuildSession(session);
@@ -35663,11 +35976,11 @@ async function deleteCave(ctx, session, cfg, id) {
   if (!id) {
     return session.text(".noIdProvided");
   }
-  const caves = await ctx.database.get("echo_cave_v2", id);
-  if (caves.length === 0) {
+  const cave = await getCaveByPublicId(ctx, id, session.channelId);
+  if (!cave) {
     return session.text("echo-cave.general.noMsgWithId");
   }
-  const caveMsg = caves[0];
+  const caveMsg = cave;
   const actor = await getDeleteActor(ctx, session);
   const permissionFailure = await getDeletePermissionFailure(ctx, session, cfg, caveMsg, actor);
   if (permissionFailure) {
@@ -35690,7 +36003,7 @@ async function deleteCaves(ctx, session, cfg, ids) {
   }
   const failedIds = [];
   const actor = await getDeleteActor(ctx, session);
-  const caves = await ctx.database.get("echo_cave_v2", ids);
+  const caves = (await getCavesByPublicIds(ctx, ids)).filter((cave) => cave.channelId === session.channelId);
   for (const cave of caves) {
     const permissionFailure = await getDeletePermissionFailure(ctx, session, cfg, cave, actor);
     if (permissionFailure) {
@@ -35791,7 +36104,7 @@ function scheduleNextSendFailureSummary(ctx, cfg) {
     );
     return;
   }
-  const delay = getDelayUntilNextRun(summaryTime);
+  const delay = getDelayUntilNextRun2(summaryTime);
   ctx.setTimeout(async () => {
     try {
       await flushSendFailureSummary(ctx, cfg);
@@ -35938,7 +36251,7 @@ function parseSummaryTime(value) {
   }
   return { hour, minute };
 }
-function getDelayUntilNextRun(summaryTime) {
+function getDelayUntilNextRun2(summaryTime) {
   const now = /* @__PURE__ */ new Date();
   const nextRun = new Date(now);
   nextRun.setSeconds(0, 0);
@@ -36107,7 +36420,7 @@ async function getCaveIdsByField(ctx, session, field, emptyText) {
     return maintenanceMessage;
   }
   const caves = await ctx.database.get(
-    "echo_cave_v2",
+    ACTIVE_CAVE_TABLE,
     {
       [field]: session.userId,
       channelId: session.channelId
@@ -36121,9 +36434,9 @@ async function getCaveIdsByField(ctx, session, field, emptyText) {
 }
 async function incrementDrawCount(ctx, caveMsg) {
   await ctx.database.set(
-    "echo_cave_v2",
+    ACTIVE_CAVE_TABLE,
     {
-      id: caveMsg.id,
+      entryId: caveMsg.entryId,
       channelId: caveMsg.channelId
     },
     {
@@ -36156,7 +36469,7 @@ async function getTargetedUserCave(ctx, session, targetUserId) {
   if (!isUserInGroup) {
     return session.text("echo-cave.user.userNotInGroup");
   }
-  const caves = await ctx.database.get("echo_cave_v2", {
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
     channelId: session.channelId
   });
   const matchingCaves = caves.filter(
@@ -36180,7 +36493,7 @@ async function getCave(ctx, session, cfg, target) {
   let shouldIncrementDrawCount = true;
   const { channelId } = session;
   if (!target) {
-    const caves = await ctx.database.get("echo_cave_v2", {
+    const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
       channelId
     });
     if (caves.length === 0) {
@@ -36197,7 +36510,7 @@ async function getCave(ctx, session, cfg, target) {
     const isExactNumericTarget = /^\d+$/.test(trimmedTarget);
     if (isExactNumericTarget) {
       const id = Number(trimmedTarget);
-      const caves = await ctx.database.get("echo_cave_v2", {
+      const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
         id,
         channelId
       });
@@ -36258,15 +36571,15 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (parsedUserIds.length === 0) {
     return session.text(".noValidUserIdProvided");
   }
-  const caves = await ctx.database.get("echo_cave_v2", id);
-  if (caves.length === 0) {
+  const cave = await getCaveByPublicId(ctx, id, session.channelId);
+  if (!cave) {
     return session.text("echo-cave.general.noMsgWithId");
   }
   const isAllUsersInGroup = await checkUsersInGroup(ctx, session, parsedUserIds);
   if (!isAllUsersInGroup) {
     return session.text("echo-cave.user.userNotInGroup");
   }
-  await ctx.database.set("echo_cave_v2", id, {
+  await ctx.database.set(ACTIVE_CAVE_TABLE, { entryId: cave.entryId }, {
     relatedUsers: parsedUserIds
   });
   return session.text(".userBoundSuccess", [id]);
@@ -36297,7 +36610,11 @@ function parseCustomTime(timeStr) {
   let totalMs = 0;
   const unitOrder = ["m", "w", "d", "h"];
   let lastIndex = -1;
-  while ((match = regex.exec(s5)) !== null) {
+  while (true) {
+    match = regex.exec(s5);
+    if (match === null) {
+      break;
+    }
     const value = parseInt(match[1], 10);
     const unit = match[2].toLowerCase();
     const currentIndex = unitOrder.indexOf(unit);
@@ -36333,12 +36650,13 @@ function getStartTime(period, customTimeMs) {
     case "day":
       startTime.setHours(0, 0, 0, 0);
       break;
-    case "week":
+    case "week": {
       const dayOfWeek = now.getDay();
       const daysToMonday = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
       startTime.setDate(now.getDate() - daysToMonday);
       startTime.setHours(0, 0, 0, 0);
       break;
+    }
     case "month":
       startTime.setDate(1);
       startTime.setHours(0, 0, 0, 0);
@@ -36420,7 +36738,7 @@ async function getRanking(ctx, session, cfg, period = "all") {
   const { channelId } = session;
   const startTime = getStartTime(normalizedPeriod, customTimeMs);
   const topCount = cfg.rankingTopCount || 10;
-  const caves = await ctx.database.get("echo_cave_v2", {
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
     channelId,
     createTime: {
       $gte: startTime
@@ -36468,7 +36786,7 @@ async function searchCave(ctx, session, userIds) {
   }
   const targetUserId = parsedUserIds[0];
   const { channelId } = session;
-  const caves = await ctx.database.get("echo_cave_v2", {
+  const caves = await ctx.database.get(ACTIVE_CAVE_TABLE, {
     channelId
   });
   const matchingCaves = caves.filter(
@@ -36694,17 +37012,30 @@ var zh_CN_default = {
       }
     },
     "cave.admin.reindex": {
-      description: "\u91CD\u6392\u6240\u6709\u56DE\u58F0\u6D1E ID\uFF0C\u4F7F\u73B0\u6709\u8BB0\u5F55\u91CD\u65B0\u8FDE\u7EED\u7F16\u53F7",
+      description: "\u91CD\u6392\u6240\u6709\u56DE\u58F0\u6D1E public ID\uFF0C\u4F7F\u73B0\u6709\u8BB0\u5F55\u91CD\u65B0\u8FDE\u7EED\u7F16\u53F7\u800C\u4E0D\u6539\u52A8\u5185\u90E8\u4E3B\u952E",
       messages: {
         noCaves: "\u{1F50D} \u5F53\u524D\u6CA1\u6709\u4EFB\u4F55\u56DE\u58F0\u6D1E\u8BB0\u5F55\u53EF\u4F9B\u91CD\u6392\u3002",
         alreadySequential: "\u2705 \u5F53\u524D\u6240\u6709\u56DE\u58F0\u6D1E ID \u5DF2\u7ECF\u8FDE\u7EED\uFF0C\u65E0\u9700\u91CD\u6392\u3002",
         backupWriteFailed: "\u274C \u56DE\u58F0\u6D1E ID \u91CD\u6392\u524D\u7684\u5907\u4EFD\u5199\u5165\u5931\u8D25\uFF0C\u64CD\u4F5C\u5DF2\u7EC8\u6B62\u3002\u9519\u8BEF\uFF1A{error}",
-        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u6267\u884C\u56DE\u58F0\u6D1E ID \u91CD\u6392\n\u5F53\u524D\u8BB0\u5F55\u6570\uFF1A{caveCount}\n\u5F53\u524D\u6700\u5927 ID\uFF1A{currentMaxId}\n\u91CD\u6392\u540E\u6700\u5927 ID\uFF1A{nextMaxId}\n\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}\n\n\u672C\u6B21\u64CD\u4F5C\u4F1A\u5148\u5199\u5165\u5B8C\u6574\u5907\u4EFD\uFF0C\u518D\u6309\u5B89\u5168\u987A\u5E8F\u91CD\u6392 ID\u3002\u6267\u884C\u671F\u95F4\u4F1A\u4E34\u65F6\u9501\u5B9A\u56DE\u58F0\u6D1E\u76F8\u5173\u547D\u4EE4\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
+        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u6267\u884C\u56DE\u58F0\u6D1E public ID \u91CD\u6392\n\u5F53\u524D\u8BB0\u5F55\u6570\uFF1A{caveCount}\n\u5F53\u524D\u6700\u5927 ID\uFF1A{currentMaxId}\n\u91CD\u6392\u540E\u6700\u5927 ID\uFF1A{nextMaxId}\n\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}\n\n\u672C\u6B21\u64CD\u4F5C\u4F1A\u5148\u5199\u5165\u5B8C\u6574\u5907\u4EFD\uFF0C\u518D\u4EC5\u91CD\u6392\u5BF9\u5916\u5C55\u793A\u7684 public ID\uFF0C\u4E0D\u6539\u52A8\u6570\u636E\u5E93\u5185\u90E8\u4E3B\u952E\u3002\u6267\u884C\u671F\u95F4\u4F1A\u4E34\u65F6\u9501\u5B9A\u56DE\u58F0\u6D1E\u76F8\u5173\u547D\u4EE4\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u56DE\u58F0\u6D1E ID \u91CD\u6392\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u56DE\u58F0\u6D1E ID \u91CD\u6392\u672A\u6267\u884C\u3002",
-        reindexDone: "\u2705 \u56DE\u58F0\u6D1E ID \u91CD\u6392\u5B8C\u6210\uFF0C\u5171\u5904\u7406 {caveCount} \u6761\u8BB0\u5F55\u3002\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}",
-        reindexFailed: "\u274C \u56DE\u58F0\u6D1E ID \u91CD\u6392\u5931\u8D25\uFF0C\u5DF2\u505C\u6B62\u7EE7\u7EED\u5199\u5165\u3002\u8BF7\u6839\u636E\u5907\u4EFD\u6587\u4EF6\u68C0\u67E5\u5E76\u6062\u590D\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}"
+        reindexDone: "\u2705 \u56DE\u58F0\u6D1E public ID \u91CD\u6392\u5B8C\u6210\uFF0C\u5171\u5904\u7406 {caveCount} \u6761\u8BB0\u5F55\u3002\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}",
+        reindexFailed: "\u274C \u56DE\u58F0\u6D1E ID \u91CD\u6392\u5931\u8D25\uFF0C\u5DF2\u505C\u6B62\u7EE7\u7EED\u5199\u5165\u3002\u53EF\u4F7F\u7528 cave.admin.restore-reindex \u6062\u590D\u5907\u4EFD\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}"
+      }
+    },
+    "cave.admin.restore-reindex": {
+      description: "\u4ECE\u56DE\u58F0\u6D1E ID \u91CD\u6392\u751F\u6210\u7684 JSON \u5907\u4EFD\u6062\u590D\u6570\u636E\u5E93",
+      messages: {
+        missingBackupPath: "\u274C \u8BF7\u63D0\u4F9B\u8981\u6062\u590D\u7684\u5907\u4EFD\u6587\u4EF6\u8DEF\u5F84\u3002",
+        backupReadFailed: "\u274C \u8BFB\u53D6\u56DE\u58F0\u6D1E\u91CD\u6392\u5907\u4EFD\u5931\u8D25\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}",
+        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u4ECE\u5907\u4EFD\u6062\u590D\u56DE\u58F0\u6D1E\u6570\u636E\n\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}\n\u5907\u4EFD\u521B\u5EFA\u65F6\u95F4\uFF1A{backupCreatedAt}\n\u5907\u4EFD\u8BB0\u5F55\u6570\uFF1A{backupCount}\n\u5F53\u524D\u6570\u636E\u5E93\u8BB0\u5F55\u6570\uFF1A{currentCount}\n\n\u672C\u6B21\u64CD\u4F5C\u4F1A\u5148\u4E34\u65F6\u817E\u632A\u5F53\u524D\u8BB0\u5F55\uFF0C\u518D\u6309\u5907\u4EFD\u5185\u5BB9\u5B8C\u6574\u6062\u590D\u3002\u6267\u884C\u671F\u95F4\u4F1A\u4E34\u65F6\u9501\u5B9A\u56DE\u58F0\u6D1E\u76F8\u5173\u547D\u4EE4\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
+        confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
+        confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u3002",
+        confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u672A\u6267\u884C\u3002",
+        restoreDone: "\u2705 \u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u5B8C\u6210\uFF0C\u5171\u6062\u590D {caveCount} \u6761\u8BB0\u5F55\u3002\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}",
+        restoreFailed: "\u274C \u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u5931\u8D25\uFF0C\u5DF2\u5C1D\u8BD5\u56DE\u6EDA\u5230\u6062\u590D\u524D\u72B6\u6001\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}"
       }
     }
   }
@@ -36742,7 +37073,9 @@ var zh_CN_default2 = {
   s3PresignExpiresIn: "S3 \u79C1\u6709\u5BF9\u8C61\u9884\u7B7E\u540D URL \u7684\u6709\u6548\u671F (\u79D2)",
   sendFailureHandlingMode: "\u56DE\u58F0\u6D1E\u53D1\u9001\u5931\u8D25\u540E\u7684\u5904\u7406\u65B9\u5F0F\uFF1A\u81EA\u52A8\u5220\u9664\u3001\u6309\u65E5\u6C47\u603B\u4E0A\u62A5\u6216\u4E0D\u989D\u5916\u5904\u7406",
   sendFailureSummaryAdminId: "\u53D1\u9001\u5931\u8D25\u65E5\u62A5\u7684\u5355\u72EC\u7BA1\u7406\u5458 ID\uFF08\u4E0D\u590D\u7528\u7BA1\u7406\u5458 ID \u5217\u8868\uFF09",
-  sendFailureSummaryTime: "\u53D1\u9001\u5931\u8D25\u65E5\u62A5\u7684\u6BCF\u65E5\u53D1\u9001\u65F6\u95F4\uFF0C\u683C\u5F0F\u4E3A HH:mm"
+  sendFailureSummaryTime: "\u53D1\u9001\u5931\u8D25\u65E5\u62A5\u7684\u6BCF\u65E5\u53D1\u9001\u65F6\u95F4\uFF0C\u683C\u5F0F\u4E3A HH:mm",
+  enableAutoReindex: "\u662F\u5426\u542F\u7528\u56DE\u58F0\u6D1E\u6570\u636E\u5E93\u81EA\u52A8\u91CD\u6574\uFF0C\u5F00\u542F\u540E\u4F1A\u5728\u6BCF\u65E5\u6307\u5B9A\u65F6\u95F4\u81EA\u52A8\u8865\u9F50 public ID \u95F4\u9699\u5E76\u5199\u5165\u65E5\u5FD7",
+  autoReindexTime: "\u56DE\u58F0\u6D1E\u6570\u636E\u5E93\u81EA\u52A8\u91CD\u6574\u7684\u6BCF\u65E5\u6267\u884C\u65F6\u95F4\uFF0C\u683C\u5F0F\u4E3A HH:mm"
 };
 // src/config/config.ts
@@ -36788,7 +37121,11 @@ var Config = import_koishi2.Schema.intersect([
     sendFailureHandlingMode: import_koishi2.Schema.union(["auto-delete", "daily-report", "ignore"]).default("ignore"),
     sendFailureSummaryAdminId: import_koishi2.Schema.string().default(""),
     sendFailureSummaryTime: import_koishi2.Schema.string().default("09:00")
-  }).description("\u53D1\u9001\u5931\u8D25\u5904\u7406")
+  }).description("\u53D1\u9001\u5931\u8D25\u5904\u7406"),
+  import_koishi2.Schema.object({
+    enableAutoReindex: import_koishi2.Schema.boolean().default(false),
+    autoReindexTime: import_koishi2.Schema.string().default("00:00")
+  }).description("\u81EA\u52A8\u7EF4\u62A4")
 ]).i18n({
   "zh-CN": zh_CN_default2
 });
@@ -36796,6 +37133,19 @@ var Config = import_koishi2.Schema.intersect([
 // src/index.ts
 var name = "echo-cave";
 var inject = ["database"];
+function toV3Record(record) {
+  return {
+    id: record.id,
+    channelId: record.channelId,
+    createTime: new Date(record.createTime),
+    userId: record.userId,
+    originUserId: record.originUserId,
+    type: record.type,
+    content: record.content,
+    relatedUsers: [...record.relatedUsers],
+    drawCount: record.drawCount
+  };
+}
 function apply(ctx, cfg) {
   ctx.i18n.define("zh-CN", zh_CN_default);
   ctx.model.extend(
@@ -36816,6 +37166,26 @@ function apply(ctx, cfg) {
       autoInc: true
     }
   );
+  ctx.model.extend(
+    ACTIVE_CAVE_TABLE,
+    {
+      entryId: "unsigned",
+      id: "unsigned",
+      channelId: "string",
+      createTime: "timestamp",
+      userId: "string",
+      originUserId: "string",
+      type: "string",
+      content: "text",
+      relatedUsers: "list",
+      drawCount: { type: "unsigned", initial: 0 }
+    },
+    {
+      primary: "entryId",
+      autoInc: true,
+      unique: ["id"]
+    }
+  );
   ctx.model.extend(
     "echo_cave_v2",
     {
@@ -36871,6 +37241,22 @@ function apply(ctx, cfg) {
       await database.upsert("echo_cave_v2", data2);
     }
   );
+  ctx.model.migrate(
+    "echo_cave_v2",
+    {
+      entryId: "unsigned"
+    },
+    async (database) => {
+      const existing = await database.get(ACTIVE_CAVE_TABLE, {});
+      if (existing.length > 0) {
+        return;
+      }
+      const data2 = (await database.get("echo_cave_v2", {})).sort((a5, b5) => a5.id - b5.id);
+      for (const record of data2) {
+        await database.create(ACTIVE_CAVE_TABLE, toV3Record(record));
+      }
+    }
+  );
   ctx.command("cave [target:text]").action(
     async ({ session }, target) => await getCave(ctx, session, cfg, target)
   );
@@ -36920,7 +37306,11 @@ function apply(ctx, cfg) {
   ctx.command("cave.admin.reindex").action(
     async ({ session }) => await reindexCaveIds(ctx, session, cfg)
   );
+  ctx.command("cave.admin.restore-reindex <backupPath:text>").action(
+    async ({ session }, backupPath) => await restoreReindexBackup(ctx, session, cfg, backupPath)
+  );
   registerSendFailureSummaryScheduler(ctx, cfg);
+  registerAutoReindexScheduler(ctx, cfg);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/index.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ export declare const name = "echo-cave";
 export declare const inject: string[];
 export * from './config/config';
 export interface EchoCave {
+    entryId?: number;
     id: number;
     channelId: string;
     createTime: Date;
@@ -32,6 +33,7 @@ declare module 'koishi' {
     interface Tables {
         echo_cave: EchoCave;
         echo_cave_v2: EchoCave;
+        echo_cave_v3: EchoCave;
         echo_cave_send_failure: EchoCaveSendFailure;
         echo_cave_user_state: EchoCaveUserState;
     }

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.29.9",
+  "version": "1.29.11",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",
@@ -36,8 +36,8 @@
     "koishi": "^4.18.10"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1027.0",
-    "@aws-sdk/s3-request-presigner": "^3.1027.0",
+    "@aws-sdk/client-s3": "^3.1029.0",
+    "@aws-sdk/s3-request-presigner": "^3.1029.0",
     "@pynickle/koishi-plugin-adapter-onebot": "^1.0.0",
     "axios": "^1.15.0",
     "uuid": "^11.1.0"