From fe42b6971279e3ea212cf7c8b63bc2b9743922a0 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 11 Mar 2021 19:09:13 +0000
Subject: [PATCH] let daemon accept real json array of parameters

to close #768
---
 utility/daemon/daemon.html  | 1 +
 utility/daemon/daemon.js    | 9 ++++++++-
 utility/daemon/package.json | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/utility/daemon/daemon.html b/utility/daemon/daemon.html
index 8b89688c..2d932800 100644
--- a/utility/daemon/daemon.html
+++ b/utility/daemon/daemon.html
@@ -52,6 +52,7 @@
 <script type="text/html" data-help-name="daemon">
     <p>Calls out to a long running system command. Sends <code>msg.payload</code> to stdin of the process.</p>
     <p>Provides 3 outputs... stdout, stderr, and return code , from the running command.</p>
+    <p>Parameters can be space separated, space separated with quotes, or a javascript array. For example `aa bb` or `"cc dd"` or `["aa","bb cc""]`.</p>
     <p>If the called program stops (i.e. a return code is produced), this node can attempt to restart the command.</p>
     <p>Setting <code>msg.kill</code> to a signal name (e.g. SIGINT, SIGHUP) will stop the process - but if the
     restart flag is set it will then auto restart. Sending <code>msg.start</code> will also re-start the process.</p>
diff --git a/utility/daemon/daemon.js b/utility/daemon/daemon.js
index bc231a5a..e0d5eb49 100644
--- a/utility/daemon/daemon.js
+++ b/utility/daemon/daemon.js
@@ -7,7 +7,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         this.cmd = n.command;
         //this.args = n.args.trim().split(" ") || [];
-        this.args = n.args.trim().match(/("[^"]*")|[^ ]+/g);
+        this.args = n.args.trim(); //.match(/("[^"]*")|[^ ]+/g);
         this.cr = n.cr;
         this.op = n.op;
         this.redo = n.redo;
@@ -15,6 +15,13 @@ module.exports = function(RED) {
         this.closer = n.closer || "SIGKILL";
         this.autorun = true;
         if (n.autorun === false) { this.autorun = false; }
+        if (this.args.match(/^\[.*\]$/)) {
+            try { this.args = JSON.parse(this.args); }
+            catch(e) {
+                node.warn("Bad parameters - should be a JSON array or space separated")
+            }
+        }
+        else { this.args = this.args.match(/("[^"]*")|[^ ]+/g); }
         var node = this;
         var lastmsg = {};
 
diff --git a/utility/daemon/package.json b/utility/daemon/package.json
index bfae623a..e19652dd 100644
--- a/utility/daemon/package.json
+++ b/utility/daemon/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-daemon",
-    "version"       : "0.1.3",
+    "version"       : "0.2.0",
     "description"   : "A Node-RED node that runs and monitors a long running system command.",
     "dependencies"  : {
     },