@zhin.js/plugin-reminder 1.0.4 → 1.0.5

package/README.md

@@ -110,3 +110,7 @@ schedules/poll/index.ts   # 正式 Schedule Feature 入口
 | `reminder_cancel` | 按 id 取消；需批准                                                |
 
 与原生 `schedule_add` 的区别：本插件到点**向会话发送提醒文案**；`schedule_*` 到点**再次唤醒 Agent**（可带 cron / 工作日等）。绝对时间仍须带 `Z` 或 `±hh:mm`。
+
+### 事务化任务存储
+
+提醒与管理员 RSS 的任务、认领、操作回执和文章明细使用独立数据表，在一个事务中提交；原 CAS JSON 只用于首次迁移。支持 SQLite、MySQL、PostgreSQL，升级须完整重启，不能与旧版本进程混写。`unknown` 投递仍不会自动重试。迁移和字段说明见[结构化存储](../../../docs/operations/structured-storage.md)。

package/lib/storage.d.ts

@@ -0,0 +1,4 @@
+import { type PluginDatabaseHost } from 'zhin.js/plugin-runtime';
+/** Both pools keep their existing CAS API but persist independent rows atomically. */
+export declare function createReminderState(database: PluginDatabaseHost): import("zhin.js").PluginStateStore;
+//# sourceMappingURL=storage.d.ts.map

package/lib/storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EAA6B,MAAM,wBAAwB,CAAC;AA8CrF,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,sCAE/D"}

package/lib/storage.js

@@ -0,0 +1,49 @@
+import { createRelationalStateStore, TASK_TARGET_COLUMNS, TASK_RECEIPT_COLUMNS, encodeTaskTarget, decodeTaskTarget, encodeTaskReceipts, decodeTaskReceipts, encodeStorageIdentity, decodeStorageIdentity } from 'zhin.js/plugin-runtime';
+import { REMINDER_STATE_KEY } from './service.js';
+import { ADMIN_REMINDER_STATE_KEY } from './admin-tasks.js';
+const taskColumns = {
+    id: { type: 'text', length: 36, primary: true }, position: { type: 'integer', nullable: false },
+    ...TASK_TARGET_COLUMNS, sender_id: { type: 'text', nullable: true }, creation: { type: 'text', nullable: true },
+    content: { type: 'text', nullable: false }, state: { type: 'text', length: 24, nullable: false },
+    created_at: { type: 'bigint', nullable: false }, next_run_at: { type: 'bigint', nullable: false },
+    interval_ms: { type: 'bigint', nullable: true }, claim_id: { type: 'text', nullable: true },
+    last_run_at: { type: 'bigint', nullable: true }, detail: { type: 'text', nullable: false },
+};
+function codec(admin) {
+    const table = admin ? 'admin_reminder_tasks' : 'reminder_tasks';
+    const receipts = 'admin_reminder_receipts';
+    return {
+        key: admin ? ADMIN_REMINDER_STATE_KEY : REMINDER_STATE_KEY,
+        header: { table: `${table}_book`, definition: {
+                version: { type: 'integer', nullable: true }, revision: { type: 'text', nullable: true },
+            } },
+        tables: { [table]: taskColumns, ...(admin ? { [receipts]: TASK_RECEIPT_COLUMNS } : {}) },
+        encode(value) {
+            const book = value;
+            if (book.version !== 1 || !Array.isArray(book.tasks))
+                throw new Error('Unsupported reminder book; original state was preserved');
+            return { header: { version: book.version, revision: 'revision' in book ? book.revision : null }, rows: {
+                    [table]: book.tasks.map((task, position) => ({ id: task.id, position, ...encodeTaskTarget(task.target),
+                        sender_id: 'senderId' in task ? encodeStorageIdentity(task.senderId) : null,
+                        creation: 'creation' in task ? task.creation : null, content: encodeStorageIdentity(task.text),
+                        state: 'status' in task ? task.status : task.state, created_at: task.createdAt, next_run_at: task.nextRunAt,
+                        interval_ms: task.intervalMs, claim_id: task.claimId, last_run_at: task.lastRunAt, detail: encodeStorageIdentity(task.detail) })),
+                    ...(admin ? { [receipts]: encodeTaskReceipts(book.receipts) } : {}),
+                } };
+        },
+        decode(header, rows) {
+            return { version: Number(header.version), ...(admin ? { revision: String(header.revision) } : {}),
+                tasks: rows[table].map(row => ({ id: String(row.id), target: decodeTaskTarget(row), text: decodeStorageIdentity(row.content),
+                    createdAt: Number(row.created_at), nextRunAt: Number(row.next_run_at), intervalMs: row.interval_ms == null ? null : Number(row.interval_ms),
+                    claimId: row.claim_id == null ? null : String(row.claim_id), lastRunAt: row.last_run_at == null ? null : Number(row.last_run_at), detail: decodeStorageIdentity(row.detail),
+                    ...(admin ? { creation: String(row.creation), state: String(row.state) } : { senderId: decodeStorageIdentity(row.sender_id), status: String(row.state) }),
+                })), ...(admin ? { receipts: decodeTaskReceipts(rows[receipts]) } : {}),
+            };
+        },
+    };
+}
+/** Both pools keep their existing CAS API but persist independent rows atomically. */
+export function createReminderState(database) {
+    return createRelationalStateStore(database, [codec(false), codec(true)]);
+}
+//# sourceMappingURL=storage.js.map

