@rei-standard/amsg-server 2.6.0-next.13 → 2.6.0-next.16

package/dist/adapters/pg.d.ts

@@ -37,75 +37,37 @@ export class PgAdapter {
     createTask(params: any): Promise<any[]>;
     getTaskByUuid(uuid: any, userId: any): Promise<any[]>;
     getTaskByUuidOnly(uuid: any): Promise<any[]>;
+    /**
+     * 这条 uuid 现在是什么状态——不限用户，也不限状态（上面那个只看 pending
+     * 行）。`runTask` 用它把「这条已经跑完了」和「压根没这条」分开回报。
+     *
+     * @param {string} uuid
+     * @returns {Promise<{ status: string }|null>}
+     */
+    getTaskStatusByUuidOnly(uuid: string): Promise<{
+        status: string;
+    } | null>;
     updateTaskById(taskId: any, updates: any): Promise<any[]>;
     updateTaskByUuid(uuid: any, userId: any, encryptedPayload: any, extraFields: any): Promise<any[]>;
     deleteTaskById(taskId: any): Promise<boolean>;
     deleteTaskByUuid(uuid: any, userId: any): Promise<boolean>;
     getPendingTasks(limit?: number): Promise<any[][]>;
-    /**
-     * 领取一条到点的任务：在 lease_until 上写下「这条归我管到什么时候」，
-     * 本次投递期间别的 tick 领不走它。
-     *
-     * 租约写在自己的列上，next_send_at 全程不动——那一列是用户设的触发时刻，
-     * 任务列表要读它、循环任务推进下一次也要拿它当基准。
-     *
-     * 两个 tick 抢同一行时只有一个改得动，另一个拿不到 RETURNING 行，据此跳
-     * 过。WHERE 里的两个条件各管一件事：
-     *   - lease_until 为空或已过期：没人正在跑这条。领了任务的 tick 中途没了
-     *     也不会把行焊死，租约到期后自然可以被接手。
-     *   - next_send_at 等于读这行时看到的值：读出来之后用户又改了排期的话，
-     *     这一跳就不该再按旧时刻发。
-     *
-     * 不加一个 'sending' 状态来表达「正在跑」：status 上有 CHECK 约束，加值
-     * 要改表。
-     *
-     * 比 next_send_at 时两边都截到毫秒：列是 timestamptz（微秒精度），驱动读
-     * 出来是 JS Date（毫秒精度），原值送回去可能因为亚毫秒差对不上。
-     *
-     * 带 serializeGroup 时多一道分组门：同一分组里已经有别的行拿着未到期的租
-     * 约，这条就领不走（同一分组同时只跑一条）。判定和写租约在同一条 UPDATE
-     * 里完成，「先查再占」的空档天然不存在。分组门只看租约，不看
-     * `retry_after`：等着重试的任务其实闲着，不该把同分组的其他任务一起堵住。
-     *
-     * @param {number} taskId
-     * @param {string|Date} expectedNextSendAt - 读这行时拿到的 next_send_at 原值
-     * @param {string|Date} leaseUntil - 租期末尾
-     * @param {string|null} [serializeGroup] - 串行分组标识；空表示不参与分组串行
-     * @returns {Promise<boolean>} true = 领到了；false = 已被别人领走、同分组有
-     *   任务正在跑、或行已不是 pending
-     */
-    claimTask(taskId: number, expectedNextSendAt: string | Date, leaseUntil: string | Date, serializeGroup?: string | null): Promise<boolean>;
+    claimTask(taskId: any, expectedNextSendAt: any, leaseUntil: any, serializeGroup?: any): Promise<boolean>;
+    renewTaskLease(taskId: any, leaseUntil: any): Promise<boolean>;
     listTasks(userId: any, opts?: {}): Promise<{
         tasks: any[][];
         total: number;
     }>;
     cleanupOldTasks(days?: number): Promise<number>;
     getTaskStatus(uuid: any, userId: any): Promise<any>;
-    /**
-     * 这个用户当前登记的推送订阅（密文原样返回，解密在上层）。
-     *
-     * @param {string} userId
-     * @returns {Promise<{ subscription: string, updated_at: number }|null>}
-     */
-    getPushSubscription(userId: string): Promise<{
+    getTaskStatusInfo(uuid: any, userId: any): Promise<{
+        status: string;
+        last_error: string | null;
+    }>;
+    getPushSubscription(userId: any): Promise<{
         subscription: string;
         updated_at: number;
-    } | null>;
-    /**
-     * 覆盖写这个用户的订阅。一个用户一行，没有 last-write-wins 之类的比较——
-     * 客户端拿到的新订阅永远比旧的有效，旧的那份只会 410。
-     *
-     * @param {string} userId
-     * @param {string} encryptedSubscription
-     * @param {number} updatedAt - epoch 毫秒
-     * @returns {Promise<boolean>}
-     */
-    upsertPushSubscription(userId: string, encryptedSubscription: string, updatedAt: number): Promise<boolean>;
-    /**
-     * 删掉这个用户的订阅（设置页「停止接收推送」）。
-     *
-     * @param {string} userId
-     * @returns {Promise<boolean>} true = 确实删掉了一行
-     */
-    deletePushSubscription(userId: string): Promise<boolean>;
+    }>;
+    upsertPushSubscription(userId: any, encryptedSubscription: any, updatedAt: any): Promise<boolean>;
+    deletePushSubscription(userId: any): Promise<boolean>;
 }

