@heavybit/shared-lib 2.1.0 → 2.7.0

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/knex/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/knex/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAiBA,4CAYC;AAGD,8CAGC;AAGD,0BAIC;AAzCD,+DAAkE;AAClE,6CAA2F;AAC3F,iEAAuD;AAEvD,+CAA6B;AAC7B,yDAAuC;AAEvC;;;GAGG;AAEH;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAAiD;IACvH,MAAM,IAAI,GAAG,GAAG,WAAW,SAAS,CAAC;IACrC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO;IAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;QAC5C,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;QACnB,IAAA,uBAAU,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QACrD,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAClE,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,IAAA,yBAAY,EAAC,KAAK,CAAC,CAAC;QACpB,IAAA,uBAAU,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxB,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,6FAA6F;AACtF,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,IAAI,GAAG,qCAAoB;IAC7E,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO;IAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,oCAAa,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,0EAA0E;AAC1E,SAAgB,OAAO,CAAC,KAA8B;IACpD,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzB,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtC,CAAC"}

package/dist/cjs/knex/migration-helpers.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.outboxColumns = outboxColumns;
+exports.processedEventsColumns = processedEventsColumns;
+exports.schedulerRunsColumns = schedulerRunsColumns;
+exports.scopedIndex = scopedIndex;
+const table_names_js_1 = require("../database/table-names.js");
+const columns_js_1 = require("./columns.js");
+/**
+ * Outbox columns: id, routing_key, exchange, payload, correlation_id, attempts, last_error, created_at,
+ * published_at (+ relay index).
+ */
+function outboxColumns(t, knex) {
+    (0, columns_js_1.ulidPrimary)(t);
+    t.string('routing_key', 191).notNullable();
+    t.enu('exchange', [...table_names_js_1.OUTBOX_EXCHANGES]).notNullable().defaultTo('events');
+    t.json('payload').notNullable();
+    t.string('correlation_id', 64).nullable();
+    t.integer('attempts').unsigned().notNullable().defaultTo(0);
+    t.string('last_error', 500).nullable();
+    (0, columns_js_1.createdAtColumn)(t, knex, 'created_at');
+    (0, columns_js_1.datetime)(t, 'published_at').nullable();
+    t.index(['published_at', 'id']);
+}
+/** Consumer idempotency columns: id, consumer, event_id (unique together), processed_at. */
+function processedEventsColumns(t, knex) {
+    (0, columns_js_1.ulidPrimary)(t);
+    t.string('consumer', 191).notNullable();
+    t.string('event_id', 64).notNullable();
+    (0, columns_js_1.createdAtColumn)(t, knex, 'processed_at');
+    t.unique(['consumer', 'event_id']);
+    t.index(['processed_at']);
+}
+/** Scheduler run columns: id, job, run_key (unique together), status, error, started_at, finished_at. */
+function schedulerRunsColumns(t, knex) {
+    (0, columns_js_1.ulidPrimary)(t);
+    t.string('job', 191).notNullable();
+    t.string('run_key', 191).notNullable();
+    t.enu('status', [...table_names_js_1.SCHEDULER_RUN_STATUSES]).notNullable().defaultTo('running');
+    t.string('error', 500).nullable();
+    (0, columns_js_1.createdAtColumn)(t, knex, 'started_at');
+    (0, columns_js_1.datetime)(t, 'finished_at').nullable();
+    t.unique(['job', 'run_key']);
+    t.index(['job', 'started_at']);
+}
+/**
+ * Index that always leads with the scope column (TEN-4); `columns` follow in order, duplicates of
+ * the scope column are dropped.
+ *
+ * @example scopedIndex(t, 'workspace_id', ['status', 'created_at'])
+ */
+function scopedIndex(t, scopeColumn, columns = [], indexName) {
+    if (!scopeColumn)
+        throw new Error('scopedIndex needs a scope column');
+    t.index([scopeColumn, ...columns.filter((c) => c !== scopeColumn)], indexName);
+}
+//# sourceMappingURL=migration-helpers.js.map

package/dist/cjs/knex/migration-helpers.js.map

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

package/dist/cjs/logging/redact.js

@@ -6,11 +6,11 @@
  * or its plural. So `accessToken` and `Set-Cookie` are redacted while `pinned` or `spinner` are not.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REDACTED = exports.DEFAULT_ALLOW_KEYS = exports.DEFAULT_REDACT_KEYS = void 0;
