Allow overriding Promise library #265

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1,5 @@
+.vscode/
+config/
+dist/
+node_modules/
+webpack

.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  env: {
+    es6: true,
+    node: true,
+  },
+  extends: ["eslint:recommended", "plugin:import/errors", "plugin:import/warnings", "prettier"],
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: "module",
+  },
+  rules: {
+    quotes: ["error", "double", { avoidEscape: true }],
+    semi: ["error", "always"],
+  },
+};

.gitignore

@@ -5,3 +5,4 @@ node_modules/
 bin/amqp-rabbitmq-0.9.1.json
 etc/
 coverage/
+.nyc_output

.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "extension": ["js"],
+  "ui": "tdd",
+  "spec": "test/**/*.js"
+}

.npmignore

@@ -6,3 +6,4 @@ scratch
 bin/amqp-rabbitmq-0.9.1.json
 etc/
 coverage/
+.nyc_output/

Makefile

@@ -42,7 +42,7 @@ bin/amqp-rabbitmq-0.9.1.json:
 	curl -L $(AMQP_JSON) > $@
 
 $(ISTANBUL):
-	npm install
+	npm install --production=false
 
 $(UGLIFY):
-	npm install
+	npm install --production=false

amqplib.d.ts

@@ -0,0 +1,36 @@
+declare module "@worthaboutapig/amqplib" {
+  export type CloseHandler = () => void;
+  export type ErrorHandler = (error: Error) => void;
+  export type IMessage = { content: string };
+
+  export interface CommonChannelConnection {
+    close(): Promise<void>;
+    on(event: string, handler: CloseHandler | ErrorHandler): void;
+    removeListener(name: string, handler: CloseHandler | ErrorHandler): void;
+    valid: boolean;
+  }
+
+  export interface IChannel extends CommonChannelConnection {
+    handlers?: ChannelEventHandlers;
+    assertQueue(name: string, options: unknown): Promise<void>;
+    consume(name: string, handler: (message: IMessage) => Promise<void>, options: { noAck: boolean }): Promise<void>;
+    sendToQueue(name: string, data: unknown, options: { persistent: true }): boolean;
+  }
+
+  export interface IConnection extends CommonChannelConnection {
+    handlers?: ConnectionEventHandlers;
+    createChannel(): Promise<IChannel>;
+  }
+
+  export type ConnectionEventHandlers = {
+    onConnectionError(error: Error): Promise<void>;
+    onConnectionClose(): Promise<void>;
+  };
+
+  export type ChannelEventHandlers = {
+    onChannelError(error: Error): Promise<void>;
+    onChannelClose(): Promise<void>;
+  };
+
+  export function connect(url: string, connOptions: unknown): Promise<IConnection>;
+}

channel_api.js

@@ -1,16 +1,22 @@
-var raw_connect = require('./lib/connect').connect;
-var ChannelModel = require('./lib/channel_model').ChannelModel;
-var Promise = require('bluebird');
+var raw_connect = require("./lib/connect").connect;
+var ChannelModel = require("./lib/channel_model").ChannelModel;
 
 function connect(url, connOptions) {
-  return Promise.fromCallback(function(cb) {
-    return raw_connect(url, connOptions, cb);
-  })
-  .then(function(conn) {
-    return new ChannelModel(conn);
+  var options = { Promise: (connOptions && connOptions.Promise) || Promise };
+
+  return new options.Promise(function (resolve, reject) {
+    raw_connect(url, connOptions, function (err, result) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(result);
+      }
+    });
+  }).then(function (conn) {
+    return new ChannelModel(conn, options);
   });
-};
+}
 
 module.exports.connect = connect;
-module.exports.credentials = require('./lib/credentials');
-module.exports.IllegalOperationError = require('./lib/error').IllegalOperationError;
+module.exports.credentials = require("./lib/credentials");
+module.exports.IllegalOperationError = require("./lib/error").IllegalOperationError;

examples/tutorials/receive_logs_direct.js

@@ -1,45 +1,51 @@
 #!/usr/bin/env node
 
