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

package/dist/{pg-PM5RYRWH.cjs → pg-IEZTAR43.cjs}

@@ -6,7 +6,7 @@
 
 
 
-var _chunk4SIN2R66cjs = require('./chunk-4SIN2R66.cjs');
+var _chunkV2SDWGUBcjs = require('./chunk-V2SDWGUB.cjs');
 
 // src/server/adapters/pg.js
 var _pg = require('pg');
@@ -30,13 +30,13 @@ var PgAdapter = class {
     return result.rows;
   }
   async initSchema() {
-    await this._query(_chunk4SIN2R66cjs.TABLE_SQL);
-    await this._query(_chunk4SIN2R66cjs.PUSH_SUBSCRIPTION_TABLE_SQL);
-    for (const migration of _chunk4SIN2R66cjs.MIGRATIONS) {
+    await this._query(_chunkV2SDWGUBcjs.TABLE_SQL);
+    await this._query(_chunkV2SDWGUBcjs.PUSH_SUBSCRIPTION_TABLE_SQL);
+    for (const migration of _chunkV2SDWGUBcjs.MIGRATIONS) {
       await this._query(migration.sql);
     }
     const indexResults = [];
-    for (const index of _chunk4SIN2R66cjs.INDEXES) {
+    for (const index of _chunkV2SDWGUBcjs.INDEXES) {
       try {
         await this._query(index.sql);
         indexResults.push({
@@ -62,11 +62,11 @@ var PgAdapter = class {
         `Critical index creation failed (${failedNames}). Please remove duplicate UUID rows and run initSchema again.`
       );
     }
-    const tableCheck = await this._query(_chunk4SIN2R66cjs.VERIFY_TABLE_SQL);
+    const tableCheck = await this._query(_chunkV2SDWGUBcjs.VERIFY_TABLE_SQL);
     if (tableCheck.length === 0) {
       throw new Error("Table creation verification failed");
     }
-    const columns = await this._query(_chunk4SIN2R66cjs.COLUMNS_SQL);
+    const columns = await this._query(_chunkV2SDWGUBcjs.COLUMNS_SQL);
     return {
       columnsCreated: columns.length,
       indexesCreated: indexResults.filter((r) => r.status === "success").length,
@@ -93,7 +93,7 @@ var PgAdapter = class {
   }
   async getTaskByUuid(uuid, userId) {
     const rows = await this._query(
-      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count
+      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count, created_at, updated_at
        FROM scheduled_messages
        WHERE uuid = $1 AND user_id = $2 AND status = 'pending'
        LIMIT 1`,
@@ -116,7 +116,7 @@ var PgAdapter = class {
     const values = [];
     let idx = 1;
     for (const [key, value] of Object.entries(updates)) {
-      if (!_chunk4SIN2R66cjs.UPDATABLE_COLUMNS.has(key)) {
+      if (!_chunkV2SDWGUBcjs.UPDATABLE_COLUMNS.has(key)) {
         throw new Error(`[amsg-server pg] rejected unknown update column: ${key}`);
       }
       sets.push(`${key} = $${idx}`);
@@ -137,7 +137,7 @@ var PgAdapter = class {
     let idx = 2;
     if (extraFields) {
       for (const [key, value] of Object.entries(extraFields)) {
-        if (!_chunk4SIN2R66cjs.UPDATABLE_COLUMNS.has(key)) {
+        if (!_chunkV2SDWGUBcjs.UPDATABLE_COLUMNS.has(key)) {
           throw new Error(`[amsg-server pg] rejected unknown update column: ${key}`);
         }
         sets.push(`${key} = $${idx}`);
@@ -171,6 +171,7 @@ var PgAdapter = class {
        FROM scheduled_messages
        WHERE status = 'pending' AND next_send_at <= NOW()
          AND (lease_until IS NULL OR lease_until <= NOW())
+         AND (retry_after IS NULL OR retry_after <= NOW())
        ORDER BY next_send_at ASC
        LIMIT $1`,
       [limit]
@@ -196,21 +197,42 @@ var PgAdapter = class {
    * 比 next_send_at 时两边都截到毫秒：列是 timestamptz（微秒精度），驱动读
    * 出来是 JS Date（毫秒精度），原值送回去可能因为亚毫秒差对不上。
    *
+   * 带 serializeGroup 时多一道分组门：同一分组里已经有别的行拿着未到期的租
+   * 约，这条就领不走（同一分组同时只跑一条）。判定和写租约在同一条 UPDATE
+   * 里完成，「先查再占」的空档天然不存在。分组门只看租约，不看
+   * `retry_after`：等着重试的任务其实闲着，不该把同分组的其他任务一起堵住。
+   *
    * @param {number} taskId
    * @param {string|Date} expectedNextSendAt - 读这行时拿到的 next_send_at 原值
    * @param {string|Date} leaseUntil - 租期末尾
-   * @returns {Promise<boolean>} true = 领到了；false = 已被别人领走或行已不是 pending
+   * @param {string|null} [serializeGroup] - 串行分组标识；空表示不参与分组串行
+   * @returns {Promise<boolean>} true = 领到了；false = 已被别人领走、同分组有
+   *   任务正在跑、或行已不是 pending
    */
-  async claimTask(taskId, expectedNextSendAt, leaseUntil) {
+  async claimTask(taskId, expectedNextSendAt, leaseUntil, serializeGroup = null) {
+    const grouped = typeof serializeGroup === "string" && serializeGroup.length > 0;
+    const params = [leaseUntil, taskId, expectedNextSendAt];
+    let setClause = "lease_until = $1, updated_at = NOW()";
+    let groupGuard = "";
+    if (grouped) {
+      params.push(serializeGroup);
+      setClause = "lease_until = $1, serialize_group = $4, updated_at = NOW()";
+      groupGuard = `
+          AND NOT EXISTS (
+            SELECT 1 FROM scheduled_messages busy
+             WHERE busy.serialize_group = $4 AND busy.id <> $2
+               AND busy.status = 'pending' AND busy.lease_until > NOW()
+          )`;
+    }
     const rows = await this._query(
       `UPDATE scheduled_messages
-          SET lease_until = $1, updated_at = NOW()
+          SET ${setClause}
         WHERE id = $2 AND status = 'pending'
           AND date_trunc('milliseconds', next_send_at)
             = date_trunc('milliseconds', $3::timestamptz)
-          AND (lease_until IS NULL OR lease_until <= NOW())
+          AND (lease_until IS NULL OR lease_until <= NOW())${groupGuard}
        RETURNING id`,
-      [leaseUntil, taskId, expectedNextSendAt]
+      params
     );
     return rows.length > 0;
   }

package/dist/{pg-JNQ6VMXC.mjs → pg-KMJPL6QV.mjs}

@@ -6,7 +6,7 @@ import {
   TABLE_SQL,
   UPDATABLE_COLUMNS,
   VERIFY_TABLE_SQL
-} from "./chunk-WAFOSZL3.mjs";
+} from "./chunk-B2FDV7YK.mjs";
 
 // src/server/adapters/pg.js
 import { Pool } from "pg";
@@ -93,7 +93,7 @@ var PgAdapter = class {
   }
   async getTaskByUuid(uuid, userId) {
     const rows = await this._query(
-      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count
+      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count, created_at, updated_at
        FROM scheduled_messages
        WHERE uuid = $1 AND user_id = $2 AND status = 'pending'
        LIMIT 1`,
@@ -171,6 +171,7 @@ var PgAdapter = class {
        FROM scheduled_messages
        WHERE status = 'pending' AND next_send_at <= NOW()
          AND (lease_until IS NULL OR lease_until <= NOW())
+         AND (retry_after IS NULL OR retry_after <= NOW())
        ORDER BY next_send_at ASC
        LIMIT $1`,
       [limit]
@@ -196,21 +197,42 @@ var PgAdapter = class {
    * 比 next_send_at 时两边都截到毫秒：列是 timestamptz（微秒精度），驱动读
    * 出来是 JS Date（毫秒精度），原值送回去可能因为亚毫秒差对不上。
    *
+   * 带 serializeGroup 时多一道分组门：同一分组里已经有别的行拿着未到期的租
+   * 约，这条就领不走（同一分组同时只跑一条）。判定和写租约在同一条 UPDATE
+   * 里完成，「先查再占」的空档天然不存在。分组门只看租约，不看
+   * `retry_after`：等着重试的任务其实闲着，不该把同分组的其他任务一起堵住。
+   *
    * @param {number} taskId
    * @param {string|Date} expectedNextSendAt - 读这行时拿到的 next_send_at 原值
    * @param {string|Date} leaseUntil - 租期末尾
-   * @returns {Promise<boolean>} true = 领到了；false = 已被别人领走或行已不是 pending
+   * @param {string|null} [serializeGroup] - 串行分组标识；空表示不参与分组串行
+   * @returns {Promise<boolean>} true = 领到了；false = 已被别人领走、同分组有
+   *   任务正在跑、或行已不是 pending
    */
-  async claimTask(taskId, expectedNextSendAt, leaseUntil) {
+  async claimTask(taskId, expectedNextSendAt, leaseUntil, serializeGroup = null) {
+    const grouped = typeof serializeGroup === "string" && serializeGroup.length > 0;
+    const params = [leaseUntil, taskId, expectedNextSendAt];
+    let setClause = "lease_until = $1, updated_at = NOW()";
+    let groupGuard = "";
+    if (grouped) {
+      params.push(serializeGroup);
+      setClause = "lease_until = $1, serialize_group = $4, updated_at = NOW()";
+      groupGuard = `
+          AND NOT EXISTS (
+            SELECT 1 FROM scheduled_messages busy
+             WHERE busy.serialize_group = $4 AND busy.id <> $2
+               AND busy.status = 'pending' AND busy.lease_until > NOW()
+          )`;
+    }
     const rows = await this._query(
       `UPDATE scheduled_messages
-          SET lease_until = $1, updated_at = NOW()
+          SET ${setClause}
         WHERE id = $2 AND status = 'pending'
           AND date_trunc('milliseconds', next_send_at)
             = date_trunc('milliseconds', $3::timestamptz)
-          AND (lease_until IS NULL OR lease_until <= NOW())
+          AND (lease_until IS NULL OR lease_until <= NOW())${groupGuard}
        RETURNING id`,
-      [leaseUntil, taskId, expectedNextSendAt]
+      params
     );
     return rows.length > 0;
   }

package/dist/single-user.d.ts

@@ -40,6 +40,7 @@ export function createSingleUserServer(config: any): {
         totalTimeoutMs: any;
         maxStateValueBytes: any;
         onAfterSend: any;
+        onFireSettled: any;
         maxScheduledTasksPerFire: any;
     };
     handlers: {
@@ -61,6 +62,9 @@ export function createSingleUserServer(config: any): {
         messages: {
             GET: (url: any, headers: any) => Promise<any>;
         };
+        getMessage: {
+            GET: (url: any, headers: any) => Promise<any>;
+        };
         vapidPublicKey: {
             GET: Function;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.6.0-next.11",
+  "version": "2.6.0-next.13",
   "description": "ReiStandard Active Messaging server SDK with pluggable database adapters. Three-axis push schema (messageKind / messageType / messageSubtype) from @rei-standard/amsg-shared. Auto-emits ReasoningPush when the LLM response carries reasoning_content.",
   "repository": {
     "type": "git",