From 3e74d75f28fca5d60b15a1e5e065935cfafbfb29 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 2 Jun 2020 23:39:36 +0100 Subject: [PATCH 1/3] Add node-red admin support --- package.json | 1 + packages/node_modules/node-red/package.json | 1 + packages/node_modules/node-red/red.js | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/package.json b/package.json index 00516c318..ccf7cd05f 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "mqtt": "2.18.8", "multer": "1.4.2", "mustache": "4.0.1", + "node-red-admin": "^0.2.2", "node-red-node-rbe": "^0.2.6", "node-red-node-sentiment": "^0.1.6", "node-red-node-tail": "^0.1.0", diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index 5e1b5f2fe..72ec8b475 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -39,6 +39,7 @@ "bcryptjs": "2.4.3", "express": "4.17.1", "fs-extra": "8.1.0", + "node-red-admin": "^0.2.2", "node-red-node-rbe": "^0.2.6", "node-red-node-tail": "^0.1.0", "nopt": "4.0.3", diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js index 05dc1a0bf..2c54d0045 100755 --- a/packages/node_modules/node-red/red.js +++ b/packages/node_modules/node-red/red.js @@ -14,6 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. **/ + +if (process.argv[2] === 'admin') { + try { + require("node-red-admin")(process.argv.slice(3)) + } catch(err) { + console.log(err) + } + return; +} + var http = require('http'); var https = require('https'); var util = require("util"); @@ -63,6 +73,7 @@ if (parsedArgs.help) { console.log("Node-RED v"+RED.version()); console.log("Usage: node-red [-v] [-?] [--settings settings.js] [--userDir DIR]"); console.log(" [--port PORT] [--title TITLE] [--safe] [flows.json]"); + console.log(" node-red admin [args] [-?] [--userDir DIR] [--json]"); console.log(""); console.log("Options:"); console.log(" -p, --port PORT port to listen on"); @@ -73,6 +84,7 @@ if (parsedArgs.help) { console.log(" --safe enable safe mode"); console.log(" -D, --define X=Y overwrite value in settings file"); console.log(" -?, --help show this help"); + console.log(" admin run an admin command"); console.log(""); console.log("Documentation can be found at http://nodered.org"); process.exit(); From 5651e7107f6f46c6cadf4bdfefc432fa3a7634c1 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 3 Jun 2020 10:48:52 +0100 Subject: [PATCH 2/3] Bump to 0.2.3 node-red-admin --- package.json | 2 +- packages/node_modules/node-red/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ccf7cd05f..7f3931a2e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "mqtt": "2.18.8", "multer": "1.4.2", "mustache": "4.0.1", - "node-red-admin": "^0.2.2", + "node-red-admin": "^0.2.3", "node-red-node-rbe": "^0.2.6", "node-red-node-sentiment": "^0.1.6", "node-red-node-tail": "^0.1.0", diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index 72ec8b475..2f66ceb6f 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -39,7 +39,7 @@ "bcryptjs": "2.4.3", "express": "4.17.1", "fs-extra": "8.1.0", - "node-red-admin": "^0.2.2", + "node-red-admin": "^0.2.3", "node-red-node-rbe": "^0.2.6", "node-red-node-tail": "^0.1.0", "nopt": "4.0.3", From bf9d6c7ac42cb6ad2ddd110f0560758cfa782db7 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 3 Jun 2020 16:53:45 +0100 Subject: [PATCH 3/3] Bump to node-red-admin 0.2.4 --- package.json | 2 +- packages/node_modules/node-red/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7f3931a2e..80f7c763f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "mqtt": "2.18.8", "multer": "1.4.2", "mustache": "4.0.1", - "node-red-admin": "^0.2.3", + "node-red-admin": "^0.2.4", "node-red-node-rbe": "^0.2.6", "node-red-node-sentiment": "^0.1.6", "node-red-node-tail": "^0.1.0", diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index 2f66ceb6f..54d5e2f2b 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -39,7 +39,7 @@ "bcryptjs": "2.4.3", "express": "4.17.1", "fs-extra": "8.1.0", - "node-red-admin": "^0.2.3", + "node-red-admin": "^0.2.4", "node-red-node-rbe": "^0.2.6", "node-red-node-tail": "^0.1.0", "nopt": "4.0.3",