-exports.maskPhoneForLog = maskPhoneForLog;
+exports.maskPhoneForLog = exports.REDACTED = exports.DEFAULT_ALLOW_KEYS = exports.DEFAULT_REDACT_KEYS = void 0;
 exports.maskPhonesInText = maskPhonesInText;
 exports.createKeyClassifier = createKeyClassifier;
 exports.redactValue = redactValue;
+const phone_js_1 = require("../common/phone.js");
 /** Words whose values are always replaced with `[REDACTED]`. Apps add their own via `redactKeys`. */
 exports.DEFAULT_REDACT_KEYS = [
     'password', 'pass', 'passphrase', 'token', 'secret', 'code', 'otp', 'authorization', 'cookie', 'credential',
@@ -26,18 +26,13 @@ const PHONE_IN_TEXT = /(?<![\w+]|\d\.)\+?\d{9,15}(?!\w|\.\d)/g;
 exports.REDACTED = '[REDACTED]';
 const MAX_DEPTH = 8;
 /**
- * Masks every digit except the last four (log rule; the UI uses `maskPhone` from common).
+ * Masks every digit except the last four; the same rule as `maskPhone` in common (one rule for logs and UI).
  *
  * @param value A phone number in any format.
  * @returns e.g. `********5678`; values with fewer than 5 digits are fully masked.
  * @example maskPhoneForLog('15551234567') // '*******4567'
  */
-function maskPhoneForLog(value) {
-    const digits = value.replace(/\D/g, '');
-    if (digits.length < 5)
-        return '*'.repeat(digits.length || 4);
-    return `${'*'.repeat(digits.length - 4)}${digits.slice(-4)}`;
-}
+exports.maskPhoneForLog = phone_js_1.maskPhone;
 /**
  * Masks phone-number-looking runs inside free text.
  *
@@ -46,7 +41,7 @@ function maskPhoneForLog(value) {
  * @example maskPhonesInText('OTP sent to 15551234567') // 'OTP sent to *******4567'
  */
 function maskPhonesInText(text) {
-    return text.replace(PHONE_IN_TEXT, maskPhoneForLog);
+    return text.replace(PHONE_IN_TEXT, exports.maskPhoneForLog);
 }
 function keyWords(key) {
     return key
@@ -108,7 +103,7 @@ function redactValue(value, classifier, depth = 0) {
         if (classifier.isSecret(key))
             out[key] = exports.REDACTED;
         else if (classifier.isPhone(key) && (typeof v === 'string' || typeof v === 'number'))
-            out[key] = maskPhoneForLog(String(v));
+            out[key] = (0, exports.maskPhoneForLog)(String(v));
         else
             out[key] = redactValue(v, classifier, depth + 1);
     }

package/dist/cjs/logging/redact.js.map

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

package/dist/cjs/messaging/base-consumer.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseConsumer = void 0;
+/**
+ * Base for a service's queue consumers (one class per queue in `src/consumers/`). The subclass declares
+ * its queue, bindings, payload schema, retry policy, dedupe and scope in the constructor and implements
+ * {@link BaseConsumer.handle}; `worker.ts` registers it. Validation, dedupe, retries, dead-lettering and
+ * context restore are done by {@link MessageConsumer}.
+ *
+ * @typeParam T Validated payload type.
+ * @typeParam TTx Dedupe transaction type (`DbExecutor` with `ProcessedEventsDeduper`).
+ * @example
+ * class ThingCreatedConsumer extends BaseConsumer<ThingCreated, DbExecutor> {
+ *   constructor(private readonly things: ThingService, dedupe: ProcessedEventsDeduper) {
+ *     super({ queue: 'thing-created', bindings: [{ exchange: 'events', routingKey: 'thing.created' }],
+ *       schema: thingCreatedSchema, dedupe, scopeFrom: (d) => ({ tenantId: d.tenantId }) });
+ *   }
+ *   protected handle({ data, tx, scope }: InboundMessage<ThingCreated, DbExecutor>) { return this.things.onCreated(scope!, data, tx!); }
+ * }
+ */
+class BaseConsumer {
+    definition;
+    constructor(definition) {
+        this.definition = definition;
+    }
+    /**
+     * Subscribes this consumer.
+     *
+     * @param consumer The service's {@link MessageConsumer}.
+     */
+    register(consumer) {
+        return consumer.subscribe({ ...this.definition, handler: (message) => this.handle(message) });
+    }
+}
+exports.BaseConsumer = BaseConsumer;
+//# sourceMappingURL=base-consumer.js.map

package/dist/cjs/messaging/base-consumer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-consumer.js","sourceRoot":"","sources":["../../../src/messaging/base-consumer.ts"],"names":[],"mappings":";;;AAKA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAsB,YAAY;IACS;IAAzC,YAAyC,UAAsC;QAAtC,eAAU,GAAV,UAAU,CAA4B;IAAG,CAAC;IAKnF;;;;OAIG;IACH,QAAQ,CAAC,QAAyB;QAChC,OAAO,QAAQ,CAAC,SAAS,CAAS,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxG,CAAC;CACF;AAdD,oCAcC"}

package/dist/cjs/messaging/consumer.js

@@ -1,128 +1,197 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageConsumer = void 0;
+exports.MessageConsumer = exports.DEFAULT_RETRY_BASE_DELAY_MS = exports.DEFAULT_MAX_ATTEMPTS = void 0;
+exports.retryDelays = retryDelays;
 const errors_js_1 = require("../common/errors.js");
-const index_js_1 = require("../logging/index.js");
+const id_js_1 = require("../common/id.js");
+const index_js_1 = require("../context/index.js");
+const index_js_2 = require("../logging/index.js");
 const envelope_js_1 = require("./envelope.js");
 const topology_js_1 = require("./topology.js");
 const RETRY_HEADER = 'x-retry-count';
-const DEFAULT_RETRY_DELAYS = [1000, 5000, 25_000];
+/** Total deliveries before a failing message is dead-lettered. */
+exports.DEFAULT_MAX_ATTEMPTS = 5;
+/** Base of the exponential retry delay (retry n waits base × 2^n). */
+exports.DEFAULT_RETRY_BASE_DELAY_MS = 1000;
 /**
- * Durable subscriptions with bounded retries and dead-lettering:
+ * Retry delays for `maxAttempts` deliveries: `base × 2^n` for n = 1 … maxAttempts − 1.
+ *
+ * @example retryDelays(5, 1000) // [2000, 4000, 8000, 16000]
+ */
+function retryDelays(maxAttempts = exports.DEFAULT_MAX_ATTEMPTS, baseMs = exports.DEFAULT_RETRY_BASE_DELAY_MS) {
+    if (!Number.isInteger(maxAttempts) || maxAttempts < 1)
+        throw new RangeError('maxAttempts must be a positive integer');
+    return Array.from({ length: maxAttempts - 1 }, (_, i) => baseMs * 2 ** (i + 1));
+}
+class Rejected extends Error {
+}
+/**
+ * Durable subscriptions with manual ack, bounded exponential retries and dead-lettering:
  *
  *   <queue> ──fail──▶ <queue>.retry.<delay>  (TTL, dead-letters back into <queue>)
- *           ──fail after last retry / non-retryable──▶ <queue>.dlq
+ *           ──last attempt / non-retryable / invalid──▶ service DLX ──▶ <queue>.dlq
  *
- * One fixed TTL per retry queue avoids head-of-line blocking of per-message TTLs.
+ * One fixed TTL per retry queue avoids head-of-line blocking of per-message TTLs. The main queue also
+ * names the service DLX, so broker-side rejects land in the same DLQ. Each message runs inside a request
+ * context carrying its correlation id, actor and restored scope.
  */
 class MessageConsumer {
     connection;
     topology;
+    service;
     handles = [];
     logger;
-    constructor(connection, topology, logger) {
+    /** Physical DLQ names for every subscription (for monitoring). */
+    deadLetterQueues = [];
+    constructor(connection, topology, service, logger) {
         this.connection = connection;
         this.topology = topology;
-        this.logger = logger ?? index_js_1.silentLogger;
+        this.service = service;
+        this.logger = logger ?? index_js_2.silentLogger;
     }
-    /** Physical DLQ names for every subscription (for monitoring). */
-    deadLetterQueues = [];
     async subscribe(options) {
-        const queue = this.topology.queue(options.queue);
-        const delays = options.retryDelaysMs ?? DEFAULT_RETRY_DELAYS;
-        const dlq = (0, topology_js_1.deadLetterQueueName)(queue);
-        this.deadLetterQueues.push(dlq);
+        const queue = this.topology.queueName(this.service, options.queue);
+        const route = {
+            queue,
+            consumerName: `${this.service}.${options.queue}`,
+            dlx: this.topology.deadLetterExchange(this.service),
+            dlq: (0, topology_js_1.deadLetterQueueName)(queue),
+            delays: retryDelays(options.maxAttempts, options.retryBaseDelayMs),
+        };
+        this.deadLetterQueues.push(route.dlq);
         const handle = await this.connection.registerChannel(`consumer:${queue}`, async (channel) => {
-            await channel.assertExchange(this.topology.eventsExchange, 'topic', { durable: true });
-            await channel.assertExchange(this.topology.commandsExchange, 'direct', { durable: true });
-            await channel.assertQueue(queue, { durable: true });
-            await channel.assertQueue(dlq, { durable: true });
-            for (const delay of delays) {
-                await channel.assertQueue((0, topology_js_1.retryQueueName)(queue, delay), {
-                    durable: true,
-                    arguments: { 'x-message-ttl': delay, 'x-dead-letter-exchange': '', 'x-dead-letter-routing-key': queue },
-                });
-            }
-            for (const binding of options.bindings) {
-                if (binding.exchange === 'events') {
-                    await channel.bindQueue(queue, this.topology.eventsExchange, binding.routingKey);
-                }
-                else {
-                    await channel.bindQueue(queue, this.topology.commandsExchange, this.topology.queue(binding.routingKey));
-                }
-            }
+            await this.declare(channel, route, options.bindings);
             await channel.prefetch(options.prefetch ?? 10);
             await channel.consume(queue, (msg) => {
                 if (msg)
-                    void this.dispatch(channel, queue, delays, dlq, msg, options);
-            });
+                    void this.dispatch(channel, route, msg, options);
+            }, { noAck: false });
         });
         this.handles.push(handle);
         this.logger.info('Subscribed', { queue, bindings: options.bindings.map((b) => `${b.exchange}:${b.routingKey}`) });
     }
-    async dispatch(channel, queue, delays, dlq, msg, options) {
-        const attempt = Number(msg.properties.headers?.[RETRY_HEADER] ?? 0);
+    async declare(channel, route, bindings) {
+        const { topology } = this;
+        await channel.assertExchange(topology.eventsExchange, 'topic', { durable: true });
+        await channel.assertExchange(topology.commandsExchange, 'direct', { durable: true });
+        await channel.assertExchange(route.dlx, 'direct', { durable: true });
+        await channel.assertQueue(route.dlq, { durable: true });
+        await channel.bindQueue(route.dlq, route.dlx, route.dlq);
+        await channel.assertQueue(route.queue, { durable: true, arguments: { 'x-dead-letter-exchange': route.dlx, 'x-dead-letter-routing-key': route.dlq } });
+        for (const delay of route.delays) {
+            await channel.assertQueue((0, topology_js_1.retryQueueName)(route.queue, delay), {
+                durable: true,
+                arguments: { 'x-message-ttl': delay, 'x-dead-letter-exchange': '', 'x-dead-letter-routing-key': route.queue },
+            });
+        }
+        for (const binding of bindings) {
+            if (binding.exchange === 'events')
+                await channel.bindQueue(route.queue, topology.eventsExchange, binding.routingKey);
+            else
+                await channel.bindQueue(route.queue, topology.commandsExchange, topology.queue(binding.routingKey));
+        }
+    }
+    async dispatch(channel, route, msg, options) {
+        const attempt = Number(msg.properties.headers?.[RETRY_HEADER] ?? 0) + 1;
+        let prepared;
+        try {
+            prepared = this.prepare(msg, options);
+        }
+        catch (error) {
+            this.deadLetter(channel, route, msg, error.message);
+            return;
+        }
+        const correlationId = this.correlationIdOf(msg);
+        const context = { correlationId, service: this.service, userId: prepared.actorUserId, scopes: prepared.scope ? { ...prepared.scope } : undefined };
+        try {
+            const outcome = await (0, index_js_1.runWithContext)(context, () => this.handle(route, msg, prepared, attempt, options));
+            if (outcome === 'duplicate')
+                this.logger.debug('Duplicate message skipped', { queue: route.queue, eventId: prepared.eventId, correlationId });
+            channel.ack(msg);
+        }
+        catch (error) {
+            const retryable = !(0, errors_js_1.isAppError)(error) || error.retryable;
+            const reason = error?.message ?? String(error);
+            this.logger.warn('Message handler failed', { queue: route.queue, attempt, retryable, eventId: prepared.eventId, correlationId, error: reason });
+            this.retryOrDeadLetter(channel, route, msg, attempt, reason, retryable);
+        }
+    }
+    /** Parses, validates and extracts scope; throws `Rejected` for messages that can never succeed. */
+    prepare(msg, options) {
         let parsed;
         try {
             parsed = JSON.parse(msg.content.toString('utf8'));
         }
         catch {
-            this.deadLetter(channel, dlq, msg, 'Malformed JSON');
-            return;
+            throw new Rejected('Malformed JSON');
         }
         const envelope = (0, envelope_js_1.isEnvelope)(parsed) ? parsed : null;
-        let data = envelope ? envelope.data : parsed;
+        const split = envelope ? (0, envelope_js_1.splitEnvelopeData)(envelope) : null;
+        let data = split ? split.payload : parsed;
         if (options.schema) {
             const result = options.schema.safeParse(data);
             if (!result.success) {
-                this.deadLetter(channel, dlq, msg, `Schema validation failed: ${result.error.issues.map((i) => i.path.join('.') + ' ' + i.message).join('; ')}`);
-                return;
+                throw new Rejected(`Schema validation failed: ${result.error.issues.map((i) => `${i.path.join('.')} ${i.message}`).join('; ')}`);
             }
             data = result.data;
         }
-        const idemKey = options.idempotency && envelope ? `${queue}:${envelope.eventId}` : null;
-        if (idemKey && options.idempotency) {
-            const claim = await options.idempotency.begin(idemKey, 300).catch(() => 'claimed');
-            if (claim === 'done') {
-                this.logger.debug('Duplicate message skipped', { queue, eventId: envelope?.eventId });
-                channel.ack(msg);
-                return;
-            }
-            if (claim === 'in-flight') {
-                this.retryOrDeadLetter(channel, queue, delays, dlq, msg, attempt, 'Duplicate in flight', true);
-                return;
-            }
-        }
+        const messageId = typeof msg.properties.messageId === 'string' ? msg.properties.messageId : undefined;
+        const eventId = split?.meta.eventId ?? messageId;
+        if (options.dedupe && !eventId)
+            throw new Rejected('Missing event id');
+        const actor = split?.meta.actorUserId;
+        return { data: data, envelope, eventId, actorUserId: actor ?? undefined, scope: this.scopeOf(data, options.scopeFrom) };
+    }
+    scopeOf(data, scopeFrom) {
+        if (!scopeFrom)
+            return undefined;
+        let values;
         try {
-            await options.handler({ data: data, envelope, routingKey: msg.fields.routingKey, attempt, raw: msg });
-            if (idemKey)
-                await options.idempotency.complete(idemKey, options.idempotencyTtlSec ?? 7 * 86_400).catch(() => undefined);
-            channel.ack(msg);
+            values = scopeFrom(data);
         }
-        catch (error) {
-            if (idemKey)
-                await options.idempotency.abandon(idemKey).catch(() => undefined);
-            const retryable = !(0, errors_js_1.isAppError)(error) || error.retryable;
-            const reason = error?.message ?? String(error);
-            this.logger.warn('Message handler failed', { queue, attempt, retryable, eventId: envelope?.eventId, error: reason });
-            this.retryOrDeadLetter(channel, queue, delays, dlq, msg, attempt, reason, retryable);
+        catch {
+            throw new Rejected('Scope could not be read from the message');
+        }
+        const entries = Object.entries(values);
+        const missing = entries.filter(([, v]) => typeof v !== 'string' || v.length === 0).map(([k]) => k);
+        if (entries.length === 0 || missing.length > 0)
+            throw new Rejected(`Missing scope: ${missing.join(', ') || '(none returned)'}`);
+        return Object.freeze(Object.fromEntries(entries));
+    }
+    correlationIdOf(msg) {
+        const header = msg.properties.headers?.[envelope_js_1.CORRELATION_HEADER];
+        if (typeof header === 'string' && header)
+            return header;
+        const prop = msg.properties.correlationId;
+        return typeof prop === 'string' && prop ? prop : (0, id_js_1.newId)();
+    }
+    async handle(route, msg, prepared, attempt, options) {
+        const call = (tx) => options.handler({
+            data: prepared.data, envelope: prepared.envelope, eventId: prepared.eventId, routingKey: msg.fields.routingKey,
+            attempt, tx, scope: prepared.scope, raw: msg,
+        });
+        if (!options.dedupe) {
+            await call(undefined);
+            return 'processed';
         }
+        return options.dedupe.run(route.consumerName, prepared.eventId, call);
     }
-    retryOrDeadLetter(channel, queue, delays, dlq, msg, attempt, reason, retryable) {
-        if (retryable && attempt < delays.length) {
-            channel.sendToQueue((0, topology_js_1.retryQueueName)(queue, delays[attempt]), msg.content, {
+    retryOrDeadLetter(channel, route, msg, attempt, reason, retryable) {
+        const delay = route.delays[attempt - 1];
+        if (retryable && delay !== undefined) {
+            channel.sendToQueue((0, topology_js_1.retryQueueName)(route.queue, delay), msg.content, {
                 ...msg.properties,
                 persistent: true,
-                headers: { ...(msg.properties.headers ?? {}), [RETRY_HEADER]: attempt + 1, 'x-last-error': reason.slice(0, 500), 'x-original-routing-key': msg.fields.routingKey },
+                headers: { ...(msg.properties.headers ?? {}), [RETRY_HEADER]: attempt, 'x-last-error': reason.slice(0, 500), 'x-original-routing-key': msg.fields.routingKey },
             });
             channel.ack(msg);
             return;
         }
-        this.deadLetter(channel, dlq, msg, reason);
+        this.deadLetter(channel, route, msg, reason);
     }
-    deadLetter(channel, dlq, msg, reason) {
-        this.logger.error('Message dead-lettered', { dlq, routingKey: msg.fields.routingKey, reason });
-        channel.sendToQueue(dlq, msg.content, {
+    deadLetter(channel, route, msg, reason) {
+        this.logger.error('Message dead-lettered', { dlq: route.dlq, routingKey: msg.fields.routingKey, reason });
+        channel.publish(route.dlx, route.dlq, msg.content, {
             ...msg.properties,
             persistent: true,
             headers: { ...(msg.properties.headers ?? {}), 'x-dead-letter-reason': reason.slice(0, 1000), 'x-failed-at': new Date().toISOString(), 'x-original-routing-key': msg.fields.routingKey },

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

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

package/dist/cjs/messaging/envelope.js

@@ -1,23 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CORRELATION_HEADER = exports.RESERVED_ENVELOPE_FIELDS = void 0;
 exports.buildEnvelope = buildEnvelope;
 exports.isEnvelope = isEnvelope;
+exports.splitEnvelopeData = splitEnvelopeData;
+exports.outgoingCorrelationId = outgoingCorrelationId;
 const id_js_1 = require("../common/id.js");
-function buildEnvelope(type, data, source, meta = {}) {
-    return {
+const index_js_1 = require("../context/index.js");
+const index_js_2 = require("../identity/index.js");
+/** Names reserved in an envelope's `data`; a payload field with one of these names is overwritten. */
+exports.RESERVED_ENVELOPE_FIELDS = ['eventId', 'version', 'actorUserId'];
+/** AMQP header that carries the correlation id between services. */
+exports.CORRELATION_HEADER = index_js_2.CONTEXT_HEADERS.CORRELATION_ID;
+/**
+ * Builds `{ routingKey, data: { ...payload, eventId, version, actorUserId? }, timestamp }`.
+ *
+ * @param routingKey Event or command name.
+ * @param data Payload fields (an object); {@link RESERVED_ENVELOPE_FIELDS} are set by the envelope.
+ * @param meta Optional id, version and actor.
+ * @returns The envelope.
+ * @example const envelope = buildEnvelope('thing.created', { thingId }, { actorUserId: user.id });
+ */
+function buildEnvelope(routingKey, data, meta = {}) {
+    const actorUserId = meta.actorUserId !== undefined ? meta.actorUserId : (0, index_js_1.getRequestContext)()?.userId;
+    const reserved = {
         eventId: meta.eventId ?? (0, id_js_1.newId)(),
-        type,
         version: meta.version ?? 1,
-        occurredAt: new Date().toISOString(),
-        source,
-        ...(meta.correlationId ? { correlationId: meta.correlationId } : {}),
-        actor: { userId: meta.actorId ?? null },
-        ...(meta.aggregate ? { aggregate: meta.aggregate } : {}),
-        data,
+        ...(actorUserId !== undefined ? { actorUserId } : {}),
     };
+    return { routingKey, data: { ...data, ...reserved }, timestamp: new Date().toISOString() };
 }
+/**
+ * True when `value` has the envelope shape (routing key, timestamp and `data.eventId`).
+ *
+ * @param value Parsed message body.
+ * @returns Whether it is an {@link EventEnvelope}.
+ */
 function isEnvelope(value) {
     const v = value;
-    return !!v && typeof v === 'object' && typeof v.eventId === 'string' && typeof v.type === 'string' && 'data' in v;
+    return !!v && typeof v === 'object'
+        && typeof v.routingKey === 'string'
+        && typeof v.timestamp === 'string'
+        && !!v.data && typeof v.data === 'object'
+        && typeof v.data.eventId === 'string';
+}
+/**
+ * Splits an envelope's `data` into the payload and the reserved fields.
+ *
+ * @param envelope A received envelope.
+ * @returns `payload` (without reserved fields) and `meta` ({@link EnvelopeData}).
+ */
+function splitEnvelopeData(envelope) {
+    const { eventId, version, actorUserId, ...payload } = envelope.data;
+    return { payload, meta: { eventId, version, ...(actorUserId !== undefined ? { actorUserId } : {}) } };
+}
+/**
+ * The correlation id to send: the explicit one, else the active request context's.
+ *
+ * @param meta Optional explicit value.
+ * @returns The id, or undefined outside a request/consumer context.
+ */
+function outgoingCorrelationId(meta) {
+    return meta?.correlationId ?? (0, index_js_1.getRequestContext)()?.correlationId;
 }
 //# sourceMappingURL=envelope.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../../src/messaging/envelope.ts"],"names":[],"mappings":";;AAYA,sCAYC;AAED,gCAGC;AA7BD,2CAAwC;AAYxC,SAAgB,aAAa,CAAI,IAAY,EAAE,IAAO,EAAE,MAAc,EAAE,OAAqB,EAAE;IAC7F,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAA,aAAK,GAAE;QAChC,IAAI;QACJ,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC;QAC1B,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACpC,MAAM;QACN,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,IAAI;KACL,CAAC;AACJ,CAAC;AAED,SAAgB,UAAU,CAAC,KAAc;IACvC,MAAM,CAAC,GAAG,KAAsC,CAAC;IACjD,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,IAAI,CAAC,CAAC;AACpH,CAAC"}
+{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../../src/messaging/envelope.ts"],"names":[],"mappings":";;;AAoCA,sCAQC;AAQD,gCAOC;AAQD,8CAGC;AAQD,sDAEC;AAhFD,2CAAwC;AACxC,kDAAwD;AACxD,mDAAuD;AAGvD,sGAAsG;AACzF,QAAA,wBAAwB,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,CAAU,CAAC;AAEvF,oEAAoE;AACvD,QAAA,kBAAkB,GAAG,0BAAe,CAAC,cAAc,CAAC;AAkBjE;;;;;;;;GAQG;AACH,SAAgB,aAAa,CAAmB,UAAkB,EAAE,IAAO,EAAE,OAAqB,EAAE;IAClG,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,4BAAiB,GAAE,EAAE,MAAM,CAAC;IACpG,MAAM,QAAQ,GAAiB;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAA,aAAK,GAAE;QAChC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC;QAC1B,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC;IACF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;AAC7F,CAAC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,KAAc;IACvC,MAAM,CAAC,GAAG,KAAsC,CAAC;IACjD,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;WAC9B,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ;WAChC,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ;WAC/B,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;WACtC,OAAQ,CAAC,CAAC,IAA8B,CAAC,OAAO,KAAK,QAAQ,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,QAAuB;IACvD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;AACxG,CAAC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,IAA0C;IAC9E,OAAO,IAAI,EAAE,aAAa,IAAI,IAAA,4BAAiB,GAAE,EAAE,aAAa,CAAC;AACnE,CAAC"}