-var amqp = require('amqplib');
-var all = require('bluebird').all;
-var basename = require('path').basename;
+var amqp = require("amqplib");
+var basename = require("path").basename;
 
 var severities = process.argv.slice(2);
 if (severities.length < 1) {
-  console.warn('Usage: %s [info] [warning] [error]',
-               basename(process.argv[1]));
+  console.warn("Usage: %s [info] [warning] [error]", basename(process.argv[1]));
   process.exit(1);
 }
 
-amqp.connect('amqp://localhost').then(function(conn) {
-  process.once('SIGINT', function() { conn.close(); });
-  return conn.createChannel().then(function(ch) {
-    var ex = 'direct_logs';
-
-    var ok = ch.assertExchange(ex, 'direct', {durable: false});
-
-    ok = ok.then(function() {
-      return ch.assertQueue('', {exclusive: true});
-    });
-
-    ok = ok.then(function(qok) {
-      var queue = qok.queue;
-      return all(severities.map(function(sev) {
-        ch.bindQueue(queue, ex, sev);
-      })).then(function() { return queue; });
+amqp
+  .connect("amqp://localhost")
+  .then(function (conn) {
+    process.once("SIGINT", function () {
+      conn.close();
     });
 
-    ok = ok.then(function(queue) {
-      return ch.consume(queue, logMessage, {noAck: true});
-    });
-    return ok.then(function() {
-      console.log(' [*] Waiting for logs. To exit press CTRL+C.');
+    return conn.createChannel().then(function (ch) {
+      var ex = "direct_logs";
+
+      var ok = ch.assertExchange(ex, "direct", { durable: false });
+
+      ok = ok.then(function () {
+        return ch.assertQueue("", { exclusive: true });
+      });
+
+      ok = ok.then(function (qok) {
+        var queue = qok.queue;
+        return Promise.all(
+          severities.map(function (sev) {
+            ch.bindQueue(queue, ex, sev);
+          }),
+        ).then(function () {
+          return queue;
+        });
+      });
+
+      ok = ok.then(function (queue) {
+        return ch.consume(queue, logMessage, { noAck: true });
+      });
+      return ok.then(function () {
+        console.log(" [*] Waiting for logs. To exit press CTRL+C.");
+      });
+
+      function logMessage(msg) {
+        console.log(" [x] %s:'%s'", msg.fields.routingKey, msg.content.toString());
+      }
     });
-
-    function logMessage(msg) {
-      console.log(" [x] %s:'%s'",
-                  msg.fields.routingKey,
-                  msg.content.toString());
-    }
-  });
-}).catch(console.warn);
+  })
+  .catch(console.warn);

examples/tutorials/receive_logs_topic.js

@@ -1,44 +1,49 @@
 #!/usr/bin/env node
 
-var amqp = require('amqplib');
-var basename = require('path').basename;
-var all = require('bluebird').all;
+var amqp = require("amqplib");
+var basename = require("path").basename;
 
 var keys = process.argv.slice(2);
 if (keys.length < 1) {
-  console.log('Usage: %s pattern [pattern...]',
-              basename(process.argv[1]));
+  console.log("Usage: %s pattern [pattern...]", basename(process.argv[1]));
   process.exit(1);
 }
 
-amqp.connect('amqp://localhost').then(function(conn) {
-  process.once('SIGINT', function() { conn.close(); });
-  return conn.createChannel().then(function(ch) {
-    var ex = 'topic_logs';
-    var ok = ch.assertExchange(ex, 'topic', {durable: false});
-
-    ok = ok.then(function() {
-      return ch.assertQueue('', {exclusive: true});
+amqp
+  .connect("amqp://localhost")
+  .then(function (conn) {
+    process.once("SIGINT", function () {
+      conn.close();
     });
+    return conn.createChannel().then(function (ch) {
+      var ex = "topic_logs";
+      var ok = ch.assertExchange(ex, "topic", { durable: false });
 
-    ok = ok.then(function(qok) {
-      var queue = qok.queue;
-      return all(keys.map(function(rk) {
-        ch.bindQueue(queue, ex, rk);
-      })).then(function() { return queue; });
-    });
+      ok = ok.then(function () {
+        return ch.assertQueue("", { exclusive: true });
+      });
 
-    ok = ok.then(function(queue) {
-      return ch.consume(queue, logMessage, {noAck: true});
-    });
-    return ok.then(function() {
-      console.log(' [*] Waiting for logs. To exit press CTRL+C.');
-    });
+      ok = ok.then(function (qok) {
+        var queue = qok.queue;
+        return Promise.all(
+          keys.map(function (rk) {
+            ch.bindQueue(queue, ex, rk);
+          }),
+        ).then(function () {
+          return queue;
+        });
+      });
+
+      ok = ok.then(function (queue) {
+        return ch.consume(queue, logMessage, { noAck: true });
+      });
+      return ok.then(function () {
+        console.log(" [*] Waiting for logs. To exit press CTRL+C.");
+      });
 
-    function logMessage(msg) {
-      console.log(" [x] %s:'%s'",
-                  msg.fields.routingKey,
-                  msg.content.toString());
-    }
-  });
-}).catch(console.warn);
+      function logMessage(msg) {
+        console.log(" [x] %s:'%s'", msg.fields.routingKey, msg.content.toString());
+      }
+    });
+  })
+  .catch(console.warn);

examples/tutorials/rpc_client.js

@@ -1,53 +1,61 @@
 #!/usr/bin/env node
 
-var amqp = require('amqplib');
-var basename = require('path').basename;
-var Promise = require('bluebird');
-var uuid = require('node-uuid');
+var amqp = require("amqplib");
+var basename = require("path").basename;
+var uuid = require("node-uuid");
 
 // I've departed from the form of the original RPC tutorial, which
 // needlessly introduces a class definition, and doesn't even
 // parameterise the request.
 
 var n;
 try {
-  if (process.argv.length < 3) throw Error('Too few args');
+  if (process.argv.length < 3) throw Error("Too few args");
   n = parseInt(process.argv[2]);
-}
-catch (e) {
+} catch (e) {
   console.error(e);
-  console.warn('Usage: %s number', basename(process.argv[1]));
+  console.warn("Usage: %s number", basename(process.argv[1]));
   process.exit(1);
 }
 
-amqp.connect('amqp://localhost').then(function(conn) {
-  return conn.createChannel().then(function(ch) {
-    return new Promise(function(resolve) {
-      var corrId = uuid();
-      function maybeAnswer(msg) {
-        if (msg.properties.correlationId === corrId) {
-          resolve(msg.content.toString());
-        }
-      }
+amqp
+  .connect("amqp://localhost")
+  .then(function (conn) {
+    return conn
+      .createChannel()
+      .then(function (ch) {
+        return new Promise(function (resolve) {
+          var corrId = uuid();
+          function maybeAnswer(msg) {
+            if (msg.properties.correlationId === corrId) {
+              resolve(msg.content.toString());
+            }
+          }
 
-      var ok = ch.assertQueue('', {exclusive: true})
-        .then(function(qok) { return qok.queue; });
+          var ok = ch.assertQueue("", { exclusive: true }).then(function (qok) {
+            return qok.queue;
+          });
 
-      ok = ok.then(function(queue) {
-        return ch.consume(queue, maybeAnswer, {noAck: true})
-          .then(function() { return queue; });
-      });
+          ok = ok.then(function (queue) {
+            return ch.consume(queue, maybeAnswer, { noAck: true }).then(function () {
+              return queue;
+            });
+          });
 
-      ok = ok.then(function(queue) {
-        console.log(' [x] Requesting fib(%d)', n);
-        ch.sendToQueue('rpc_queue', Buffer.from(n.toString()), {
-          correlationId: corrId, replyTo: queue
+          ok = ok.then(function (queue) {
+            console.log(" [x] Requesting fib(%d)", n);
+            ch.sendToQueue("rpc_queue", Buffer.from(n.toString()), {
+              correlationId: corrId,
+              replyTo: queue,
+            });
+          });
         });
+      })
+      .then(function (fibN) {
+        console.log(" [.] Got %d", fibN);
+      })
+      .finally(function () {
+        conn.close();
       });
-    });
-  })
-  .then(function(fibN) {
-    console.log(' [.] Got %d', fibN);
   })
-  .finally(function() { conn.close(); });
-}).catch(console.warn);
+  .catch(console.warn);