package/dist/adapters/schema.d.ts

@@ -12,7 +12,7 @@
  *     派生值而不是宿主给的原始 key —— 原始 key 往往是角色 id 之类的宿主数据，
  *     任务内容都是密文落库的，这一列不该成为它的明文出口。
  */
-export const TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS scheduled_messages (\n    id SERIAL PRIMARY KEY,\n    user_id VARCHAR(255) NOT NULL,\n    uuid VARCHAR(36),\n    encrypted_payload TEXT NOT NULL,\n    message_type VARCHAR(50) NOT NULL CHECK (message_type IN ('fixed', 'prompted', 'auto', 'instant')),\n    next_send_at TIMESTAMP WITH TIME ZONE NOT NULL,\n    lease_until TIMESTAMP WITH TIME ZONE,\n    retry_after TIMESTAMP WITH TIME ZONE,\n    serialize_group VARCHAR(64),\n    status VARCHAR(50) NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),\n    retry_count INTEGER DEFAULT 0,\n    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),\n    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()\n  )\n";
+export const TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS scheduled_messages (\n    id SERIAL PRIMARY KEY,\n    user_id VARCHAR(255) NOT NULL,\n    uuid VARCHAR(36),\n    encrypted_payload TEXT NOT NULL,\n    message_type VARCHAR(50) NOT NULL CHECK (message_type IN ('fixed', 'prompted', 'auto', 'instant')),\n    next_send_at TIMESTAMP WITH TIME ZONE NOT NULL,\n    lease_until TIMESTAMP WITH TIME ZONE,\n    retry_after TIMESTAMP WITH TIME ZONE,\n    serialize_group VARCHAR(64),\n    status VARCHAR(50) NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),\n    retry_count INTEGER DEFAULT 0,\n    last_error TEXT,\n    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),\n    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()\n  )\n";
 /**
  * 建表语句用的是 CREATE TABLE IF NOT EXISTS，已经存在的表不会被改动，所以
  * 后加的列要单独补。initSchema 每次都会跑一遍，Postgres 的 IF NOT EXISTS

package/dist/adapters/schema.sqlite.d.ts

@@ -14,7 +14,7 @@
  * Index entries mirror the Postgres INDEXES shape ({ name, sql, description,
  * critical }) so both adapters' initSchema() return the same index metadata.
  */
