@amqp-contract/worker 0.11.0 → 0.13.0

package/dist/index.cjs

@@ -5,36 +5,16 @@ let node_util = require("node:util");
 
 //#region src/errors.ts
 /**
-* Base error class for worker errors
-*/
-var WorkerError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "WorkerError";
-		const ErrorConstructor = Error;
-		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
-	}
-};
-/**
-* Error for technical/runtime failures in worker operations
-* This includes validation failures, parsing failures, and processing failures
-*/
-var TechnicalError = class extends WorkerError {
-	constructor(message, cause) {
-		super(message);
-		this.cause = cause;
-		this.name = "TechnicalError";
-	}
-};
-/**
 * Error thrown when message validation fails
 */
-var MessageValidationError = class extends WorkerError {
+var MessageValidationError = class extends Error {
 	constructor(consumerName, issues) {
 		super(`Message validation failed for consumer "${consumerName}"`);
 		this.consumerName = consumerName;
 		this.issues = issues;
 		this.name = "MessageValidationError";
+		const ErrorConstructor = Error;
+		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
 	}
 };
 /**
@@ -44,11 +24,13 @@ var MessageValidationError = class extends WorkerError {
 * Use this error type when the operation might succeed if retried.
 * The worker will apply exponential backoff and retry the message.
 */
-var RetryableError = class extends WorkerError {
+var RetryableError = class extends Error {
 	constructor(message, cause) {
 		super(message);
 		this.cause = cause;
 		this.name = "RetryableError";
+		const ErrorConstructor = Error;
+		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
 	}
 };
 /**
@@ -58,34 +40,173 @@ var RetryableError = class extends WorkerError {
 * Use this error type when retrying would not help - the message will be
 * immediately sent to the dead letter queue (DLQ) if configured.
 */
-var NonRetryableError = class extends WorkerError {
+var NonRetryableError = class extends Error {
 	constructor(message, cause) {
 		super(message);
 		this.cause = cause;
 		this.name = "NonRetryableError";
+		const ErrorConstructor = Error;
+		if (typeof ErrorConstructor.captureStackTrace === "function") ErrorConstructor.captureStackTrace(this, this.constructor);
 	}
 };
+/**
+* Type guard to check if an error is a RetryableError.
+*
+* Use this to check error types in catch blocks or error handlers.
+*
+* @param error - The error to check
+* @returns True if the error is a RetryableError
+*
+* @example
+* ```typescript
+* import { isRetryableError } from '@amqp-contract/worker';
+*
+* try {
+*   await processMessage();
+* } catch (error) {
+*   if (isRetryableError(error)) {
+*     console.log('Will retry:', error.message);
+*   } else {
+*     console.log('Permanent failure:', error);
+*   }
+* }
+* ```
+*/
+function isRetryableError(error) {
+	return error instanceof RetryableError;
+}
+/**
+* Type guard to check if an error is a NonRetryableError.
+*
+* Use this to check error types in catch blocks or error handlers.
+*
+* @param error - The error to check
+* @returns True if the error is a NonRetryableError
+*
+* @example
+* ```typescript
+* import { isNonRetryableError } from '@amqp-contract/worker';
+*
+* try {
+*   await processMessage();
+* } catch (error) {
+*   if (isNonRetryableError(error)) {
+*     console.log('Will not retry:', error.message);
+*   }
+* }
+* ```
+*/
+function isNonRetryableError(error) {
+	return error instanceof NonRetryableError;
+}
+/**
+* Type guard to check if an error is any HandlerError (RetryableError or NonRetryableError).
+*
+* @param error - The error to check
+* @returns True if the error is a HandlerError
+*
+* @example
+* ```typescript
+* import { isHandlerError } from '@amqp-contract/worker';
+*
+* function handleError(error: unknown) {
+*   if (isHandlerError(error)) {
+*     // error is RetryableError | NonRetryableError
+*     console.log('Handler error:', error.name, error.message);
+*   }
+* }
+* ```
+*/
+function isHandlerError(error) {
+	return isRetryableError(error) || isNonRetryableError(error);
+}
+/**
+* Create a RetryableError with less verbosity.
+*
+* This is a shorthand factory function for creating RetryableError instances.
+* Use it for cleaner error creation in handlers.
+*
+* @param message - Error message describing the failure
+* @param cause - Optional underlying error that caused this failure
+* @returns A new RetryableError instance
+*
+* @example
+* ```typescript
+* import { retryable } from '@amqp-contract/worker';
+* import { Future, Result } from '@swan-io/boxed';
+*
+* const handler = ({ payload }) =>
+*   Future.fromPromise(processPayment(payload))
+*     .mapOk(() => undefined)
+*     .mapError((e) => retryable('Payment service unavailable', e));
+*
+* // Equivalent to:
+* // .mapError((e) => new RetryableError('Payment service unavailable', e));
+* ```
+*/
+function retryable(message, cause) {
+	return new RetryableError(message, cause);
+}
+/**
+* Create a NonRetryableError with less verbosity.
+*
+* This is a shorthand factory function for creating NonRetryableError instances.
+* Use it for cleaner error creation in handlers.
+*
+* @param message - Error message describing the failure
+* @param cause - Optional underlying error that caused this failure
+* @returns A new NonRetryableError instance
+*
+* @example
+* ```typescript
+* import { nonRetryable } from '@amqp-contract/worker';
+* import { Future, Result } from '@swan-io/boxed';
+*
+* const handler = ({ payload }) => {
+*   if (!isValidPayload(payload)) {
+*     return Future.value(Result.Error(nonRetryable('Invalid payload format')));
+*   }
+*   return Future.value(Result.Ok(undefined));
+* };
+*
+* // Equivalent to:
+* // return Future.value(Result.Error(new NonRetryableError('Invalid payload format')));
+* ```
+*/
+function nonRetryable(message, cause) {
+	return new NonRetryableError(message, cause);
+}
 
 //#endregion
 //#region src/decompression.ts
 const gunzipAsync = (0, node_util.promisify)(node_zlib.gunzip);
 const inflateAsync = (0, node_util.promisify)(node_zlib.inflate);
 /**
+* Supported content encodings for message decompression.
+*/
+const SUPPORTED_ENCODINGS = ["gzip", "deflate"];
+/**
+* Type guard to check if a string is a supported encoding.
+*/
+function isSupportedEncoding(encoding) {
+	return SUPPORTED_ENCODINGS.includes(encoding.toLowerCase());
+}
+/**
 * Decompress a buffer based on the content-encoding header.
 *
 * @param buffer - The buffer to decompress
 * @param contentEncoding - The content-encoding header value (e.g., 'gzip', 'deflate')
-* @returns A promise that resolves to the decompressed buffer
-* @throws Error if decompression fails or if the encoding is unsupported
+* @returns A Future with the decompressed buffer or a TechnicalError
 *
 * @internal
 */
-async function decompressBuffer(buffer, contentEncoding) {
-	if (!contentEncoding) return buffer;
-	switch (contentEncoding.toLowerCase()) {
-		case "gzip": return gunzipAsync(buffer);
-		case "deflate": return inflateAsync(buffer);
-		default: throw new Error(`Unsupported content-encoding: ${contentEncoding}`);
+function decompressBuffer(buffer, contentEncoding) {
+	if (!contentEncoding) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(buffer));
+	const normalizedEncoding = contentEncoding.toLowerCase();
+	if (!isSupportedEncoding(normalizedEncoding)) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new _amqp_contract_core.TechnicalError(`Unsupported content-encoding: "${contentEncoding}". Supported encodings are: ${SUPPORTED_ENCODINGS.join(", ")}. Please check your publisher configuration.`)));
+	switch (normalizedEncoding) {
+		case "gzip": return _swan_io_boxed.Future.fromPromise(gunzipAsync(buffer)).mapError((error) => new _amqp_contract_core.TechnicalError("Failed to decompress gzip", error));
+		case "deflate": return _swan_io_boxed.Future.fromPromise(inflateAsync(buffer)).mapError((error) => new _amqp_contract_core.TechnicalError("Failed to decompress deflate", error));
 	}
 }
 
@@ -98,17 +219,6 @@ function isHandlerTuple(entry) {
 	return Array.isArray(entry) && entry.length === 2;
 }
 /**
-* Type guard to check if a value is a Standard Schema v1 compliant schema.
-*/
-function isStandardSchema(value) {
-	if (typeof value !== "object" || value === null) return false;
-	if (!("~standard" in value)) return false;
-	const standard = value["~standard"];
-	if (typeof standard !== "object" || standard === null) return false;
-	if (!("validate" in standard)) return false;
-	return typeof standard.validate === "function";
-}
-/**
 * Type-safe AMQP worker for consuming messages from RabbitMQ.
 *
 * This class provides automatic message validation, connection management,
@@ -204,7 +314,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			urls,
 			connectionOptions
 		}), handlers, logger, telemetry);
-		return worker.waitForConnectionReady().flatMapOk(() => worker.validateRetryConfiguration()).flatMapOk(() => worker.consumeAll()).mapOk(() => worker);
+		return worker.waitForConnectionReady().flatMapOk(() => worker.consumeAll()).mapOk(() => worker);
 	}
 	/**
 	* Close the AMQP channel and connection.
@@ -223,7 +333,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* ```
 	*/
 	close() {
-		return _swan_io_boxed.Future.all(Array.from(this.consumerTags).map((consumerTag) => _swan_io_boxed.Future.fromPromise(this.amqpClient.channel.cancel(consumerTag)).mapErrorToResult((error) => {
+		return _swan_io_boxed.Future.all(Array.from(this.consumerTags).map((consumerTag) => this.amqpClient.cancel(consumerTag).mapErrorToResult((error) => {
 			this.logger?.warn("Failed to cancel consumer during close", {
 				consumerTag,
 				error
@@ -231,213 +341,103 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			return _swan_io_boxed.Result.Ok(void 0);
 		}))).map(_swan_io_boxed.Result.all).tapOk(() => {
 			this.consumerTags.clear();
-		}).flatMapOk(() => _swan_io_boxed.Future.fromPromise(this.amqpClient.close())).mapError((error) => new TechnicalError("Failed to close AMQP connection", error)).mapOk(() => void 0);
-	}
-	/**
-	* Validate retry configuration for all consumers.
-	*
-	* For quorum-native mode, validates that the queue is properly configured.
-	* For TTL-backoff mode, wait queues are created by setupAmqpTopology in the core package.
-	*/
-	validateRetryConfiguration() {
-		if (!this.contract.consumers) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
-		for (const consumerName of Object.keys(this.contract.consumers)) {
-			const consumer = this.contract.consumers[consumerName];
-			if (!consumer) continue;
-			const queue = consumer.queue;
-			if ((queue.retry?.mode ?? "ttl-backoff") === "quorum-native") {
-				const validationError = this.validateQuorumNativeConfigForConsumer(String(consumerName), consumer);
-				if (validationError) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(validationError));
-				this.logger?.info("Using quorum-native retry mode", {
-					consumerName: String(consumerName),
-					queueName: queue.name
-				});
-			} else if (queue.deadLetter) this.logger?.info("Using TTL-backoff retry mode", {
-				consumerName: String(consumerName),
-				queueName: queue.name
-			});
-			else this.logger?.warn("Queue has no deadLetter configured - retries will use nack with requeue", {
-				consumerName: String(consumerName),
-				queueName: queue.name
-			});
-		}
-		return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
+		}).flatMapOk(() => this.amqpClient.close()).mapOk(() => void 0);
 	}
 	/**
-	* Get the resolved retry configuration for a consumer's queue.
-	* Reads retry config from the queue definition in the contract.
+	* Get the retry configuration for a consumer's queue.
+	* Defaults are applied in the contract's defineQueue, so we just return the config.
 	*/
 	getRetryConfigForConsumer(consumer) {
-		const retryOptions = consumer.queue.retry;
-		if (retryOptions?.mode === "quorum-native") return {
-			mode: "quorum-native",
-			maxRetries: 0,
-			initialDelayMs: 0,
-			maxDelayMs: 0,
-			backoffMultiplier: 0,
-			jitter: false
-		};
-		if (retryOptions?.mode === "ttl-backoff") return {
-			mode: "ttl-backoff",
-			maxRetries: retryOptions.maxRetries ?? 3,
-			initialDelayMs: retryOptions.initialDelayMs ?? 1e3,
-			maxDelayMs: retryOptions.maxDelayMs ?? 3e4,
-			backoffMultiplier: retryOptions.backoffMultiplier ?? 2,
-			jitter: retryOptions.jitter ?? true
-		};
-		return {
-			mode: "ttl-backoff",
-			maxRetries: 3,
-			initialDelayMs: 1e3,
-			maxDelayMs: 3e4,
-			backoffMultiplier: 2,
-			jitter: true
-		};
-	}
-	/**
-	* Validate that quorum-native retry mode is properly configured for a specific consumer.
-	*
-	* Requirements for quorum-native mode:
-	* - Consumer queue must be a quorum queue
-	* - Consumer queue must have deliveryLimit configured
-	* - Consumer queue should have DLX configured (warning if not)
-	*
-	* @returns TechnicalError if validation fails, null if valid
-	*/
-	validateQuorumNativeConfigForConsumer(consumerName, consumer) {
-		const queue = consumer.queue;
-		if (queue.type !== "quorum") return new TechnicalError(`Consumer "${consumerName}" uses queue "${queue.name}" with type "${queue.type}". Quorum-native retry mode requires quorum queues.`);
-		if (queue.deliveryLimit === void 0) return new TechnicalError(`Consumer "${consumerName}" uses queue "${queue.name}" without deliveryLimit configured. Quorum-native retry mode requires deliveryLimit to be set on the queue definition.`);
-		if (!queue.deadLetter) this.logger?.warn(`Consumer "${consumerName}" uses queue "${queue.name}" without deadLetter configured. Messages exceeding deliveryLimit will be dropped instead of dead-lettered.`);
-		return null;
+		return consumer.queue.retry;
 	}
 	/**
-	* Start consuming messages for all consumers
+	* Start consuming messages for all consumers.
+	* TypeScript guarantees consumers exist (handlers require matching consumers).
 	*/
 	consumeAll() {
-		if (!this.contract.consumers) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new TechnicalError("No consumers defined in contract")));
-		const consumerNames = Object.keys(this.contract.consumers);
-		let maxPrefetch = 0;
-		for (const consumerName of consumerNames) {
-			const options = this.consumerOptions[consumerName];
-			if (options?.prefetch !== void 0) {
-				if (options.prefetch <= 0 || !Number.isInteger(options.prefetch)) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new TechnicalError(`Invalid prefetch value for "${String(consumerName)}": must be a positive integer`)));
-				maxPrefetch = Math.max(maxPrefetch, options.prefetch);
-			}
-		}
-		if (maxPrefetch > 0) this.amqpClient.channel.addSetup(async (channel) => {
+		const consumers = this.contract.consumers;
+		const consumerNames = Object.keys(consumers);
+		const maxPrefetch = consumerNames.reduce((max, name) => {
+			const prefetch = this.consumerOptions[name]?.prefetch;
+			return prefetch ? Math.max(max, prefetch) : max;
+		}, 0);
+		if (maxPrefetch > 0) this.amqpClient.addSetup(async (channel) => {
 			await channel.prefetch(maxPrefetch);
 		});
-		return _swan_io_boxed.Future.all(consumerNames.map((consumerName) => this.consume(consumerName))).map(_swan_io_boxed.Result.all).mapOk(() => void 0);
+		return _swan_io_boxed.Future.all(consumerNames.map((name) => this.consume(name))).map(_swan_io_boxed.Result.all).mapOk(() => void 0);
 	}
 	waitForConnectionReady() {
-		return _swan_io_boxed.Future.fromPromise(this.amqpClient.channel.waitForConnect()).mapError((error) => new TechnicalError("Failed to wait for connection ready", error));
+		return this.amqpClient.waitForConnect();
 	}
 	/**
-	* Start consuming messages for a specific consumer
+	* Start consuming messages for a specific consumer.
+	* TypeScript guarantees consumer and handler exist for valid consumer names.
 	*/
 	consume(consumerName) {
-		const consumers = this.contract.consumers;
-		if (!consumers) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new TechnicalError("No consumers defined in contract")));
-		const consumer = consumers[consumerName];
-		if (!consumer) {
-			const availableConsumers = Object.keys(consumers);
-			const available = availableConsumers.length > 0 ? availableConsumers.join(", ") : "none";
-			return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new TechnicalError(`Consumer not found: "${String(consumerName)}". Available consumers: ${available}`)));
-		}
+		const consumer = this.contract.consumers[consumerName];
 		const handler = this.actualHandlers[consumerName];
