koishi-plugin-toram 4.2.0 → 4.2.1

package/lib/index.js

@@ -178,7 +178,7 @@ var JsonMgr = _JsonMgr;
 
 // src/script/botFunction/monthlyCardReminder.ts
 var MONTHLY_CARD_REMINDER_TYPE = "monthly-card-reminder";
-function scheduleMonthlyCardReminders(groupId, hours) {
+async function scheduleMonthlyCardReminders(groupId, hours) {
   const now = /* @__PURE__ */ new Date();
   for (let i = 0; i < hours.length; i++) {
     const hour = hours[i];
@@ -190,12 +190,12 @@ function scheduleMonthlyCardReminders(groupId, hours) {
       (x) => x.type === MONTHLY_CARD_REMINDER_TYPE && x.payload?.groupId === groupId && x.payload?.timeIndex === i
     );
     if (!exists) {
-      BotTodoMgr.Inst().addTodo(ts, MONTHLY_CARD_REMINDER_TYPE, { groupId, timeIndex: i });
+      await BotTodoMgr.Inst().addTodo(ts, MONTHLY_CARD_REMINDER_TYPE, { groupId, timeIndex: i });
     }
   }
 }
 __name(scheduleMonthlyCardReminders, "scheduleMonthlyCardReminders");
-async function executeMonthlyCardReminder(item) {
+function executeMonthlyCardReminder(item) {
   const payload = item.payload || {};
   const groupId = payload.groupId;
   const timeIndex = payload.timeIndex;
@@ -687,19 +687,18 @@ var _BotTodoMgr = class _BotTodoMgr {
     });
   }
   // 持久化内存中的 todo
-  saveTodos() {
-    const data = [];
-    this._todos.forEach((list) => data.push(...list));
-    this.ctx.database.upsert("toram_todo", data);
+  async saveTodos() {
+    const data = Array.from(this._todos.values()).flat();
+    await this.ctx.database.upsert("toram_todo", data);
   }
   // 新增一条 todo，返回 id
-  addTodo(ts, type, payload) {
+  async addTodo(ts, type, payload) {
     const id = `${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
     const todo = { id, ts, type, payload };
     const list = this._todos.get(ts) || [];
     list.push(todo);
     this._todos.set(ts, list);
-    this.saveTodos();
+    await this.saveTodos();
     if (this._started) {
       if (this._nextTs === void 0 || ts < this._nextTs) {
         this.scheduleNext();
@@ -713,22 +712,22 @@ var _BotTodoMgr = class _BotTodoMgr {
     return list.map((x) => ({ ...x }));
   }
   // 删除某个时间戳下的指定 todo
-  removeTodo(ts, id) {
+  async removeTodo(ts, id) {
     const list = this._todos.get(ts);
     if (!list) return;
     const next = list.filter((x) => x.id !== id);
     if (next.length > 0) this._todos.set(ts, next);
     else this._todos.delete(ts);
-    this.saveTodos();
+    await this.saveTodos();
   }
   // 删除某个时间戳下的所有 todo
-  removeTodosAt(ts) {
+  async removeTodosAt(ts) {
     if (!this._todos.has(ts)) return;
     this._todos.delete(ts);
-    this.saveTodos();
+    await this.saveTodos();
   }
   // 取出并删除“到期”的 todo 列表（ts <= now）
-  popDueTodos(now) {
+  async popDueTodos(now) {
     const result = [];
     const keys = Array.from(this._todos.keys()).filter((ts) => ts <= now).sort((a, b) => a - b);
     keys.forEach((ts) => {
@@ -736,7 +735,7 @@ var _BotTodoMgr = class _BotTodoMgr {
       if (list && list.length) result.push(...list);
       this._todos.delete(ts);
     });
-    if (keys.length > 0) this.saveTodos();
+    if (keys.length > 0) await this.saveTodos();
     return result;
   }
   // 下一个最近的时间戳（若不存在返回 undefined）
@@ -764,10 +763,10 @@ var _BotTodoMgr = class _BotTodoMgr {
     this._nextTs = void 0;
   }
   // 立即重新计算下一个调度点
-  scheduleNext() {
+  async scheduleNext() {
     if (!this._started) return;
     try {
-      const dropped = this.popDueTodos(Date.now());
+      const dropped = await this.popDueTodos(Date.now());
       if (dropped.length) {
         console.warn("BotTodoMgr 清理过期任务数量: ", dropped.length);
       }
@@ -797,7 +796,7 @@ var _BotTodoMgr = class _BotTodoMgr {
         const list = this._todos.get(scheduledTs) || [];
         if (list.length) {
           this._todos.delete(scheduledTs);
-          this.saveTodos();
+          await this.saveTodos();
           await this.executeBatch(list);
         }
       } catch (e) {
@@ -889,7 +888,7 @@ async function apply(ctx, config) {
   TalkMgr.Inst().setTalks();
   await UserMgr.Inst().setUsers(ctx);
   MonsterMgr.Inst().setMonsters();
-  BotTodoMgr.Inst().setTodos(ctx);
+  await BotTodoMgr.Inst().setTodos(ctx);
   registerBotTodoHandlers();
   BotTodoMgr.Inst().start();
   scheduleMonthlyCardReminders(config.groupId, [

package/lib/script/BotTodoMgr.d.ts

@@ -21,16 +21,16 @@ export declare class BotTodoMgr {
     private _started;
     setTodos(ctx: Context): Promise<void>;
     private saveTodos;
-    addTodo(ts: number, type: string, payload?: any): string;
+    addTodo(ts: number, type: string, payload?: any): Promise<string>;
     getTodosAt(ts: number): BotTodoItem[];
-    removeTodo(ts: number, id: string): void;
-    removeTodosAt(ts: number): void;
-    popDueTodos(now: number): BotTodoItem[];
+    removeTodo(ts: number, id: string): Promise<void>;
+    removeTodosAt(ts: number): Promise<void>;
+    popDueTodos(now: number): Promise<BotTodoItem[]>;
     getNextTimestamp(): number | undefined;
     on(type: string, handler: (item: BotTodoItem) => any | Promise<any>): void;
     start(): void;
     stop(): void;
-    scheduleNext(): void;
+    scheduleNext(): Promise<void>;
     private internalPlanNext;
     private executeBatch;
 }

package/lib/script/botFunction/monthlyCardReminder.d.ts

@@ -1,4 +1,4 @@
 import { BotTodoItem } from "../BotTodoMgr";
 export declare const MONTHLY_CARD_REMINDER_TYPE = "monthly-card-reminder";
-export declare function scheduleMonthlyCardReminders(groupId: string, hours: number[]): void;
-export declare function executeMonthlyCardReminder(item: BotTodoItem): Promise<void>;
+export declare function scheduleMonthlyCardReminders(groupId: string, hours: number[]): Promise<void>;
+export declare function executeMonthlyCardReminder(item: BotTodoItem): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-toram",
   "description": "托拉姆物语小工具",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "contributors": [
     "青灯 <1874053520@qq.com>"
   ],