-export const SQLITE_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS scheduled_messages (\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    user_id TEXT NOT NULL,\n    uuid TEXT,\n    encrypted_payload TEXT NOT NULL,\n    message_type TEXT NOT NULL CHECK (message_type IN ('fixed', 'prompted', 'auto', 'instant')),\n    next_send_at TEXT NOT NULL,\n    lease_until TEXT,\n    retry_after TEXT,\n    serialize_group TEXT,\n    status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),\n    retry_count INTEGER NOT NULL DEFAULT 0,\n    created_at TEXT NOT NULL,\n    updated_at TEXT NOT NULL\n  )\n";
+export const SQLITE_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS scheduled_messages (\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    user_id TEXT NOT NULL,\n    uuid TEXT,\n    encrypted_payload TEXT NOT NULL,\n    message_type TEXT NOT NULL CHECK (message_type IN ('fixed', 'prompted', 'auto', 'instant')),\n    next_send_at TEXT NOT NULL,\n    lease_until TEXT,\n    retry_after TEXT,\n    serialize_group TEXT,\n    status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),\n    retry_count INTEGER NOT NULL DEFAULT 0,\n    last_error TEXT,\n    created_at TEXT NOT NULL,\n    updated_at TEXT NOT NULL\n  )\n";
 /**
  * 建表语句用的是 CREATE TABLE IF NOT EXISTS，已经存在的表不会被改动，所以
  * 后加的列要单独补。initSchema 每次都会跑一遍，列已经在了就跳过。
@@ -32,3 +32,17 @@ export const SQLITE_INDEXES: {
 }[];
 export const CLIENT_STATE_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS client_state (\n    user_id TEXT NOT NULL,\n    namespace TEXT NOT NULL,\n    key TEXT NOT NULL,\n    value TEXT NOT NULL,\n    updated_at INTEGER NOT NULL,\n    PRIMARY KEY (user_id, namespace, key)\n  )\n";
 export const PUSH_SUBSCRIPTION_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS push_subscriptions (\n    user_id TEXT PRIMARY KEY,\n    subscription TEXT NOT NULL,\n    updated_at INTEGER NOT NULL\n  )\n";
+export const MESSAGE_OUTBOX_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS message_outbox (\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    user_id TEXT NOT NULL,\n    message_id TEXT NOT NULL,\n    task_uuid TEXT,\n    session_id TEXT,\n    message_index INTEGER,\n    total_messages INTEGER,\n    payload TEXT NOT NULL,\n    created_at INTEGER NOT NULL,\n    delivered_at INTEGER,\n    acked_at INTEGER,\n    UNIQUE (user_id, message_id)\n  )\n";
+export const MESSAGE_OUTBOX_INDEX_SQL: "\n  CREATE INDEX IF NOT EXISTS idx_outbox_unacked\n    ON message_outbox (user_id, id)\n    WHERE acked_at IS NULL\n";
+/**
+ * 这一版代码跑起来需要的表 / 列 / 索引。
+ *
+ * 索引只列 critical 的那几个（uidx_uuid 之类）：其余索引缺了只是慢，缺了它则
+ * 是正确性问题。
+ *
+ * @type {{ tables: Record<string, string[]>, indexes: string[] }}
+ */
+export const SQLITE_REQUIRED_SCHEMA: {
+    tables: Record<string, string[]>;
+    indexes: string[];
+};

package/dist/{chunk-B2FDV7YK.mjs → chunk-34I2YSWE.mjs}

@@ -12,6 +12,7 @@ var TABLE_SQL = `
     serialize_group VARCHAR(64),
     status VARCHAR(50) NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
     retry_count INTEGER DEFAULT 0,
+    last_error TEXT,
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
     updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
   )
@@ -31,6 +32,14 @@ var MIGRATIONS = [
     name: "add_serialize_group",
     sql: "ALTER TABLE scheduled_messages ADD COLUMN IF NOT EXISTS serialize_group VARCHAR(64)",
     description: "Serialization group for runScheduledTick serializeBy (2.6.0)"
+  },
+  {
+    name: "add_last_error",
+    // 上一次投递失败的脱敏摘要（JSON：{ at, occurrence, reason }）。payload 里
+    // 的 lastError 是密文里的完整记录，这一列是它的明文出口——payload 本身
+    // 解密失败时也写得进去，GET /message 对已失败的行也读得出来。
+    sql: "ALTER TABLE scheduled_messages ADD COLUMN IF NOT EXISTS last_error TEXT",
+    description: "Sanitized last delivery-failure summary (2.6.0)"
   }
 ];
 var INDEXES = [
@@ -108,6 +117,7 @@ var UPDATABLE_COLUMNS = /* @__PURE__ */ new Set([
   "serialize_group",
   "status",
   "retry_count",
+  "last_error",
   "created_at",
   "updated_at"
 ]);