Merge pull request #33 from hapinessjs/next

Next into master

Author: fauvillej

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapiness/rabbitmq",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Hapiness module for rabbitmq",
   "main": "commonjs/index.js",
   "types": "index.d.ts",

package.json

@@ -22,6 +22,9 @@ export class ChannelManager extends EventEmitter {
         this._connection = connectionManager.connection;
         this._prefetch = prefetch;
         this._global = global;
+        this._connectionManager.on('error', () => {
+            this._isConnected = false;
+        });
     }
 
     get prefetch(): number {

src/module/managers/channel-manager.ts

@@ -7,8 +7,6 @@ import { events } from '../events';
 import { ChannelStore } from './channel-store';
 import { ChannelManager } from './channel-manager';
 
-export const REGEX_URI = /^amqp:\/\/([^@\n]+:[^@\n]+@)?(\w+)(:?)(\d{0,6})(\/[\w%]+)?(\?(?:&?[^=&\s]*=[^=&\s]*)+)?$/;
-
 const debug = require('debug')('hapiness:rabbitmq');
 
 export class ConnectionManager extends EventEmitter {
@@ -38,10 +36,6 @@ export class ConnectionManager extends EventEmitter {
         }
 
         if (this._options.uri) {
-            if (!this._options.uri.match(REGEX_URI)) {
-                throw new Error('Invalid uri');
-            }
-
             this._uri = this._options.uri;
         } else {
             const port = this._options.port || 5672;
@@ -53,7 +47,9 @@ export class ConnectionManager extends EventEmitter {
         }
 
         // Will block new connection if SIGTERM is received
+        /* istanbul ignore next */
         process.once('SIGTERM', () => this._isSIGTERMReceived = true);
+        /* istanbul ignore next */
         process.once('SIGINT', () => this._isSIGTERMReceived = true);
 
         this.setDefaultPrefetch(this._options.default_prefetch);
@@ -109,6 +105,7 @@ export class ConnectionManager extends EventEmitter {
             return Observable.of(null);
         }
 
+        /* istanbul ignore next */
         if (this._isSIGTERMReceived) {
             return Observable.of(null);
         }

src/module/managers/connection-manager.ts

@@ -23,7 +23,8 @@ export class InitExtensionUnitTest {
     private userQueue;
 
     before() {
-        this.ch = new ChannelManager(<any>{connection: {}});
+        const connection = new ConnectionManagerMock();
+        this.ch = new ChannelManager(connection);
         this.ch['ch'] = <any>new ChannelMock();
         this.userQueue = new UserQueue();
         this.queueWrapper = new QueueWrapper(this.userQueue, extractMetadataByDecorator(UserQueue, 'Queue'));

test/unit/extension/init-extension.test.ts

@@ -49,41 +49,14 @@ export class ConnectionUnitTest {
         });
     }
 
-    @test(' - Test options.uri')
-    testOptionsUri() {
-        const urisOk = [
-            'amqp://localhost',
-            'amqp://hello:world@localhost',
-            'amqp://hello:world@localhost:98798',
-            'amqp://hello:world@localhost:98798/vhost',
-            'amqp://hello:world@localhost:98798/%2Fvhost',
-            'amqp://hello:world@localhost:98798'
-        ];
-
-        const urisNOk = ['not_good', ' amqp://localhost', 'amqp://xxx:zzzzz@', 'amqp://xxx:zzzzz#/322d'];
-
-        urisOk.forEach(uri => {
-            const instance = new ConnectionManager({ uri });
-            unit.object(instance).isInstanceOf(ConnectionManager);
-        });
-
-        urisNOk.forEach(uri => {
-            unit
-                .exception(_ => {
-                    unit.when('Invalid uri', new ConnectionManager({ uri }));
-                })
-                .isInstanceOf(Error)
-                .hasProperty('message', 'Invalid uri');
-        });
-    }
-
     @test(' - Test options')
     testOptions() {
         const options = [
             [{ login: 'keyboard', password: 'cat' }, 'amqp://keyboard:cat@localhost:5672'],
             [{ retry: { maximum_attempts: 0 } }, 'amqp://localhost:5672'],
             [{ params: { heartBeat: 30 } }, 'amqp://localhost:5672?heartBeat=30'],
             [{ params: { heartBeat: 30 }, vhost: '/my_vhost' }, 'amqp://localhost:5672/%2Fmy_vhost?heartBeat=30'],
+            [{ uri: 'amqp://localhost:5672/%2Fmy_vhost?heartBeat=30' }, 'amqp://localhost:5672/%2Fmy_vhost?heartBeat=30'],
             [undefined, 'amqp://localhost:5672']
         ];
 

test/unit/managers/connection.test.ts

@@ -11,6 +11,7 @@ import { UserExchange } from '../../fixtures/Exchanges';
 import { generateMessage } from '../../mocks/Message';
 import { extractMetadataByDecorator } from '@hapiness/core';
 import { MessageStore } from '../../../src';
+import { ConnectionManagerMock } from '../../mocks/ConnectionManager';
 
 @suite('- Unit Queue')
 export class QueueServiceUnitTest {
@@ -31,7 +32,7 @@ export class QueueServiceUnitTest {
     }
 
     before() {
-        this.ch = new ChannelManager(<any>{ connection: {}});
+        this.ch = new ChannelManager(new ConnectionManagerMock());
         this.ch.setChannel(new ChannelMock());
         unit.spy(this.ch.getChannel(), 'assertQueue');
         unit.spy(this.ch.getChannel(), 'bindQueue');