Update other examples

Author: cressie176

examples/headers.js

@@ -2,41 +2,41 @@
 
 // Example of using a headers exchange
 
-var amqp = require('../')
-
-amqp.connect().then(function(conn) {
-  return conn.createChannel().then(withChannel);
-}, console.error);
-
-function withChannel(ch) {
-  // NB the type of the exchange is 'headers'
-  ch.assertExchange('matching exchange', 'headers').then(function(ex) {
-    ch.assertQueue().then(function(q) {
-      bindAndConsume(ch, ex, q).then(function() {
-        send(ch, ex);
-      });
-    });
+const amqp = require('../');
+
+(async () => {
+
+  const connection = await amqp.connect();
+  const channel = await connection.createChannel();
+
+  process.once('SIGINT', async () => {
+    await channel.close();
+    await connection.close();
   });
-}
 
-function bindAndConsume(ch, ex, q) {
+  const { exchange } = await channel.assertExchange('matching exchange', 'headers');
+  const { queue } = await channel.assertQueue();
+
   // When using a headers exchange, the headers to be matched go in
   // the binding arguments. The routing key is ignore, so best left
   // empty.
 
   // 'x-match' is 'all' or 'any', meaning "all fields must match" or
   // "at least one field must match", respectively. The values to be
   // matched go in subsequent fields.
-  ch.bindQueue(q.queue, ex.exchange, '', {'x-match': 'any',
-                                          'foo': 'bar',
-                                          'baz': 'boo'});
-  return ch.consume(q.queue, function(msg) {
-    console.log(msg.content.toString());
-  }, {noAck: true});
-}
-
-function send(ch, ex) {
-  // The headers for a message are given as an option to `publish`:
-  ch.publish(ex.exchange, '', Buffer.from('hello'), {headers: {baz: 'boo'}});
-  ch.publish(ex.exchange, '', Buffer.from('world'), {headers: {foo: 'bar'}});
-}
+  await channel.bindQueue(queue, exchange, '', {
+    'x-match': 'any',
+    'foo': 'bar',
+    'baz': 'boo'
+  });
+
+  await channel.consume(queue, (message) => {
+    console.log(message.content.toString());
+  }, { noAck: true });
+
+  channel.publish(exchange, '', Buffer.from('hello'), { headers: { baz: 'boo' }});
+  channel.publish(exchange, '', Buffer.from('hello'), { headers: { foo: 'bar' }});
+  channel.publish(exchange, '', Buffer.from('lost'), { headers: { meh: 'nah' }});
+
+  console.log(' [x] To exit press CTRL+C.');
+})();

examples/ssl.js

@@ -18,8 +18,8 @@
 //
 //     openssl s_client -connect localhost:5671
 
-var amqp = require('../');
-var fs = require('fs');
+const amqp = require('../');
+const fs = require('fs');
 
 // Assemble the SSL options; for verification we need at least
 // * a certificate to present to the server ('cert', in PEM format)
@@ -34,7 +34,7 @@ var fs = require('fs');
 // to use `rejectUnauthorized: false`.
 
 // Options for full client and server verification:
-var opts = {
+const opts = {
   cert: fs.readFileSync('../etc/client/cert.pem'),
   key: fs.readFileSync('../etc/client/key.pem'),
   // cert and key or
@@ -49,16 +49,22 @@ var opts = {
 //     {verify, verify_none},
 //     {fail_if_no_peer_cert,false}
 //
-// var opts = {  ca: [fs.readFileSync('../etc/testca/cacert.pem')] };
+// const opts = {  ca: [fs.readFileSync('../etc/testca/cacert.pem')] };
 
 // Option to use the SSL client certificate for authentication
 // opts.credentials = amqp.credentials.external();
 
-var open = amqp.connect('amqps://localhost', opts);
+(async () => {
+  const connection = await amqp.connect('amqp://localhost', opts);
+  const channel = await connection.createChannel();
 
-open.then(function(conn) {
-  process.on('SIGINT', conn.close.bind(conn));
-  return conn.createChannel().then(function(ch) {
-    ch.sendToQueue('foo', Buffer.from('Hello World!'));
+  process.on('SIGINT', async () => {
+    await channel.close();
+    await connection.close();
   });
-}).then(null, console.warn);
+
+  channel.sendToQueue('foo', Buffer.from('Hello World!'));
+
+  console.log(' [x] To exit press CTRL+C.');
+})();
+

examples/tutorials/callback_api/rpc_server.js

@@ -28,7 +28,7 @@ amqp.connect((err, connection) => {
         channel.ack(message);
       }, { noAck: false }, function(err) {
         if (err) return bail(err, conn);
-        console.log(' [x] Awaiting RPC requests');
+        console.log(' [x] Awaiting RPC requests. To exit press CTRL+C.');
       });
     });
   });

examples/tutorials/rpc_server.js

@@ -27,7 +27,7 @@ const queue = 'rpc_queue';
       channel.ack(message);
     });
 
-    console.log(' [x] Awaiting RPC requests');
+    console.log(' [x] Awaiting RPC requests. To exit press CTRL+C.');
   }
   catch (err) {
     console.warn(err);

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();
+  }
+})();