@amqp-contract/worker 0.25.0 → 2.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, safeJsonParse, startConsumeSpan } from "@amqp-contract/core";
-import { ResultAsync, err, errAsync, ok, okAsync } from "neverthrow";
+import { Err, Ok, TaggedError, allAsync, fromPromise, fromSafePromise } from "unthrown";
 import { gunzip, inflate } from "node:zlib";
 import { promisify } from "node:util";
 //#region src/decompression.ts
@@ -21,55 +21,57 @@ 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
 //#region src/errors.ts
 /**
-* Abstract base class for all handler-signalled errors.
-*
-* Concrete subclasses (`RetryableError`, `NonRetryableError`) discriminate on
-* the `name` property so exhaustive narrowing in user code keeps working.
-* `error instanceof HandlerError` is true for any handler error.
-*/
-var HandlerError = class extends Error {
-	constructor(message, cause) {
-		super(message);
-		this.cause = cause;
-		const ErrorConstructor = Error;
-		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
-	}
-};
-/**
 * Retryable errors - transient failures that may succeed on retry
 * Examples: network timeouts, rate limiting, temporary service unavailability
 *
 * 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 HandlerError {
-	name = "RetryableError";
+var RetryableError = class extends TaggedError("@amqp-contract/RetryableError", { name: "RetryableError" }) {
+	constructor(message, cause) {
+		super({
+			message,
+			cause
+		});
+	}
 };
 /**
 * Non-retryable errors - permanent failures that should not be retried
 * 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 HandlerError {
-	name = "NonRetryableError";
+var NonRetryableError = class extends TaggedError("@amqp-contract/NonRetryableError", { name: "NonRetryableError" }) {
+	constructor(message, cause) {
+		super({
+			message,
+			cause
+		});
+	}
 };
 /**
 * Type guard to check if an error is a RetryableError.
@@ -140,7 +142,7 @@ function isNonRetryableError(error) {
 * ```
 */
 function isHandlerError(error) {
-	return error instanceof HandlerError;
+	return error instanceof RetryableError || error instanceof NonRetryableError;
 }
 /**
 * Create a RetryableError with less verbosity.
@@ -155,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) {
@@ -183,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) {
@@ -222,7 +224,7 @@ function nonRetryable(message, cause) {
 function handleError(ctx, error, msg, consumerName, consumer) {
 	if (error instanceof NonRetryableError) {
 		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);
@@ -232,7 +234,7 @@ function handleError(ctx, error, msg, consumerName, consumer) {
 		queueName: extractQueue(consumer.queue).name
 	});
 	sendToDLQ(ctx, msg, consumer);
-	return okAsync(void 0);
+	return Ok(void 0).toAsync();
 }
 /**
 * Handle error by requeuing immediately.
@@ -255,7 +257,7 @@ function handleErrorImmediateRequeue(ctx, error, msg, consumerName, consumer, co
 			maxRetries: config.maxRetries
 		});
 		sendToDLQ(ctx, msg, consumer);
-		return okAsync(void 0);
+		return Ok(void 0).toAsync();
 	}
 	ctx.logger?.info("Retrying message (immediate-requeue mode)", {
 		consumerName,
@@ -265,7 +267,7 @@ function handleErrorImmediateRequeue(ctx, error, msg, consumerName, consumer, co
 	});
 	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,
@@ -306,7 +308,7 @@ 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;
@@ -319,7 +321,7 @@ function handleErrorTtlBackoff(ctx, error, msg, consumerName, consumer, config)
 			maxRetries: config.maxRetries
 		});
 		sendToDLQ(ctx, msg, consumer);
-		return okAsync(void 0);
+		return Ok(void 0).toAsync();
 	}
 	const delayMs = calculateRetryDelay(retryCount, config);
 	ctx.logger?.info("Retrying message (ttl-backoff mode)", {
@@ -392,14 +394,14 @@ 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,
 				retryCount: newRetryCount,
 				...delayMs !== void 0 ? { delayMs } : {}
 			});
-			return err(new TechnicalError("Failed to publish message for retry (write buffer full)"));
+			return Err(new TechnicalError("Failed to publish message for retry (write buffer full)"));
 		}
 		ctx.amqpClient.ack(msg);
 		ctx.logger?.info("Message published for retry", {
@@ -407,7 +409,7 @@ function publishForRetry(ctx, { msg, exchange, routingKey, queueName, waitQueueN
 			retryCount: newRetryCount,
 			...delayMs !== void 0 ? { delayMs } : {}
 		});
-		return ok(void 0);
+		return Ok(void 0);
 	}).orElse((publishError) => {
 		ctx.logger?.error("Publish for retry failed; leaving original un-ack'd for redelivery", {
 			queueName,
@@ -415,7 +417,7 @@ function publishForRetry(ctx, { msg, exchange, routingKey, queueName, waitQueueN
 			...delayMs !== void 0 ? { delayMs } : {},
 			error: publishError
 		});
-		return err(publishError);
+		return Err(publishError);
 	});
 }
 /**
@@ -452,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');
@@ -472,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
@@ -558,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'],
 	* });
@@ -577,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.
@@ -601,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(() => {
+			return Ok(void 0);
+		}))).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`.
@@ -618,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();
@@ -639,10 +643,9 @@ 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) => {
-			if (result.issues) return err(new TechnicalError(`${context.field} validation failed`, new MessageValidationError(context.consumerName, result.issues)));
-			return ok(result.value);
+		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);
 		});
 	}
 	/**
@@ -654,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) => safeJsonParse(buffer, (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
 		}));
@@ -694,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", {
@@ -702,22 +703,21 @@ 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) => {
-			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, {
+		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);
+		}).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
@@ -728,7 +728,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	parseAndValidateOrNack(msg, consumer, name) {
 		return this.parseAndValidateMessage(msg, consumer, name).orElse((parseError) => {
 			this.amqpClient.nack(msg, false, false);
-			return errAsync(parseError);
+			return Err(parseError).toAsync();
 		});
 	}
 	/**
@@ -743,10 +743,10 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	/**
 	* 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 `okAsync(undefined)`.
+	* resolves to `Ok(undefined).toAsync()`.
 	*/
 	publishReplyIfRpc(msg, view, name, handlerResponse) {
-		if (!view.isRpc || !view.responseSchema) return okAsync(void 0);
+		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);
 	}
