From 59d8fcffb212753aa1fd346cef51ca6338f53e52 Mon Sep 17 00:00:00 2001
From: Ram Hershberg <ram@bringg.com>
Date: Sun, 17 Mar 2024 11:33:29 +0200
Subject: [PATCH 1/3] Add more useful type exports.

---
 types/index.d.ts            |  3 ++-
 types/modules/consumer.d.ts |  4 ++++
 types/modules/producer.d.ts | 16 ++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index 9c9945e..3f3c114 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -16,7 +16,8 @@ import arnavmq = require('./modules/arnavmq');
 declare function arnavmqFactory(config: ConnectionConfig): arnavmq.Arnavmq;
 
 declare namespace arnavmqFactory {
-  export type ArnavmqFactory = (config: ConnectionConfig) => arnavmq.Arnavmq;
+  export type Arnavmq = arnavmq.Arnavmq;
+  export type ArnavmqFactory = (config: ConnectionConfig) => Arnavmq;
 
   export { ConnectionConfig, Connection, Consumer, Producer, ConnectionHooks, ConsumerHooks, ProducerHooks };
 }
diff --git a/types/modules/consumer.d.ts b/types/modules/consumer.d.ts
index bcfc3d7..d8ad54e 100644
--- a/types/modules/consumer.d.ts
+++ b/types/modules/consumer.d.ts
@@ -60,4 +60,8 @@ declare class Consumer {
   ): Promise<void>;
 }
 
+declare namespace Consumer {
+  export { ConsumeOptions, ConsumeCallback };
+}
+
 export = Consumer;
diff --git a/types/modules/producer.d.ts b/types/modules/producer.d.ts
index 1cc3abd..a37d773 100644
--- a/types/modules/producer.d.ts
+++ b/types/modules/producer.d.ts
@@ -7,7 +7,7 @@ declare class ProducerError extends Error {
   constructor(error: { name: string; message: string });
 }
 
-interface PublishOptions extends amqp.Options.Publish {
+interface ProduceOptions extends amqp.Options.Publish {
   routingKey?: string;
   rpc?: boolean;
 }
@@ -45,7 +45,7 @@ declare class Producer {
    * @param msg The message to publish
    * @param options The publish options
    */
-  publishOrSendToQueue(queue: string, msg: Buffer, options: PublishOptions): Promise<boolean>;
+  publishOrSendToQueue(queue: string, msg: Buffer, options: ProduceOptions): Promise<boolean>;
   /**
    * Start a timer to reject the pending RPC call if no answer is received within the given timeout
    * @param queue  The queue where the RPC request was sent
@@ -61,7 +61,7 @@ declare class Producer {
    * @param options contain rpc property (if true, enable rpc for this message)
    * @return Resolves when message is correctly sent, or when response is received when rpc is enabled
    */
-  private checkRpc(queue: string, msg: Buffer, options: PublishOptions): Promise<boolean>;
+  private checkRpc(queue: string, msg: Buffer, options: ProduceOptions): Promise<boolean>;
   /**
    * @deprecated Use publish instead
    * Ensure channel exists and send message using `checkRpc`
@@ -70,18 +70,22 @@ declare class Producer {
    * @param options message options (persistent, durable, rpc, etc.)
    * @return checkRpc response
    */
-  produce(queue: string, msg: unknown, options: PublishOptions): Promise<unknown>;
+  produce(queue: string, msg: unknown, options: ProduceOptions): Promise<unknown>;
   /** @see Producer.produce */
-  publish(queue: string, msg: unknown, options: PublishOptions): Promise<unknown>;
+  publish(queue: string, msg: unknown, options: ProduceOptions): Promise<unknown>;
 
   private _sendToQueue(
     queue: string,
     message: unknown,
-    settings: PublishOptions,
+    settings: ProduceOptions,
     currentRetryNumber: number,
   ): Promise<unknown>;
 
   private _shouldRetry(error: Error | ProducerError, currentRetryNumber: number): boolean;
 }
 
+declare namespace Producer {
+  export { ProduceOptions, ProducerError };
+}
+
 export = Producer;

From 2d3cffa12a3a8824feeb752a7f472b7429edd1d6 Mon Sep 17 00:00:00 2001
From: Ram Hershberg <ram@bringg.com>
Date: Sun, 17 Mar 2024 11:34:14 +0200
Subject: [PATCH 2/3] 0.16.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bea467c..0d72e1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arnavmq",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "ArnavMQ is a RabbitMQ wrapper",
   "keywords": [
     "rabbitmq",

From df3564d604764c69ca35fd2945354d6c1fa59181 Mon Sep 17 00:00:00 2001
From: Ram Hershberg <ram@bringg.com>
Date: Sun, 17 Mar 2024 12:27:28 +0200
Subject: [PATCH 3/3] Change method to private.

---
 types/modules/producer.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/modules/producer.d.ts b/types/modules/producer.d.ts
index a37d773..6fc9c30 100644
--- a/types/modules/producer.d.ts
+++ b/types/modules/producer.d.ts
@@ -45,7 +45,7 @@ declare class Producer {
    * @param msg The message to publish
    * @param options The publish options
    */
-  publishOrSendToQueue(queue: string, msg: Buffer, options: ProduceOptions): Promise<boolean>;
+  private publishOrSendToQueue(queue: string, msg: Buffer, options: ProduceOptions): Promise<boolean>;
   /**
    * Start a timer to reject the pending RPC call if no answer is received within the given timeout
    * @param queue  The queue where the RPC request was sent