@autofleet/rabbit 1.5.7-1 → 1.5.7-2

package/.idea/workspace.xml

@@ -204,7 +204,7 @@
       <workItem from="1609106672294" duration="594000" />
       <workItem from="1609146731453" duration="21000" />
       <workItem from="1609193609209" duration="1486000" />
-      <workItem from="1609629219943" duration="3863000" />
+      <workItem from="1609629219943" duration="5228000" />
     </task>
     <task id="LOCAL-00001" summary="validate name before usage">
       <created>1606375684964</created>

package/dist/index.d.ts

@@ -5,6 +5,9 @@ import { EventEmitter } from 'events';
 interface ExchangesCache {
     [key: string]: any;
 }
+export interface AfRabbitOptions {
+    reconnect: boolean;
+}
 declare class RabbitMq {
     static parseMsg(msg: any): any;
     static validateName(type: string, name: string): void;
@@ -15,12 +18,14 @@ declare class RabbitMq {
     PUBLISH_TIMEOUT: number;
     PUBLISH_ERROR_MSG: string;
     DISCONNECT_MSG: string;
+    RESCONNECT_MSG: string;
     channel: ChannelWrapper | null;
     connection: AmqpConnectionManager | null;
     em: EventEmitter;
     creatingConnection: boolean;
     exchanges: ExchangesCache;
-    constructor();
+    options: AfRabbitOptions | undefined;
+    constructor(options?: AfRabbitOptions);
     ack: (msg: any) => Promise<void>;
     nack: (queue: string, options?: Options.AssertQueue | undefined) => (msg: any, retries: number) => Promise<void>;
     getConnection(): Promise<AmqpConnectionManager>;

package/dist/index.js

@@ -41,10 +41,11 @@ const rabbitError_1 = __importDefault(require("./rabbitError"));
 const assertExchangeFanout = (c, exchangeName) => c.assertExchange(exchangeName, 'fanout');
 const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
-    constructor() {
+    constructor(options) {
         this.PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
         this.PUBLISH_ERROR_MSG = `rabbit: publish timeout(${this.PUBLISH_TIMEOUT}ms) has pass, exchange: `;
         this.DISCONNECT_MSG = 'rabbit: connection disconnect';
+        this.RESCONNECT_MSG = 'rabbit: reconnecting';
         this.ack = (msg) => __awaiter(this, void 0, void 0, function* () {
             if (this.channel) {
                 yield this.channel.ack(msg);
@@ -72,6 +73,7 @@ class RabbitMq {
         this.connection = null;
         this.creatingConnection = false;
         this.exchanges = {};
+        this.options = options;
     }
     static parseMsg(msg) {
         let { content } = msg;
@@ -104,7 +106,16 @@ class RabbitMq {
                 const host = process.env.RABBITMQ_SERVICE_HOST || '';
                 const connection = yield amqp_connection_manager_1.connect([`amqp://${host}`]);
                 this.connection = connection;
-                this.connection.on('disconnect', ({ err }) => console.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`));
+                this.connection.on('disconnect', ({ err }) => {
+                    var _a;
+                    if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.reconnect) {
+                        console.error(`${this.RESCONNECT_MSG}${err && ` - ${err}`}`);
+                        this.connection = null;
+                    }
+                    else {
+                        console.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
+                    }
+                });
                 this.creatingConnection = false;
                 this.em.emit(connectionCreatedConst, connection);
                 resolve(connection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.5.7-1",
+  "version": "1.5.7-2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -11,6 +11,10 @@ interface ExchangesCache {
   [key: string]: any
 }
 
+export interface AfRabbitOptions {
+  reconnect: boolean
+}
+
 const assertExchangeFanout = (c: any, exchangeName: string) => c.assertExchange(exchangeName, 'fanout');
 
 const connectionCreatedConst = 'connectionCreated';
@@ -49,6 +53,8 @@ class RabbitMq {
 
   DISCONNECT_MSG = 'rabbit: connection disconnect';
 
+  RESCONNECT_MSG = 'rabbit: reconnecting';
+
   channel: ChannelWrapper | null;
 
   connection: AmqpConnectionManager | null;
@@ -59,12 +65,15 @@ class RabbitMq {
 
   exchanges: ExchangesCache;
 
-  constructor() {
+  options: AfRabbitOptions | undefined;
+
+  constructor(options?: AfRabbitOptions) {
     this.em = new EventEmitter();
     this.channel = null;
     this.connection = null;
     this.creatingConnection = false;
     this.exchanges = {};
+    this.options = options;
   }
 
   public ack = async (msg: any) => {
@@ -104,7 +113,14 @@ class RabbitMq {
       const connection: AmqpConnectionManager = await connect([`amqp://${host}`]);
       this.connection = connection;
       this.connection.on('disconnect',
-        ({ err }) => console.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`));
+        ({ err }) => {
+          if (this.options?.reconnect) {
+            console.error(`${this.RESCONNECT_MSG}${err && ` - ${err}`}`);
+            this.connection = null;
+          } else {
+            console.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
+          }
+        });
       this.creatingConnection = false;
       this.em.emit(connectionCreatedConst, connection);
       resolve(connection);