@heavybit/shared-lib 2.1.0 → 2.7.0

package/dist/cjs/messaging/idempotency.js

@@ -1,32 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryIdempotencyStore = exports.RedisIdempotencyStore = void 0;
+exports.StoreDeduper = exports.MemoryIdempotencyStore = exports.RedisIdempotencyStore = exports.ProcessedEventsDeduper = void 0;
+exports.isDuplicateKeyError = isDuplicateKeyError;
+const errors_js_1 = require("../common/errors.js");
+const id_js_1 = require("../common/id.js");
+const tables_js_1 = require("../database/tables.js");
+/** Thrown inside the ledger transaction to roll back when the event is already recorded. */
+class AlreadyProcessed extends Error {
+}
+const DUPLICATE_KEY = 'ER_DUP_ENTRY';
+/** True for a MySQL duplicate-key error, also when Drizzle wraps it in `cause`. */
+function isDuplicateKeyError(error) {
+    for (let e = error, depth = 0; e && depth < 5; e = e.cause, depth += 1) {
+        if (e.code === DUPLICATE_KEY || e.errno === 1062)
+            return true;
+    }
+    return false;
+}
+/**
+ * Database ledger (`processed_events`, unique `(consumer, event_id)`): the ledger row and the handler's
+ * writes commit in one transaction, so an event is recorded as processed if and only if its effects
+ * commit. A concurrent duplicate blocks on the unique key until the first commits, then is skipped.
+ *
+ * @example const dedupe = new ProcessedEventsDeduper(db); // handler gets `tx` and writes through it
+ */
+class ProcessedEventsDeduper {
+    db;
+    table;
+    constructor(db, table = tables_js_1.processedEvents) {
+        this.db = db;
+        this.table = table;
+    }
+    async run(consumer, eventId, work) {
+        try {
+            await this.db.transaction(async (tx) => {
+                try {
+                    await tx.insert(this.table).values({ id: (0, id_js_1.newId)(), consumer, eventId });
+                }
+                catch (error) {
+                    if (isDuplicateKeyError(error))
+                        throw new AlreadyProcessed();
+                    throw error;
+                }
+                await work(tx);
+            });
+            return 'processed';
+        }
+        catch (error) {
+            if (error instanceof AlreadyProcessed)
+                return 'duplicate';
+            throw error;
+        }
+    }
+}
+exports.ProcessedEventsDeduper = ProcessedEventsDeduper;
 const PROCESSING = 'processing';
 const DONE = 'done';
