update readme and cleanup

Author: bartoval

examples/rabbitMQ/Readme.md

@@ -32,9 +32,7 @@ This guide will help you set up and use AMQP 1.0 with RabbitMQ, using the includ
 
 3. **Install Node.js dependencies**:
 
-   ```bash
-   npm install rhea minimist
-   ```
+- remember to run npm install from the root
 
 4. **Clone or download the example scripts** to your working directory.
 

examples/rabbitMQ/options.js

@@ -4,14 +4,10 @@
  * A lightweight wrapper around minimist that provides a more structured API
  * for defining and parsing command-line options.
  */
-var util = require('util');
 var minimist = require('minimist');
 
 /**
  * Formats an option definition into a help text string
- *
- * @param {Object} optdef - Option definition object
- * @returns {String} Formatted description string for the option
  */
 function describe(optdef) {
     var desc = '    --' + optdef.name;
@@ -21,32 +17,19 @@ function describe(optdef) {
     return desc;
 }
 
-/**
- * Simple wrapper for console.log
- *
- * @param {String} s - String to print
- */
-function print(s) {
-    console.log(s);
-}
-
 /**
  * Displays usage information for all options
- *
- * @param {Array} options - Array of option definition objects
- * @param {String} usage - Optional custom usage text
  */
 function usage(options, usage) {
     console.log(usage || 'options:');
-    options.map(describe).forEach(print);
+    options.map(describe).forEach(function(desc) {
+        console.log(desc);
+    });
 }
 
 /**
  * Converts an options object into an array of option definitions
  * Ensures each option has a name property (derived from the object key or alias)
- *
- * @param {Object} options - Options definition object
- * @returns {Array} Array of option definition objects
  */
 function as_array(options) {
     var out = [];
@@ -70,9 +53,6 @@ function as_array(options) {
 
 /**
  * Options constructor - Initializes the options parser
- *
- * @param {Array} options - Array of option definitions
- * @constructor
  */
 function Options(options) {
     this.options = options;
@@ -87,7 +67,7 @@ function Options(options) {
 
     // Convert our option definitions to minimist format
     this.options.forEach(function (definition) {
-    // Set up aliases
+        // Set up aliases
         if (definition.alias) {
             minimist_opts.alias[definition.name] = definition.alias;
         }
@@ -107,43 +87,38 @@ function Options(options) {
 
 /**
  * Adds help functionality
- * If the specified option (default 'help') is present, displays usage and exits
- *
- * @param {String} name - Option name to trigger help (default: 'help')
- * @returns {Options} - This Options instance for chaining
+ * If the specified option (default 'help') is present, displays usage and throws an error
  */
 Options.prototype.help = function (name) {
     var field = name || 'help';
-    if (this.argv[name]) {
+    if (this.argv[field]) {
         usage(this.options, this.usage_text);
-        process.exit(0);
+        throw new Error('Help displayed');
     }
     return this;
 };
 
 /**
  * Sets custom usage text for help display
- *
- * @param {String} usage - Custom usage message
- * @returns {Options} - This Options instance for chaining
  */
 Options.prototype.usage = function (usage) {
     this.usage_text = usage;
     return this;
 };
 
-/**
- * Module exports
- * Provides a factory function to create Options instances
- */
 module.exports = {
     /**
-   * Creates a new Options instance with the specified option definitions
-   *
-   * @param {Object} options - Object containing option definitions
-   * @returns {Options} - Configured Options instance
-   */
+     * Creates a new Options instance with the specified option definitions
+     */
     options: function (options) {
-        return new Options(as_array(options));
+        try {
+            return new Options(as_array(options));
+        } catch (error) {
+            if (error.message === 'Help displayed') {
+                // eslint-disable-next-line no-process-exit
+                process.exit(0);
+            }
+            throw error;
+        }
     },
 };

examples/rabbitMQ/rabbitmq_queue_setup.js

@@ -2,7 +2,6 @@
  * Script for RabbitMQ queue configuration
  */
 const http = require("http");
-const querystring = require("querystring");
 
 var args = require("./options.js")
   .options({

examples/rabbitMQ/rabbitmq_receiver.js

@@ -1,7 +1,9 @@
 /*
  * AMQP 1.0 receiver example for RabbitMQ
  */
-var container = require('rhea');
+
+// var container = require('rhea');
+var container = require('../../lib/container.js'); // local rhea version
 
 var args = require('./options.js')
     .options({
@@ -59,7 +61,7 @@ var received = 0;
 var expected = args.count;
 
 console.log('Connecting to RabbitMQ at %s:%s...', args.host, args.port);
-var connection = container.connect(connection_options);
+container.connect(connection_options);
 
 // When the connection is established
 container.on('connection_open', function (context) {
@@ -69,7 +71,7 @@ container.on('connection_open', function (context) {
     var source = {
         address: args.node,
     };
-    var receiver = context.connection.open_receiver({
+    context.connection.open_receiver({
         source: source,
         credit_window: args.prefetch,
         autoaccept: args.auto_ack,
@@ -79,7 +81,7 @@ container.on('connection_open', function (context) {
 });
 
 // When the receiver link is opened
-container.on('receiver_open', function (context) {
+container.on('receiver_open', function () {
     console.log('Receiver link established');
     console.log('Waiting for messages...');
 });
@@ -142,9 +144,8 @@ container.on('disconnected', function (context) {
             received,
             expected
         );
-        process.exit(1);
+        throw new Error('Incomplete message reception');
     } else {
         console.log('Exiting');
-        process.exit(0);
     }
 });

examples/rabbitMQ/rabbitmq_sender.js

@@ -1,7 +1,7 @@
 /*
  * AMQP 1.0 sender example for RabbitMQ
  */
-var container = require('rhea');
+var container = require('../../lib/container.js'); // local rhea version
 
 var args = require('./options.js')
     .options({
@@ -55,12 +55,12 @@ var connection_options = {
 };
 
 console.log('Connecting to RabbitMQ at %s:%s...', args.host, args.port);
-var connection = container.connect(connection_options);
+// Connect but don't store the returned object since we're not using it directly
+container.connect(connection_options);
 
 var sent = 0;
 var confirmed = 0;
 var total = args.count;
-var sender;
 
 // When the connection is established
 container.on('connection_open', function (context) {
@@ -74,7 +74,7 @@ container.on('connection_open', function (context) {
             address: args.node,
             capabilities: ['topic'],
         };
-        sender = context.connection.open_sender({
+        context.connection.open_sender({
             target: target,
             properties: {
                 'routing-key': args.address,
@@ -86,7 +86,7 @@ container.on('connection_open', function (context) {
         target = {
             address: args.node,
         };
-        sender = context.connection.open_sender({
+        context.connection.open_sender({
             target: target,
         });
     }
@@ -156,7 +156,8 @@ container.on('disconnected', function (context) {
         console.log('Attempting to reconnect...');
     } else {
         console.log('Exiting');
-        process.exit(0);
+        // Instead of process.exit(0), throw an error that can be caught
+        throw new Error('Disconnected and not reconnecting');
     }
 });
 
@@ -187,3 +188,16 @@ function send_message(sender) {
         body: message_body,
     });
 }
+
+// Main error handling
+process.on('uncaughtException', function(err) {
+    // Handle the disconnection error gracefully
+    if (err.message === 'Disconnected and not reconnecting') {
+        // eslint-disable-next-line no-process-exit
+        process.exit(0);
+    } else {
+        console.error('Uncaught exception:', err);
+        // eslint-disable-next-line no-process-exit
+        process.exit(1);
+    }
+});