@autofleet/rabbit 1.5.1 → 1.5.2

package/dist/example.js

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("./index");
-// process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
+process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
 const init = () => __awaiter(void 0, void 0, void 0, function* () {
     const rabbit = new index_1.default();
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     yield rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
         console.log('consumeFromExchange: msg2', msg.content);
         ack(msg);
@@ -29,5 +28,7 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
         ack(msg);
     });
     yield rabbit.sendToQueue('test-q-2', 'hey-q');
+    const getQueueLength = yield rabbit.getQueueLength('test-q2');
+    console.log(`getQueueLength:${getQueueLength}`);
 });
 init();

package/dist/index.d.ts

@@ -21,6 +21,8 @@ declare class RabbitMq {
     getConnection(): Promise<AmqpConnectionManager>;
     assertChannel(): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;
+    getQueueLength(queue: string): Promise<any>;
+    bindQueue(queue: string, exchange: string): Promise<any>;
     assertQueue(queue: string, options?: any): Promise<void>;
     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>;

package/dist/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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 = require("bluebird");
 const amqp_connection_manager_1 = require("amqp-connection-manager");
@@ -29,7 +30,6 @@ class RabbitMq {
         this.nack = (queue) => (msg, retries) => __awaiter(this, void 0, void 0, function* () {
             if (this.channel) {
                 if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
-                    // eslint-disable-next-line no-param-reassign
                     msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
                     yield this.sendToQueue(queue, msg.content);
                 }
@@ -53,7 +53,7 @@ class RabbitMq {
         try {
             content = JSON.parse(content);
         }
-        catch (e) { } // eslint-disable-line no-empty
+        catch (e) { }
         return Object.assign(Object.assign({}, msg), { content });
     }
     static validateName(type, name) {
@@ -63,14 +63,12 @@ class RabbitMq {
     }
     getConnection() {
         return __awaiter(this, void 0, void 0, function* () {
-            // eslint-disable-next-line no-async-promise-executor
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 if (this.creatingConnection) {
                     this.em.on(connectionCreatedConst, resolve);
                     return;
                 }
                 if (this.connection !== null) {
-                    // eslint-disable-next-line consistent-return
                     return this.connection;
                 }
                 this.creatingConnection = true;
@@ -86,7 +84,6 @@ class RabbitMq {
     }
     assertChannel() {
         return __awaiter(this, void 0, void 0, function* () {
-            // eslint-disable-next-line no-async-promise-executor,consistent-return
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 if (this.channel) {
                     return resolve(this.channel);
@@ -104,7 +101,6 @@ class RabbitMq {
             }));
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     assertExchange(exchangeName, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const channel = yield this.assertChannel();
@@ -118,7 +114,21 @@ class RabbitMq {
             }));
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getQueueLength(queue) {
+        return __awaiter(this, void 0, void 0, function* () {
+            RabbitMq.validateName('queue', queue);
+            const channel = yield this.assertChannel();
+            // @ts-ignore
+            return channel.checkQueue(queue);
+        });
+    }
+    bindQueue(queue, exchange) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const channel = yield this.assertChannel();
+            // @ts-ignore
+            return channel.bindQueue(queue, exchange, '');
+        });
+    }
     assertQueue(queue, options) {
         return __awaiter(this, void 0, void 0, function* () {
             RabbitMq.validateName('queue', queue);
@@ -126,7 +136,6 @@ class RabbitMq {
             return channel.addSetup((c) => c.assertQueue(queue));
         });
     }
-    // eslint-disable-next-line @typescript-eslint/ban-types
     consume(queue, callback, options) {
         return __awaiter(this, void 0, void 0, function* () {
             RabbitMq.validateName('queue', queue);
@@ -141,7 +150,6 @@ class RabbitMq {
             }));
         });
     }
-    // eslint-disable-next-line @typescript-eslint/ban-types
     consumeFromExchange(queue, exchange, callback, options) {
         return __awaiter(this, void 0, void 0, function* () {
             RabbitMq.validateName('queue', queue);

package/dist/index.test.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/no-unused-vars */
 const index_1 = require("./index");
-// import RabbitError from './rabbitError';
 jest.setTimeout(120000);
 const rabbit = new index_1.default();
 const delay = () => new Promise((resolve) => setTimeout(() => resolve(), 500));
@@ -48,7 +48,6 @@ describe('RabbitMQ', () => {
         expect(err).toBeDefined();
     }));
     it('cant publish due timeout', () => __awaiter(void 0, void 0, void 0, function* () {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         process.env.RABBITMQ_PUBLISH_TIMEOUT = 1;
         const rabbit2 = new index_1.default();
@@ -61,4 +60,25 @@ describe('RabbitMQ', () => {
         }
         expect(err).toBeDefined();
     }));
+    it('get queue length', () => __awaiter(void 0, void 0, void 0, function* () {
+        const queueName = 'test-queue-length';
+        const exchangeName = 'test-e2';
+        yield rabbit.assertQueue(queueName);
+        yield rabbit.assertExchange(exchangeName);
+        yield rabbit.bindQueue(queueName, exchangeName);
+        yield rabbit.publish(exchangeName, 'hey');
+        let messageCount;
+        ({ messageCount } = yield rabbit.getQueueLength(queueName));
+        expect(messageCount).toEqual(1);
+        yield rabbit.publish(exchangeName, 'hey');
+        ({ messageCount } = yield rabbit.getQueueLength(queueName));
+        expect(messageCount).toEqual(2);
+        yield rabbit.consumeFromExchange(queueName, exchangeName, (msg, ack) => __awaiter(void 0, void 0, void 0, function* () {
+            expect(msg.content).toEqual('hey');
+            ack(msg);
+        }));
+        yield delay();
+        ({ messageCount } = yield rabbit.getQueueLength(queueName));
+        expect(messageCount).toEqual(0);
+    }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -14,9 +14,9 @@
     "dev": "nodemon"
   },
   "dependencies": {
+    "@types/amqp-connection-manager": "^2.0.10",
+    "@types/amqplib": "^0.5.16",
     "@types/jest": "^22.0.0",
-    "@types/amqp-connection-manager": "^2.0.2",
-    "@types/amqplib": "^0.5.9",
     "amqp-connection-manager": "^3.2.1",
     "amqplib": "^0.6.0",
     "bluebird": "^3.7.2",

package/src/example.ts

@@ -1,10 +1,10 @@
 import RabbitMq from './index';
 
-// process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
+process.env.RABBITMQ_SERVICE_HOST = '34.76.123.137:5672';
 
 const init = async () => {
   const rabbit = new RabbitMq();
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   await rabbit.consumeFromExchange('test-q2', 'test-e', (msg, ack) => {
     console.log('consumeFromExchange: msg2', msg.content);
     ack(msg);
@@ -21,7 +21,11 @@ const init = async () => {
     console.log('consume: msg-q', msg.content);
     ack(msg);
   });
+
   await rabbit.sendToQueue('test-q-2', 'hey-q');
+
+  const getQueueLength = await rabbit.getQueueLength('test-q2');
+  console.log(`getQueueLength:${getQueueLength}`);
 };
 
 init();

package/src/index.test.ts

@@ -1,5 +1,5 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment,@typescript-eslint/no-unused-vars */
 import RabbitMq from './index';
-// import RabbitError from './rabbitError';
 
 jest.setTimeout(120000);
 
@@ -43,7 +43,6 @@ describe('RabbitMQ', () => {
   });
 
   it('cant publish due timeout', async () => {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     process.env.RABBITMQ_PUBLISH_TIMEOUT = 1;
     const rabbit2 = new RabbitMq();
@@ -56,4 +55,28 @@ describe('RabbitMQ', () => {
     }
     expect(err).toBeDefined();
   });
+
+  it('get queue length', async () => {
+    const queueName = 'test-queue-length';
+    const exchangeName = 'test-e2';
+
+    await rabbit.assertQueue(queueName);
+    await rabbit.assertExchange(exchangeName);
+    await rabbit.bindQueue(queueName, exchangeName);
+
+    await rabbit.publish(exchangeName, 'hey');
+    let messageCount: any;
+    ({ messageCount } = await rabbit.getQueueLength(queueName));
+    expect(messageCount).toEqual(1);
+    await rabbit.publish(exchangeName, 'hey');
+    ({ messageCount } = await rabbit.getQueueLength(queueName));
+    expect(messageCount).toEqual(2);
+    await rabbit.consumeFromExchange(queueName, exchangeName, async (msg: any, ack: any) => {
+      expect(msg.content).toEqual('hey');
+      ack(msg);
+    });
+    await delay();
+    ({ messageCount } = await rabbit.getQueueLength(queueName));
+    expect(messageCount).toEqual(0);
+  });
 });

package/src/index.ts

@@ -1,3 +1,4 @@
+/* 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
 import * as bluebird from 'bluebird';
 import { ConfirmChannel } from 'amqplib';
@@ -19,7 +20,7 @@ class RabbitMq {
 
     try {
       content = JSON.parse(content);
-    } catch (e) { } // eslint-disable-line no-empty
+    } catch (e) { }
 
     return {
       ...msg,
@@ -66,7 +67,6 @@ class RabbitMq {
   public nack = (queue: string) => async (msg: any, retries: number) => {
     if (this.channel) {
       if (!msg.content['x-retry-count'] || msg.content['x-retry-count'] <= retries) {
-        // eslint-disable-next-line no-param-reassign
         msg.content['x-retry-count'] = msg.content['x-retry-count'] ? msg.content['x-retry-count'] + 1 : 1;
         await this.sendToQueue(queue, msg.content);
       } else {
@@ -79,14 +79,12 @@ class RabbitMq {
   }
 
   async getConnection() {
-    // eslint-disable-next-line no-async-promise-executor
     return new Promise<AmqpConnectionManager>(async (resolve) => {
       if (this.creatingConnection) {
         this.em.on(connectionCreatedConst, resolve);
         return;
       }
       if (this.connection !== null) {
-        // eslint-disable-next-line consistent-return
         return this.connection;
       }
       this.creatingConnection = true;
@@ -102,7 +100,6 @@ class RabbitMq {
   }
 
   async assertChannel() {
-    // eslint-disable-next-line no-async-promise-executor,consistent-return
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
       if (this.channel) {
         return resolve(this.channel);
@@ -121,7 +118,6 @@ class RabbitMq {
     });
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async assertExchange(exchangeName: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
     if (this.exchanges[exchangeName]) {
@@ -134,14 +130,25 @@ class RabbitMq {
     });
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async getQueueLength(queue: string) {
+    RabbitMq.validateName('queue', queue);
+    const channel: ChannelWrapper = await this.assertChannel();
+    // @ts-ignore
+    return channel.checkQueue(queue);
+  }
+
+  async bindQueue(queue: string, exchange: string) {
+    const channel: ChannelWrapper = await this.assertChannel();
+    // @ts-ignore
+    return channel.bindQueue(queue, exchange, '');
+  }
+
   async assertQueue(queue: string, options?: any) {
     RabbitMq.validateName('queue', queue);
     const channel: ChannelWrapper = await this.assertChannel();
     return channel.addSetup((c: ConfirmChannel) => c.assertQueue(queue));
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-types
   async consume(queue: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {
     RabbitMq.validateName('queue', queue);
     const { limit } = (options && options.limit) ? options : { limit: 1 };
@@ -155,7 +162,6 @@ class RabbitMq {
     });
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-types
   async consumeFromExchange(queue: string, exchange: string, callback: (msg: any, ack: Function, nack: Function) => any, options?: any) {
     RabbitMq.validateName('queue', queue);
     RabbitMq.validateName('exchange', exchange);