Fix duration mode and connector client

Author: kornys

lib/connectorClient.js

@@ -26,6 +26,7 @@ const Options = require('./optionsParser.js').ConnectorOptions;
 class Connector extends CoreClient {
     constructor() {
         super();
+        this.stop = false;
         this.containers = [];
         this.connections = [];
         this.senders = [];
@@ -40,6 +41,20 @@ class Connector extends CoreClient {
         };
     }
 
+    sendMessage(context, self) {
+        self.results.sent++;
+
+        context.sender.send({body: 'test message ' + self.sent});
+
+        if (self.options.timeout > 0) {
+            self.resetTimeout(context, false);
+        }
+
+        if (self.options.infinitySend && !self.stop) {
+            setTimeout(self.sendMessage, 1000, context, self);
+        }
+    }
+
     /**
      * Close all connection, sessions, senders and receiver
      * @method CloseObjects
@@ -107,25 +122,17 @@ class Connector extends CoreClient {
                     self.results.receivers.open += 1;
                 });
 
-                this.containers[i].on('sender_open', function() {
+                this.containers[i].on('sender_open', function(context) {
                     self.results.senders.open += 1;
+                    if (self.options.objCtrl && self.options.objCtrl.indexOf('S') && self.options.senderCount > 0) {
+                        self.sendMessage(context, self);
+                    }
                 });
 
-                if (this.options.objCtrl && this.options.objCtrl.indexOf('S') && this.options.senderCount > 0) {
-                    this.containers[i].on('sendable', function(context) {
-                        const count = 1;
-                        let sent = 0;
-                        while(sent < count && context.sender.sendable()) {
-                            context.sender.send({body: 'test message ' + sent});
-                            sent++;
-                            self.results.sent++;
-                        }
-                    });
-                }
-
                 if (this.options.objCtrl && this.options.objCtrl.indexOf('R') && this.options.receiverCount > 0) {
-                    this.containers[i].on('message', function() {
+                    this.containers[i].on('message', function(context) {
                         self.results.received++;
+                        context.delivery.accept();
                     });
                 }
 
@@ -176,6 +183,7 @@ class Connector extends CoreClient {
 
         //set timeout for end connections
         setTimeout(function(connector) {
+            connector.stop = true;
             connector.closeObjects(connector);
             connector.printOutput();
         }, this.options.timeout,

lib/optionsParser.js

@@ -383,6 +383,7 @@ class ConnectorOptions extends BasicOptions {
         this.objCtrl;
         this.senderCount;
         this.receiverCount;
+        this.infinitySend;
     }
 
     /**
@@ -397,13 +398,15 @@ class ConnectorOptions extends BasicOptions {
                 'obj-ctrl':             { default: 'C', describe: 'Optional creation object control based on <object-ids>, syntax C/E/S/R stands for Connection, sEssion, Sender, Receiver'},
                 'sender-count':         { default: 1, describe: 'count of senders', type: 'uint'},
                 'receiver-count':       { default: 1, describe: 'count of receivers', type: 'uint'},
+                'infinity-send':        { default: true, describe: 'set infinite send loop until kill or timeout', type: 'boolean'},
             });
         const args = this.parse(argsProcessor, listArgs);
         this.parseBasic(listArgs);
 
         this.objCtrl = args['obj-ctrl'];
         this.senderCount = args['sender-count'];
         this.receiverCount = args['receiver-count'];
+        this.infinitySend = args['infinity-send'];
     }
 }
 

lib/senderClient.js

@@ -184,7 +184,9 @@ class Sender extends CoreClient {
         const self = this;
         //send messages
         this.container.on('sendable', function (context) {
-            self._sendMessage(context);
+            if (self.options.duration === 0) {
+                self._sendMessage(context);
+            }
         });
 
         //on accept message
@@ -206,6 +208,9 @@ class Sender extends CoreClient {
 
         //event raised when sender is opening
         this.container.on('sender_open', function (context) {
+            if (self.options.duration > 0) {
+                self._sendMessage(context);
+            }
             if (self.options.timeout > 0) {
                 self.timeoutClose(context, self.options.timeout);
             }

package.json

@@ -18,7 +18,7 @@
     "cli-rhea-connector": "bin/connector-client.js"
   },
   "dependencies": {
-    "rhea": "^1.0.10",
+    "rhea": "^1.0.19",
     "string-format-js": "",
     "ws": "^5.0.0",
     "yargs": "7.1.0"