@amqp-contract/worker 0.10.0 → 0.12.0

package/dist/index.mjs

@@ -1,40 +1,20 @@
-import { AmqpClient, defaultTelemetryProvider, endSpanError, endSpanSuccess, recordConsumeMetric, startConsumeSpan } from "@amqp-contract/core";
+import { AmqpClient, TechnicalError, defaultTelemetryProvider, endSpanError, endSpanSuccess, recordConsumeMetric, startConsumeSpan } from "@amqp-contract/core";
 import { Future, Result } from "@swan-io/boxed";
 import { gunzip, inflate } from "node:zlib";
 import { promisify } from "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,11 +40,13 @@ 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);
 	}
 };
 
@@ -71,27 +55,43 @@ var NonRetryableError = class extends WorkerError {
 const gunzipAsync = promisify(gunzip);
 const inflateAsync = promisify(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 Future.value(Result.Ok(buffer));
+	const normalizedEncoding = contentEncoding.toLowerCase();
+	if (!isSupportedEncoding(normalizedEncoding)) return Future.value(Result.Error(new TechnicalError(`Unsupported content-encoding: "${contentEncoding}". Supported encodings are: ${SUPPORTED_ENCODINGS.join(", ")}. Please check your publisher configuration.`)));
+	switch (normalizedEncoding) {
+		case "gzip": return Future.fromPromise(gunzipAsync(buffer)).mapError((error) => new TechnicalError("Failed to decompress gzip", error));
+		case "deflate": return Future.fromPromise(inflateAsync(buffer)).mapError((error) => new TechnicalError("Failed to decompress deflate", error));
 	}
 }
 
 //#endregion
 //#region src/worker.ts
 /**
+* Type guard to check if a handler entry is a tuple format [handler, options].
+*/
+function isHandlerTuple(entry) {
+	return Array.isArray(entry) && entry.length === 2;
+}
+/**
 * Type-safe AMQP worker for consuming messages from RabbitMQ.
 *
 * This class provides automatic message validation, connection management,
@@ -133,16 +133,13 @@ async function decompressBuffer(buffer, contentEncoding) {
 */
 var TypedAmqpWorker = class TypedAmqpWorker {
 	/**
-	* Internal handler type - always safe handlers (`Future<Result>`).
-	* Unsafe handlers are wrapped into safe handlers by defineUnsafeHandler/defineUnsafeHandlers.
+	* Internal handler storage - handlers returning `Future<Result>`.
 	*/
 	actualHandlers;
 	consumerOptions;
-	batchTimers = /* @__PURE__ */ new Map();
 	consumerTags = /* @__PURE__ */ new Set();
-	retryConfig;
 	telemetry;
-	constructor(contract, amqpClient, handlers, logger, retryOptions, telemetry) {
+	constructor(contract, amqpClient, handlers, logger, telemetry) {
 		this.contract = contract;
 		this.amqpClient = amqpClient;
 		this.logger = logger;
@@ -153,19 +150,12 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 		for (const consumerName of Object.keys(handlersRecord)) {
 			const handlerEntry = handlersRecord[consumerName];
 			const typedConsumerName = consumerName;
-			if (Array.isArray(handlerEntry)) {
-				this.actualHandlers[typedConsumerName] = handlerEntry[0];
-				this.consumerOptions[typedConsumerName] = handlerEntry[1];
+			if (isHandlerTuple(handlerEntry)) {
+				const [handler, options] = handlerEntry;
+				this.actualHandlers[typedConsumerName] = handler;
+				this.consumerOptions[typedConsumerName] = options;
 			} else this.actualHandlers[typedConsumerName] = handlerEntry;
 		}
-		if (retryOptions === void 0) this.retryConfig = null;
-		else this.retryConfig = {
-			maxRetries: retryOptions.maxRetries ?? 3,
-			initialDelayMs: retryOptions.initialDelayMs ?? 1e3,
-			maxDelayMs: retryOptions.maxDelayMs ?? 3e4,
-			backoffMultiplier: retryOptions.backoffMultiplier ?? 2,
-			jitter: retryOptions.jitter ?? true
-		};
 	}
 	/**
 	* Create a type-safe AMQP worker from a contract.
@@ -186,18 +176,18 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* const worker = await TypedAmqpWorker.create({
 	*   contract: myContract,
 	*   handlers: {
-	*     processOrder: async (msg) => console.log('Order:', msg.orderId)
+	*     processOrder: async ({ payload }) => console.log('Order:', payload.orderId)
 	*   },
 	*   urls: ['amqp://localhost']
 	* }).resultToPromise();
 	* ```
 	*/
-	static create({ contract, handlers, urls, connectionOptions, logger, retry, telemetry }) {
+	static create({ contract, handlers, urls, connectionOptions, logger, telemetry }) {
 		const worker = new TypedAmqpWorker(contract, new AmqpClient(contract, {
 			urls,
 			connectionOptions
-		}), handlers, logger, retry, telemetry);
-		return worker.waitForConnectionReady().flatMapOk(() => worker.setupWaitQueues()).flatMapOk(() => worker.consumeAll()).mapOk(() => worker);
+		}), handlers, logger, telemetry);
+		return worker.waitForConnectionReady().flatMapOk(() => worker.consumeAll()).mapOk(() => worker);
 	}
 	/**
 	* Close the AMQP channel and connection.
@@ -216,9 +206,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	* ```
 	*/
 	close() {
-		for (const timer of this.batchTimers.values()) clearTimeout(timer);
-		this.batchTimers.clear();
-		return Future.all(Array.from(this.consumerTags).map((consumerTag) => Future.fromPromise(this.amqpClient.channel.cancel(consumerTag)).mapErrorToResult((error) => {
+		return 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
@@ -226,146 +214,103 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			return Result.Ok(void 0);
 		}))).map(Result.all).tapOk(() => {
 			this.consumerTags.clear();
-		}).flatMapOk(() => Future.fromPromise(this.amqpClient.close())).mapError((error) => new TechnicalError("Failed to close AMQP connection", error)).mapOk(() => void 0);
+		}).flatMapOk(() => this.amqpClient.close()).mapOk(() => void 0);
 	}
 	/**
-	* Set up wait queues for retry mechanism.
-	* Creates and binds wait queues for each consumer queue that has DLX configuration.
+	* Get the retry configuration for a consumer's queue.
+	* Defaults are applied in the contract's defineQueue, so we just return the config.
 	*/