@@ -759,7 +759,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* 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
+	* `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
@@ -772,14 +772,14 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 		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 });
-		return this.parseAndValidateOrNack(msg, consumer, name).orTee((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
 			});
 			state.messageHandled = true;
-		}).andThen((validatedMessage) => this.runHandler(handler, validatedMessage, msg).andThen((handlerResponse) => this.publishReplyIfRpc(msg, view, name, handlerResponse).andTee(() => {
+		}).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
@@ -797,10 +797,10 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			return handleError({
 				amqpClient: this.amqpClient,
 				logger: this.logger
-			}, handlerError, msg, String(name), consumer).andTee(() => {
+			}, handlerError, msg, String(name), consumer).tap(() => {
 				state.messageHandled = true;
-			}).andThen(() => errAsync(new TechnicalError(`Handler "${String(name)}" failed: ${handlerError.message}`, handlerError)));
-		})).andTee(() => {
+			}).flatMap(() => Err(new TechnicalError(`Handler "${String(name)}" failed: ${handlerError.message}`, handlerError)).toAsync());
+		})).tap(() => {
 			try {
 				endSpanSuccess(span);
 				recordConsumeMetric(this.telemetry, queueName, String(name), true, Date.now() - startTime);
@@ -811,7 +811,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 					error: telemetryError
 				});
 			}
-		}).orTee((error) => {
+		}).tapErr((error) => {
 			const reportedError = error.cause instanceof Error ? error.cause : error;
 			try {
 				endSpanError(span, reportedError);
@@ -857,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));
 	}
@@ -883,7 +883,9 @@ function formatAvailable(names) {
 function validateHandlerTargetExists(contract, name) {
 	const consumers = contract.consumers;
 	const rpcs = contract.rpcs;
-	if (!(!!consumers && Object.hasOwn(consumers, name)) && !(!!rpcs && Object.hasOwn(rpcs, name))) {
+	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}`);
 	}
@@ -904,8 +906,8 @@ function defineHandler(contract, name, handler, options) {
 * Define multiple type-safe handlers for consumers and RPCs in a contract.
 *
 * **Recommended:** This function creates handlers that return
-* `ResultAsync<void, HandlerError>` (consumers) or
-* `ResultAsync<TResponse, HandlerError>` (RPCs), providing explicit error
+* `AsyncResult<void, HandlerError>` (consumers) or
+* `AsyncResult<TResponse, HandlerError>` (RPCs), providing explicit error
 * handling and better control over retry behavior.
 *
 * The handlers object must contain exactly one entry per `consumers` and
@@ -919,15 +921,15 @@ function defineHandler(contract, name, handler, options) {
 * @example
 * ```typescript
 * import { defineHandlers, RetryableError } from '@amqp-contract/worker';
-* import { okAsync, ResultAsync } from 'neverthrow';
+* import { fromPromise, Ok } from 'unthrown';
 *
 * const handlers = defineHandlers(orderContract, {
 *   processOrder: ({ payload }) =>
-*     ResultAsync.fromPromise(
+*     fromPromise(
 *       processPayment(payload),
 *       (error) => new RetryableError('Payment failed', error),
 *     ).map(() => undefined),
-*   calculate: ({ payload }) => okAsync({ sum: payload.a + payload.b }),
+*   calculate: ({ payload }) => Ok({ sum: payload.a + payload.b }).toAsync(),
 * });
 * ```
 */
@@ -936,6 +938,6 @@ function defineHandlers(contract, handlers) {
 	return handlers;
 }
 //#endregion
-export { HandlerError, MessageValidationError, NonRetryableError, RetryableError, TypedAmqpWorker, defineHandler, defineHandlers, isHandlerError, isNonRetryableError, isRetryableError, nonRetryable, retryable };
+export { MessageValidationError, NonRetryableError, RetryableError, TypedAmqpWorker, defineHandler, defineHandlers, isHandlerError, isNonRetryableError, isRetryableError, nonRetryable, retryable };
 
 //# sourceMappingURL=index.mjs.map