amqplib 0.10.3 → 0.10.4

package/examples/tutorials/send.js

@@ -1,23 +1,31 @@
 #!/usr/bin/env node
 
-var amqp = require('amqplib');
+const amqp = require('amqplib');
 
-amqp.connect('amqp://localhost').then(function(conn) {
-  return conn.createChannel().then(function(ch) {
-    var q = 'hello';
-    var msg = 'Hello World!';
+const queue = 'hello';
+const text = 'Hello World!';
 
-    var ok = ch.assertQueue(q, {durable: false});
+(async () => {
+  let connection;
+  try {
+    connection = await amqp.connect('amqp://localhost');
+    const channel = await connection.createChannel();
 
-    return ok.then(function(_qok) {
-      // NB: `sentToQueue` and `publish` both return a boolean
-      // indicating whether it's OK to send again straight away, or
-      // (when `false`) that you should wait for the event `'drain'`
-      // to fire before writing again. We're just doing the one write,
-      // so we'll ignore it.
-      ch.sendToQueue(q, Buffer.from(msg));
-      console.log(" [x] Sent '%s'", msg);
-      return ch.close();
-    });
-  }).finally(function() { conn.close(); });
-}).catch(console.warn);
+    await channel.assertQueue(queue, { durable: false });
+
+    // NB: `sentToQueue` and `publish` both return a boolean
+    // indicating whether it's OK to send again straight away, or
+    // (when `false`) that you should wait for the event `'drain'`
+    // to fire before writing again. We're just doing the one write,
+    // so we'll ignore it.
+    channel.sendToQueue(queue, Buffer.from(text));
+    console.log(" [x] Sent '%s'", text);
+    await channel.close();
+  }
+  catch (err) {
+    console.warn(err);
+  }
+  finally {
+    if (connection) await connection.close();
+  };
+})();  

package/examples/tutorials/worker.js

@@ -1,28 +1,34 @@
 #!/usr/bin/env node
 // Process tasks from the work queue
 
-var amqp = require('amqplib');
+const amqp = require('amqplib');
 
-amqp.connect('amqp://localhost').then(function(conn) {
-  process.once('SIGINT', function() { conn.close(); });
-  return conn.createChannel().then(function(ch) {
-    var ok = ch.assertQueue('task_queue', {durable: true});
-    ok = ok.then(function() { ch.prefetch(1); });
-    ok = ok.then(function() {
-      ch.consume('task_queue', doWork, {noAck: false});
-      console.log(" [*] Waiting for messages. To exit press CTRL+C");
+const queue = 'task_queue';
+
+(async () => {
+  try {
+    const connection = await amqp.connect('amqp://localhost');
+    process.once('SIGINT', async () => { 
+      await connection.close();
     });
-    return ok;
 
-    function doWork(msg) {
-      var body = msg.content.toString();
-      console.log(" [x] Received '%s'", body);
-      var secs = body.split('.').length - 1;
-      //console.log(" [x] Task takes %d seconds", secs);
-      setTimeout(function() {
+    const channel = await connection.createChannel();
+    await channel.assertQueue(queue, { durable: true });
+
+    channel.prefetch(1);
+    await channel.consume(queue, (message) => {
+      const text = message.content.toString();
+      console.log(" [x] Received '%s'", text);
+      const seconds = text.split('.').length - 1;
+      setTimeout(() => {
         console.log(" [x] Done");
-        ch.ack(msg);
-      }, secs * 1000);
-    }
-  });
-}).catch(console.warn);
+        channel.ack(message);
+      }, seconds * 1000);      
+    }, { noAck: false });
+      
+    console.log(" [*] Waiting for messages. To exit press CTRL+C");
+  }
+  catch (err) {
+    console.warn(err);
+  }
+})();

package/examples/waitForConfirms.js

@@ -1,22 +1,21 @@
-var amqp = require('../');
+const amqp = require('../');
 
-var NUM_MSGS = 20;
+(async () => {
+  let connection;
+  try {
+    connection = await amqp.connect();
+    const channel = await connection.createConfirmChannel();
 
-function mkCallback(i) {
-  return (i % 2) === 0 ? function(err) {
-    if (err !== null) { console.error('Message %d failed!', i); }
-    else { console.log('Message %d confirmed', i); }
-  } : null;
-}
+    for (var i=0; i < 20; i++) {
+      channel.publish('amq.topic', 'whatever', Buffer.from('blah'));
+    };
 
-amqp.connect().then(function(c) {
-  c.createConfirmChannel().then(function(ch) {
-    for (var i=0; i < NUM_MSGS; i++) {
-      ch.publish('amq.topic', 'whatever', Buffer.from('blah'), {}, mkCallback(i));
-    }
-    ch.waitForConfirms().then(function() {
-      console.log('All messages done');
-      c.close();
-    }).catch(console.error);
-  });
-});
+    await channel.waitForConfirms();
+    console.log('All messages done');
+    await channel.close();
+  } catch (err) {
+    console.warn(err);
+  } finally {
+    if (connection) await connection.close();
+  }
+})();