-	setupWaitQueues() {
-		if (this.retryConfig === null) return Future.value(Result.Ok(void 0));
-		if (!this.contract.consumers || !this.contract.queues) return Future.value(Result.Ok(void 0));
-		const setupTasks = [];
-		for (const consumerName of Object.keys(this.contract.consumers)) {
-			const consumer = this.contract.consumers[consumerName];
-			if (!consumer) continue;
-			const queue = consumer.queue;
-			const deadLetter = queue.deadLetter;
-			if (!deadLetter) continue;
-			const queueName = queue.name;
-			const waitQueueName = `${queueName}-wait`;
-			const dlxName = deadLetter.exchange.name;
-			const setupTask = Future.fromPromise(this.amqpClient.channel.addSetup(async (channel) => {
-				await channel.assertQueue(waitQueueName, {
-					durable: queue.durable ?? false,
-					deadLetterExchange: dlxName,
-					deadLetterRoutingKey: queueName
-				});
-				await channel.bindQueue(waitQueueName, dlxName, `${queueName}-wait`);
-				await channel.bindQueue(queueName, dlxName, queueName);
-				this.logger?.info("Wait queue created and bound", {
-					consumerName: String(consumerName),
-					queueName,
-					waitQueueName,
-					dlxName
-				});
-			})).mapError((error) => new TechnicalError(`Failed to setup wait queue for "${String(consumerName)}"`, error));
-			setupTasks.push(setupTask);
-		}
-		if (setupTasks.length === 0) return Future.value(Result.Ok(void 0));
-		return Future.all(setupTasks).map(Result.all).mapOk(() => void 0);
+	getRetryConfigForConsumer(consumer) {
+		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 Future.value(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 Future.value(Result.Error(new TechnicalError(`Invalid prefetch value for "${String(consumerName)}": must be a positive integer`)));
-				maxPrefetch = Math.max(maxPrefetch, options.prefetch);
-			}
-			if (options?.batchSize !== void 0) {
-				const effectivePrefetch = options.prefetch ?? options.batchSize;
-				maxPrefetch = Math.max(maxPrefetch, effectivePrefetch);
-			}
-		}
-		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 Future.all(consumerNames.map((consumerName) => this.consume(consumerName))).map(Result.all).mapOk(() => void 0);
+		return Future.all(consumerNames.map((name) => this.consume(name))).map(Result.all).mapOk(() => void 0);
 	}
 	waitForConnectionReady() {
-		return 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 Future.value(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 Future.value(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 Future.value(Result.Error(new TechnicalError(`Handler for "${String(consumerName)}" not provided`)));
-		const options = this.consumerOptions[consumerName] ?? {};
-		if (options.batchSize !== void 0) {
-			if (options.batchSize <= 0 || !Number.isInteger(options.batchSize)) return Future.value(Result.Error(new TechnicalError(`Invalid batchSize for "${String(consumerName)}": must be a positive integer`)));
-		}
-		if (options.batchTimeout !== void 0) {
-			if (typeof options.batchTimeout !== "number" || !Number.isFinite(options.batchTimeout) || options.batchTimeout <= 0) return Future.value(Result.Error(new TechnicalError(`Invalid batchTimeout for "${String(consumerName)}": must be a positive number`)));
-		}
-		if (options.batchSize !== void 0 && options.batchSize > 0) return this.consumeBatch(consumerName, consumer, options, handler);
-		else return this.consumeSingle(consumerName, consumer, handler);
+		return this.consumeSingle(consumerName, consumer, handler);
 	}
 	/**
-	* Parse and validate a message from AMQP
-	* @returns `Future<Result<validated message, void>>` - Ok with validated message, or Error (already handled with nack)
+	* Validate data against a Standard Schema and handle errors.
 	*/
-	parseAndValidateMessage(msg, consumer, consumerName) {
-		const decompressMessage = 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 Future.fromPromise(validationPromise).mapError((error) => new TechnicalError(`Error validating ${context.field}`, error)).mapOkToResult((result) => {
+			if (result.issues) return Result.Error(new TechnicalError(`${context.field} validation failed`, new MessageValidationError(context.consumerName, result.issues)));
+			return 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);
+			this.amqpClient.nack(msg, false, false);
 		});
-		const parseMessage = (buffer) => {
-			const parseResult = 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 Future.value(Result.Error(void 0));
-			}
-			return Future.value(Result.Ok(parseResult.value));
+	}
+	/**
+	* 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 validateMessage = (parsedMessage) => {
-			const rawValidation = consumer.message.payload["~standard"].validate(parsedMessage);
-			return Future.fromPromise(rawValidation instanceof Promise ? rawValidation : Promise.resolve(rawValidation)).mapOkToResult((validationResult) => {
-				if (validationResult.issues) {
-					const error = new MessageValidationError(String(consumerName), validationResult.issues);
-					this.logger?.error("Message validation failed", {
-						consumerName: String(consumerName),
-						queueName: consumer.queue.name,
-						error
-					});
-					this.amqpClient.channel.nack(msg, false, false);
-					return Result.Error(void 0);
-				}
-				return Result.Ok(validationResult.value);
+		const nackAndError = (message, error) => {
+			this.logger?.error(message, {
+				...context,
+				error
 			});
+			this.amqpClient.nack(msg, false, false);
+			return new TechnicalError(message, error);
 		};
-		return decompressMessage.flatMapOk(parseMessage).flatMapOk(validateMessage);
+		const parsePayload = decompressBuffer(msg.content, msg.properties.contentEncoding).tapError((error) => {
+			this.logger?.error("Failed to decompress message", {
+				...context,
+				error
+			});
+			this.amqpClient.nack(msg, false, false);
+		}).mapOkToResult((buffer) => 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) : Future.value(Result.Ok(void 0));
+		return Future.allFromDict({
+			payload: parsePayload,
+			headers: parseHeaders
+		}).map(Result.allFromDict);
 	}
 	/**
 	* Consume messages one at a time
 	*/
 	consumeSingle(consumerName, consumer, handler) {
 		const queueName = consumer.queue.name;
-		return 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),
@@ -375,12 +320,12 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			}
 			const startTime = Date.now();
 			const span = startConsumeSpan(this.telemetry, queueName, String(consumerName), { "messaging.rabbitmq.message.delivery_tag": msg.fields.deliveryTag });
