Merge pull request #23 from radiofrance/opts-protocol

README.md

@@ -122,6 +122,13 @@ Default: `guest`
 
 Password associate to username.
 
+##### protocol
+
+Type: `amqp|amqps`<br>
+Default: `amqp`
+
+Connection protocol.
+
 ##### hostname
 
 Type: `string`<br>

index.js

@@ -26,6 +26,7 @@ class RabQ extends EventEmitter {
 
     validateOptions(opts);
 
+    this.protocol = opts.protocol || 'amqp';
     this.hostname = opts.hostname || 'localhost';
     this.port = opts.port || 5672;
     this.username = opts.username || 'guest';
@@ -64,10 +65,11 @@ class RabQ extends EventEmitter {
       level: 'info',
       uuid: null,
       token: null,
-      msg: `Connecting to RabbitMQ ... (amqp://${this.hostname}:${this.port}/${encodeURIComponent(this.vhost)})`
+      msg: `Connecting to RabbitMQ ... (${this.protocol}://${this.hostname}:${this.port}/${encodeURIComponent(this.vhost)})`
     });
 
     const settings = {
+      protocol: this.protocol,
       hostname: this.hostname,
       port: this.port,
       username: this.username,

lib/get-connection.js

@@ -3,7 +3,7 @@
 const amqp = require('amqplib');
 
 module.exports = settings => {
-  const uri = 'amqp://' + encodeURIComponent(settings.username) + ':' + encodeURIComponent(settings.password) + '@' + settings.hostname + ':' + settings.port + '/' + encodeURIComponent(settings.vhost);
+  const uri = settings.protocol + '://' + encodeURIComponent(settings.username) + ':' + encodeURIComponent(settings.password) + '@' + settings.hostname + ':' + settings.port + '/' + encodeURIComponent(settings.vhost);
 
   return amqp.connect(uri)
     .then(conn => conn.createConfirmChannel()

lib/validate-options.js

@@ -1,6 +1,9 @@
 'use strict';
 
 module.exports = (opts = {}) => {
+  if (opts.protocol && opts.protocol !== 'amqp' && opts.protocol !== 'amqps') {
+    throw new Error(`opts.protocol should be 'amqp' or 'amqps'. Currently "${typeof opts.protocol}".`);
+  }
   if (opts.hostname && typeof opts.hostname !== 'string') {
     throw new Error(`opts.hostname should be a string. Currently "${typeof opts.hostname}".`);
   }

test/config.json

@@ -1,4 +1,5 @@
 {
+  "protocol": "amqp",
   "username": "guest",
   "password": "guest",
   "hostname": "127.0.0.1",

test/index.js

@@ -9,6 +9,7 @@ test('constructor with default options', t => {
   t.notThrows(() => {
     const p = new RabQ(minimalOptions);
     t.deepEqual({
+      protocol: p.protocol,
       username: p.username,
       password: p.password,
       hostname: p.hostname,