-		if (!handler) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(new TechnicalError(`Handler for "${String(consumerName)}" not provided`)));
 		return this.consumeSingle(consumerName, consumer, handler);
 	}
 	/**
-	* Parse and validate a message from AMQP
-	* @returns `Future<Result<consumed message, void>>` - Ok with validated consumed message (payload + headers), or Error (already handled with nack)
+	* Validate data against a Standard Schema and handle errors.
 	*/
-	parseAndValidateMessage(msg, consumer, consumerName) {
-		const decompressMessage = _swan_io_boxed.Future.fromPromise(decompressBuffer(msg.content, msg.properties.contentEncoding)).tapError((error) => {
-			this.logger?.error("Error decompressing message", {
-				consumerName: String(consumerName),
-				queueName: consumer.queue.name,
-				contentEncoding: msg.properties.contentEncoding,
+	validateSchema(schema, data, context, msg) {
+		const rawValidation = schema["~standard"].validate(data);
+		const validationPromise = rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation);
+		return _swan_io_boxed.Future.fromPromise(validationPromise).mapError((error) => new _amqp_contract_core.TechnicalError(`Error validating ${context.field}`, error)).mapOkToResult((result) => {
+			if (result.issues) return _swan_io_boxed.Result.Error(new _amqp_contract_core.TechnicalError(`${context.field} validation failed`, new MessageValidationError(context.consumerName, result.issues)));
+			return _swan_io_boxed.Result.Ok(result.value);
+		}).tapError((error) => {
+			this.logger?.error(`${context.field} validation failed`, {
+				consumerName: context.consumerName,
+				queueName: context.queueName,
 				error
 			});
-			this.amqpClient.channel.nack(msg, false, false);
-		}).mapError(() => void 0);
-		const parseMessage = (buffer) => {
-			const parseResult = _swan_io_boxed.Result.fromExecution(() => JSON.parse(buffer.toString()));
-			if (parseResult.isError()) {
-				this.logger?.error("Error parsing message", {
-					consumerName: String(consumerName),
-					queueName: consumer.queue.name,
-					error: parseResult.error
-				});
-				this.amqpClient.channel.nack(msg, false, false);
-				return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(void 0));
-			}
-			return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(parseResult.value));
-		};
-		const validatePayload = (parsedMessage) => {
-			const rawValidation = consumer.message.payload["~standard"].validate(parsedMessage);
-			return _swan_io_boxed.Future.fromPromise(rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation)).mapError(() => void 0).mapOkToResult((validationResult) => {
-				if (validationResult.issues) {
-					const error = new MessageValidationError(String(consumerName), validationResult.issues);
-					this.logger?.error("Message payload validation failed", {
-						consumerName: String(consumerName),
-						queueName: consumer.queue.name,
-						error
-					});
-					this.amqpClient.channel.nack(msg, false, false);
-					return _swan_io_boxed.Result.Error(void 0);
-				}
-				return _swan_io_boxed.Result.Ok(validationResult.value);
-			});
+			this.amqpClient.nack(msg, false, false);
+		});
+	}
+	/**
+	* Parse and validate a message from AMQP.
+	* @returns Ok with validated message (payload + headers), or Error (message already nacked)
+	*/
+	parseAndValidateMessage(msg, consumer, consumerName) {
+		const context = {
+			consumerName: String(consumerName),
+			queueName: consumer.queue.name
 		};
-		const validateHeaders = () => {
-			const headersSchema = consumer.message.headers;
-			if (!headersSchema) return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
-			if (!isStandardSchema(headersSchema)) {
-				const error = new MessageValidationError(String(consumerName), "Invalid headers schema: not a Standard Schema v1 compliant schema");
-				this.logger?.error("Message headers validation failed", {
-					consumerName: String(consumerName),
-					queueName: consumer.queue.name,
-					error
-				});
-				this.amqpClient.channel.nack(msg, false, false);
-				return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Error(void 0));
-			}
-			const validSchema = headersSchema;
-			const rawHeaders = msg.properties.headers ?? {};
-			const rawValidation = validSchema["~standard"].validate(rawHeaders);
-			return _swan_io_boxed.Future.fromPromise(rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation)).mapError(() => void 0).mapOkToResult((validationResult) => {
-				if (validationResult.issues) {
-					const error = new MessageValidationError(String(consumerName), validationResult.issues);
-					this.logger?.error("Message headers validation failed", {
-						consumerName: String(consumerName),
-						queueName: consumer.queue.name,
-						error
-					});
-					this.amqpClient.channel.nack(msg, false, false);
-					return _swan_io_boxed.Result.Error(void 0);
-				}
-				return _swan_io_boxed.Result.Ok(validationResult.value);
+		const nackAndError = (message, error) => {
+			this.logger?.error(message, {
+				...context,
+				error
 			});
+			this.amqpClient.nack(msg, false, false);
+			return new _amqp_contract_core.TechnicalError(message, error);
 		};
-		const buildConsumedMessage = (validatedPayload) => {
-			return validateHeaders().mapOk((validatedHeaders) => {
-				return {
-					payload: validatedPayload,
-					headers: validatedHeaders
-				};
+		const parsePayload = decompressBuffer(msg.content, msg.properties.contentEncoding).tapError((error) => {
+			this.logger?.error("Failed to decompress message", {
+				...context,
+				error
 			});
-		};
-		return decompressMessage.flatMapOk(parseMessage).flatMapOk(validatePayload).flatMapOk(buildConsumedMessage);
+			this.amqpClient.nack(msg, false, false);
+		}).mapOkToResult((buffer) => _swan_io_boxed.Result.fromExecution(() => JSON.parse(buffer.toString())).mapError((error) => nackAndError("Failed to parse JSON", error))).flatMapOk((parsed) => this.validateSchema(consumer.message.payload, parsed, {
+			...context,
+			field: "payload"
+		}, msg));
+		const parseHeaders = consumer.message.headers ? this.validateSchema(consumer.message.headers, msg.properties.headers ?? {}, {
+			...context,
+			field: "headers"
+		}, msg) : _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
+		return _swan_io_boxed.Future.allFromDict({
+			payload: parsePayload,
+			headers: parseHeaders
+		}).map(_swan_io_boxed.Result.allFromDict);
 	}
 	/**
 	* Consume messages one at a time
 	*/
 	consumeSingle(consumerName, consumer, handler) {
 		const queueName = consumer.queue.name;
-		return _swan_io_boxed.Future.fromPromise(this.amqpClient.channel.consume(queueName, async (msg) => {
+		return this.amqpClient.consume(queueName, async (msg) => {
 			if (msg === null) {
 				this.logger?.warn("Consumer cancelled by server", {
 					consumerName: String(consumerName),
@@ -452,7 +452,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 					consumerName: String(consumerName),
 					queueName
 				});
-				this.amqpClient.channel.ack(msg);
+				this.amqpClient.ack(msg);
 				const durationMs = Date.now() - startTime;
 				(0, _amqp_contract_core.endSpanSuccess)(span);
 				(0, _amqp_contract_core.recordConsumeMetric)(this.telemetry, queueName, String(consumerName), true, durationMs);
@@ -473,9 +473,9 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				(0, _amqp_contract_core.endSpanError)(span, /* @__PURE__ */ new Error("Message validation failed"));
 				(0, _amqp_contract_core.recordConsumeMetric)(this.telemetry, queueName, String(consumerName), false, durationMs);
 			}).toPromise();
-		})).tapOk((reply) => {
-			this.consumerTags.add(reply.consumerTag);
-		}).mapError((error) => new TechnicalError(`Failed to start consuming for "${String(consumerName)}"`, error)).mapOk(() => void 0);
+		}).tapOk((consumerTag) => {
+			this.consumerTags.add(consumerTag);
+		}).mapError((error) => new _amqp_contract_core.TechnicalError(`Failed to start consuming for "${String(consumerName)}"`, error)).mapOk(() => void 0);
 	}
 	/**
 	* Handle error in message processing with retry logic.
@@ -540,7 +540,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			attemptsBeforeDeadLetter,
 			error: error.message
 		});
-		this.amqpClient.channel.nack(msg, false, true);
+		this.amqpClient.nack(msg, false, true);
 		return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
 	}
 	/**
@@ -622,14 +622,14 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 		const deadLetter = consumer.queue.deadLetter;
 		if (!deadLetter) {
 			this.logger?.warn("Cannot retry: queue does not have DLX configured, falling back to nack with requeue", { queueName });
-			this.amqpClient.channel.nack(msg, false, true);
+			this.amqpClient.nack(msg, false, true);
 			return _swan_io_boxed.Future.value(_swan_io_boxed.Result.Ok(void 0));
 		}
 		const dlxName = deadLetter.exchange.name;
 		const waitRoutingKey = `${queueName}-wait`;
-		this.amqpClient.channel.ack(msg);
+		this.amqpClient.ack(msg);
 		const content = this.parseMessageContentForRetry(msg, queueName);
-		return _swan_io_boxed.Future.fromPromise(this.amqpClient.channel.publish(dlxName, waitRoutingKey, content, {
+		return this.amqpClient.publish(dlxName, waitRoutingKey, content, {
 			...msg.properties,
 			expiration: delayMs.toString(),
 			headers: {
@@ -638,14 +638,14 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				"x-last-error": error.message,
 				"x-first-failure-timestamp": msg.properties.headers?.["x-first-failure-timestamp"] ?? Date.now()
 			}
-		})).mapError((error$1) => new TechnicalError("Failed to publish message for retry", error$1)).mapOkToResult((published) => {
+		}).mapOkToResult((published) => {
 			if (!published) {
 				this.logger?.error("Failed to publish message for retry (write buffer full)", {
 					queueName,
 					waitRoutingKey,
 					retryCount: newRetryCount
 				});
-				return _swan_io_boxed.Result.Error(new TechnicalError("Failed to publish message for retry (write buffer full)"));
+				return _swan_io_boxed.Result.Error(new _amqp_contract_core.TechnicalError("Failed to publish message for retry (write buffer full)"));
 			}
 			this.logger?.info("Message published for retry", {
 				queueName,
@@ -667,7 +667,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			queueName,
 			deliveryTag: msg.fields.deliveryTag
 		});
-		this.amqpClient.channel.nack(msg, false, false);
+		this.amqpClient.nack(msg, false, false);
 	}
 };
 
@@ -736,7 +736,11 @@ function defineHandlers(contract, handlers) {
 exports.MessageValidationError = MessageValidationError;
 exports.NonRetryableError = NonRetryableError;
 exports.RetryableError = RetryableError;
-exports.TechnicalError = TechnicalError;
 exports.TypedAmqpWorker = TypedAmqpWorker;
 exports.defineHandler = defineHandler;
-exports.defineHandlers = defineHandlers;
+exports.defineHandlers = defineHandlers;
+exports.isHandlerError = isHandlerError;
+exports.isNonRetryableError = isNonRetryableError;
+exports.isRetryableError = isRetryableError;
+exports.nonRetryable = nonRetryable;
+exports.retryable = retryable;