@autofleet/rabbit 2.1.11 → 2.1.12-beta2

package/dist/index.d.ts

@@ -52,10 +52,10 @@ declare class RabbitMq implements IAfRabbitMq {
     assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string): Promise<import("amqplib").Replies.AssertQueue>;
     bindQueue(queue: string, exchange: string): Promise<void>;
-    assertQueue(queue: string, options?: Options.AssertQueue): Promise<void>;
+    assertQueue(queue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
     consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
     consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any): Promise<void>;
-    publish(exchange: string, content: any, customHeaders?: any): Promise<unknown>;
+    publish(exchange: string, content: any, customHeaders?: any): Promise<void>;
     sendToQueue(queue: string, content: any, options?: any, customHeaders?: any): Promise<boolean>;
     isConnected(): Promise<boolean>;
 }

package/dist/index.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,9 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/ban-types,@typescript-eslint/no-unused-vars,consistent-return,no-async-promise-executor,no-param-reassign,no-empty */
-// eslint-disable-next-line max-classes-per-file
-const bluebird = __importStar(require("bluebird"));
 const moment_1 = __importDefault(require("moment"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
@@ -122,13 +100,13 @@ class RabbitMq {
     getConnection() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                if (this.connection !== null) {
+                    return resolve(this.connection);
+                }
                 if (this.creatingConnection) {
                     this.em.once(connectionCreatedConst, resolve);
                     return;
                 }
-                if (this.connection !== null) {
-                    return resolve(this.connection);
-                }
                 this.creatingConnection = true;
                 const username = process.env.RABBITMQ_USERNAME || 'guest';
                 const password = process.env.RABBITMQ_PASSWORD || 'guest';
@@ -208,7 +186,7 @@ class RabbitMq {
         return __awaiter(this, void 0, void 0, function* () {
             RabbitMq.validateName('queue', queue);
             const channel = yield this.assertChannel();
-            return channel.addSetup((c) => c.assertQueue(queue, options));
+            return channel.assertQueue(queue, options);
         });
     }
     consume(queue, callback, options) {
@@ -273,15 +251,7 @@ class RabbitMq {
             RabbitMq.validateName('exchange', exchange);
             const channel = yield this.assertChannel();
             yield this.assertExchange(exchange);
-            return new bluebird.Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield channel.publish(exchange, '', Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
-                    return resolve();
-                }
-                catch (e) {
-                    reject(e);
-                }
-            })).timeout(this.PUBLISH_TIMEOUT, `${this.PUBLISH_ERROR_MSG}${exchange}`);
+            yield channel.publish(exchange, '', Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
         });
     }
     sendToQueue(queue, content, options, customHeaders) {

package/package.json

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

package/src/index.ts

@@ -158,13 +158,13 @@ class RabbitMq implements IAfRabbitMq {
 
   async getConnection() {
     return new Promise<AmqpConnectionManager>(async (resolve) => {
+      if (this.connection !== null) {
+        return resolve(this.connection);
+      }
       if (this.creatingConnection) {
         this.em.once(connectionCreatedConst, resolve);
         return;
       }
-      if (this.connection !== null) {
-        return resolve(this.connection);
-      }
       this.creatingConnection = true;
       const username: string = process.env.RABBITMQ_USERNAME || 'guest';
       const password: string = process.env.RABBITMQ_PASSWORD || 'guest';
@@ -237,7 +237,7 @@ class RabbitMq implements IAfRabbitMq {
   async assertQueue(queue: string, options?: Options.AssertQueue) {
     RabbitMq.validateName('queue', queue);
     const channel: ChannelWrapper = await this.assertChannel();
-    return channel.addSetup((c: ConfirmChannel) => c.assertQueue(queue, options));
+    return channel.assertQueue(queue, options);
   }
 
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {
@@ -309,16 +309,9 @@ class RabbitMq implements IAfRabbitMq {
     RabbitMq.validateName('exchange', exchange);
     const channel: ChannelWrapper = await this.assertChannel();
     await this.assertExchange(exchange);
-    return new bluebird.Promise(async (resolve, reject) => {
-      try {
-        await channel.publish(exchange, '',
-          Buffer.from(JSON.stringify(content)),
-          RabbitMq.getPublishOptions(customHeaders));
-        return resolve();
-      } catch (e) {
-        reject(e);
-      }
-    }).timeout(this.PUBLISH_TIMEOUT, `${this.PUBLISH_ERROR_MSG}${exchange}`);
+    await channel.publish(exchange, '',
+      Buffer.from(JSON.stringify(content)),
+      RabbitMq.getPublishOptions(customHeaders));
   }
 
   async sendToQueue(queue: string, content: any, options?: any, customHeaders?: any) {