-			await this.parseAndValidateMessage(msg, consumer, consumerName).flatMapOk((validatedMessage) => handler(validatedMessage).flatMapOk(() => {
+			await this.parseAndValidateMessage(msg, consumer, consumerName).flatMapOk((validatedMessage) => handler(validatedMessage, msg).flatMapOk(() => {
 				this.logger?.info("Message consumed successfully", {
 					consumerName: String(consumerName),
 					queueName
 				});
-				this.amqpClient.channel.ack(msg);
+				this.amqpClient.ack(msg);
 				const durationMs = Date.now() - startTime;
 				endSpanSuccess(span);
 				recordConsumeMetric(this.telemetry, queueName, String(consumerName), true, durationMs);
@@ -401,112 +346,26 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 				endSpanError(span, /* @__PURE__ */ new Error("Message validation failed"));
 				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);
-	}
-	/**
-	* Handle batch processing error by applying error handling to all messages.
-	*/
-	handleBatchError(error, currentBatch, consumerName, consumer) {
-		return Future.all(currentBatch.map((item) => this.handleError(error, item.amqpMessage, consumerName, consumer))).map(Result.all).mapOk(() => void 0);
-	}
-	/**
-	* Consume messages in batches
-	*/
-	consumeBatch(consumerName, consumer, options, handler) {
-		const batchSize = options.batchSize;
-		const batchTimeout = options.batchTimeout ?? 1e3;
-		const timerKey = String(consumerName);
-		const queueName = consumer.queue.name;
-		let batch = [];
-		let isProcessing = false;
-		const processBatch = () => {
-			if (isProcessing || batch.length === 0) return Future.value(Result.Ok(void 0));
-			isProcessing = true;
-			const currentBatch = batch;
-			batch = [];
-			const timer = this.batchTimers.get(timerKey);
-			if (timer) {
-				clearTimeout(timer);
-				this.batchTimers.delete(timerKey);
-			}
-			const messages = currentBatch.map((item) => item.message);
-			const batchCount = currentBatch.length;
-			const startTime = Date.now();
-			const span = startConsumeSpan(this.telemetry, queueName, String(consumerName), { "amqp.batch.size": batchCount });
-			this.logger?.info("Processing batch", {
-				consumerName: String(consumerName),
-				queueName,
-				batchSize: batchCount
-			});
-			return handler(messages).flatMapOk(() => {
-				for (const item of currentBatch) this.amqpClient.channel.ack(item.amqpMessage);
-				this.logger?.info("Batch processed successfully", {
-					consumerName: String(consumerName),
-					queueName,
-					batchSize: batchCount
-				});
-				const durationMs = Date.now() - startTime;
-				endSpanSuccess(span);
-				recordConsumeMetric(this.telemetry, queueName, String(consumerName), true, durationMs);
-				return Future.value(Result.Ok(void 0));
-			}).flatMapError((handlerError) => {
-				this.logger?.error("Error processing batch", {
-					consumerName: String(consumerName),
-					queueName,
-					batchSize: batchCount,
-					errorType: handlerError.name,
-					error: handlerError.message
-				});
-				const durationMs = Date.now() - startTime;
-				endSpanError(span, handlerError);
-				recordConsumeMetric(this.telemetry, queueName, String(consumerName), false, durationMs);
-				return this.handleBatchError(handlerError, currentBatch, String(consumerName), consumer);
-			}).tap(() => {
-				isProcessing = false;
-			});
-		};
-		const scheduleBatchProcessing = () => {
-			if (isProcessing) return;
-			const existingTimer = this.batchTimers.get(timerKey);
-			if (existingTimer) clearTimeout(existingTimer);
-			const timer = setTimeout(() => {
-				processBatch().toPromise();
-			}, batchTimeout);
-			this.batchTimers.set(timerKey, timer);
-		};
-		return Future.fromPromise(this.amqpClient.channel.consume(queueName, async (msg) => {
-			if (msg === null) {
-				this.logger?.warn("Consumer cancelled by server", {
-					consumerName: String(consumerName),
-					queueName
-				});
-				await processBatch().toPromise();
-				return;
-			}
-			const validationResult = await this.parseAndValidateMessage(msg, consumer, consumerName).toPromise();
-			if (validationResult.isError()) return;
-			batch.push({
-				message: validationResult.value,
-				amqpMessage: msg
-			});
-			if (batch.length >= batchSize) {
-				await processBatch().toPromise();
-				if (batch.length > 0 && !this.batchTimers.has(timerKey)) scheduleBatchProcessing();
-			} else if (!this.batchTimers.has(timerKey)) scheduleBatchProcessing();
-		})).tapOk((reply) => {
-			this.consumerTags.add(reply.consumerTag);
+		}).tapOk((consumerTag) => {
+			this.consumerTags.add(consumerTag);
 		}).mapError((error) => new TechnicalError(`Failed to start consuming for "${String(consumerName)}"`, error)).mapOk(() => void 0);
 	}
 	/**
 	* Handle error in message processing with retry logic.
 	*
-	* Flow:
+	* Flow depends on retry mode:
+	*
+	* **quorum-native mode:**
 	* 1. If NonRetryableError -> send directly to DLQ (no retry)
-	* 2. If no retry config -> legacy behavior (immediate requeue)
-	* 3. If max retries exceeded -> send to DLQ
-	* 4. Otherwise -> publish to wait queue with TTL for retry
+	* 2. Otherwise -> nack with requeue=true (RabbitMQ handles delivery count)
+	*
+	* **ttl-backoff mode:**
+	* 1. If NonRetryableError -> send directly to DLQ (no retry)
+	* 2. If max retries exceeded -> send to DLQ
+	* 3. Otherwise -> publish to wait queue with TTL for retry
+	*
+	* **Legacy mode (no retry config):**
+	* 1. nack with requeue=true (immediate requeue)
 	*/
 	handleError(error, msg, consumerName, consumer) {
 		if (error instanceof NonRetryableError) {
@@ -518,16 +377,50 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			this.sendToDLQ(msg, consumer);
 			return Future.value(Result.Ok(void 0));
 		}
-		if (this.retryConfig === null) {
-			this.logger?.warn("Error in handler (legacy mode: immediate requeue)", {
-				consumerName,
-				error: error.message
-			});
-			this.amqpClient.channel.nack(msg, false, true);
-			return Future.value(Result.Ok(void 0));
-		}
+		const config = this.getRetryConfigForConsumer(consumer);
+		if (config.mode === "quorum-native") return this.handleErrorQuorumNative(error, msg, consumerName, consumer);
+		return this.handleErrorTtlBackoff(error, msg, consumerName, consumer, config);
+	}
+	/**
+	* Handle error using quorum queue's native delivery limit feature.
+	*
+	* Simply requeues the message with nack(requeue=true). RabbitMQ automatically:
+	* - Increments x-delivery-count header
+	* - Dead-letters the message when count exceeds x-delivery-limit
+	*
+	* This is simpler than TTL-based retry but provides immediate retries only.
+	*/
+	handleErrorQuorumNative(error, msg, consumerName, consumer) {
+		const queue = consumer.queue;
+		const queueName = queue.name;
+		const deliveryCount = msg.properties.headers?.["x-delivery-count"] ?? 0;
+		const deliveryLimit = queue.type === "quorum" ? queue.deliveryLimit : void 0;
+		const attemptsBeforeDeadLetter = deliveryLimit !== void 0 ? Math.max(0, deliveryLimit - deliveryCount - 1) : "unknown";
+		if (deliveryLimit !== void 0 && deliveryCount >= deliveryLimit - 1) this.logger?.warn("Message at final delivery attempt (quorum-native mode)", {
+			consumerName,
+			queueName,
+			deliveryCount,
+			deliveryLimit,
+			willDeadLetterOnNextFailure: deliveryCount === deliveryLimit - 1,
+			alreadyExceededLimit: deliveryCount >= deliveryLimit,
+			error: error.message
+		});
+		else this.logger?.warn("Retrying message (quorum-native mode)", {
+			consumerName,
+			queueName,
+			deliveryCount,
+			deliveryLimit,
+			attemptsBeforeDeadLetter,
+			error: error.message
+		});
+		this.amqpClient.nack(msg, false, true);
+		return Future.value(Result.Ok(void 0));
+	}
+	/**
+	* Handle error using TTL + wait queue pattern for exponential backoff.
+	*/
+	handleErrorTtlBackoff(error, msg, consumerName, consumer, config) {
 		const retryCount = msg.properties.headers?.["x-retry-count"] ?? 0;
-		const config = this.retryConfig;
 		if (retryCount >= config.maxRetries) {
 			this.logger?.error("Max retries exceeded, sending to DLQ", {
 				consumerName,
@@ -538,8 +431,8 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			this.sendToDLQ(msg, consumer);
 			return Future.value(Result.Ok(void 0));
 		}
-		const delayMs = this.calculateRetryDelay(retryCount);
-		this.logger?.warn("Retrying message", {
+		const delayMs = this.calculateRetryDelay(retryCount, config);
+		this.logger?.warn("Retrying message (ttl-backoff mode)", {
 			consumerName,
 			retryCount: retryCount + 1,
 			delayMs,
@@ -550,8 +443,8 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 	/**
 	* Calculate retry delay with exponential backoff and optional jitter.
 	*/
-	calculateRetryDelay(retryCount) {
-		const { initialDelayMs, maxDelayMs, backoffMultiplier, jitter } = this.retryConfig;
+	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);
@@ -602,14 +495,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 Future.value(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 Future.fromPromise(this.amqpClient.channel.publish(dlxName, waitRoutingKey, content, {
+		return this.amqpClient.publish(dlxName, waitRoutingKey, content, {
 			...msg.properties,
 			expiration: delayMs.toString(),
 			headers: {
@@ -618,7 +511,7 @@ 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,
@@ -647,7 +540,7 @@ var TypedAmqpWorker = class TypedAmqpWorker {
 			queueName,
 			deliveryTag: msg.fields.deliveryTag
 		});
-		this.amqpClient.channel.nack(msg, false, false);
+		this.amqpClient.nack(msg, false, false);
 	}
 };
 
@@ -673,19 +566,6 @@ function validateHandlers(contract, handlers) {
 	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}`);
 }
-/**
-* Wrap a Promise-based handler into a Future-based safe handler.
-* This is used internally by defineUnsafeHandler to convert Promise handlers to Future handlers.
-*/
-function wrapUnsafeHandler(handler) {
-	return (input) => {
-		return Future.fromPromise(handler(input)).mapOkToResult(() => Result.Ok(void 0)).flatMapError((error) => {
-			if (error instanceof NonRetryableError || error instanceof RetryableError) return Future.value(Result.Error(error));
-			const retryableError = new RetryableError(error instanceof Error ? error.message : String(error), error);
-			return Future.value(Result.Error(retryableError));
-		});
-	};
-}
 function defineHandler(contract, consumerName, handler, options) {
 	validateConsumerExists(contract, String(consumerName));
 	if (options) return [handler, options];
@@ -709,12 +589,12 @@ function defineHandler(contract, consumerName, handler, options) {
 * import { orderContract } from './contract';
 *
 * const handlers = defineHandlers(orderContract, {
-*   processOrder: (message) =>
-*     Future.fromPromise(processPayment(message))
+*   processOrder: ({ payload }) =>
+*     Future.fromPromise(processPayment(payload))
 *       .mapOk(() => undefined)
 *       .mapError((error) => new RetryableError('Payment failed', error)),
-*   notifyOrder: (message) =>
-*     Future.fromPromise(sendNotification(message))
+*   notifyOrder: ({ payload }) =>
+*     Future.fromPromise(sendNotification(payload))
 *       .mapOk(() => undefined)
 *       .mapError((error) => new RetryableError('Notification failed', error)),
 * });
@@ -724,53 +604,7 @@ function defineHandlers(contract, handlers) {
 	validateHandlers(contract, handlers);
 	return handlers;
 }
-function defineUnsafeHandler(contract, consumerName, handler, options) {
-	validateConsumerExists(contract, String(consumerName));
-	const wrappedHandler = wrapUnsafeHandler(handler);
-	if (options) return [wrappedHandler, options];
-	return wrappedHandler;
-}
-/**
-* Define multiple unsafe handlers for consumers in a contract.
-*
-* @deprecated Use `defineHandlers` instead for explicit error handling with `Future<Result>`.
-*
-* **Warning:** Unsafe handlers use exception-based error handling.
-* Consider migrating to safe handlers for better error control.
-*
-* **Note:** Internally, this function wraps all Promise-based handlers into Future-based
-* safe handlers for consistent processing in the worker.
-*
-* @template TContract - The contract definition type
-* @param contract - The contract definition containing the consumers
-* @param handlers - An object with async handler functions for each consumer
-* @returns A type-safe handlers object that can be used with TypedAmqpWorker
-*
-* @example
-* ```typescript
-* import { defineUnsafeHandlers } from '@amqp-contract/worker';
-*
-* // ⚠️ Consider using defineHandlers for better error handling
-* const handlers = defineUnsafeHandlers(orderContract, {
-*   processOrder: async (message) => {
-*     await processPayment(message);
-*   },
-*   notifyOrder: async (message) => {
-*     await sendNotification(message);
-*   },
-* });
-* ```
-*/
-function defineUnsafeHandlers(contract, handlers) {
-	validateHandlers(contract, handlers);
-	const result = {};
-	for (const [name, entry] of Object.entries(handlers)) if (Array.isArray(entry)) {
-		const [handler, options] = entry;
-		result[name] = [wrapUnsafeHandler(handler), options];
-	} else result[name] = wrapUnsafeHandler(entry);
-	return result;
-}
 
 //#endregion
-export { MessageValidationError, NonRetryableError, RetryableError, TechnicalError, TypedAmqpWorker, defineHandler, defineHandlers, defineUnsafeHandler, defineUnsafeHandlers };
+export { MessageValidationError, NonRetryableError, RetryableError, TypedAmqpWorker, defineHandler, defineHandlers };
 //# sourceMappingURL=index.mjs.map