runmq 1.4.0 → 1.4.2

package/dist/index.cjs

@@ -60,8 +60,8 @@ var RunMQException = class extends Error {
   }
 };
 
-// src/core/clients/RabbitMQClientAdapter.ts
-var import_rabbitmq_client = require("rabbitmq-client");
+// src/core/clients/AmqplibClientAdapter.ts
+var import_amqplib = __toESM(require("amqplib"), 1);
 
 // src/core/exceptions/Exceptions.ts
 var Exceptions = class {
@@ -73,8 +73,8 @@ Exceptions.INVALID_MESSAGE_FORMAT = "MESSAGE_SHOULD_BE_VALID_RECORD";
 Exceptions.UNSUPPORTED_SCHEMA = "UNSUPPORTED_SCHEMA";
 Exceptions.FAILURE_TO_DEFINE_TTL_POLICY = "FAILURE_TO_DEFINE_TTL_POLICY";
 
-// src/core/clients/RabbitMQClientChannel.ts
-var RabbitMQClientChannel = class {
+// src/core/clients/AmqplibChannel.ts
+var AmqplibChannel = class {
   constructor(channel) {
     this.channel = channel;
   }
@@ -84,8 +84,7 @@ var RabbitMQClientChannel = class {
     if (options == null ? void 0 : options.deadLetterRoutingKey) args["x-dead-letter-routing-key"] = options.deadLetterRoutingKey;
     if (options == null ? void 0 : options.messageTtl) args["x-message-ttl"] = options.messageTtl;
     if (options == null ? void 0 : options.arguments) Object.assign(args, options.arguments);
-    const result = await this.channel.queueDeclare({
-      queue,
+    const result = await this.channel.assertQueue(queue, {
       durable: options == null ? void 0 : options.durable,
       exclusive: options == null ? void 0 : options.exclusive,
       autoDelete: options == null ? void 0 : options.autoDelete,
@@ -98,10 +97,7 @@ var RabbitMQClientChannel = class {
     };
   }
   async checkQueue(queue) {
-    const result = await this.channel.queueDeclare({
-      queue,
-      passive: true
-    });
+    const result = await this.channel.checkQueue(queue);
     return {
       queue: result.queue,
       messageCount: result.messageCount,
@@ -109,8 +105,7 @@ var RabbitMQClientChannel = class {
     };
   }
   async deleteQueue(queue, options) {
-    const result = await this.channel.queueDelete({
-      queue,
+    const result = await this.channel.deleteQueue(queue, {
       ifUnused: options == null ? void 0 : options.ifUnused,
       ifEmpty: options == null ? void 0 : options.ifEmpty
     });
@@ -122,9 +117,7 @@ var RabbitMQClientChannel = class {
     const args = {};
     if (options == null ? void 0 : options.alternateExchange) args["alternate-exchange"] = options.alternateExchange;
     if (options == null ? void 0 : options.arguments) Object.assign(args, options.arguments);
-    await this.channel.exchangeDeclare({
-      exchange,
-      type,
+    await this.channel.assertExchange(exchange, type, {
       durable: options == null ? void 0 : options.durable,
       internal: options == null ? void 0 : options.internal,
       autoDelete: options == null ? void 0 : options.autoDelete,
@@ -135,37 +128,26 @@ var RabbitMQClientChannel = class {
     };
   }
   async checkExchange(exchange) {
-    await this.channel.exchangeDeclare({
-      exchange,
-      passive: true
-    });
+    await this.channel.checkExchange(exchange);
     return {
       exchange
     };
   }
   async deleteExchange(exchange, options) {
-    await this.channel.exchangeDelete({
-      exchange,
+    await this.channel.deleteExchange(exchange, {
       ifUnused: options == null ? void 0 : options.ifUnused
     });
   }
   async bindQueue(queue, source, pattern, args) {
-    await this.channel.queueBind({
-      queue,
-      exchange: source,
-      routingKey: pattern,
-      arguments: args
-    });
+    await this.channel.bindQueue(queue, source, pattern, args);
   }
   publish(exchange, routingKey, content, options) {
     var _a2;
-    this.channel.basicPublish({
-      exchange,
-      routingKey,
+    return this.channel.publish(exchange, routingKey, content, {
       correlationId: options == null ? void 0 : options.correlationId,
       messageId: options == null ? void 0 : options.messageId,
       headers: options == null ? void 0 : options.headers,
-      durable: options == null ? void 0 : options.persistent,
+      persistent: options == null ? void 0 : options.persistent,
       expiration: (_a2 = options == null ? void 0 : options.expiration) == null ? void 0 : _a2.toString(),
       contentType: options == null ? void 0 : options.contentType,
       contentEncoding: options == null ? void 0 : options.contentEncoding,
@@ -175,69 +157,67 @@ var RabbitMQClientChannel = class {
       type: options == null ? void 0 : options.type,
       userId: options == null ? void 0 : options.userId,
       appId: options == null ? void 0 : options.appId
-    }, content);
-    return true;
+    });
   }
   async consume(queue, onMessage, options) {
-    const result = await this.channel.basicConsume({
-      queue,
-      consumerTag: options == null ? void 0 : options.consumerTag,
-      noLocal: options == null ? void 0 : options.noLocal,
-      noAck: options == null ? void 0 : options.noAck,
-      exclusive: options == null ? void 0 : options.exclusive,
-      arguments: options == null ? void 0 : options.arguments
-    }, (msg) => {
-      const body = msg.body;
-      const content = Buffer.isBuffer(body) ? body : typeof body === "string" ? Buffer.from(body) : Buffer.from(JSON.stringify(body));
+    const result = await this.channel.consume(queue, (msg) => {
+      if (msg === null) {
+        onMessage(null);
+        return;
+      }
       const consumeMessage = {
-        content,
+        content: msg.content,
         fields: {
-          consumerTag: msg.consumerTag,
-          deliveryTag: msg.deliveryTag,
-          redelivered: msg.redelivered,
-          exchange: msg.exchange,
-          routingKey: msg.routingKey
+          consumerTag: msg.fields.consumerTag,
+          deliveryTag: msg.fields.deliveryTag,
+          redelivered: msg.fields.redelivered,
+          exchange: msg.fields.exchange,
+          routingKey: msg.fields.routingKey
         },
         properties: {
-          contentType: msg.contentType,
-          contentEncoding: msg.contentEncoding,
-          headers: msg.headers || {},
-          deliveryMode: msg.durable ? 2 : 1,
-          priority: msg.priority,
-          correlationId: msg.correlationId,
-          replyTo: msg.replyTo,
-          expiration: msg.expiration,
-          messageId: msg.messageId,
-          timestamp: msg.timestamp,
-          type: msg.type,
-          userId: msg.userId,
-          appId: msg.appId
+          contentType: msg.properties.contentType || void 0,
+          contentEncoding: msg.properties.contentEncoding || void 0,
+          headers: msg.properties.headers || {},
+          deliveryMode: msg.properties.deliveryMode,
+          priority: msg.properties.priority,
+          correlationId: msg.properties.correlationId || void 0,
+          replyTo: msg.properties.replyTo || void 0,
+          expiration: msg.properties.expiration || void 0,
+          messageId: msg.properties.messageId || void 0,
+          timestamp: msg.properties.timestamp,
+          type: msg.properties.type || void 0,
+          userId: msg.properties.userId || void 0,
+          appId: msg.properties.appId || void 0
         }
       };
       onMessage(consumeMessage);
+    }, {
+      consumerTag: options == null ? void 0 : options.consumerTag,
+      noLocal: options == null ? void 0 : options.noLocal,
+      noAck: options == null ? void 0 : options.noAck,
+      exclusive: options == null ? void 0 : options.exclusive,
+      priority: options == null ? void 0 : options.priority,
+      arguments: options == null ? void 0 : options.arguments
     });
     return {
       consumerTag: result.consumerTag
     };
   }
   ack(message, allUpTo) {
-    this.channel.basicAck({
-      deliveryTag: message.fields.deliveryTag,
-      multiple: allUpTo
-    });
+    this.channel.ack(
+      { fields: message.fields, content: message.content, properties: message.properties },
+      allUpTo
+    );
   }
   nack(message, allUpTo, requeue) {
-    this.channel.basicNack({
-      deliveryTag: message.fields.deliveryTag,
-      multiple: allUpTo,
+    this.channel.nack(
+      { fields: message.fields, content: message.content, properties: message.properties },
+      allUpTo,
       requeue
-    });
+    );
   }
   async prefetch(count, global) {
-    await this.channel.basicQos({
-      prefetchCount: count,
-      global
-    });
+    await this.channel.prefetch(count, global);
   }
   async close() {
     await this.channel.close();
@@ -272,8 +252,8 @@ var RunMQConsoleLogger = class {
   }
 };
 
-// src/core/clients/RabbitMQClientAdapter.ts
-var RabbitMQClientAdapter = class {
+// src/core/clients/AmqplibClientAdapter.ts
+var AmqplibClientAdapter = class {
   constructor(config, logger = new RunMQConsoleLogger()) {
     this.config = config;
     this.logger = logger;
@@ -292,38 +272,20 @@ var RabbitMQClientAdapter = class {
         }
         this.connection = void 0;
       }
-      this.connection = new import_rabbitmq_client.Connection({
-        url: this.config.url,
-        // Disable automatic retries - we handle retries at RunMQ level
-        retryLow: 100,
-        retryHigh: 200,
-        connectionTimeout: 5e3
-      });
+      const connection = await import_amqplib.default.connect(this.config.url);
+      this.connection = connection;
       this.connection.on("error", (err) => {
         this.logger.error("RabbitMQ connection error:", { error: err });
         this.isConnected = false;
       });
-      this.connection.on("connection", () => {
-        this.isConnected = true;
-      });
-      this.connection.on("connection.blocked", (reason) => {
-        this.logger.warn("RabbitMQ connection blocked:", { reason });
-      });
-      this.connection.on("connection.unblocked", () => {
-        this.logger.info("RabbitMQ connection unblocked");
+      this.connection.on("close", () => {
+        this.isConnected = false;
       });
-      await this.connection.onConnect(5e3, true);
       this.isConnected = true;
       return this.connection;
     } catch (error) {
       this.isConnected = false;
-      if (this.connection) {
-        try {
-          this.connection.close();
-        } catch (e) {
-        }
-        this.connection = void 0;
-      }
+      this.connection = void 0;
       throw new RunMQException(
         Exceptions.CONNECTION_NOT_ESTABLISHED,
         {
@@ -334,9 +296,9 @@ var RabbitMQClientAdapter = class {
   }
   async getChannel() {
     const connection = await this.connect();
-    const rawChannel = await connection.acquire();
+    const rawChannel = await connection.createChannel();
     this.acquiredChannels.push(rawChannel);
-    return new RabbitMQClientChannel(rawChannel);
+    return new AmqplibChannel(rawChannel);
   }
   async getDefaultChannel() {
     if (!this.defaultChannel) {
@@ -353,9 +315,7 @@ var RabbitMQClientAdapter = class {
     this.acquiredChannels = [];
     for (const channel of channels) {
       try {
-        if (channel.active) {
-          await channel.close();
-        }
+        await channel.close();
       } catch (e) {
       }
     }
@@ -1364,7 +1324,7 @@ var RunMQ = class _RunMQ {
       reconnectDelay: (_a2 = config.reconnectDelay) != null ? _a2 : DEFAULTS.RECONNECT_DELAY,
       maxReconnectAttempts: (_b = config.maxReconnectAttempts) != null ? _b : DEFAULTS.MAX_RECONNECT_ATTEMPTS
     });
-    this.client = new RabbitMQClientAdapter(this.config, this.logger);
+    this.client = new AmqplibClientAdapter(this.config, this.logger);
     this.consumer = new RunMQConsumerCreator(this.client, this.logger, this.config.management);
   }
   /**