package/lib/storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-reminder",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Persistent personal reminders for Zhin Plugin Runtime",
   "type": "module",
   "main": "./lib/index.js",
@@ -22,15 +22,15 @@
     "schema.json"
   ],
   "dependencies": {
-    "@zhin.js/im-contract": "1.1.5",
-    "@zhin.js/skill": "1.1.8",
-    "@zhin.js/tool": "1.1.8"
+    "@zhin.js/im-contract": "1.1.6",
+    "@zhin.js/skill": "1.1.9",
+    "@zhin.js/tool": "1.1.9"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "zhin.js": "^1.1.13",
-    "@zhin.js/command": "^1.1.9",
-    "@zhin.js/schedule-feature": "^1.1.7"
+    "zhin.js": "^1.1.15",
+    "@zhin.js/command": "^1.1.10",
+    "@zhin.js/schedule-feature": "^1.1.8"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {
@@ -47,8 +47,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "zhin.js": "1.1.13",
-    "@zhin.js/schedule-feature": "1.1.7"
+    "zhin.js": "1.1.15",
+    "@zhin.js/schedule-feature": "1.1.8"
   },
   "engines": {
     "node": ">=22.19.0"

package/plugin.js

@@ -3,6 +3,7 @@ import { databaseHostToken, definePlugin, outboundHostToken } from 'zhin.js';
 import { pluginVerificationToken, pluginTaskProviderToken } from 'zhin.js/plugin-runtime';
 import { randomUUID } from 'node:crypto';
 import { assertReminderTimezone } from "./lib/config.js";
+import { createReminderState } from "./lib/storage.js";
 import { ReminderService } from "./lib/service.js";
 import { reminderServiceToken } from "./lib/runtime.js";
 export default definePlugin({
@@ -12,11 +13,13 @@ export default definePlugin({
     setup(context) {
         const config = context.config.get();
         assertReminderTimezone(config.timezone);
-        const state = context.resources.use(databaseHostToken).state;
+        const database = context.resources.use(databaseHostToken);
+        const state = database.state;
+        const taskState = createReminderState(database);
         const outbound = context.resources.use(outboundHostToken);
         if (!outbound.sendTarget)
             throw new Error('提醒需要支持精确 DeliveryTarget 的 Outbound Host');
-        const service = new ReminderService(state, outbound, config);
+        const service = new ReminderService(taskState, outbound, config);
         context.resources.provide(reminderServiceToken, service);
         context.resources.provide(pluginTaskProviderToken, service.administratorTasks);
         context.resources.provide(pluginVerificationToken, {

package/src/storage.ts

@@ -0,0 +1,52 @@
+import { createRelationalStateStore, TASK_TARGET_COLUMNS, TASK_RECEIPT_COLUMNS, encodeTaskTarget, decodeTaskTarget,
+  encodeTaskReceipts, decodeTaskReceipts, encodeStorageIdentity, decodeStorageIdentity,
+  type PluginDatabaseHost, type RelationalStateCodec } from 'zhin.js/plugin-runtime';
+import { REMINDER_STATE_KEY, type ReminderBook } from './service.js';
+import { ADMIN_REMINDER_STATE_KEY, type AdminReminderBook } from './admin-tasks.js';
+
+const taskColumns = {
+  id: { type: 'text', length: 36, primary: true }, position: { type: 'integer', nullable: false },
+  ...TASK_TARGET_COLUMNS, sender_id: { type: 'text', nullable: true }, creation: { type: 'text', nullable: true },
+  content: { type: 'text', nullable: false }, state: { type: 'text', length: 24, nullable: false },
+  created_at: { type: 'bigint', nullable: false }, next_run_at: { type: 'bigint', nullable: false },
+  interval_ms: { type: 'bigint', nullable: true }, claim_id: { type: 'text', nullable: true },
+  last_run_at: { type: 'bigint', nullable: true }, detail: { type: 'text', nullable: false },
+};
+
+function codec(admin: boolean): RelationalStateCodec {
+  const table = admin ? 'admin_reminder_tasks' : 'reminder_tasks';
+  const receipts = 'admin_reminder_receipts';
+  return {
+    key: admin ? ADMIN_REMINDER_STATE_KEY : REMINDER_STATE_KEY,
+    header: { table: `${table}_book`, definition: {
+      version: { type: 'integer', nullable: true }, revision: { type: 'text', nullable: true },
+    } },
+    tables: { [table]: taskColumns, ...(admin ? { [receipts]: TASK_RECEIPT_COLUMNS } : {}) },
+    encode(value) {
+      const book = value as ReminderBook | AdminReminderBook;
+      if (book.version !== 1 || !Array.isArray(book.tasks)) throw new Error('Unsupported reminder book; original state was preserved');
+      return { header: { version: book.version, revision: 'revision' in book ? book.revision : null }, rows: {
+        [table]: book.tasks.map((task, position) => ({ id: task.id, position, ...encodeTaskTarget(task.target),
+          sender_id: 'senderId' in task ? encodeStorageIdentity(task.senderId) : null,
+          creation: 'creation' in task ? task.creation : null, content: encodeStorageIdentity(task.text),
+          state: 'status' in task ? task.status : task.state, created_at: task.createdAt, next_run_at: task.nextRunAt,
+          interval_ms: task.intervalMs, claim_id: task.claimId, last_run_at: task.lastRunAt, detail: encodeStorageIdentity(task.detail) })),
+        ...(admin ? { [receipts]: encodeTaskReceipts((book as AdminReminderBook).receipts) } : {}),
+      } };
+    },
+    decode(header, rows) {
+      return { version: Number(header.version), ...(admin ? { revision: String(header.revision) } : {}),
+        tasks: rows[table]!.map(row => ({ id: String(row.id), target: decodeTaskTarget(row), text: decodeStorageIdentity(row.content),
+          createdAt: Number(row.created_at), nextRunAt: Number(row.next_run_at), intervalMs: row.interval_ms == null ? null : Number(row.interval_ms),
+          claimId: row.claim_id == null ? null : String(row.claim_id), lastRunAt: row.last_run_at == null ? null : Number(row.last_run_at), detail: decodeStorageIdentity(row.detail),
+          ...(admin ? { creation: String(row.creation), state: String(row.state) } : { senderId: decodeStorageIdentity(row.sender_id), status: String(row.state) }),
+        })), ...(admin ? { receipts: decodeTaskReceipts(rows[receipts]!) } : {}),
+      };
+    },
+  };
+}
+
+/** Both pools keep their existing CAS API but persist independent rows atomically. */
+export function createReminderState(database: PluginDatabaseHost) {
+  return createRelationalStateStore(database, [codec(false), codec(true)]);
+}