+/** Redis claim store; every key comes from the service keyspace (`{prefix}idem:{key}`). */
 class RedisIdempotencyStore {
     redis;
-    prefix;
-    constructor(redis, prefix = 'idem:') {
+    keyspace;
+    constructor(redis, keyspace) {
         this.redis = redis;
-        this.prefix = prefix;
+        this.keyspace = keyspace;
+    }
+    key(key) {
+        return this.keyspace.key('idem', key);
     }
     async begin(key, leaseSec) {
-        const k = this.prefix + key;
+        const k = this.key(key);
         const set = await this.redis.set(k, PROCESSING, 'EX', leaseSec, 'NX');
         if (set === 'OK')
             return 'claimed';
         return (await this.redis.get(k)) === DONE ? 'done' : 'in-flight';
     }
     async complete(key, ttlSec) {
-        await this.redis.set(this.prefix + key, DONE, 'EX', ttlSec);
+        await this.redis.set(this.key(key), DONE, 'EX', ttlSec);
     }
     async abandon(key) {
-        const k = this.prefix + key;
         // Only release our own lease — never erase a completed marker.
-        await this.redis.eval("if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) end return 0", 1, k, PROCESSING);
+        await this.redis.eval("if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) end return 0", 1, this.key(key), PROCESSING);
     }
 }
 exports.RedisIdempotencyStore = RedisIdempotencyStore;
+/** In-process claim store for tests and single-process tools. */
 class MemoryIdempotencyStore {
     entries = new Map();
     read(key) {
@@ -54,4 +111,34 @@ class MemoryIdempotencyStore {
     }
 }
 exports.MemoryIdempotencyStore = MemoryIdempotencyStore;
+/**
+ * {@link EventDeduper} over an {@link IdempotencyStore}. A duplicate still in flight elsewhere throws a
+ * retryable 503, so the consumer retries it later instead of acking it unprocessed.
+ */
+class StoreDeduper {
+    store;
+    options;
+    constructor(store, options = {}) {
+        this.store = store;
+        this.options = options;
+    }
+    async run(consumer, eventId, work) {
+        const key = `${consumer}:${eventId}`;
+        const claim = await this.store.begin(key, this.options.leaseSec ?? 300);
+        if (claim === 'done')
+            return 'duplicate';
+        if (claim === 'in-flight')
+            throw new errors_js_1.ServiceUnavailableError('Duplicate message in flight', { code: 'DUPLICATE_IN_FLIGHT' });
+        try {
+            await work(undefined);
+        }
+        catch (error) {
+            await this.store.abandon(key).catch(() => undefined);
+            throw error;
+        }
+        await this.store.complete(key, this.options.ttlSec ?? 7 * 86_400).catch(() => undefined);
+        return 'processed';
+    }
+}
+exports.StoreDeduper = StoreDeduper;
 //# sourceMappingURL=idempotency.js.map

package/dist/cjs/messaging/idempotency.js.map

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

package/dist/cjs/messaging/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./topology.js"), exports);
 __exportStar(require("./envelope.js"), exports);
 __exportStar(require("./publisher.js"), exports);
 __exportStar(require("./consumer.js"), exports);
+__exportStar(require("./base-consumer.js"), exports);
 __exportStar(require("./idempotency.js"), exports);
 __exportStar(require("./rpc.js"), exports);
 __exportStar(require("./outbox.js"), exports);
@@ -39,7 +40,7 @@ function createMessaging(options) {
     const topology = (0, topology_js_1.createTopology)({ app: options.app, prefix: options.prefix });
     const connection = new connection_js_1.AmqpConnection({ url: options.url, connectionName: `${options.service}@${options.prefix}`, logger });
     const publisher = new publisher_js_1.MessagePublisher({ connection, topology, source: options.service, logger });
-    const consumer = new consumer_js_1.MessageConsumer(connection, topology, logger);
+    const consumer = new consumer_js_1.MessageConsumer(connection, topology, options.service, logger);
     const rpcServer = new rpc_js_1.RpcServer(connection, topology, logger);
     const rpcClient = new rpc_js_1.RpcClient(connection, topology, options.service, logger);
     const monitor = new monitor_js_1.QueueMonitor(connection, () => consumer.deadLetterQueues, logger);

package/dist/cjs/messaging/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/messaging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AA2CA,0CA0BC;AArED,kDAAmD;AAEnD,mDAAiD;AACjD,+CAAgD;AAChD,6CAA4C;AAC5C,iDAAkD;AAClD,qCAAgD;AAChD,+CAA8D;AAE9D,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,mDAAiC;AACjC,2CAAyB;AACzB,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,wDAAsC;AAuBtC,0FAA0F;AAC1F,SAAgB,eAAe,CAAC,OAAyB;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,uBAAY,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAA,4BAAc,EAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,IAAI,8BAAc,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5H,MAAM,SAAS,GAAG,IAAI,+BAAgB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAClG,MAAM,QAAQ,GAAG,IAAI,6BAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,IAAI,yBAAY,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEtF,OAAO;QACL,QAAQ;QACR,UAAU;QACV,SAAS;QACT,QAAQ;QACR,SAAS;QACT,SAAS;QACT,OAAO;QACP,KAAK,CAAC,KAAK;YACT,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE;KAChC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/messaging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkDA,0CA0BC;AA5ED,kDAAmD;AAEnD,mDAAiD;AACjD,+CAAgD;AAChD,6CAA4C;AAC5C,iDAAkD;AAClD,qCAAgD;AAChD,+CAA8D;AAE9D,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,qDAAmC;AACnC,mDAAiC;AACjC,2CAAyB;AACzB,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,wDAAsC;AA6BtC,0FAA0F;AAC1F,SAAgB,eAAe,CAAC,OAAyB;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,uBAAY,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAA,4BAAc,EAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,IAAI,8BAAc,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5H,MAAM,SAAS,GAAG,IAAI,+BAAgB,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAClG,MAAM,QAAQ,GAAG,IAAI,6BAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,IAAI,yBAAY,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEtF,OAAO;QACL,QAAQ;QACR,UAAU;QACV,SAAS;QACT,QAAQ;QACR,SAAS;QACT,SAAS;QACT,OAAO;QACP,KAAK,CAAC,KAAK;YACT,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE;KAChC,CAAC;AACJ,CAAC"}

package/dist/cjs/messaging/outbox.js

@@ -1,56 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutboxRelay = exports.DEFAULT_OUTBOX_TABLE = void 0;
-exports.outboxRoutingKey = outboxRoutingKey;
 exports.enqueueOutbox = enqueueOutbox;
+const drizzle_orm_1 = require("drizzle-orm");
+const table_names_js_1 = require("../database/table-names.js");
+Object.defineProperty(exports, "DEFAULT_OUTBOX_TABLE", { enumerable: true, get: function () { return table_names_js_1.DEFAULT_OUTBOX_TABLE; } });
+const tables_js_1 = require("../database/tables.js");
 const index_js_1 = require("../logging/index.js");
+const envelope_js_1 = require("./envelope.js");
 const publisher_js_1 = require("./publisher.js");
-exports.DEFAULT_OUTBOX_TABLE = 'event_outbox';
-const COMMAND_PREFIX = 'command:';
-/** Outbox `routing_key` column value: the event type, or `command:<name>` for commands. */
-function outboxRoutingKey(envelope, kind = 'event') {
-    return kind === 'command' ? `${COMMAND_PREFIX}${envelope.type}` : envelope.type;
-}
 /**
- * Transactional outbox: write the domain change and the event in one DB transaction, then a
- * relay publishes pending rows with broker confirms. Closes the "row committed, event lost"
- * gap of publish-after-commit. Consumers must be idempotent (they are: see IdempotencyStore).
+ * Transactional outbox: stages a message in the caller's transaction, so it is published if and only if
+ * the domain change commits. The {@link OutboxRelay} publishes it later with broker confirms. The
+ * correlation id (explicit, else the request context's) is stored with the row and sent as a header.
  *
- * Table (see `createOutboxTable` in `@heavybit/shared-lib/knex`):
- *   id CHAR(26) PK = eventId, routing_key, payload JSON, attempts, last_error, created_at, published_at
+ * @param tx The caller's open Drizzle transaction (or db handle for a single-statement change).
+ * @param routingKey Event or command name.
+ * @param data Payload fields.
+ * @param options Exchange, envelope meta and table.
+ * @returns The staged envelope.
+ * @example await db.transaction(async (tx) => { await repo.insert(ctx, row, { tx }); await enqueueOutbox(tx, 'thing.created', { thingId: row.id }); });
  */
-async function enqueueOutbox(db, envelope, options = {}) {
-    await db(options.table ?? exports.DEFAULT_OUTBOX_TABLE).insert({
-        id: envelope.eventId,
-        routing_key: outboxRoutingKey(envelope, options.kind),
-        payload: JSON.stringify(envelope),
+async function enqueueOutbox(tx, routingKey, data, options = {}) {
+    const table = options.table ?? tables_js_1.outbox;
+    const envelope = (0, envelope_js_1.buildEnvelope)(routingKey, data, options);
+    await tx.insert(table).values({
+        id: envelope.data.eventId,
+        routingKey,
+        exchange: options.exchange ?? 'events',
+        payload: envelope,
+        correlationId: (0, envelope_js_1.outgoingCorrelationId)(options) ?? null,
         attempts: 0,
-        created_at: new Date(),
     });
+    return envelope;
 }
+/**
+ * Publishes pending outbox rows in id (= time) order. Each batch locks its rows with
+ * `FOR UPDATE SKIP LOCKED`, so several replicas can relay at once without double-publishing, and marks a
+ * row published only after the broker confirms it. Consumers still dedupe: a crash between confirm and
+ * commit re-sends the row.
+ *
+ * Failures: an unroutable command stays pending and the batch continues; a broker error stops the batch
+ * (keeping order) and the poll interval backs off exponentially until a batch succeeds.
+ */
 class OutboxRelay {
     options;
     timer = null;
     running = null;
     rerun = false;
+    failures = 0;
     logger;
     table;
     constructor(options) {
         this.options = options;
         this.logger = options.logger ?? index_js_1.silentLogger;
-        this.table = options.table ?? exports.DEFAULT_OUTBOX_TABLE;
+        this.table = options.table ?? tables_js_1.outbox;
     }
+    /** Starts polling. */
     start() {
         if (this.timer)
             return;
-        this.timer = setInterval(() => { void this.trigger(); }, this.options.intervalMs ?? 2000);
-        void this.trigger();
+        this.schedule(0);
     }
+    /** Stops polling (an in-flight batch finishes). */
     stop() {
         if (this.timer)
-            clearInterval(this.timer);
+            clearTimeout(this.timer);
         this.timer = null;
     }
+    /** Delay before the next poll: the interval, doubled per consecutive failed batch, capped. */
+    nextDelayMs() {
+        const interval = this.options.intervalMs ?? 2000;
+        return Math.min(this.options.maxBackoffMs ?? 60_000, interval * 2 ** this.failures);
+    }
     /** Publishes pending rows now. Concurrent triggers coalesce into one follow-up run. */
     async trigger() {
         if (this.running) {
@@ -68,68 +90,88 @@ class OutboxRelay {
             }
         } while (this.rerun);
     }
-    /** One batch. Returns how many rows were published. */
+    /** One batch. */
     async flush() {
-        const { knex, bus } = this.options;
-        let published = 0;
+        const metrics = { published: 0, failed: 0, lagMs: 0 };
+        let brokerDown = false;
         try {
-            await knex.transaction(async (trx) => {
-                // SKIP LOCKED lets several replicas relay concurrently without double-publishing.
-                const rows = await trx(this.table)
-                    .select('id', 'routing_key', 'payload', 'attempts')
-                    .whereNull('published_at')
-                    .orderBy('id', 'asc')
-                    .limit(this.options.batchSize ?? 100)
-                    .forUpdate()
-                    .skipLocked();
+            await this.options.db.transaction(async (tx) => {
+                const rows = await this.lockPending(tx);
+                if (rows[0])
+                    metrics.lagMs = Math.max(0, Date.now() - new Date(rows[0].createdAt).getTime());
                 for (const row of rows) {
-                    const envelope = (typeof row.payload === 'string' ? JSON.parse(row.payload) : row.payload);
                     try {
-                        if (row.routing_key.startsWith(COMMAND_PREFIX))
-                            await bus.sendEnvelope(envelope);
-                        else
-                            await bus.publishEnvelope(envelope);
-                        await trx(this.table).where({ id: row.id }).update({ published_at: new Date(), last_error: null });
-                        published += 1;
+                        await this.publish(row);
+                        await tx.update(this.table).set({ publishedAt: new Date(), lastError: null }).where((0, drizzle_orm_1.eq)(this.table.id, row.id));
+                        metrics.published += 1;
                     }
                     catch (error) {
-                        await trx(this.table).where({ id: row.id }).update({ attempts: knex.raw('attempts + 1'), last_error: String(error.message).slice(0, 500) });
-                        // Unroutable: only this command's owner is missing. Keep the row for the next tick and carry on,
-                        // so one undeclared queue never holds back every other event behind it.
+                        metrics.failed += 1;
+                        await tx.update(this.table)
+                            .set({ attempts: (0, drizzle_orm_1.sql) `${this.table.attempts} + 1`, lastError: String(error?.message ?? error).slice(0, 500) })
+                            .where((0, drizzle_orm_1.eq)(this.table.id, row.id));
+                        // Unroutable: only this command's owner is missing. Keep the row and carry on, so one
+                        // undeclared queue never holds back every other message behind it.
                         if ((0, publisher_js_1.isUnroutableError)(error)) {
                             this.reportUnroutable(row, error);
                             continue;
                         }
-                        // Broker down: stop this batch; the next tick retries in order.
+                        // Broker down: stop this batch; the next poll retries in order.
+                        brokerDown = true;
                         break;
                     }
                 }
             });
         }
         catch (error) {
+            brokerDown = true;
             this.logger.error('Outbox relay batch failed', { error: error.message });
         }
-        if (published)
-            this.logger.debug('Outbox relayed', { published });
-        return published;
+        this.failures = brokerDown ? Math.min(this.failures + 1, 16) : 0;
+        if (metrics.published)
+            this.logger.debug('Outbox relayed', { published: metrics.published });
+        this.options.onMetrics?.(metrics);
+        return metrics;
+    }
+    /** Deletes published rows older than `olderThanDays`; returns how many were removed. */
+    async prune(olderThanDays = 7) {
+        const cutoff = new Date(Date.now() - olderThanDays * 86_400_000);
+        const [result] = await this.options.db.delete(this.table)
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.isNotNull)(this.table.publishedAt), (0, drizzle_orm_1.lt)(this.table.publishedAt, cutoff)));
+        return result?.affectedRows ?? 0;
+    }
+    lockPending(tx) {
+        return tx.select().from(this.table)
+            .where((0, drizzle_orm_1.isNull)(this.table.publishedAt))
+            .orderBy((0, drizzle_orm_1.asc)(this.table.id))
+            .limit(this.options.batchSize ?? 100)
+            .for('update', { skipLocked: true });
+    }
+    publish(row) {
+        const envelope = (typeof row.payload === 'string' ? JSON.parse(row.payload) : row.payload);
+        const options = row.correlationId ? { correlationId: row.correlationId } : {};
+        return row.exchange === 'commands'
+            ? this.options.bus.sendEnvelope(envelope, options)
+            : this.options.bus.publishEnvelope(envelope, options);
+    }
+    schedule(delayMs) {
+        this.timer = setTimeout(() => {
+            void this.trigger().finally(() => { if (this.timer)
+                this.schedule(this.nextDelayMs()); });
+        }, delayMs);
     }
     /**
      * Logged on the 1st, 2nd, 4th, 8th… failure of a row (the attempt count before this one is in `attempts`),
-     * so a queue that stays missing for hours is still visible without a line every tick.
+     * so a queue that stays missing for hours is still visible without a line every poll.
      */
     reportUnroutable(row, error) {
         const attempt = Number(row.attempts ?? 0) + 1;
         if ((attempt & (attempt - 1)) !== 0)
             return;
         this.logger.error('Outbox command is unroutable: its consumer queue is not declared; will retry', {
-            eventId: row.id, routingKey: row.routing_key, target: error.routingKey, attempt,
+            eventId: row.id, routingKey: row.routingKey, target: error.routingKey, attempt,
         });
     }
-    /** Deletes published rows older than `olderThanDays`. */
-    async prune(olderThanDays = 7) {
-        const cutoff = new Date(Date.now() - olderThanDays * 86_400_000);
-        return this.options.knex(this.table).whereNotNull('published_at').andWhere('published_at', '<', cutoff).delete();
-    }
 }
 exports.OutboxRelay = OutboxRelay;
 //# sourceMappingURL=outbox.js.map

package/dist/cjs/messaging/outbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbox.js","sourceRoot":"","sources":["../../../src/messaging/outbox.ts"],"names":[],"mappings":";;;AAYA,4CAEC;AAUD,sCAQC;AA/BD,kDAAmD;AAEnD,iDAAgH;AAEnG,QAAA,oBAAoB,GAAG,cAAc,CAAC;AAInD,MAAM,cAAc,GAAG,UAAU,CAAC;AAElC,2FAA2F;AAC3F,SAAgB,gBAAgB,CAAC,QAAqC,EAAE,OAAmB,OAAO;IAChG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,cAAc,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAClF,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,aAAa,CAAC,EAA2B,EAAE,QAAuB,EAAE,UAAiD,EAAE;IAC3I,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,4BAAoB,CAAC,CAAC,MAAM,CAAC;QACrD,EAAE,EAAE,QAAQ,CAAC,OAAO;QACpB,WAAW,EAAE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;QACrD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QACjC,QAAQ,EAAE,CAAC;QACX,UAAU,EAAE,IAAI,IAAI,EAAE;KACvB,CAAC,CAAC;AACL,CAAC;AAYD,MAAa,WAAW;IAOO;IANrB,KAAK,GAA0C,IAAI,CAAC;IACpD,OAAO,GAA2B,IAAI,CAAC;IACvC,KAAK,GAAG,KAAK,CAAC;IACL,MAAM,CAAS;IACf,KAAK,CAAS;IAE/B,YAA6B,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;QACtD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,uBAAY,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,4BAAoB,CAAC;IACrD,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO;QACvB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QAC1F,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK;YAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,uFAAuF;IACvF,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,OAAO;QACT,CAAC;QACD,GAAG,CAAC;YACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC;YACrB,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE;IACvB,CAAC;IAED,uDAAuD;IACvD,KAAK,CAAC,KAAK;QACT,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACnC,kFAAkF;gBAClF,MAAM,IAAI,GAA2F,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;qBACvH,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC;qBAClD,SAAS,CAAC,cAAc,CAAC;qBACzB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;qBACpB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC;qBACpC,SAAS,EAAE;qBACX,UAAU,EAAE,CAAC;gBAChB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,QAAQ,GAAG,CAAC,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAkB,CAAC;oBAC5G,IAAI,CAAC;wBACH,IAAI,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC;4BAAE,MAAM,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;;4BAC5E,MAAM,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;wBACzC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;wBACnG,SAAS,IAAI,CAAC,CAAC;oBACjB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,MAAM,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;wBACvJ,iGAAiG;wBACjG,wEAAwE;wBACxE,IAAI,IAAA,gCAAiB,EAAC,KAAK,CAAC,EAAE,CAAC;4BAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAClC,SAAS;wBACX,CAAC;wBACD,gEAAgE;wBAChE,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,SAAS;YAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;OAGG;IACK,gBAAgB,CAAC,GAA2D,EAAE,KAA6B;QACjH,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;YAAE,OAAO;QAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8EAA8E,EAAE;YAChG,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO;SAChF,CAAC,CAAC;IACL,CAAC;IAED,yDAAyD;IACzD,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,UAAU,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IACnH,CAAC;CACF;AAlGD,kCAkGC"}
+{"version":3,"file":"outbox.js","sourceRoot":"","sources":["../../../src/messaging/outbox.ts"],"names":[],"mappings":"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"}

package/dist/cjs/messaging/publisher.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NoopMessageBus = exports.MessagePublisher = exports.UnroutableMessageError = void 0;
+exports.NoopMessageBus = exports.MessagePublisher = exports.MAX_DELAY_MS = exports.UnroutableMessageError = void 0;
 exports.isUnroutableError = isUnroutableError;
 const errors_js_1 = require("../common/errors.js");
 const id_js_1 = require("../common/id.js");
 const index_js_1 = require("../logging/index.js");
 const envelope_js_1 = require("./envelope.js");
+const topology_js_1 = require("./topology.js");
 /**
  * The broker accepted a `mandatory` message but no queue was bound to receive it (the consumer has never
  * started, or its binding is wrong). Retryable: the message is not lost — the caller (or the outbox relay)
@@ -21,16 +22,20 @@ class UnroutableMessageError extends errors_js_1.ServiceUnavailableError {
     }
 }
 exports.UnroutableMessageError = UnroutableMessageError;
+/** True when `error` is an {@link UnroutableMessageError} (retryable; the target queue is missing). */
 function isUnroutableError(error) {
     return error instanceof UnroutableMessageError;
 }
-const envelopeProps = (envelope, mandatory) => ({
-    mandatory, messageId: envelope.eventId, correlationId: envelope.correlationId, type: envelope.type,
+/** Largest delay `scheduleDelayed` accepts (AMQP per-message TTL is a 32-bit value). */
+exports.MAX_DELAY_MS = 2 ** 31 - 1;
+const envelopeProps = (envelope, mandatory, options) => ({
+    mandatory, messageId: envelope.data.eventId, correlationId: (0, envelope_js_1.outgoingCorrelationId)(options), type: envelope.routingKey,
 });
 /**
  * Event and command publisher on a confirm channel: `publish()` resolves only once the broker
  * has persisted the message, and rejects with 503 when the broker is unreachable so callers
- * (or the outbox relay) can retry.
+ * (or the outbox relay) can retry. Every message is persistent JSON with `messageId` = event id and the
+ * correlation id in the `x-correlation-id` header.
  *
  * Commands and direct queue sends are `mandatory`: a command has exactly one owner, so one that no
  * queue receives is a fault, not a no-op. The broker returns it (`basic.return`, always before its
@@ -43,6 +48,8 @@ class MessagePublisher {
     logger;
     /** Message ids the broker returned as unroutable, awaiting their confirm. */
     returned = new Set();
+    /** Delay queues already declared, per live channel (a reconnect gets a new channel). */
+    declaredDelayQueues = new WeakMap();
     constructor(options) {
         this.options = options;
         this.logger = options.logger ?? index_js_1.silentLogger;
@@ -59,46 +66,86 @@ class MessagePublisher {
             });
         }, { confirm: true });
     }
-    async publish(type, data, meta = {}) {
-        const envelope = (0, envelope_js_1.buildEnvelope)(type, data, this.options.source, meta);
-        await this.publishEnvelope(envelope);
+    async publish(routingKey, data, meta = {}) {
+        const envelope = (0, envelope_js_1.buildEnvelope)(routingKey, data, meta);
+        await this.publishEnvelope(envelope, meta);
         return envelope;
     }
-    async publishEnvelope(envelope) {
-        await this.write(this.options.topology.eventsExchange, envelope.type, envelope, envelopeProps(envelope, false));
+    async publishEnvelope(envelope, options) {
+        await this.write(this.options.topology.eventsExchange, envelope.routingKey, envelope, envelopeProps(envelope, false, options));
     }
     async send(command, data, meta = {}) {
-        const envelope = (0, envelope_js_1.buildEnvelope)(command, data, this.options.source, meta);
-        await this.sendEnvelope(envelope);
+        const envelope = (0, envelope_js_1.buildEnvelope)(command, data, meta);
+        await this.sendEnvelope(envelope, meta);
         return envelope;
     }
-    async sendEnvelope(envelope) {
-        await this.write(this.options.topology.commandsExchange, this.options.topology.queue(envelope.type), envelope, envelopeProps(envelope, true));
+    async sendEnvelope(envelope, options) {
+        const { topology } = this.options;
+        await this.write(topology.commandsExchange, topology.queue(envelope.routingKey), envelope, envelopeProps(envelope, true, options));
     }
     /**
      * Sends `payload` as-is (no envelope) to `queue` through the default exchange. The queue is the
      * consumer's to declare, so it is not asserted here; a missing queue rejects as unroutable.
      */
     async sendToQueue(queue, payload, options = {}) {
-        await this.write('', queue, payload, { mandatory: true, messageId: options.messageId ?? (0, id_js_1.newId)(), correlationId: options.correlationId });
+        await this.write('', queue, payload, { mandatory: true, messageId: options.messageId ?? (0, id_js_1.newId)(), correlationId: (0, envelope_js_1.outgoingCorrelationId)(options) });
     }
-    write(exchange, routingKey, body, props) {
+    /**
+     * Parks `payload` in a delay queue with a per-message TTL; when it expires the broker dead-letters it
+     * into `queue` (MSG-4). Delay queues are bucketed by power of two (see `delayQueueName`). The target
+     * queue must exist when the TTL fires, or the broker drops the message.
+     *
+     * @throws RangeError when `delayMs` is not an integer in 1 … {@link MAX_DELAY_MS}.
+     */
+    async scheduleDelayed(queue, payload, delayMs, options = {}) {
+        if (!Number.isInteger(delayMs) || delayMs < 1 || delayMs > exports.MAX_DELAY_MS) {
+            throw new RangeError('delayMs must be an integer between 1 and 2^31-1');
+        }
+        const delayQueue = await this.declareDelayQueue(queue, delayMs);
+        await this.write('', delayQueue, payload, {
+            mandatory: true, messageId: options.messageId ?? (0, id_js_1.newId)(), correlationId: (0, envelope_js_1.outgoingCorrelationId)(options), expiration: String(delayMs),
+        });
+    }
+    async declareDelayQueue(queue, delayMs) {
+        const channel = this.channel();
+        const name = (0, topology_js_1.delayQueueName)(queue, delayMs);
+        const declared = this.declaredDelayQueues.get(channel) ?? new Set();
+        if (!declared.has(name)) {
+            await channel.assertQueue(name, { durable: true, arguments: { 'x-dead-letter-exchange': '', 'x-dead-letter-routing-key': queue } });
+            declared.add(name);
+            this.declaredDelayQueues.set(channel, declared);
+        }
+        return name;
+    }
+    channel() {
         const channel = this.handle?.current();
-        if (!channel) {
-            return Promise.reject(new errors_js_1.ServiceUnavailableError('Message broker unavailable'));
+        if (!channel)
+            throw new errors_js_1.ServiceUnavailableError('Message broker unavailable');
+        return channel;
+    }
+    write(exchange, routingKey, body, props) {
+        let channel;
+        try {
+            channel = this.channel();
+        }
+        catch (error) {
+            return Promise.reject(error);
         }
-        const { messageId } = props;
+        const { messageId, correlationId } = props;
+        const publishOptions = {
+            persistent: true,
+            mandatory: props.mandatory,
+            contentType: 'application/json',
+            messageId,
+            correlationId,
+            type: props.type,
+            expiration: props.expiration,
+            timestamp: Math.floor(Date.now() / 1000),
+            appId: this.options.source,
+            headers: correlationId ? { [envelope_js_1.CORRELATION_HEADER]: correlationId } : {},
+        };
         return new Promise((resolve, reject) => {
-            channel.publish(exchange, routingKey, Buffer.from(JSON.stringify(body)), {
-                persistent: true,
-                mandatory: props.mandatory,
-                contentType: 'application/json',
-                messageId,
-                correlationId: props.correlationId,
-                type: props.type,
-                timestamp: Math.floor(Date.now() / 1000),
-                appId: this.options.source,
-            }, (error) => {
+            channel.publish(exchange, routingKey, Buffer.from(JSON.stringify(body)), publishOptions, (error) => {
                 // The broker sends `basic.return` before the confirm, so a returned message is already recorded here.
                 const unroutable = this.returned.delete(messageId);
                 if (error) {
@@ -119,31 +166,32 @@ class MessagePublisher {
 exports.MessagePublisher = MessagePublisher;
 /** Stand-in when messaging is disabled (local tooling, tests): logs and drops. */
 class NoopMessageBus {
-    source;
     logger;
-    constructor(source, logger = index_js_1.silentLogger) {
-        this.source = source;
+    constructor(logger = index_js_1.silentLogger) {
         this.logger = logger;
     }
-    async publish(type, data, meta = {}) {
-        const envelope = (0, envelope_js_1.buildEnvelope)(type, data, this.source, meta);
-        this.logger.debug('Messaging disabled; event dropped', { type, eventId: envelope.eventId });
+    async publish(routingKey, data, meta = {}) {
+        const envelope = (0, envelope_js_1.buildEnvelope)(routingKey, data, meta);
+        this.logger.debug('Messaging disabled; event dropped', { routingKey, eventId: envelope.data.eventId });
         return envelope;
     }
     async publishEnvelope(envelope) {
-        this.logger.debug('Messaging disabled; event dropped', { type: envelope.type, eventId: envelope.eventId });
+        this.logger.debug('Messaging disabled; event dropped', { routingKey: envelope.routingKey, eventId: envelope.data.eventId });
     }
     async send(command, data, meta = {}) {
-        const envelope = (0, envelope_js_1.buildEnvelope)(command, data, this.source, meta);
-        this.logger.debug('Messaging disabled; command dropped', { command, eventId: envelope.eventId });
+        const envelope = (0, envelope_js_1.buildEnvelope)(command, data, meta);
+        this.logger.debug('Messaging disabled; command dropped', { command, eventId: envelope.data.eventId });
         return envelope;
     }
     async sendEnvelope(envelope) {
-        this.logger.debug('Messaging disabled; command dropped', { command: envelope.type, eventId: envelope.eventId });
+        this.logger.debug('Messaging disabled; command dropped', { command: envelope.routingKey, eventId: envelope.data.eventId });
     }
     async sendToQueue(queue) {
         this.logger.debug('Messaging disabled; queue message dropped', { queue });
     }
+    async scheduleDelayed(queue, _payload, delayMs) {
+        this.logger.debug('Messaging disabled; delayed message dropped', { queue, delayMs });
+    }
 }
 exports.NoopMessageBus = NoopMessageBus;
 //# sourceMappingURL=publisher.js.map