@relaybus/rabbitmq 0.1.0 → 0.2.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { RelayBusError, NonRetryableError, ConfigurationError, toErrorInfo, createRetryPolicy, toMilliseconds, computeRetryDelay, isRetryableError } from '@relaybus/core';
+import { RelayBusError, NonRetryableError, assertEventType, ConfigurationError, toErrorInfo, createRetryPolicy, toMilliseconds, computeRetryDelay, isRetryableError } from '@relaybus/core';
 
 // src/errors.ts
 var RabbitMqUnavailableError = class extends RelayBusError {
@@ -178,9 +178,417 @@ var ConnectionSupervisor = class {
     }
   }
 };
+
+// src/json-payload.ts
+function assertJsonPayload(payload, eventId) {
+  visit(payload, "$", /* @__PURE__ */ new Set(), eventId);
+}
+function visit(value, path, ancestors, eventId) {
+  switch (typeof value) {
+    case "string":
+    case "boolean":
+      return;
+    case "number":
+      if (!Number.isFinite(value)) {
+        throw refuse(eventId, path, `is ${value}, which JSON turns into null`);
+      }
+      return;
+    case "object":
+      if (value !== null) {
+        visitObject(value, path, ancestors, eventId);
+      }
+      return;
+    default:
+      throw refuse(eventId, path, `is ${typeof value}, which JSON cannot represent`);
+  }
+}
+function visitObject(value, path, ancestors, eventId) {
+  if (ancestors.has(value)) {
+    throw refuse(eventId, path, "is a circular reference");
+  }
+  ancestors.add(value);
+  if (Array.isArray(value)) {
+    for (let index = 0; index < value.length; index += 1) {
+      if (!(index in value)) {
+        throw refuse(eventId, `${path}[${index}]`, "is an array hole, which JSON turns into null");
+      }
+      visit(value[index], `${path}[${index}]`, ancestors, eventId);
+    }
+  } else {
+    const prototype = Object.getPrototypeOf(value);
+    if (prototype !== Object.prototype && prototype !== null) {
+      throw refuse(eventId, path, "is not a plain object (class instance, Date, Map or Set)");
+    }
+    if (Object.getOwnPropertySymbols(value).length > 0) {
+      throw refuse(eventId, path, "has a symbol key, which JSON drops");
+    }
+    for (const key of Object.keys(value)) {
+      visit(value[key], `${path}.${key}`, ancestors, eventId);
+    }
+  }
+  ancestors.delete(value);
+}
+function refuse(eventId, path, reason) {
+  return new UnserializablePayloadError(
+    `Event ${eventId} has a payload JSON cannot represent faithfully: ${path} ${reason}`
+  );
+}
+
+// src/wire-format.ts
+var ATTRIBUTE_PREFIX = "cloudEvents:";
+var EVENT_HEADER_PREFIX = "relaybus:";
+var SPEC_VERSION = "1.0";
+var JSON_CONTENT_TYPE = "application/json";
+var SHORT_STRING_LIMIT_BYTES = 255;
+var RFC3339_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/i;
+function encodeEnvelope(envelope) {
+  assertJsonPayload(envelope.payload, envelope.id);
+  assertShortString("Event id", envelope.id);
+  const headers = {
+    [`${ATTRIBUTE_PREFIX}specversion`]: SPEC_VERSION,
+    [`${ATTRIBUTE_PREFIX}id`]: envelope.id,
+    [`${ATTRIBUTE_PREFIX}type`]: envelope.type,
+    [`${ATTRIBUTE_PREFIX}source`]: envelope.source,
+    [`${ATTRIBUTE_PREFIX}time`]: envelope.occurredAt.toISOString(),
+    [`${ATTRIBUTE_PREFIX}datacontenttype`]: JSON_CONTENT_TYPE
+  };
+  if (envelope.key !== null) {
+    headers[`${ATTRIBUTE_PREFIX}subject`] = envelope.key;
+  }
+  if (envelope.causationId !== null) {
+    headers[`${ATTRIBUTE_PREFIX}causationid`] = envelope.causationId;
+  }
+  if (envelope.correlationId !== null) {
+    headers[`${ATTRIBUTE_PREFIX}correlationid`] = envelope.correlationId;
+  }
+  for (const [name, value] of Object.entries(envelope.headers)) {
+    assertShortString(
+      `Header name '${EVENT_HEADER_PREFIX}${name}'`,
+      `${EVENT_HEADER_PREFIX}${name}`
+    );
+    headers[`${EVENT_HEADER_PREFIX}${name}`] = value;
+  }
+  return {
+    content: Buffer.from(JSON.stringify(envelope.payload), "utf8"),
+    options: {
+      contentType: JSON_CONTENT_TYPE,
+      persistent: true,
+      messageId: envelope.id,
+      timestamp: Math.floor(envelope.occurredAt.getTime() / 1e3),
+      ...mirror("type", envelope.type),
+      ...mirror("appId", envelope.source),
+      ...envelope.correlationId === null ? {} : mirror("correlationId", envelope.correlationId),
+      headers
+    }
+  };
+}
+function assertShortString(label, value) {
+  const bytes = Buffer.byteLength(value, "utf8");
+  if (bytes > SHORT_STRING_LIMIT_BYTES) {
+    throw new AmqpLimitExceededError(
+      `${label} is ${bytes} bytes, above the AMQP limit of ${SHORT_STRING_LIMIT_BYTES} bytes`
+    );
+  }
+}
+function mirror(name, value) {
+  return Buffer.byteLength(value, "utf8") > SHORT_STRING_LIMIT_BYTES ? {} : { [name]: value };
+}
+function decodeEnvelope(message) {
+  const { properties } = message;
+  const attributes = properties.headers ?? {};
+  if (attributes[`${ATTRIBUTE_PREFIX}specversion`] !== SPEC_VERSION) {
+    throw new MalformedMessageError(
+      `Message is not a CloudEvents ${SPEC_VERSION} event (header ${ATTRIBUTE_PREFIX}specversion)`
+    );
+  }
+  return {
+    id: required("id", text(attributes[`${ATTRIBUTE_PREFIX}id`]) ?? text(properties.messageId)),
+    type: required("type", text(attributes[`${ATTRIBUTE_PREFIX}type`]) ?? text(properties.type)),
+    source: required(
+      "source",
+      text(attributes[`${ATTRIBUTE_PREFIX}source`]) ?? text(properties.appId)
+    ),
+    key: text(attributes[`${ATTRIBUTE_PREFIX}subject`]) ?? null,
+    payload: parsePayload(message.content),
+    headers: extractEventHeaders(attributes),
+    correlationId: text(attributes[`${ATTRIBUTE_PREFIX}correlationid`]) ?? text(properties.correlationId) ?? null,
+    causationId: text(attributes[`${ATTRIBUTE_PREFIX}causationid`]) ?? null,
+    occurredAt: parseTime(attributes[`${ATTRIBUTE_PREFIX}time`], properties.timestamp)
+  };
+}
+function extractEventHeaders(attributes) {
+  const headers = {};
+  for (const [name, value] of Object.entries(attributes)) {
+    if (name.startsWith(EVENT_HEADER_PREFIX) && typeof value === "string") {
+      Object.defineProperty(headers, name.slice(EVENT_HEADER_PREFIX.length), {
+        value,
+        enumerable: true,
+        writable: true,
+        configurable: true
+      });
+    }
+  }
+  return headers;
+}
+function parsePayload(content) {
+  try {
+    return JSON.parse(content.toString("utf8"));
+  } catch {
+    throw new MalformedMessageError("Message body is not valid JSON");
+  }
+}
+function parseTime(rawTime, timestampSeconds) {
+  if (rawTime === void 0) {
+    const fallback = typeof timestampSeconds === "number" ? new Date(timestampSeconds * 1e3) : void 0;
+    if (fallback === void 0 || Number.isNaN(fallback.getTime())) {
+      throw new MalformedMessageError("Message has no valid time (header cloudEvents:time)");
+    }
+    return fallback;
+  }
+  const occurredAt = typeof rawTime === "string" && RFC3339_PATTERN.test(rawTime) ? new Date(rawTime) : void 0;
+  if (occurredAt === void 0 || Number.isNaN(occurredAt.getTime())) {
+    throw new MalformedMessageError(
+      "Message time (header cloudEvents:time) is not an RFC 3339 timestamp"
+    );
+  }
+  return occurredAt;
+}
+function text(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function required(attribute, value) {
+  if (value === void 0 || value.length === 0) {
+    throw new MalformedMessageError(
+      `Message has no ${attribute} (header ${ATTRIBUTE_PREFIX}${attribute})`
+    );
+  }
+  return value;
+}
+
+// src/inbound-decoders.ts
+var STRUCTURED_MEDIA_TYPE = "application/cloudevents+json";
+var strictUtf8 = new TextDecoder("utf-8", { fatal: true });
+var SPEC_VERSION2 = "1.0";
+var SPEC_VERSION_HEADER = "cloudEvents:specversion";
+var INTERNAL_HEADER_PREFIXES = ["x-relaybus-", "x-first-death-", "x-last-death-"];
+var STRUCTURED_ATTRIBUTES = /* @__PURE__ */ new Set([
+  "specversion",
+  "id",
+  "type",
+  "source",
+  "time",
+  "subject",
+  "datacontenttype",
+  "dataschema",
+  "data",
+  "data_base64",
+  "correlationid",
+  "causationid"
+]);
+function decodeCloudEvent(message) {
+  if (mediaTypeOf(message.properties.contentType) !== STRUCTURED_MEDIA_TYPE) {
+    return decodeEnvelope(message);
+  }
+  const body = parseJsonBody(message.content);
+  if (!isJsonObject(body)) {
+    throw new MalformedMessageError("A structured CloudEvent must be a JSON object");
+  }
+  if (body["specversion"] !== SPEC_VERSION2) {
+    throw new MalformedMessageError(`specversion must be '${SPEC_VERSION2}'`);
+  }
+  const type = requiredAttribute(body, "type");
+  assertValidType(type, "type");
+  assertJsonDataContentType(optionalAttribute(body, "datacontenttype"));
+  if (Object.hasOwn(body, "data_base64")) {
+    throw new MalformedMessageError(
+      "data_base64 is not supported: relaybus payloads are JSON, send them as data"
+    );
+  }
+  const time = optionalAttribute(body, "time");
+  return {
+    id: requiredAttribute(body, "id"),
+    type,
+    source: requiredAttribute(body, "source"),
+    key: optionalAttribute(body, "subject") ?? null,
+    payload: Object.hasOwn(body, "data") ? body["data"] : null,
+    headers: { ...readForeignHeaders(message.properties), ...extensionAttributes(body) },
+    correlationId: optionalAttribute(body, "correlationid") ?? null,
+    causationId: optionalAttribute(body, "causationid") ?? null,
+    occurredAt: time === void 0 ? propertyTimeOrNow(message.properties) : parseTime2(time)
+  };
+}
+function plainJsonDecoder(options) {
+  if (typeof options.type === "string") {
+    assertEventType(options.type);
+  }
+  return (message) => {
+    const { properties } = message;
+    if (properties.headers?.[SPEC_VERSION_HEADER] !== void 0 || mediaTypeOf(properties.contentType) === STRUCTURED_MEDIA_TYPE) {
+      return decodeCloudEvent(message);
+    }
+    const plain = {
+      routingKey: message.fields.routingKey,
+      properties,
+      headers: readForeignHeaders(properties),
+      payload: parseJsonBody(message.content)
+    };
+    const type = resolveText(options.type, plain, "type");
+    if (type === void 0) {
+      throw new MalformedMessageError("Message has no event type: the type option found none");
+    }
+    assertValidType(type, "The event type");
+    const id = resolveText(options.id, plain, "id") ?? nonEmptyText(properties.messageId);
+    if (id === void 0) {
+      throw new MalformedMessageError(
+        "Message has no id: set the messageId property on the producer or configure the id option"
+      );
+    }
+    return {
+      id,
+      type,
+      source: resolveText(options.source, plain, "source") ?? defaultSource(message),
+      key: resolveText(options.key, plain, "key") ?? null,
+      payload: plain.payload,
+      headers: plain.headers,
+      correlationId: null,
+      causationId: null,
+      occurredAt: resolveOccurredAt(options.occurredAt, plain)
+    };
+  };
+}
+function completeDecodedEvent(decoded, message) {
+  if (typeof decoded !== "object" || decoded === null) {
+    throw new MalformedMessageError("The decoder must return an event object synchronously");
+  }
+  if ("then" in decoded) {
+    observeRejection(decoded);
+    throw new MalformedMessageError("The decoder must return an event object synchronously");
+  }
+  const event = decoded;
+  return {
+    id: event.id,
+    type: event.type,
+    source: event.source ?? defaultSource(message),
+    key: event.key ?? null,
+    payload: event.payload,
+    headers: event.headers ?? {},
+    correlationId: event.correlationId ?? null,
+    causationId: event.causationId ?? null,
+    occurredAt: event.occurredAt ?? propertyTimeOrNow(message.properties)
+  };
+}
+function parseJsonBody(content) {
+  let text2;
+  try {
+    text2 = strictUtf8.decode(content);
+  } catch {
+    throw new MalformedMessageError("Message body is not valid UTF-8");
+  }
+  try {
+    return JSON.parse(text2);
+  } catch {
+    throw new MalformedMessageError("Message body is not valid JSON");
+  }
+}
+function mediaTypeOf(contentType) {
+  return typeof contentType === "string" ? contentType.split(";")[0].trim().toLowerCase() : void 0;
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function nonEmptyText(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function defaultSource(message) {
+  return nonEmptyText(message.properties.appId) ?? message.fields.routingKey;
+}
+function optionalAttribute(body, name) {
+  const value = body[name];
+  if (value !== void 0 && typeof value !== "string") {
+    throw new MalformedMessageError(`Attribute '${name}' must be a string`);
+  }
+  return value;
+}
+function requiredAttribute(body, name) {
+  const value = optionalAttribute(body, name);
+  if (value === void 0 || value.length === 0) {
+    throw new MalformedMessageError(`Attribute '${name}' is missing or empty`);
+  }
+  return value;
+}
+function assertValidType(type, label) {
+  try {
+    assertEventType(type);
+  } catch (error) {
+    throw new MalformedMessageError(
+      `${label} is not a valid event type: ${error.message}`
+    );
+  }
+}
+function assertJsonDataContentType(dataContentType) {
+  const mediaType = mediaTypeOf(dataContentType);
+  if (mediaType !== void 0 && mediaType !== "application/json" && mediaType !== "text/json" && !mediaType.endsWith("+json")) {
+    throw new MalformedMessageError(`datacontenttype must be JSON, received '${dataContentType}'`);
+  }
+}
+function parseTime2(text2) {
+  const time = new Date(text2);
+  if (!RFC3339_PATTERN.test(text2) || Number.isNaN(time.getTime())) {
+    throw new MalformedMessageError(`time is not an RFC 3339 timestamp: '${text2}'`);
+  }
+  return time;
+}
+function propertyTimeOrNow(properties) {
+  const { timestamp } = properties;
+  return typeof timestamp === "number" && Number.isFinite(timestamp) ? new Date(timestamp * 1e3) : /* @__PURE__ */ new Date();
+}
+function extensionAttributes(body) {
+  return Object.fromEntries(
+    Object.entries(body).filter(
+      (entry) => !STRUCTURED_ATTRIBUTES.has(entry[0]) && typeof entry[1] === "string"
+    )
+  );
+}
+function readForeignHeaders(properties) {
+  return Object.fromEntries(
+    Object.entries(properties.headers ?? {}).filter(
+      (entry) => typeof entry[1] === "string" && !INTERNAL_HEADER_PREFIXES.some((prefix) => entry[0].startsWith(prefix))
+    )
+  );
+}
+function resolveText(option, message, name) {
+  const value = typeof option === "function" ? option(message) : option;
+  if (value === void 0 || value === null) {
+    return void 0;
+  }
+  if (typeof value !== "string") {
+    observeRejection(value);
+    throw new MalformedMessageError(
+      `The ${name} option returned ${typeof value}, expected a string`
+    );
+  }
+  return value.length === 0 ? void 0 : value;
+}
+function resolveOccurredAt(option, message) {
+  const value = option?.(message);
+  if (value === void 0) {
+    return propertyTimeOrNow(message.properties);
+  }
+  if (!(value instanceof Date) || Number.isNaN(value.getTime())) {
+    observeRejection(value);
+    throw new MalformedMessageError("The occurredAt option returned no valid Date");
+  }
+  return value;
+}
+function observeRejection(value) {
+  if (typeof value === "object" && value !== null && "then" in value) {
+    Promise.resolve(value).catch(() => void 0);
+  }
+}
 var REDELIVERIES_HEADER = "x-relaybus-redeliveries";
 var FIRST_FAILURE_HEADER = "x-relaybus-first-failure-at";
 var DEAD_LETTER_REASON_HEADER = "x-relaybus-dead-letter-reason";
+var ORIGINAL_ROUTING_KEY_HEADER = "x-relaybus-routing-key";
 var RELAYBUS_STATE_HEADERS = [REDELIVERIES_HEADER, FIRST_FAILURE_HEADER];
 var BROKER_COUNTER_HEADERS = ["x-delivery-count", "x-acquired-count"];
 var MAXIMUM_LADDER_TIERS = 16;
@@ -217,7 +625,7 @@ function chooseRetryTier(ladder, delayMs, random) {
   return random() < (delayMs - lower) / (upper - lower) ? upper : lower;
 }
 function readCounterHeader(message, name) {
-  const value = message.properties.headers[name];
+  const value = message.properties.headers?.[name];
   const parsed = typeof value === "string" && /^\d+$/.test(value) ? Number(value) : value;
   return typeof parsed === "number" && Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
 }
@@ -246,6 +654,14 @@ function copyForRepublish(message, headerChanges) {
     }
   };
 }
+function originalRoutingKey(message) {
+  const original = message.properties.headers?.[ORIGINAL_ROUTING_KEY_HEADER];
+  return typeof original === "string" ? original : message.fields.routingKey;
+}
+function withOriginalRoutingKey(message) {
+  const routingKey = originalRoutingKey(message);
+  return routingKey === message.fields.routingKey ? message : { ...message, fields: { ...message.fields, routingKey } };
+}
 
 // src/options.ts
 var DEFAULT_HANDLER_RETRY = {
@@ -314,6 +730,7 @@ function resolveSettings(options) {
     allowUnroutable: options.allowUnroutable ?? false,
     publishTimeoutMs: positiveDuration(options.publishTimeout ?? "30s", "publishTimeout"),
     shutdownTimeoutMs: toMilliseconds(options.shutdownTimeout ?? "30s", "shutdownTimeout"),
+    decode: resolveDecode(options.decode),
     logger: options.logger ?? console,
     random: options.random ?? Math.random
   };
@@ -329,6 +746,12 @@ function resolveQueueName(settings) {
   }
   return `${settings.queuePrefix}.${settings.consumerGroup}`;
 }
+function resolveDecode(decode) {
+  if (decode === void 0) {
+    return decodeEnvelope;
+  }
+  return (message) => completeDecodedEvent(decode(message), message);
+}
 function resolveConnect(options) {
   const { url, connect } = options;
   if (url === void 0 === (connect === void 0)) {
@@ -416,192 +839,6 @@ async function assertConsumerTopology(channel, topology) {
   }
 }
 
-// src/json-payload.ts
-function assertJsonPayload(payload, eventId) {
-  visit(payload, "$", /* @__PURE__ */ new Set(), eventId);
-}
-function visit(value, path, ancestors, eventId) {
-  switch (typeof value) {
-    case "string":
-    case "boolean":
-      return;
-    case "number":
-      if (!Number.isFinite(value)) {
-        throw refuse(eventId, path, `is ${value}, which JSON turns into null`);
-      }
-      return;
-    case "object":
-      if (value !== null) {
-        visitObject(value, path, ancestors, eventId);
-      }
-      return;
-    default:
-      throw refuse(eventId, path, `is ${typeof value}, which JSON cannot represent`);
-  }
-}
-function visitObject(value, path, ancestors, eventId) {
-  if (ancestors.has(value)) {
-    throw refuse(eventId, path, "is a circular reference");
-  }
-  ancestors.add(value);
-  if (Array.isArray(value)) {
-    for (let index = 0; index < value.length; index += 1) {
-      if (!(index in value)) {
-        throw refuse(eventId, `${path}[${index}]`, "is an array hole, which JSON turns into null");
-      }
-      visit(value[index], `${path}[${index}]`, ancestors, eventId);
-    }
-  } else {
-    const prototype = Object.getPrototypeOf(value);
-    if (prototype !== Object.prototype && prototype !== null) {
-      throw refuse(eventId, path, "is not a plain object (class instance, Date, Map or Set)");
-    }
-    if (Object.getOwnPropertySymbols(value).length > 0) {
-      throw refuse(eventId, path, "has a symbol key, which JSON drops");
-    }
-    for (const key of Object.keys(value)) {
-      visit(value[key], `${path}.${key}`, ancestors, eventId);
-    }
-  }
-  ancestors.delete(value);
-}
-function refuse(eventId, path, reason) {
-  return new UnserializablePayloadError(
-    `Event ${eventId} has a payload JSON cannot represent faithfully: ${path} ${reason}`
-  );
-}
-
-// src/wire-format.ts
-var ATTRIBUTE_PREFIX = "cloudEvents:";
-var EVENT_HEADER_PREFIX = "relaybus:";
-var SPEC_VERSION = "1.0";
-var JSON_CONTENT_TYPE = "application/json";
-var SHORT_STRING_LIMIT_BYTES = 255;
-var RFC3339_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/i;
-function encodeEnvelope(envelope) {
-  assertJsonPayload(envelope.payload, envelope.id);
-  assertShortString("Event id", envelope.id);
-  const headers = {
-    [`${ATTRIBUTE_PREFIX}specversion`]: SPEC_VERSION,
-    [`${ATTRIBUTE_PREFIX}id`]: envelope.id,
-    [`${ATTRIBUTE_PREFIX}type`]: envelope.type,
-    [`${ATTRIBUTE_PREFIX}source`]: envelope.source,
-    [`${ATTRIBUTE_PREFIX}time`]: envelope.occurredAt.toISOString(),
-    [`${ATTRIBUTE_PREFIX}datacontenttype`]: JSON_CONTENT_TYPE
-  };
-  if (envelope.key !== null) {
-    headers[`${ATTRIBUTE_PREFIX}subject`] = envelope.key;
-  }
-  if (envelope.causationId !== null) {
-    headers[`${ATTRIBUTE_PREFIX}causationid`] = envelope.causationId;
-  }
-  if (envelope.correlationId !== null) {
-    headers[`${ATTRIBUTE_PREFIX}correlationid`] = envelope.correlationId;
-  }
-  for (const [name, value] of Object.entries(envelope.headers)) {
-    assertShortString(
-      `Header name '${EVENT_HEADER_PREFIX}${name}'`,
-      `${EVENT_HEADER_PREFIX}${name}`
-    );
-    headers[`${EVENT_HEADER_PREFIX}${name}`] = value;
-  }
-  return {
-    content: Buffer.from(JSON.stringify(envelope.payload), "utf8"),
-    options: {
-      contentType: JSON_CONTENT_TYPE,
-      persistent: true,
-      messageId: envelope.id,
-      timestamp: Math.floor(envelope.occurredAt.getTime() / 1e3),
-      ...mirror("type", envelope.type),
-      ...mirror("appId", envelope.source),
-      ...envelope.correlationId === null ? {} : mirror("correlationId", envelope.correlationId),
-      headers
-    }
-  };
-}
-function assertShortString(label, value) {
-  const bytes = Buffer.byteLength(value, "utf8");
-  if (bytes > SHORT_STRING_LIMIT_BYTES) {
-    throw new AmqpLimitExceededError(
-      `${label} is ${bytes} bytes, above the AMQP limit of ${SHORT_STRING_LIMIT_BYTES} bytes`
-    );
-  }
-}
-function mirror(name, value) {
-  return Buffer.byteLength(value, "utf8") > SHORT_STRING_LIMIT_BYTES ? {} : { [name]: value };
-}
-function decodeEnvelope(message) {
-  const { properties } = message;
-  const attributes = properties.headers ?? {};
-  if (attributes[`${ATTRIBUTE_PREFIX}specversion`] !== SPEC_VERSION) {
-    throw new MalformedMessageError(
-      `Message is not a CloudEvents ${SPEC_VERSION} event (header ${ATTRIBUTE_PREFIX}specversion)`
-    );
-  }
-  return {
-    id: required("id", text(attributes[`${ATTRIBUTE_PREFIX}id`]) ?? text(properties.messageId)),
-    type: required("type", text(attributes[`${ATTRIBUTE_PREFIX}type`]) ?? text(properties.type)),
-    source: required(
-      "source",
-      text(attributes[`${ATTRIBUTE_PREFIX}source`]) ?? text(properties.appId)
-    ),
-    key: text(attributes[`${ATTRIBUTE_PREFIX}subject`]) ?? null,
-    payload: parsePayload(message.content),
-    headers: extractEventHeaders(attributes),
-    correlationId: text(attributes[`${ATTRIBUTE_PREFIX}correlationid`]) ?? text(properties.correlationId) ?? null,
-    causationId: text(attributes[`${ATTRIBUTE_PREFIX}causationid`]) ?? null,
-    occurredAt: parseTime(attributes[`${ATTRIBUTE_PREFIX}time`], properties.timestamp)
-  };
-}
-function extractEventHeaders(attributes) {
-  const headers = {};
-  for (const [name, value] of Object.entries(attributes)) {
-    if (name.startsWith(EVENT_HEADER_PREFIX) && typeof value === "string") {
-      Object.defineProperty(headers, name.slice(EVENT_HEADER_PREFIX.length), {
-        value,
-        enumerable: true,
-        writable: true,
-        configurable: true
-      });
-    }
-  }
-  return headers;
-}
-function parsePayload(content) {
-  try {
-    return JSON.parse(content.toString("utf8"));
-  } catch {
-    throw new MalformedMessageError("Message body is not valid JSON");
-  }
-}
-function parseTime(rawTime, timestampSeconds) {
-  if (rawTime === void 0) {
-    const fallback = typeof timestampSeconds === "number" ? new Date(timestampSeconds * 1e3) : void 0;
-    if (fallback === void 0 || Number.isNaN(fallback.getTime())) {
-      throw new MalformedMessageError("Message has no valid time (header cloudEvents:time)");
-    }
-    return fallback;
-  }
-  const occurredAt = typeof rawTime === "string" && RFC3339_PATTERN.test(rawTime) ? new Date(rawTime) : void 0;
-  if (occurredAt === void 0 || Number.isNaN(occurredAt.getTime())) {
-    throw new MalformedMessageError(
-      "Message time (header cloudEvents:time) is not an RFC 3339 timestamp"
-    );
-  }
-  return occurredAt;
-}
-function text(value) {
-  return typeof value === "string" ? value : void 0;
-}
-function required(attribute, value) {
-  if (value === void 0 || value.length === 0) {
-    throw new MalformedMessageError(
-      `Message has no ${attribute} (header ${ATTRIBUTE_PREFIX}${attribute})`
-    );
-  }
-  return value;
-}
-
 // src/queue-consumer.ts
 var QueueConsumer = class {
   #settings;
@@ -700,7 +937,7 @@ var QueueConsumer = class {
     const { queue, handlerRetry } = this.#settings;
     let envelope;
     try {
-      envelope = decodeEnvelope(message);
+      envelope = this.#settings.decode(withOriginalRoutingKey(message));
     } catch (error) {
       this.#settings.logger.error(
         `[QueueConsumer](process) Dead-lettering malformed message | queue=${queue} routingKey=${message.fields.routingKey} error=${toErrorInfo(error).message}`
@@ -780,7 +1017,8 @@ var QueueConsumer = class {
   async #redeliverLater(channel, message, delayMs, redeliveries, firstFailureAt) {
     const { content, options } = copyForRepublish(message, {
       [REDELIVERIES_HEADER]: String(redeliveries),
-      [FIRST_FAILURE_HEADER]: String(firstFailureAt)
+      [FIRST_FAILURE_HEADER]: String(firstFailureAt),
+      [ORIGINAL_ROUTING_KEY_HEADER]: originalRoutingKey(message)
     });
     try {
       await this.#settings.republish(
@@ -996,6 +1234,7 @@ var RabbitMqTransport = class {
         republish: (exchange, routingKey, content, options) => this.#publishConfirmed(exchange, routingKey, content, options, true),
         shutdownTimeoutMs: this.#settings.shutdownTimeoutMs,
         onMessage,
+        decode: this.#settings.decode,
         onConsumerLost: (reason) => this.#supervisor.recover(reason),
         logger: this.#settings.logger,
         random: this.#settings.random
@@ -1099,7 +1338,34 @@ function takeUnroutable(unroutable, key) {
   }
   return true;
 }
+function fromHeader(name) {
+  if (name.length === 0) {
+    throw new ConfigurationError("fromHeader needs a header name");
+  }
+  return (message) => Object.hasOwn(message.headers, name) ? message.headers[name] : void 0;
+}
+function fromPayloadField(path) {
+  const segments = path.split(".");
+  if (segments.some((segment) => segment.length === 0)) {
+    throw new ConfigurationError(
+      `fromPayloadField needs a dotted path of non-empty names, received '${path}'`
+    );
+  }
+  return (message) => {
+    let value = message.payload;
+    for (const segment of segments) {
+      if (typeof value !== "object" || value === null || !Object.hasOwn(value, segment)) {
+        return void 0;
+      }
+      value = value[segment];
+    }
+    if (typeof value === "string") {
+      return value;
+    }
+    return Number.isSafeInteger(value) ? String(value) : void 0;
+  };
+}
 
-export { AmqpLimitExceededError, MalformedMessageError, RabbitMqPublishRejectedError, RabbitMqTransport, RabbitMqUnavailableError, UnroutableMessageError, UnserializablePayloadError };
+export { AmqpLimitExceededError, MalformedMessageError, RabbitMqPublishRejectedError, RabbitMqTransport, RabbitMqUnavailableError, UnroutableMessageError, UnserializablePayloadError, decodeCloudEvent, fromHeader, fromPayloadField, plainJsonDecoder };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map