@amqp-contract/worker 0.24.0 → 1.0.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { extractConsumer, extractQueue, isQueueWithTtlBackoffInfrastructure } from "@amqp-contract/contract";
-import { AmqpClient, MessageValidationError, TechnicalError, defaultTelemetryProvider, endSpanError, endSpanSuccess, recordConsumeMetric, startConsumeSpan } from "@amqp-contract/core";
-import { Result, ResultAsync, err, errAsync, ok, okAsync } from "neverthrow";
+import { AmqpClient, MessageValidationError, TechnicalError, defaultTelemetryProvider, endSpanError, endSpanSuccess, recordConsumeMetric, safeJsonParse, startConsumeSpan } from "@amqp-contract/core";
+import { TaggedError, allAsync, err, fromPromise, fromSafePromise, ok } from "unthrown";
 import { gunzip, inflate } from "node:zlib";
 import { promisify } from "node:util";
 //#region src/decompression.ts
@@ -21,17 +21,17 @@ function isSupportedEncoding(encoding) {
 *
 * @param buffer - The buffer to decompress
 * @param contentEncoding - The content-encoding header value (e.g., 'gzip', 'deflate')
-* @returns A ResultAsync resolving to the decompressed buffer or a TechnicalError
+* @returns An AsyncResult resolving to the decompressed buffer or a TechnicalError
 *
 * @internal
 */
 function decompressBuffer(buffer, contentEncoding) {
-	if (!contentEncoding) return okAsync(buffer);
+	if (!contentEncoding) return ok(buffer).toAsync();
 	const normalizedEncoding = contentEncoding.toLowerCase();
-	if (!isSupportedEncoding(normalizedEncoding)) return errAsync(new TechnicalError(`Unsupported content-encoding: "${contentEncoding}". Supported encodings are: ${SUPPORTED_ENCODINGS.join(", ")}. Please check your publisher configuration.`));
+	if (!isSupportedEncoding(normalizedEncoding)) return err(new TechnicalError(`Unsupported content-encoding: "${contentEncoding}". Supported encodings are: ${SUPPORTED_ENCODINGS.join(", ")}. Please check your publisher configuration.`)).toAsync();
 	switch (normalizedEncoding) {
-		case "gzip": return ResultAsync.fromPromise(gunzipAsync(buffer), (error) => new TechnicalError("Failed to decompress gzip", error));
-		case "deflate": return ResultAsync.fromPromise(inflateAsync(buffer), (error) => new TechnicalError("Failed to decompress deflate", error));
+		case "gzip": return fromPromise(gunzipAsync(buffer), (error) => new TechnicalError("Failed to decompress gzip", error));
+		case "deflate": return fromPromise(inflateAsync(buffer), (error) => new TechnicalError("Failed to decompress deflate", error));
 	}
 }
 //#endregion
@@ -42,14 +42,18 @@ function decompressBuffer(buffer, contentEncoding) {
 *
 * Use this error type when the operation might succeed if retried.
 * The worker will apply exponential backoff and retry the message.
+*
+* Built on unthrown's {@link TaggedError}, so it carries a namespaced `_tag` of
+* `"@amqp-contract/RetryableError"` (to avoid colliding with other libraries'
+* tags in a shared `matchTags`) for exhaustive dispatch; the `Error.name` is
+* kept bare (`"RetryableError"`).
 */
-var RetryableError = class extends Error {
+var RetryableError = class extends TaggedError("@amqp-contract/RetryableError", { name: "RetryableError" }) {
 	constructor(message, cause) {
-		super(message);
-		this.cause = cause;
-		this.name = "RetryableError";
-		const ErrorConstructor = Error;
-		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
+		super({
+			message,
+			cause
+		});
 	}
 };
 /**
@@ -57,15 +61,16 @@ var RetryableError = class extends Error {
 * Examples: invalid data, business rule violations, permanent external failures
 *
 * Use this error type when retrying would not help - the message will be
-* immediately sent to the dead letter queue (DLQ) if configured.
+* immediately sent to the dead letter queue (DLQ) if configured. Carries a
+* namespaced `_tag` of `"@amqp-contract/NonRetryableError"`; the `Error.name` is
+* kept bare (`"NonRetryableError"`).
 */
-var NonRetryableError = class extends Error {
+var NonRetryableError = class extends TaggedError("@amqp-contract/NonRetryableError", { name: "NonRetryableError" }) {
 	constructor(message, cause) {
-		super(message);
-		this.cause = cause;
-		this.name = "NonRetryableError";
-		const ErrorConstructor = Error;
-		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
+		super({
+			message,
+			cause
+		});
 	}
 };
 /**
@@ -137,7 +142,7 @@ function isNonRetryableError(error) {
 * ```
 */
 function isHandlerError(error) {
-	return isRetryableError(error) || isNonRetryableError(error);
+	return error instanceof RetryableError || error instanceof NonRetryableError;
 }
 /**
 * Create a RetryableError with less verbosity.
@@ -152,16 +157,16 @@ function isHandlerError(error) {
 * @example
 * ```typescript
 * import { retryable } from '@amqp-contract/worker';
-* import { ResultAsync } from 'neverthrow';
+* import { fromPromise } from 'unthrown';
 *
 * const handler = ({ payload }) =>
-*   ResultAsync.fromPromise(
+*   fromPromise(
 *     processPayment(payload),
 *     (e) => retryable('Payment service unavailable', e),
 *   ).map(() => undefined);
 *
 * // Equivalent to:
-* // ResultAsync.fromPromise(processPayment(payload), (e) => new RetryableError('...', e))
+* // fromPromise(processPayment(payload), (e) => new RetryableError('...', e))
 * ```
 */
 function retryable(message, cause) {
@@ -180,17 +185,17 @@ function retryable(message, cause) {
 * @example
 * ```typescript
 * import { nonRetryable } from '@amqp-contract/worker';
-* import { errAsync, okAsync } from 'neverthrow';
+* import { err, ok } from 'unthrown';
 *
 * const handler = ({ payload }) => {
 *   if (!isValidPayload(payload)) {
-*     return errAsync(nonRetryable('Invalid payload format'));
+*     return err(nonRetryable('Invalid payload format')).toAsync();
 *   }
-*   return okAsync(undefined);
+*   return ok(undefined).toAsync();
 * };
 *
 * // Equivalent to:
-* // return errAsync(new NonRetryableError('Invalid payload format'));
+* // return err(new NonRetryableError('Invalid payload format')).toAsync();
 * ```
 */
 function nonRetryable(message, cause) {
@@ -218,23 +223,18 @@ function nonRetryable(message, cause) {
 */
 function handleError(ctx, error, msg, consumerName, consumer) {
 	if (error instanceof NonRetryableError) {
-		ctx.logger?.error("Non-retryable error, sending to DLQ immediately", {
-			consumerName,
-			errorType: error.name,
-			error: error.message
-		});
 		sendToDLQ(ctx, msg, consumer);
-		return okAsync(void 0);
+		return ok(void 0).toAsync();
 	}
 	const config = extractQueue(consumer.queue).retry;
 	if (config.mode === "immediate-requeue") return handleErrorImmediateRequeue(ctx, error, msg, consumerName, consumer, config);
 	if (config.mode === "ttl-backoff") return handleErrorTtlBackoff(ctx, error, msg, consumerName, consumer, config);
-	ctx.logger?.warn("Retry disabled (none mode), sending to DLQ", {
+	ctx.logger?.info("Retry disabled (none mode), sending to DLQ", {
 		consumerName,
-		error: error.message
+		queueName: extractQueue(consumer.queue).name
 	});
 	sendToDLQ(ctx, msg, consumer);
-	return okAsync(void 0);
+	return ok(void 0).toAsync();
 }
 /**
 * Handle error by requeuing immediately.
@@ -250,26 +250,24 @@ function handleErrorImmediateRequeue(ctx, error, msg, consumerName, consumer, co
 	const queueName = queue.name;
 	const retryCount = queue.type === "quorum" ? msg.properties.headers?.["x-delivery-count"] ?? 0 : msg.properties.headers?.["x-retry-count"] ?? 0;
 	if (retryCount >= config.maxRetries) {
-		ctx.logger?.error("Max retries exceeded, sending to DLQ (immediate-requeue mode)", {
+		ctx.logger?.info("Max retries exceeded, sending to DLQ (immediate-requeue mode)", {
 			consumerName,
 			queueName,
 			retryCount,
-			maxRetries: config.maxRetries,
-			error: error.message
+			maxRetries: config.maxRetries
 		});
 		sendToDLQ(ctx, msg, consumer);
-		return okAsync(void 0);
+		return ok(void 0).toAsync();
 	}
-	ctx.logger?.warn("Retrying message (immediate-requeue mode)", {
+	ctx.logger?.info("Retrying message (immediate-requeue mode)", {
 		consumerName,
 		queueName,
 		retryCount,
-		maxRetries: config.maxRetries,
-		error: error.message
+		maxRetries: config.maxRetries
 	});
 	if (queue.type === "quorum") {
 		ctx.amqpClient.nack(msg, false, true);
-		return okAsync(void 0);
+		return ok(void 0).toAsync();
 	} else return publishForRetry(ctx, {
 		msg,
 		exchange: msg.fields.exchange,
@@ -310,30 +308,28 @@ function handleErrorTtlBackoff(ctx, error, msg, consumerName, consumer, config)
 			consumerName,
 			queueName: consumer.queue.name
 		});
-		return errAsync(new TechnicalError("Queue does not have TTL-backoff infrastructure"));
+		return err(new TechnicalError("Queue does not have TTL-backoff infrastructure")).toAsync();
 	}
 	const queueEntry = consumer.queue;
 	const queueName = extractQueue(queueEntry).name;
 	const retryCount = msg.properties.headers?.["x-retry-count"] ?? 0;
 	if (retryCount >= config.maxRetries) {
-		ctx.logger?.error("Max retries exceeded, sending to DLQ (ttl-backoff mode)", {
+		ctx.logger?.info("Max retries exceeded, sending to DLQ (ttl-backoff mode)", {
 			consumerName,
 			queueName,
 			retryCount,
-			maxRetries: config.maxRetries,
-			error: error.message
+			maxRetries: config.maxRetries
 		});
 		sendToDLQ(ctx, msg, consumer);
-		return okAsync(void 0);
+		return ok(void 0).toAsync();
 	}
 	const delayMs = calculateRetryDelay(retryCount, config);
-	ctx.logger?.warn("Retrying message (ttl-backoff mode)", {
+	ctx.logger?.info("Retrying message (ttl-backoff mode)", {
 		consumerName,
 		queueName,
 		retryCount: retryCount + 1,
 		maxRetries: config.maxRetries,
-		delayMs,
-		error: error.message
+		delayMs
 	});
 	return publishForRetry(ctx, {
 		msg,
@@ -350,9 +346,9 @@ function handleErrorTtlBackoff(ctx, error, msg, consumerName, consumer, config)
 */
 function calculateRetryDelay(retryCount, config) {
 	const { initialDelayMs, maxDelayMs, backoffMultiplier, jitter } = config;
-	let delay = Math.min(initialDelayMs * Math.pow(backoffMultiplier, retryCount), maxDelayMs);
-	if (jitter) delay = delay * (.5 + Math.random() * .5);
-	return Math.floor(delay);
+	let delay = initialDelayMs * Math.pow(backoffMultiplier, retryCount);
+	if (jitter) delay = delay * (.5 + Math.random());
+	return Math.floor(Math.min(delay, maxDelayMs));
 }
 /**
 * Parse message content for republishing.
@@ -384,7 +380,6 @@ function parseMessageContentForRetry(ctx, msg, queueName) {
 */
 function publishForRetry(ctx, { msg, exchange, routingKey, queueName, waitQueueName, delayMs, error }) {
 	const newRetryCount = (msg.properties.headers?.["x-retry-count"] ?? 0) + 1;
-	ctx.amqpClient.ack(msg);
 	const content = parseMessageContentForRetry(ctx, msg, queueName);
 	return ctx.amqpClient.publish(exchange, routingKey, content, {
 		...msg.properties,
@@ -399,7 +394,7 @@ function publishForRetry(ctx, { msg, exchange, routingKey, queueName, waitQueueN
 				"x-retry-queue": queueName
 			} : {}
 		}
-	}).andThen((published) => {
+	}).flatMap((published) => {
 		if (!published) {
 			ctx.logger?.error("Failed to publish message for retry (write buffer full)", {
 				queueName,
@@ -408,12 +403,21 @@ function publishForRetry(ctx, { msg, exchange, routingKey, queueName, waitQueueN
 			});
 			return err(new TechnicalError("Failed to publish message for retry (write buffer full)"));
 		}
+		ctx.amqpClient.ack(msg);
 		ctx.logger?.info("Message published for retry", {
 			queueName,
 			retryCount: newRetryCount,
 			...delayMs !== void 0 ? { delayMs } : {}
 		});
 		return ok(void 0);
+	}).orElse((publishError) => {
+		ctx.logger?.error("Publish for retry failed; leaving original un-ack'd for redelivery", {
+			queueName,
+			retryCount: newRetryCount,
+			...delayMs !== void 0 ? { delayMs } : {},
+			error: publishError
+		});
+		return err(publishError);
 	});
 }
 /**
@@ -450,7 +454,7 @@ function isHandlerTuple(entry) {
 * ```typescript
 * import { TypedAmqpWorker } from '@amqp-contract/worker';
 * import { defineQueue, defineMessage, defineContract, defineConsumer } from '@amqp-contract/contract';
-* import { okAsync } from 'neverthrow';
+* import { ok } from 'unthrown';
 * import { z } from 'zod';
 *
 * const orderQueue = defineQueue('order-processing');
@@ -470,20 +474,23 @@ function isHandlerTuple(entry) {
 *   handlers: {
 *     processOrder: ({ payload }) => {
 *       console.log('Processing order', payload.orderId);
-*       return okAsync(undefined);
+*       return ok(undefined).toAsync();
 *     },
 *   },
 *   urls: ['amqp://localhost'],
 * });
 *
-* if (result.isErr()) throw result.error;
-* const worker = result.value;
+* const worker = result.unwrap();
 *
 * // Close when done
 * await worker.close();
 * ```
 */
 var TypedAmqpWorker = class TypedAmqpWorker {
+	contract;
+	amqpClient;
+	defaultConsumerOptions;
+	logger;
 	/**
 	* Internal handler storage. Keyed by handler name (consumer or RPC); the
 	* stored function signature is widened so the dispatch loop can call it
@@ -556,14 +563,14 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* Connections are automatically shared across clients and workers with the same
 	* URLs and connection options, following RabbitMQ best practices.
 	*
-	* @returns A ResultAsync that resolves to the worker or a TechnicalError.
+	* @returns A AsyncResult that resolves to the worker or a TechnicalError.
 	*
 	* @example
 	* ```typescript
 	* const result = await TypedAmqpWorker.create({
 	*   contract: myContract,
 	*   handlers: {
-	*     processOrder: ({ payload }) => okAsync(undefined),
+	*     processOrder: ({ payload }) => ok(undefined).toAsync(),
 	*   },
 	*   urls: ['amqp://localhost'],
 	* });
@@ -575,14 +582,15 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			connectionOptions,
 			connectTimeoutMs
 		}), handlers, defaultConsumerOptions ?? {}, logger, telemetry);
-		const setup = worker.waitForConnectionReady().andThen(() => worker.consumeAll());
-		return new ResultAsync((async () => {
+		const setup = worker.waitForConnectionReady().flatMap(() => worker.consumeAll());
+		return fromSafePromise((async () => {
 			const setupResult = await setup;
-			if (setupResult.isOk()) return ok(worker);
-			const closeResult = await worker.close();
-			if (closeResult.isErr()) logger?.warn("Failed to close worker after setup failure", { error: closeResult.error });
-			return err(setupResult.error);
-		})());
+			if (!setupResult.isOk()) {
+				const closeResult = await worker.close();
+				if (closeResult.isErr()) logger?.warn("Failed to close worker after setup failure", { error: closeResult.error });
+			}
+			return setupResult.map(() => worker);
+		})()).flatMap((result) => result);
 	}
 	/**
 	* Close the AMQP channel and connection.
@@ -599,16 +607,15 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* ```
 	*/
 	close() {
-		const cancellations = Array.from(this.consumerTags).map((consumerTag) => this.amqpClient.cancel(consumerTag).orElse((error) => {
+		return allAsync(Array.from(this.consumerTags).map((consumerTag) => this.amqpClient.cancel(consumerTag).orElse((error) => {
 			this.logger?.warn("Failed to cancel consumer during close", {
 				consumerTag,
 				error
 			});
 			return ok(void 0);
-		}));
-		return ResultAsync.combine(cancellations).andTee(() => {
+		}))).tap(() => {
 			this.consumerTags.clear();
-		}).andThen(() => this.amqpClient.close()).map(() => void 0);
+		}).flatMap(() => this.amqpClient.close()).map(() => void 0);
 	}
 	/**
 	* Start consuming for every entry in `contract.consumers` and `contract.rpcs`.
@@ -616,8 +623,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	consumeAll() {
 		const consumerNames = Object.keys(this.contract.consumers ?? {});
 		const rpcNames = Object.keys(this.contract.rpcs ?? {});
-		const allNames = [...consumerNames, ...rpcNames];
-		return ResultAsync.combine(allNames.map((name) => this.consume(name))).map(() => void 0);
+		return allAsync([...consumerNames, ...rpcNames].map((name) => this.consume(name))).map(() => void 0);
 	}
 	waitForConnectionReady() {
 		return this.amqpClient.waitForConnect();
@@ -637,8 +643,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	*/
 	validateSchema(schema, data, context) {
 		const rawValidation = schema["~standard"].validate(data);
-		const validationPromise = rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation);
-		return ResultAsync.fromPromise(validationPromise, (error) => new TechnicalError(`Error validating ${context.field}`, error)).andThen((result) => {
+		return fromPromise(rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation), (error) => new TechnicalError(`Error validating ${context.field}`, error)).flatMap((result) => {
 			if (result.issues) return err(new TechnicalError(`${context.field} validation failed`, new MessageValidationError(context.consumerName, result.issues)));
 			return ok(result.value);
 		});
@@ -652,15 +657,13 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	*/
 	parseAndValidateMessage(msg, consumer, consumerName) {
 		const context = { consumerName: String(consumerName) };
-		const parsePayload = decompressBuffer(msg.content, msg.properties.contentEncoding).andThen((buffer) => Result.fromThrowable(() => JSON.parse(buffer.toString()), (error) => new TechnicalError("Failed to parse JSON", error))()).andThen((parsed) => this.validateSchema(consumer.message.payload, parsed, {
+		return allAsync([decompressBuffer(msg.content, msg.properties.contentEncoding).flatMap((buffer) => safeJsonParse(buffer, (error) => new TechnicalError("Failed to parse JSON", error))).flatMap((parsed) => this.validateSchema(consumer.message.payload, parsed, {
 			...context,
 			field: "payload"
-		}));
-		const parseHeaders = consumer.message.headers ? this.validateSchema(consumer.message.headers, msg.properties.headers ?? {}, {
+		})), consumer.message.headers ? this.validateSchema(consumer.message.headers, msg.properties.headers ?? {}, {
 			...context,
 			field: "headers"
-		}) : okAsync(void 0);
-		return ResultAsync.combine([parsePayload, parseHeaders]).map(([payload, headers]) => ({
+		}) : ok(void 0).toAsync()]).map(([payload, headers]) => ({
 			payload,
 			headers
 		}));
@@ -692,7 +695,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				rpcName: String(rpcName),
 				queueName
 			});
-			return errAsync(new NonRetryableError(`RPC "${String(rpcName)}" received a message without replyTo; cannot deliver response`));
+			return err(new NonRetryableError(`RPC "${String(rpcName)}" received a message without replyTo; cannot deliver response`)).toAsync();
 		}
 		if (typeof correlationId !== "string" || correlationId.length === 0) {
 			this.logger?.error("RPC handler returned a response but the incoming message has no correlationId", {
@@ -700,84 +703,127 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				queueName,
 				replyTo
 			});
-			return errAsync(new NonRetryableError(`RPC "${String(rpcName)}" received a message without correlationId; cannot deliver response`));
+			return err(new NonRetryableError(`RPC "${String(rpcName)}" received a message without correlationId; cannot deliver response`)).toAsync();
 		}
 		let rawValidation;
 		try {
 			rawValidation = responseSchema["~standard"].validate(response);
 		} catch (error) {
-			return errAsync(new NonRetryableError("RPC response schema validation threw", error));
+			return err(new NonRetryableError("RPC response schema validation threw", error)).toAsync();
 		}
-		const validationPromise = rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation);
-		return ResultAsync.fromPromise(validationPromise, (error) => new NonRetryableError("RPC response schema validation threw", error)).andThen((validation) => {
+		return fromPromise(rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation), (error) => new NonRetryableError("RPC response schema validation threw", error)).flatMap((validation) => {
 			if (validation.issues) return err(new NonRetryableError(`RPC response for "${String(rpcName)}" failed schema validation`, new MessageValidationError(String(rpcName), validation.issues)));
 			return ok(validation.value);
-		}).andThen((validatedResponse) => this.amqpClient.publish("", replyTo, validatedResponse, {
+		}).flatMap((validatedResponse) => this.amqpClient.publish("", replyTo, validatedResponse, {
 			correlationId,
 			contentType: "application/json"
-		}).mapErr((error) => new NonRetryableError("Failed to publish RPC response", error)).andThen((published) => published ? ok(void 0) : err(new NonRetryableError("Failed to publish RPC response: channel buffer full"))));
+		}).mapErr((error) => new NonRetryableError("Failed to publish RPC response", error)).flatMap((published) => published ? ok(void 0) : err(new NonRetryableError("Failed to publish RPC response: channel buffer full"))));
+	}
+	/**
+	* Parse and validate the message; on failure, nack(requeue=false) so the
+	* queue's DLX (if configured) receives the poison message and bypass the
+	* retry pipeline — a malformed payload is deterministic and retrying it
+	* would burn the queue's retry budget on a guaranteed failure.
+	*/
+	parseAndValidateOrNack(msg, consumer, name) {
+		return this.parseAndValidateMessage(msg, consumer, name).orElse((parseError) => {
+			this.amqpClient.nack(msg, false, false);
+			return err(parseError).toAsync();
+		});
+	}
+	/**
+	* Invoke the handler and ack the message on success. Returns the handler's
+	* response (RPC) or `undefined` (regular consumer). Errors propagate as
+	* `HandlerError` for downstream RPC reply publishing or routing via
+	* {@link handleError}.
+	*/
+	runHandler(handler, validatedMessage, msg) {
+		return handler(validatedMessage, msg);
+	}
+	/**
+	* For RPC handlers, validate and publish the reply on the caller's
+	* `replyTo` / `correlationId`. For non-RPC consumers, this is a no-op that
+	* resolves to `ok(undefined).toAsync()`.
+	*/
+	publishReplyIfRpc(msg, view, name, handlerResponse) {
+		if (!view.isRpc || !view.responseSchema) return ok(void 0).toAsync();
+		const queueName = extractQueue(view.consumer.queue).name;
+		return this.publishRpcResponse(msg, queueName, name, view.responseSchema, handlerResponse);
 	}
 	/**
 	* Process a single consumed message: validate, invoke handler, optionally
-	* publish the RPC response, record telemetry, and handle errors.
+	* publish the RPC response, record telemetry, and route errors.
+	*
+	* The caller-supplied `state` is mutated as the message is ack'd/nack'd so
+	* the consume callback's catch-all guard can tell whether a defensive nack
+	* is still needed (see {@link consumeSingle}).
+	*
+	* Success-vs-failure telemetry is data-driven: the chain resolves to
+	* `ok(undefined)` only on handler success (and reply-publish success for
+	* RPC). Handler failures — even when {@link handleError} routes them
+	* successfully to retry/DLQ — are classified as failures for metrics by
+	* re-failing the chain with a `TechnicalError` whose `cause` is the
+	* original `HandlerError`. The terminal `orTee` unwraps the cause before
+	* recording the span exception so traces keep the original
+	* `RetryableError` / `NonRetryableError` class as the exception type.
 	*/
-	processMessage(msg, view, name, handler) {
-		const { consumer, isRpc, responseSchema } = view;
+	processMessage(msg, view, name, handler, state) {
+		const { consumer } = view;
 		const queueName = extractQueue(consumer.queue).name;
 		const startTime = Date.now();
 		const span = startConsumeSpan(this.telemetry, queueName, String(name), { "messaging.rabbitmq.message.delivery_tag": msg.fields.deliveryTag });
-		let messageHandled = false;
-		let firstError;
-		const inner = this.parseAndValidateMessage(msg, consumer, name).orElse((parseError) => {
-			firstError = parseError;
+		return this.parseAndValidateOrNack(msg, consumer, name).tapErr((parseError) => {
 			this.logger?.error("Failed to parse/validate message; sending to DLQ", {
 				consumerName: String(name),
 				queueName,
 				error: parseError
 			});
-			this.amqpClient.nack(msg, false, false);
-			return errAsync(parseError);
-		}).andThen((validatedMessage) => handler(validatedMessage, msg).andThen((handlerResponse) => {
-			if (isRpc && responseSchema) return this.publishRpcResponse(msg, queueName, name, responseSchema, handlerResponse).map(() => {
-				this.logger?.info("Message consumed successfully", {
-					consumerName: String(name),
-					queueName
-				});
-				this.amqpClient.ack(msg);
-				messageHandled = true;
-			});
+			state.messageHandled = true;
+		}).flatMap((validatedMessage) => this.runHandler(handler, validatedMessage, msg).flatMap((handlerResponse) => this.publishReplyIfRpc(msg, view, name, handlerResponse).tap(() => {
 			this.logger?.info("Message consumed successfully", {
 				consumerName: String(name),
 				queueName
 			});
 			this.amqpClient.ack(msg);
-			messageHandled = true;
-			return okAsync(void 0);
-		}).orElse((handlerError) => {
+			state.messageHandled = true;
+		})).orElse((handlerError) => {
 			this.logger?.error("Error processing message", {
 				consumerName: String(name),
 				queueName,
 				errorType: handlerError.name,
+				retryCount: msg.properties.headers?.["x-delivery-count"] ?? msg.properties.headers?.["x-retry-count"] ?? 0,
 				error: handlerError.message
 			});
-			firstError = handlerError;
 			return handleError({
 				amqpClient: this.amqpClient,
 				logger: this.logger
-			}, handlerError, msg, String(name), consumer);
-		}));
-		return new ResultAsync((async () => {
-			const result = await inner;
-			const durationMs = Date.now() - startTime;
-			if (messageHandled) {
+			}, handlerError, msg, String(name), consumer).tap(() => {
+				state.messageHandled = true;
+			}).flatMap(() => err(new TechnicalError(`Handler "${String(name)}" failed: ${handlerError.message}`, handlerError)).toAsync());
+		})).tap(() => {
+			try {
 				endSpanSuccess(span);
-				recordConsumeMetric(this.telemetry, queueName, String(name), true, durationMs);
-			} else {
-				endSpanError(span, result.isErr() ? result.error : firstError ?? /* @__PURE__ */ new Error("Unknown error"));
-				recordConsumeMetric(this.telemetry, queueName, String(name), false, durationMs);
+				recordConsumeMetric(this.telemetry, queueName, String(name), true, Date.now() - startTime);
+			} catch (telemetryError) {
+				this.logger?.warn("Telemetry recording threw; ignoring", {
+					consumerName: String(name),
+					queueName,
+					error: telemetryError
+				});
 			}
-			return result;
-		})());
+		}).tapErr((error) => {
+			const reportedError = error.cause instanceof Error ? error.cause : error;
+			try {
+				endSpanError(span, reportedError);
+				recordConsumeMetric(this.telemetry, queueName, String(name), false, Date.now() - startTime);
+			} catch (telemetryError) {
+				this.logger?.warn("Telemetry recording threw; ignoring", {
+					consumerName: String(name),
+					queueName,
+					error: telemetryError
+				});
+			}
+		});
 	}
 	/**
 	* Consume messages one at a time.
@@ -792,9 +838,18 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				});
 				return;
 			}
+			const state = { messageHandled: false };
 			try {
-				await this.processMessage(msg, view, name, handler);
+				await this.processMessage(msg, view, name, handler, state);
 			} catch (error) {
+				if (state.messageHandled) {
+					this.logger?.error("Uncaught error in consume callback after message was already handled; not nacking", {
+						consumerName: String(name),
+						queueName,
+						error
+					});
+					return;
+				}
 				this.logger?.error("Uncaught error in consume callback; nacking message", {
 					consumerName: String(name),
 					queueName,
@@ -802,7 +857,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				});
 				this.amqpClient.nack(msg, false, false);
 			}
-		}, this.consumerOptions[name]).andTee((consumerTag) => {
+		}, this.consumerOptions[name]).tap((consumerTag) => {
 			this.consumerTags.add(consumerTag);
 		}).map(() => void 0).mapErr((error) => new TechnicalError(`Failed to start consuming for "${String(name)}"`, error));
 	}
@@ -810,58 +865,71 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 //#endregion
 //#region src/handlers.ts
 /**
-* Validate that a consumer exists in the contract
+* Build the list of available handler-target names — every key under
+* `contract.consumers` plus every key under `contract.rpcs`.
+*/
+function availableHandlerNames(contract) {
+	const consumers = contract.consumers ? Object.keys(contract.consumers) : [];
+	const rpcs = contract.rpcs ? Object.keys(contract.rpcs) : [];
+	return [...consumers, ...rpcs];
+}
+function formatAvailable(names) {
+	return names.length > 0 ? names.join(", ") : "none";
+}
+/**
+* Validate that a name maps to a contract entry — either a `consumers` key
+* or an `rpcs` key. The two name spaces are disjoint by contract definition.
 */
-function validateConsumerExists(contract, consumerName) {
+function validateHandlerTargetExists(contract, name) {
 	const consumers = contract.consumers;
-	if (!consumers || !(consumerName in consumers)) {
-		const availableConsumers = consumers ? Object.keys(consumers) : [];
-		const available = availableConsumers.length > 0 ? availableConsumers.join(", ") : "none";
-		throw new Error(`Consumer "${consumerName}" not found in contract. Available consumers: ${available}`);
+	const rpcs = contract.rpcs;
+	const isConsumer = !!consumers && Object.hasOwn(consumers, name);
+	const isRpc = !!rpcs && Object.hasOwn(rpcs, name);
+	if (!isConsumer && !isRpc) {
+		const available = formatAvailable(availableHandlerNames(contract));
+		throw new Error(`Handler target "${name}" not found in contract. Available consumers and RPCs: ${available}`);
 	}
 }
 /**
-* Validate that all handlers reference valid consumers
+* Validate that every key in `handlers` maps to a contract entry —
+* either a `consumers` key or an `rpcs` key.
 */
 function validateHandlers(contract, handlers) {
-	const consumers = contract.consumers;
-	const availableConsumers = Object.keys(consumers ?? {});
-	const availableConsumerNames = availableConsumers.length > 0 ? availableConsumers.join(", ") : "none";
-	for (const handlerName of Object.keys(handlers)) if (!consumers || !(handlerName in consumers)) throw new Error(`Consumer "${handlerName}" not found in contract. Available consumers: ${availableConsumerNames}`);
+	for (const handlerName of Object.keys(handlers)) validateHandlerTargetExists(contract, handlerName);
 }
-function defineHandler(contract, consumerName, handler, options) {
-	validateConsumerExists(contract, String(consumerName));
+function defineHandler(contract, name, handler, options) {
+	validateHandlerTargetExists(contract, String(name));
 	if (options) return [handler, options];
 	return handler;
 }
 /**
-* Define multiple type-safe handlers for consumers in a contract.
+* Define multiple type-safe handlers for consumers and RPCs in a contract.
+*
+* **Recommended:** This function creates handlers that return
+* `AsyncResult<void, HandlerError>` (consumers) or
+* `AsyncResult<TResponse, HandlerError>` (RPCs), providing explicit error
+* handling and better control over retry behavior.
 *
-* **Recommended:** This function creates handlers that return `ResultAsync<void, HandlerError>`,
-* providing explicit error handling and better control over retry behavior.
+* The handlers object must contain exactly one entry per `consumers` and
+* `rpcs` key in the contract — see {@link WorkerInferHandlers}.
 *
 * @template TContract - The contract definition type
-* @param contract - The contract definition containing the consumers
-* @param handlers - An object with handler functions for each consumer
+* @param contract - The contract definition containing the consumers and RPCs
+* @param handlers - An object with handler functions for each consumer and RPC
 * @returns A type-safe handlers object that can be used with TypedAmqpWorker
 *
 * @example
 * ```typescript
 * import { defineHandlers, RetryableError } from '@amqp-contract/worker';
-* import { ResultAsync } from 'neverthrow';
-* import { orderContract } from './contract';
+* import { fromPromise, ok } from 'unthrown';
 *
 * const handlers = defineHandlers(orderContract, {
 *   processOrder: ({ payload }) =>
-*     ResultAsync.fromPromise(
+*     fromPromise(
 *       processPayment(payload),
 *       (error) => new RetryableError('Payment failed', error),
 *     ).map(() => undefined),
-*   notifyOrder: ({ payload }) =>
-*     ResultAsync.fromPromise(
-*       sendNotification(payload),
-*       (error) => new RetryableError('Notification failed', error),
-*     ).map(() => undefined),
+*   calculate: ({ payload }) => ok({ sum: payload.a + payload.b }).toAsync(),
 * });
 * ```
 */