From 7adf102d8d6d57ea3e5e7217fd959c1f1daf550f Mon Sep 17 00:00:00 2001
From: Kunihiko Toumura <kunihiko.toumura.yv@hitachi.com>
Date: Sat, 22 Jun 2019 16:05:50 +0900
Subject: [PATCH 001/305] Initial implementation of redo (un-undo)

---
 .../@node-red/editor-client/src/js/history.js | 164 +++++++++++++++++-
 .../editor-client/src/js/keymap.json          |   6 +-
 .../@node-red/editor-client/src/js/ui/view.js |   1 +
 3 files changed, 167 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index 930598dd5..b59af14d5 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -15,6 +15,7 @@
  **/
 RED.history = (function() {
     var undo_history = [];
+    var redo_history = [];
 
     function undoEvent(ev) {
         var i;
@@ -22,52 +23,81 @@ RED.history = (function() {
         var node;
         var subflow;
         var modifiedTabs = {};
+        var inv_ev;
         if (ev) {
             if (ev.t == 'multi') {
+                inv_ev = {
+                    t: 'multi',
+                    events: []
+                };                
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
-                    undoEvent(ev.events[i]);
+                    var r = undoEvent(ev.events[i]);
+                    inv_ev.events.push(r);
                 }
             } else if (ev.t == 'replace') {
+                inv_ev = {
+                    t: 'replace',
+                    config: RED.nodes.createCompleteNodeSet(),
+                    changed: [],
+                    rev: RED.nodes.version()
+                };
                 RED.nodes.clear();
                 var imported = RED.nodes.import(ev.config);
                 imported[0].forEach(function(n) {
                     if (ev.changed[n.id]) {
                         n.changed = true;
+                        inv_ev.changed[n.id] = true;
                     }
                 })
 
                 RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
+                inv_ev = {
+                    t: "delete",
+                };
                 if (ev.nodes) {
+                    inv_ev.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         node = RED.nodes.node(ev.nodes[i]);
                         if (node.z) {
                             modifiedTabs[node.z] = true;
                         }
+                        inv_ev.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inv_ev.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inv_ev.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.workspaces) {
+                    inv_ev.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        var workspaceOrder = RED.nodes.getWorkspaceOrder();
+                        ev.workspaces[i]._index = workspaceOrder.indexOf(ev.workspaces[i].id);
+                        inv_ev.workspaces.push(ev.workspaces[i]);
                         RED.nodes.removeWorkspace(ev.workspaces[i].id);
                         RED.workspaces.remove(ev.workspaces[i]);
                     }
                 }
                 if (ev.subflows) {
+                    inv_ev.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inv_ev.subflows.push(ev.subflows[i]);
                         RED.nodes.removeSubflow(ev.subflows[i]);
                         RED.workspaces.remove(ev.subflows[i]);
                     }
                 }
                 if (ev.subflow) {
+                    inv_ev.subflow = {};
                     if (ev.subflow.instances) {
+                        inv_ev.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inv_ev.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -83,21 +113,30 @@ RED.history = (function() {
                     }
                 }
                 if (ev.removedLinks) {
+                    inv_ev.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inv_ev.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
 
             } else if (ev.t == "delete") {
+                inv_ev = {
+                    t: "add"
+                };
                 if (ev.workspaces) {
+                    inv_ev.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        inv_ev.workspaces.push(ev.workspaces[i]);
                         RED.nodes.addWorkspace(ev.workspaces[i],ev.workspaces[i]._index);
                         RED.workspaces.add(ev.workspaces[i],undefined,ev.workspaces[i]._index);
                         delete ev.workspaces[i]._index;
                     }
                 }
                 if (ev.subflows) {
+                    inv_ev.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inv_ev.subflows.push(ev.subflows[i]);
                         RED.nodes.addSubflow(ev.subflows[i]);
                     }
                 }
@@ -126,8 +165,10 @@ RED.history = (function() {
                     }
                 }
                 if (ev.subflow) {
+                    inv_ev.subflow = {};
                     if (ev.subflow.hasOwnProperty('instances')) {
                         ev.subflow.instances.forEach(function(n) {
+                            inv_ev.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -152,14 +193,25 @@ RED.history = (function() {
                     });
                 }
                 if (ev.nodes) {
+                    inv_ev.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
+                        inv_ev.nodes.push(ev.nodes[i].id);
                     }
                 }
                 if (ev.links) {
+                    inv_ev.links = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inv_ev.links.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inv_ev.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inv_ev.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
                 if (ev.changes) {
@@ -179,8 +231,14 @@ RED.history = (function() {
 
                 }
             } else if (ev.t == "move") {
+                inv_ev = {
+                    t: 'move',
+                    nodes: []
+                };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
+                    inv_ev.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
                     n.n.dirty = true;
@@ -188,18 +246,28 @@ RED.history = (function() {
                 }
                 // A move could have caused a link splice
                 if (ev.links) {
+                    inv_ev.removedLinks = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inv_ev.removedLinks.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.removedLinks) {
+                    inv_ev.links = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inv_ev.links.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "edit") {
+                inv_ev = {
+                    t: "edit",
+                    changes: {}
+                };
+                inv_ev.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
+                        inv_ev.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
                             // This is a config node property
                             var currentConfigNode = RED.nodes.node(ev.node[i]);
@@ -219,22 +287,29 @@ RED.history = (function() {
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
                 }
                 if (ev.subflow) {
+                    inv_ev.subflow = {};
                     if (ev.subflow.hasOwnProperty('inputCount')) {
+                        inv_ev.subflow.inputCount = ev.node.in.length;
                         if (ev.node.in.length > ev.subflow.inputCount) {
+                            inv_ev.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
                             ev.node.in.splice(ev.subflow.inputCount);
                         } else if (ev.subflow.inputs.length > 0) {
                             ev.node.in = ev.node.in.concat(ev.subflow.inputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('outputCount')) {
+                        inv_ev.subflow.outputCount = ev.node.out.length;
                         if (ev.node.out.length > ev.subflow.outputCount) {
+                            inv_ev.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
                             ev.node.out.splice(ev.subflow.outputCount);
                         } else if (ev.subflow.outputs.length > 0) {
                             ev.node.out = ev.node.out.concat(ev.subflow.outputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inv_ev.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inv_ev.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -258,9 +333,11 @@ RED.history = (function() {
                     var outputMap;
                     if (ev.outputMap) {
                         outputMap = {};
+                        inv_ev.outputMap = {};
                         for (var port in ev.outputMap) {
                             if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
                                 outputMap[ev.outputMap[port]] = port;
+                                inv_ev.outputMap[ev.outputMap[port]] = port;
                             }
                         }
                     }
@@ -268,39 +345,106 @@ RED.history = (function() {
                     RED.editor.validateNode(ev.node);
                 }
                 if (ev.links) {
+                    inv_ev.createdLinks = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inv_ev.createdLinks.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inv_ev.links = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                        inv_ev.links.push(ev.createdLinks[i]);
                     }
                 }
                 ev.node.dirty = true;
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
+                inv_ev = {
+                    t: "deleteSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    dirty: RED.nodes.dirty()
+                };
                 if (ev.nodes) {
+                    inv_ev.movedNodes = [];
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        inv_ev.movedNodes.push(n.id);
                     });
+                    inv_ev.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
+                        inv_ev.subflows.push(RED.nodes.node(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inv_ev.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inv_ev.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
 
+                inv_ev.subflow = ev.subflow;
                 RED.nodes.removeSubflow(ev.subflow.subflow);
                 RED.workspaces.remove(ev.subflow.subflow);
 
                 if (ev.removedLinks) {
+                    inv_ev.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inv_ev.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
+            } else if (ev.t == "deleteSubflow") {
+                inv_ev = {
+                    t: "createSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    ditry: RED.nodes.dirty(),
+                };
+                if (ev.subflow) {
+                    RED.nodes.addSubflow(ev.subflow.subflow);
+                    inv_ev.subflow = ev.subflow;
+                }
+                if (ev.subflows) {
+                    inv_ev.nodes = [];
+                    for (i=0;i<ev.subflows.length;i++) {
+                        RED.nodes.add(ev.subflows[i]);
+                        inv_ev.nodes.push(ev.subflows[i].id);
+                    }
+                }
+                if (ev.movedNodes) {
+                    ev.movedNodes.forEach(function(nid) {
+                        nn = RED.nodes.node(nid);
+                        nn.x -= ev.subflow.offsetX;
+                        nn.y -= ev.subflow.offsetY;
+                        nn.z = ev.subflow.subflow.id;
+                        nn.dirty = true;
+                    });
+                }
+                if (ev.links) {
+                    inv_ev.links = [];
+                    for (i=0;i<ev.links.length;i++) {
+                        inv_ev.links.push(ev.links[i]);
+                        RED.nodes.addLink(ev.links[i]);
+                    }
+                }
+                if  (ev.createdLinks) {
+                    inv_ev.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inv_ev.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                    }
+                }
             } else if (ev.t == "reorder") {
+                inv_ev = {
+                    t: 'reorder',
+                    order: RED.nodes.getWorkspaceOrder()
+                };                
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }
@@ -320,6 +464,8 @@ RED.history = (function() {
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
+
+            return inv_ev;
         }
 
     }
@@ -339,16 +485,30 @@ RED.history = (function() {
         },
         push: function(ev) {
             undo_history.push(ev);
+            redo_history = [];
         },
         pop: function() {
             var ev = undo_history.pop();
-            undoEvent(ev);
+            var rev = undoEvent(ev);
+            if (rev) {
+                redo_history.push(rev);
+            }
         },
         peek: function() {
             return undo_history[undo_history.length-1];
         },
         clear: function() {
             undo_history = [];
+            redo_history = [];
+        },
+        redo: function() {
+            var ev = redo_history.pop();
+            if (ev) {
+                var uev = undoEvent(ev);
+                if (uev) {
+                    undo_history.push(uev);
+                }
+            }
         }
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
index 2db2d4836..c8ffe6306 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -29,7 +29,8 @@
         "backspace": "core:delete-config-selection",
         "delete": "core:delete-config-selection",
         "ctrl-a": "core:select-all-config-nodes",
-        "ctrl-z": "core:undo"
+        "ctrl-z": "core:undo",
+        "ctrl-shift-z": "core:redo"
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
@@ -50,6 +51,7 @@
         "shift-down": "core:step-selection-down",
         "shift-left": "core:step-selection-left",
         "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab"
+        "ctrl-shift-k": "core:show-next-tab",
+        "ctrl-shift-z": "core:redo"
      }
 }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 57cce2852..9ae641731 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -406,6 +406,7 @@ RED.view = (function() {
         RED.actions.add("core:delete-selection",deleteSelection);
         RED.actions.add("core:edit-selected-node",editSelection);
         RED.actions.add("core:undo",RED.history.pop);
+        RED.actions.add("core:redo",RED.history.redo);
         RED.actions.add("core:select-all-nodes",selectAll);
         RED.actions.add("core:zoom-in",zoomIn);
         RED.actions.add("core:zoom-out",zoomOut);

From 94c9da468e8ee32be50fd587cf1b3a64cf20c72c Mon Sep 17 00:00:00 2001
From: Kunihiko Toumura <kunihiko.toumura.yv@hitachi.com>
Date: Thu, 4 Jul 2019 08:26:39 +0100
Subject: [PATCH 002/305] fix initialization bug

---
 packages/node_modules/@node-red/editor-client/src/js/history.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index b59af14d5..36acb4a2c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -167,6 +167,7 @@ RED.history = (function() {
                 if (ev.subflow) {
                     inv_ev.subflow = {};
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inv_ev.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
                             inv_ev.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);

From 3ee8bcad8cc7b7f3dea668634077d4a4f0c04284 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 8 Jul 2019 23:52:08 +0900
Subject: [PATCH 003/305] add support for specifying subflow template color

---
 .../editor-client/locales/en-US/editor.json   |  1 +
 .../editor-client/locales/ja/editor.json      |  1 +
 .../@node-red/editor-client/src/js/nodes.js   |  3 +-
 .../editor-client/src/js/ui/editor.js         | 43 +++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 9a53a870c..16b1ea97a 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -310,6 +310,7 @@
         "addNewType": "Add new __type__...",
         "nodeProperties": "node properties",
         "label": "Label",
+        "color": "Color",
         "portLabels": "Port labels",
         "labelInputs": "Inputs",
         "labelOutputs": "Outputs",
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 770c75589..1cf864c63 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -310,6 +310,7 @@
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
+        "color": "色",
         "portLabels": "ポートラベル",
         "labelInputs": "入力",
         "labelOutputs": "出力",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 62949efce..89361ec0c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -366,7 +366,7 @@ RED.nodes = (function() {
             category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: "#da9",
+            color: sf.color || "#da9",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
@@ -551,6 +551,7 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+        node.color = n.color;
 
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 4547dc756..f26967148 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1001,6 +1001,41 @@ RED.editor = (function() {
             $('<div id="red-ui-editor-node-icon">').text(node.icon).appendTo(iconButton);
         }
 
+        if (node.type === "subflow") {
+            // subflow template can select its color
+            var colorRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
+            var selector = $("<input/>", {
+                id: "red-ui-editor-node-color",
+                type: "color",
+                value: "#E9967A",
+                list: "red-ui-editor-node-colors"
+            }).css({
+                width: "100px"
+            }).appendTo(colorRow);
+            var colors = $("<datalist id='red-ui-editor-node-colors'>").appendTo(colorRow);
+            var recommendedColors = [
+                "#3FADB5", "#87A980", "#A6BBCF",
+                "#AAAA66", "#C0C0C0", "#C0DEED",
+                "#C7E9C0", "#D7D7A0", "#D8BFD8",
+                "#DAC4B4", "#DEB887", "#DEBD5C",
+                "#E2D96E", "#E6E0F8", "#E7E7AE",
+                "#E9967A", "#F3B567", "#FDD0A2",
+                "#FDF0C2", "#FFAAAA", "#FFCC66",
+                "#FFF0F0", "#FFFFFF"
+            ];
+            recommendedColors.forEach(function (col) {
+                var opt = $("<option>").appendTo(colors);
+                opt.val(col);
+            });
+            if (node.color) {
+                selector.val(node.color);
+            }
+            selector.change();
+        }        
+
         $('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
 
         var inputCount = node.inputs || node._def.inputs || 0;
@@ -2178,6 +2213,14 @@ RED.editor = (function() {
                             changed = true;
                         }
 
+                        var oldColor = editing_node.color;
+                        var newColor =  $("#red-ui-editor-node-color").val();
+                        if (oldColor !== newColor) {
+                            editing_node.color = newColor;
+                            changes.color = newColor;
+                            changed = true;
+                        }
+
                         var old_env = editing_node.env;
                         var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
                         if (!isSameEnv(old_env, new_env)) {

From 238bcb86981d2624711d1f6c48cd71a1fee959c3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 8 Jul 2019 15:54:31 +0100
Subject: [PATCH 004/305] Add "has key" rule to  switch node + tests

---
 .../@node-red/nodes/core/logic/10-switch.html | 26 ++++++++++++++++++-
 .../@node-red/nodes/core/logic/10-switch.js   |  4 ++-
 .../nodes/locales/en-US/messages.json         |  3 ++-
 test/nodes/core/logic/10-switch_spec.js       | 11 +++++++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 7dbe0b0ba..83d3f8765 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -48,6 +48,7 @@
         {v:"lte",t:"<=",kind:'V'},
         {v:"gt",t:">",kind:'V'},
         {v:"gte",t:">=",kind:'V'},
+        {v:"exists",t:"switch.rules.exists",kind:'V'},
         {v:"btwn",t:"switch.rules.btwn",kind:'V'},
         {v:"cont",t:"switch.rules.cont",kind:'V'},
         {v:"regex",t:"switch.rules.regex",kind:'V'},
@@ -142,6 +143,7 @@
                 var typeField = rule.find(".node-input-rule-type-value");
                 var numField = rule.find(".node-input-rule-num-value");
                 var expField = rule.find(".node-input-rule-exp-value");
+                var keyField = rule.find(".node-input-rule-key-value");
                 var btwnField1 = rule.find(".node-input-rule-btwn-value");
                 var btwnField2 = rule.find(".node-input-rule-btwn-value2");
                 var selectWidth;
@@ -160,6 +162,8 @@
                     numField.typedInput("width",(newWidth-selectWidth-70));
                 } else if (type === "jsonata_exp") {
                     expField.typedInput("width",(newWidth-selectWidth-70));
+                } else if (type === "exists") {
+                    keyField.typedInput("width",(newWidth-selectWidth-70));
                 } else if (type === "istype") {
                     typeField.typedInput("width",(newWidth-selectWidth-70));
                 } else {
@@ -214,6 +218,7 @@
                     var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
                     var btwnAndLabel = $('<span/>',{class:"node-input-rule-btwn-label"}).text(" "+andLabel+" ").appendTo(row3);
                     var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"margin-left:2px;"}).appendTo(row3).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+                    var keyValueField = $('<input/>',{class:"node-input-rule-key-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'str',types:['str','msg','flow','global','env']});
                     var typeValueField = $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row)
                         .typedInput({default:'string',types:[
                             {value:"string",label:"string",hasValue:false},
@@ -236,6 +241,7 @@
                         if ((type === "btwn") || (type === "index")) {
                             valueField.typedInput('hide');
                             expValueField.typedInput('hide');
+                            keyValueField.typedInput('hide');
                             numValueField.typedInput('hide');
                             typeValueField.typedInput('hide');
                             btwnValueField.typedInput('show');
@@ -243,19 +249,30 @@
                             btwnValueField.typedInput('hide');
                             btwnValue2Field.typedInput('hide');
                             expValueField.typedInput('hide');
+                            keyValueField.typedInput('hide');
                             numValueField.typedInput('show');
                             typeValueField.typedInput('hide');
                             valueField.typedInput('hide');
+                        } else if (type === "exists") {
+                            btwnValueField.typedInput('hide');
+                            btwnValue2Field.typedInput('hide');
+                            expValueField.typedInput('hide');
+                            keyValueField.typedInput('show');
+                            numValueField.typedInput('hide');
+                            typeValueField.typedInput('hide');
+                            valueField.typedInput('hide');
                         } else if (type === "jsonata_exp") {
                             btwnValueField.typedInput('hide');
                             btwnValue2Field.typedInput('hide');
                             expValueField.typedInput('show');
+                            keyValueField.typedInput('hide');
                             numValueField.typedInput('hide');
                             typeValueField.typedInput('hide');
                             valueField.typedInput('hide');
                         } else {
                             btwnValueField.typedInput('hide');
                             expValueField.typedInput('hide');
+                            keyValueField.typedInput('hide');
                             numValueField.typedInput('hide');
                             typeValueField.typedInput('hide');
                             valueField.typedInput('hide');
@@ -297,7 +314,10 @@
                     } else if (rule.t === "istype") {
                         typeValueField.typedInput('value',rule.vt);
                         typeValueField.typedInput('type',rule.vt);
-                    } else if (rule.t === "jsonata_exp") {
+                    } else if (rule.t === "exists") {
+                        keyValueField.typedInput('value',rule.v);
+                        keyValueField.typedInput('type',rule.vt);
+                    }else if (rule.t === "jsonata_exp") {
                         expValueField.typedInput('value',rule.v);
                         expValueField.typedInput('type',rule.vt||'jsonata');
                     } else if (typeof rule.v != "undefined") {
@@ -372,12 +392,16 @@
                     } else if (type === "istype") {
                         r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                         r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
+                    } else if (type === "exists") {
+                        r.v = rule.find(".node-input-rule-key-value").typedInput('value');
+                        r.vt = rule.find(".node-input-rule-key-value").typedInput('type');
                     } else if (type === "jsonata_exp") {
                         r.v = rule.find(".node-input-rule-exp-value").typedInput('value');
                         r.vt = rule.find(".node-input-rule-exp-value").typedInput('type');
                     } else {
                         r.v = rule.find(".node-input-rule-value").typedInput('value');
                         r.vt = rule.find(".node-input-rule-value").typedInput('type');
+                        console.log("DONG",r)
                     }
                     if (type === "regex") {
                         r.case = rule.find(".node-input-rule-case").prop("checked");
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
index f8e92a7a3..ef999ce3c 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
@@ -47,7 +47,6 @@ module.exports = function(RED) {
             }
             return false;
         },
-
         'istype': function(a, b) {
             if (b === "array") { return Array.isArray(a); }
             else if (b === "buffer") { return Buffer.isBuffer(a); }
@@ -72,6 +71,9 @@ module.exports = function(RED) {
             var index = parts.index;
             return ((min <= index) && (index <= max));
         },
+        'exists': function(a, b) {
+            if (typeof b !== "object" ) {  return a.hasOwnProperty(b+""); }
+        },
         'jsonata_exp': function(a, b) { return (b === true); },
         'else': function(a) { return a === true; }
     };
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 76e1cf2f8..1bf5f86d6 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -621,7 +621,8 @@
             "tail":"tail",
             "index":"index between",
             "exp":"JSONata exp",
-            "else":"otherwise"
+            "else":"otherwise",
+            "exists":"has key"
         },
         "errors": {
             "invalid-expr": "Invalid JSONata expression: __error__",
diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/logic/10-switch_spec.js
index 899e6edef..a1b1424ca 100644
--- a/test/nodes/core/logic/10-switch_spec.js
+++ b/test/nodes/core/logic/10-switch_spec.js
@@ -254,6 +254,16 @@ describe('switch Node', function() {
         genericSwitchTest("gte", 3, true, true, 3, done);
     });
 
+    it('should match if a payload has a required property', function(done) {
+        genericSwitchTest("exists", "a", true, true, {a:1}, done);
+    });
+    it('should not match if a payload does not have a required property', function(done) {
+        genericSwitchTest("exists", "a", true, false, {b:1}, done);
+    });
+    it('should not match if the key is not a string', function(done) {
+        genericSwitchTest("exists", 1, true, false, {a:1}, done);
+    });
+
     it('should check if payload is between given values', function(done) {
         twoFieldSwitchTest("btwn", "3", "5", true, true, 4, done);
     });
@@ -519,7 +529,6 @@ describe('switch Node', function() {
         singularSwitchTest("nempty", true, false, 0, done);
     });
 
-
     it('should check input against a previous value', function(done) {
         var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{ "t": "gt", "v": "", "vt": "prev" }],checkall:true,outputs:1,wires:[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];

From 3b5ea0f15f9a7b3510fe660b71c8cc73f7618d21 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 8 Jul 2019 23:23:33 +0100
Subject: [PATCH 005/305] Add node done API

---
 .../nodes/core/core/25-complete.html          | 136 +++++++
 .../@node-red/nodes/core/core/25-complete.js  |  30 ++
 .../@node-red/nodes/core/core/58-debug.js     |  10 +-
 .../@node-red/nodes/core/logic/15-change.js   |   3 +-
 .../nodes/locales/en-US/core/25-complete.html |  29 ++
 .../nodes/locales/en-US/messages.json         |   3 +
 .../@node-red/runtime/lib/nodes/Node.js       |  92 ++++-
 .../@node-red/runtime/lib/nodes/flows/Flow.js |  26 +-
 .../runtime/lib/nodes/flows/index.js          |   6 +-
 test/nodes/core/core/80-function_spec.js      | 265 +++++++-------
 test/nodes/core/logic/18-sort_spec.js         |  23 +-
 test/nodes/core/parsers/70-HTML_spec.js       |  24 +-
 test/nodes/core/parsers/70-JSON_spec.js       | 120 ++++---
 test/nodes/core/parsers/70-YAML_spec.js       |  20 +-
 .../@node-red/runtime/lib/nodes/Node_spec.js  |  94 ++++-
 .../runtime/lib/nodes/flows/Flow_spec.js      | 339 +++++++++++-------
 .../runtime/lib/nodes/flows/Subflow_spec.js   | 317 ++++++++--------
 17 files changed, 1039 insertions(+), 498 deletions(-)
 create mode 100644 packages/node_modules/@node-red/nodes/core/core/25-complete.html
 create mode 100644 packages/node_modules/@node-red/nodes/core/core/25-complete.js
 create mode 100644 packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html

diff --git a/packages/node_modules/@node-red/nodes/core/core/25-complete.html b/packages/node_modules/@node-red/nodes/core/core/25-complete.html
new file mode 100644
index 000000000..f82ed02f8
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/core/core/25-complete.html
@@ -0,0 +1,136 @@
+<script type="text/x-red" data-template-name="complete">
+    <div class="form-row node-input-target-row">
+        <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+    </div>
+    <div class="form-row node-input-target-row node-input-target-list-row" style="min-height: 100px">
+        <div id="node-input-complete-target-container-div"></div>
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+    </div>
+</script>
+<script type="text/javascript">
+    RED.nodes.registerType('complete',{
+        category: 'input',
+        color:"#c0edc0",
+        defaults: {
+            name: {value:""},
+            scope: {value:[]},
+            uncaught: {value:false}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "alert.svg",
+        label: function() {
+            if (this.name) {
+                return this.name;
+            }
+            return this._("complete.completeNodes",{number:this.scope.length});
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var node = this;
+            var scope = node.scope || [];
+
+            this._resize = function() {
+                var rows = $("#dialog-form>div:not(.node-input-target-list-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.length;i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-input-target-list-row");
+                editorRow.css("height",height+"px");
+            };
+
+            var dirList = $("#node-input-complete-target-container-div").css({width: "100%", height: "100%"})
+                .treeList({multi:true}).on("treelistitemmouseover", function(e, item) {
+                    item.node.highlighted = true;
+                    item.node.dirty = true;
+                    RED.view.redraw();
+                }).on("treelistitemmouseout", function(e, item) {
+                    item.node.highlighted = false;
+                    item.node.dirty = true;
+                    RED.view.redraw();
+                })
+            var candidateNodes = RED.nodes.filterNodes({z:node.z});
+            var allChecked = true;
+            var items = [];
+            var nodeItemMap = {};
+
+            candidateNodes.forEach(function(n) {
+                if (n.id === node.id) {
+                    return;
+                }
+                var isChecked = scope.indexOf(n.id) !== -1;
+
+                allChecked = allChecked && isChecked;
+
+                var nodeDef = RED.nodes.getType(n.type);
+                var label;
+                var sublabel;
+                if (nodeDef) {
+                    var l = nodeDef.label;
+                    label = (typeof l === "function" ? l.call(n) : l)||"";
+                    sublabel = n.type;
+                    if (sublabel.indexOf("subflow:") === 0) {
+                        var subflowId = sublabel.substring(8);
+                        var subflow = RED.nodes.subflow(subflowId);
+                        sublabel = "subflow : "+subflow.name;
+                    }
+                }
+                if (!nodeDef || !label) {
+                    label = n.type;
+                }
+                nodeItemMap[n.id] = {
+                    node: n,
+                    label: label,
+                    sublabel: sublabel,
+                    selected: isChecked
+                };
+                items.push(nodeItemMap[n.id]);
+            });
+            dirList.treeList('data',items);
+
+            $("#node-input-complete-target-select").on("click", function(e) {
+                e.preventDefault();
+                var preselected = dirList.treeList('selected').map(function(n) {return n.node.id});
+                RED.tray.hide();
+                RED.view.selectNodes({
+                    selected: preselected,
+                    onselect: function(selection) {
+                        RED.tray.show();
+                        var newlySelected = {};
+                        selection.forEach(function(n) {
+                            newlySelected[n.id] = true;
+                            if (nodeItemMap[n.id]) {
+                                nodeItemMap[n.id].treeList.select(true);
+                            }
+                        })
+                        preselected.forEach(function(id) {
+                            if (!newlySelected[id]) {
+                                nodeItemMap[id].treeList.select(false);
+                            }
+                        })
+                    },
+                    oncancel: function() {
+                        RED.tray.show();
+                    },
+                    filter: function(n) {
+                        return n.id !== node.id;
+                    }
+                });
+            })
+
+        },
+        oneditsave: function() {
+            this.scope = $("#node-input-complete-target-container-div").treeList('selected').map(function(i) { return i.node.id})
+        },
+        oneditresize: function(size) {
+            this._resize();
+        }
+    });
+</script>
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-complete.js b/packages/node_modules/@node-red/nodes/core/core/25-complete.js
new file mode 100644
index 000000000..78008f81d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/core/core/25-complete.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+
+    function CompleteNode(n) {
+        RED.nodes.createNode(this,n);
+        var node = this;
+        this.scope = n.scope;
+        this.on("input",function(msg) {
+            this.send(msg);
+        });
+    }
+
+    RED.nodes.registerType("complete",CompleteNode);
+}
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
index 1571605da..badbad25e 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
@@ -81,7 +81,7 @@ module.exports = function(RED) {
             }
         }
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, done) {
             if (this.complete === "true") {
                 // debug complete msg object
                 if (this.console === "true") {
@@ -90,13 +90,14 @@ module.exports = function(RED) {
                 if (this.active && this.tosidebar) {
                     sendDebug({id:node.id, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
                 }
+                done();
             } else {
-                prepareValue(msg,function(err,msg) {
+                prepareValue(msg,function(err,debugMsg) {
                     if (err) {
                         node.error(err);
                         return;
                     }
-                    var output = msg.msg;
+                    var output = debugMsg.msg;
                     if (node.console === "true") {
                         if (typeof output === "string") {
                             node.log((output.indexOf("\n") !== -1 ? "\n" : "") + output);
@@ -114,9 +115,10 @@ module.exports = function(RED) {
                     }
                     if (node.active) {
                         if (node.tosidebar == true) {
-                            sendDebug(msg);
+                            sendDebug(debugMsg);
                         }
                     }
+                    done();
                 });
             }
         })
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.js b/packages/node_modules/@node-red/nodes/core/logic/15-change.js
index 8d100233e..fb25939c0 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/15-change.js
@@ -328,13 +328,14 @@ module.exports = function(RED) {
         }
 
         if (valid) {
-            this.on('input', function(msg) {
+            this.on('input', function(msg, done) {
                 applyRules(msg, 0, (err,msg) => {
                     if (err) {
                         node.error(err,msg);
                     } else if (msg) {
                         node.send(msg);
                     }
+                    done();
                 })
             });
         }
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html
new file mode 100644
index 000000000..d73f8e13d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html
@@ -0,0 +1,29 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="complete">
+    <p>Trigger a flow when another node completes its handling of a message.</p>
+    <h3>Details</h3>
+    <p>If a node tells the runtime when it has finished handling a message,
+        this node can be used to trigger a second flow.</p>
+    <p>For example, this can be used alongside a node with no output port,
+        such as the Email sending node, to continue the flow.</p>
+    <p>This node must be configured to handle the event for selected nodes in the
+        flow. Unlike the Catch node, it does not provide a 'handle all' mode automatically
+        applies to all nodes in the flow.</p>
+    <p>Not all nodes will trigger this event - it will depend on whether they
+        have been implemented to support this feature as introduced in Node-RED 1.0.</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 76e1cf2f8..6e8794eb7 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -112,6 +112,9 @@
             "selected": "selected nodes"
         }
     },
+    "complete": {
+        "completeNodes": "complete: __number__"
+    },
     "debug": {
         "output": "Output",
         "none": "None",
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index b1003d717..f4ecabc86 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -27,6 +27,8 @@ function Node(n) {
     this.type = n.type;
     this.z = n.z;
     this._closeCallbacks = [];
+    this._inputCallback = null;
+    this._inputCallbacks = null;
 
     if (n.name) {
         this.name = n.name;
@@ -43,6 +45,10 @@ function Node(n) {
         // as part of its constructure - config._flow will overwrite this._flow
         // which we can tolerate as they are the same object.
         Object.defineProperty(this,'_flow', {value: n._flow, enumerable: false, writable: true })
+        this._asyncDelivery = n._flow.asyncMessageDelivery;
+    }
+    if (this._asyncDelivery === undefined) {
+        this._asyncDelivery = true;
     }
     this.updateWires(n.wires);
 }
@@ -79,17 +85,95 @@ Node.prototype.context = function() {
     return this._context;
 }
 
-Node.prototype._on = Node.prototype.on;
+Node.prototype._complete = function(msg,error) {
+    if (error) {
+        // For now, delegate this to this.error
+        // But at some point, the timeout handling will need to know about
+        // this as well.
+        this.error(error,msg);
+    } else {
+        this._flow.handleComplete(this,msg);
+    }
+}
 
+Node.prototype._on = Node.prototype.on;
 Node.prototype.on = function(event, callback) {
     var node = this;
     if (event == "close") {
         this._closeCallbacks.push(callback);
+    } else if (event === "input") {
+        if (this._inputCallback) {
+            this._inputCallbacks = [this._inputCallback, callback];
+            this._inputCallback = null;
+        } else if (this._inputCallbacks) {
+            this._inputCallbacks.push(callback);
+        } else {
+            this._inputCallback = callback;
+        }
     } else {
         this._on(event, callback);
     }
 };
 
+Node.prototype._emit = Node.prototype.emit;
+Node.prototype.emit = function(event,arg) {
+    var node = this;
+    if (event === "input") {
+        // When Pluggable Message Routing arrives, this will be called from
+        // that and will already be sync/async depending on the router.
+        if (this._asyncDelivery) {
+            setImmediate(function() {
+                node._emitInput(arg);
+            });
+        } else {
+            this._emitInput(arg);
+        }
+    } else {
+        this._emit(event,arg);
+    }
+}
+
+Node.prototype._emitInput = function(arg) {
+    var node = this;
+    if (node._inputCallback) {
+        try {
+            node._inputCallback(arg,function(err) { node._complete(arg,err); });
+        } catch(err) {
+            node.error(err,arg);
+        }
+    } else if (node._inputCallbacks) {
+        var c = node._inputCallbacks.length;
+        for (var i=0;i<c;i++) {
+            var cb = node._inputCallbacks[i];
+            if (cb.length === 2) {
+                c++;
+            }
+            try {
+                node._inputCallbacks[i](arg,function(err) {
+                    c--;
+                    if (c === 0) {
+                        node._complete(arg,err);
+                    }
+                });
+            } catch(err) {
+                node.error(err,msg);
+            }
+        }
+    }
+}
+
+Node.prototype._removeAllListeners = Node.prototype.removeAllListeners;
+Node.prototype.removeAllListeners = function(name) {
+    if (name === "input") {
+        this._inputCallback = null;
+        this._inputCallbacks = null;
+    } else if (name === "close") {
+        this._closeCallbacks = [];
+    } else {
+        this._removeAllListeners(name);
+    }
+}
+
 Node.prototype.close = function(removed) {
     //console.log(this.type,this.id,removed);
     var promises = [];
@@ -233,11 +317,7 @@ Node.prototype.receive = function(msg) {
         msg._msgid = redUtil.generateId();
     }
     this.metric("receive",msg);
-    try {
-        this.emit("input", msg);
-    } catch(err) {
-        this.error(err,msg);
-    }
+    this.emit("input",msg);
 };
 
 function log_helper(self, level, msg) {
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
index 4fb516f9d..40855793f 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
@@ -23,6 +23,7 @@ var Subflow;
 var Log;
 
 var nodeCloseTimeout = 15000;
+var asyncMessageDelivery = true;
 
 /**
  * This class represents a flow within the runtime. It is responsible for
@@ -125,6 +126,7 @@ class Flow {
         var id;
         this.catchNodes = [];
         this.statusNodes = [];
+        this.completeNodeMap = {};
 
         var configNodes = Object.keys(this.flow.configs);
         var configNodeAttempts = {};
@@ -228,7 +230,7 @@ class Flow {
             this.trace(" id               | type         | alias");
             this.trace("------------------|--------------|-----------------");
         }
-        // Build the map of catch/status nodes.
+        // Build the map of catch/status/complete nodes.
         for (id in this.activeNodes) {
             if (this.activeNodes.hasOwnProperty(id)) {
                 node = this.activeNodes[id];
@@ -237,6 +239,13 @@ class Flow {
                     this.catchNodes.push(node);
                 } else if (node.type === "status") {
                     this.statusNodes.push(node);
+                } else if (node.type === "complete") {
+                    if (node.scope) {
+                        node.scope.forEach(id => {
+                            this.completeNodeMap[id] = this.completeNodeMap[id] || [];
+                            this.completeNodeMap[id].push(node);
+                        })
+                    }
                 }
             }
         }
@@ -516,6 +525,20 @@ class Flow {
         return handled;
     }
 
+    handleComplete(node,msg) {
+        if (this.completeNodeMap[node.id]) {
+            let toSend = msg;
+            this.completeNodeMap[node.id].forEach((completeNode,index) => {
+                toSend = redUtil.cloneMessage(msg);
+                completeNode.receive(toSend);
+            })
+        }
+    }
+
+    get asyncMessageDelivery() {
+        return asyncMessageDelivery
+    }
+
     dump() {
         console.log("==================")
         console.log(this.TYPE, this.id);
@@ -562,6 +585,7 @@ function stopNode(node,removed) {
 module.exports = {
     init: function(runtime) {
         nodeCloseTimeout = runtime.settings.nodeCloseTimeout || 15000;
+        asyncMessageDelivery = !runtime.settings.runtimeSyncDelivery
         Log = runtime.log;
         Subflow = require("./Subflow");
         Subflow.init(runtime);
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
index ef9fbdab2..981ed7173 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js
@@ -729,6 +729,10 @@ module.exports = {
     updateFlow: updateFlow,
     removeFlow: removeFlow,
     disableFlow:null,
-    enableFlow:null
+    enableFlow:null,
+    isDeliveryModeAsync: function() {
+        // If settings is null, this is likely being run by unit tests
+        return !settings || !settings.runtimeSyncDelivery
+    }
 
 };
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index 01e40c464..295c45ee2 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -268,45 +268,50 @@ describe('function node', function() {
         helper.load(functionNode, flow, function() {
             var n1 = helper.getNode("n1");
             n1.receive({payload:"foo",topic: "bar"});
-            try {
-                helper.log().called.should.be.true();
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "function";
-                });
-                logEvents.should.have.length(1);
-                var msg = logEvents[0][0];
-                msg.should.have.property('level', helper.log().ERROR);
-                msg.should.have.property('id', 'n1');
-                msg.should.have.property('type', 'function');
-                msg.should.have.property('msg', 'ReferenceError: retunr is not defined (line 2, col 1)');
-                done();
-            } catch(err) {
-                done(err);
-            }
+            setTimeout(function() {
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function(evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    msg.should.have.property('msg', 'ReferenceError: retunr is not defined (line 2, col 1)');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            },50);
         });
     });
 
     it('should handle node.on()', function(done) {
-        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"node.on('close',function(){node.log('closed')});"}];
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"node.on('close',function(){ node.log('closed')});"}];
         helper.load(functionNode, flow, function() {
             var n1 = helper.getNode("n1");
             n1.receive({payload:"foo",topic: "bar"});
-            helper.getNode("n1").close();
-            try {
-                helper.log().called.should.be.true();
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "function";
+            setTimeout(function() {
+                n1.close().then(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().INFO);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'closed');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
                 });
-                logEvents.should.have.length(1);
-                var msg = logEvents[0][0];
-                msg.should.have.property('level', helper.log().INFO);
-                msg.should.have.property('id', 'n1');
-                msg.should.have.property('type', 'function');
-                msg.should.have.property('msg', 'closed');
-                done();
-            } catch(err) {
-                done(err);
-            }
+            },1500);
         });
     });
 
@@ -532,22 +537,24 @@ describe('function node', function() {
     });
 
     function checkCallbackError(name, done) {
-        try {
-            helper.log().called.should.be.true();
-            var logEvents = helper.log().args.filter(function (evt) {
-                return evt[0].type == "function";
-            });
-            logEvents.should.have.length(1);
-            var msg = logEvents[0][0];
-            msg.should.have.property('level', helper.log().ERROR);
-            msg.should.have.property('id', name);
-            msg.should.have.property('type', 'function');
-            msg.should.have.property('msg', 'Error: Callback must be a function');
-            done();
-        }
-        catch (e) {
-            done(e);
-        }
+        setTimeout(function() {
+            try {
+                helper.log().called.should.be.true();
+                var logEvents = helper.log().args.filter(function (evt) {
+                    return evt[0].type == "function";
+                });
+                logEvents.should.have.length(1);
+                var msg = logEvents[0][0];
+                msg.should.have.property('level', helper.log().ERROR);
+                msg.should.have.property('id', name);
+                msg.should.have.property('type', 'function');
+                msg.should.have.property('msg', 'Error: Callback must be a function');
+                done();
+            }
+            catch (e) {
+                done(e);
+            }
+        },50);
     }
 
     it('should get persistable node context (w/o callback)', function(done) {
@@ -1267,12 +1274,12 @@ describe('function node', function() {
                         n1.receive({payload:"foo",topic: "bar"});
                     } else {
                         msg.should.have.property('payload', "hello");
+                        delete process.env._TEST_FOO_;
                         done();
                     }
                 } catch(err) {
-                    done(err);
-                } finally {
                     delete process.env._TEST_FOO_;
+                    done(err);
                 }
             });
             n1.receive({payload:"foo",topic: "bar"});
@@ -1285,21 +1292,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().INFO);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'test');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().INFO);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'test');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
         it('should log a Debug Message', function (done) {
@@ -1307,21 +1316,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().DEBUG);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'test');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().DEBUG);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'test');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
         it('should log a Trace Message', function (done) {
@@ -1329,21 +1340,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().TRACE);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'test');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().TRACE);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'test');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
         it('should log a Warning Message', function (done) {
@@ -1351,21 +1364,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().WARN);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'test');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().WARN);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'test');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
         it('should log an Error Message', function (done) {
@@ -1373,21 +1388,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().ERROR);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'test');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().ERROR);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'test');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
     });
diff --git a/test/nodes/core/logic/18-sort_spec.js b/test/nodes/core/logic/18-sort_spec.js
index ac8d7d11c..960a6d666 100644
--- a/test/nodes/core/logic/18-sort_spec.js
+++ b/test/nodes/core/logic/18-sort_spec.js
@@ -475,20 +475,21 @@ describe('SORT node', function() {
                     {id:"n2", type:"helper"}];
         helper.load(sortNode, flow, function() {
             var n1 = helper.getNode("n1");
-            setTimeout(function() {
-                var logEvents = helper.log().args.filter(function (evt) {
-                    return evt[0].type == "sort";
-                });
-                var evt = logEvents[0][0];
-                evt.should.have.property('id', "n1");
-                evt.should.have.property('type', "sort");
-                evt.should.have.property('msg', "sort.clear");
-                done();
-            }, 150);
             var msg = { payload: 0,
                         parts: { id: "X", index: 0, count: 2} };
             n1.receive(msg);
-            n1.close();
+            setTimeout(function() {
+                n1.close().then(function() {
+                    var logEvents = helper.log().args.filter(function (evt) {
+                        return evt[0].type == "sort";
+                    });
+                    var evt = logEvents[0][0];
+                    evt.should.have.property('id', "n1");
+                    evt.should.have.property('type', "sort");
+                    evt.should.have.property('msg', "sort.clear");
+                    done();
+                });
+            }, 150);
         });
     });
 
diff --git a/test/nodes/core/parsers/70-HTML_spec.js b/test/nodes/core/parsers/70-HTML_spec.js
index e7e7ffa8b..3183a0539 100644
--- a/test/nodes/core/parsers/70-HTML_spec.js
+++ b/test/nodes/core/parsers/70-HTML_spec.js
@@ -21,7 +21,7 @@ var fs = require('fs-extra');
 var htmlNode = require("nr-test-utils").require("@node-red/nodes/core/parsers/70-HTML.js");
 var helper = require("node-red-node-test-helper");
 
-describe('html node', function() {
+describe('HTML node', function() {
 
     var resourcesDir = __dirname+ path.sep + ".." + path.sep + ".." + path.sep + ".." + path.sep + "resources" + path.sep;
     var file = path.join(resourcesDir, "70-HTML-test-file.html");
@@ -228,16 +228,20 @@ describe('html node', function() {
                     var n1 = helper.getNode("n1");
                     var n2 = helper.getNode("n2");
                     n1.receive({payload:null,topic: "bar"});
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function(evt) {
-                        return evt[0].type == "html";
-                    });
-                    logEvents.should.have.length(1);
-                    // Each logEvent is the array of args passed to the function.
-                    logEvents[0][0].should.have.a.property('msg');
-                    logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                    setTimeout(function() {
+                        try {
+                            helper.log().called.should.be.true();
+                            var logEvents = helper.log().args.filter(function(evt) {
+                                return evt[0].type == "html";
+                            });
+                            logEvents.should.have.length(1);
+                            // Each logEvent is the array of args passed to the function.
+                            logEvents[0][0].should.have.a.property('msg');
+                            logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
 
-                    done();
+                            done();
+                        } catch(err) { done(err) }
+                    },50);
                 } catch(err) {
                     done(err);
                 }
diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js
index 7effdfab7..2ec3304bb 100644
--- a/test/nodes/core/parsers/70-JSON_spec.js
+++ b/test/nodes/core/parsers/70-JSON_spec.js
@@ -148,14 +148,18 @@ describe('JSON node', function() {
                 var jn1 = helper.getNode("jn1");
                 var jn2 = helper.getNode("jn2");
                 jn1.receive({payload:'foo',topic: "bar"});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.startWith("Unexpected token o");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.startWith("Unexpected token o");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },20);
             } catch(err) {
                 done(err);
             }
@@ -378,14 +382,18 @@ describe('JSON node', function() {
                 var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
                 var obj =  {"number": "foo", "string": 3};
                 jn1.receive({payload:obj, schema:schema});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
@@ -402,14 +410,18 @@ describe('JSON node', function() {
                 var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
                 var obj =  {"number": "foo", "string": 3};
                 jn1.receive({payload:obj, schema:schema});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
@@ -426,14 +438,18 @@ describe('JSON node', function() {
                 var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
                 var jsonString =  '{"number":"Hello","string":3}';
                 jn1.receive({payload:jsonString, schema:schema});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
@@ -450,14 +466,18 @@ describe('JSON node', function() {
                 var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
                 var jsonString =  '{"number":"Hello","string":3}';
                 jn1.receive({payload:jsonString, schema:schema});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
@@ -474,14 +494,18 @@ describe('JSON node', function() {
                 var schema = "garbage";
                 var obj =  {"number": "foo", "string": 3};
                 jn1.receive({payload:obj, schema:schema});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "json";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.equal("json.errors.schema-error-compile");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "json";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.equal("json.errors.schema-error-compile");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
diff --git a/test/nodes/core/parsers/70-YAML_spec.js b/test/nodes/core/parsers/70-YAML_spec.js
index 925a52922..3441e0946 100644
--- a/test/nodes/core/parsers/70-YAML_spec.js
+++ b/test/nodes/core/parsers/70-YAML_spec.js
@@ -130,14 +130,18 @@ describe('YAML node', function() {
                 var yn1 = helper.getNode("yn1");
                 var yn2 = helper.getNode("yn2");
                 yn1.receive({payload:'employees:\n-firstName: John\n- lastName: Smith\n',topic: "bar"});
-                var logEvents = helper.log().args.filter(function(evt) {
-                    return evt[0].type == "yaml";
-                });
-                logEvents.should.have.length(1);
-                logEvents[0][0].should.have.a.property('msg');
-                logEvents[0][0].msg.should.startWith("end of the stream");
-                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
-                done();
+                setTimeout(function() {
+                    try {
+                        var logEvents = helper.log().args.filter(function(evt) {
+                            return evt[0].type == "yaml";
+                        });
+                        logEvents.should.have.length(1);
+                        logEvents[0][0].should.have.a.property('msg');
+                        logEvents[0][0].msg.should.startWith("end of the stream");
+                        logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                        done();
+                    } catch(err) { done(err) }
+                },50);
             } catch(err) {
                 done(err);
             }
diff --git a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
index 7e5aed1b0..8267411fb 100644
--- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
@@ -156,10 +156,50 @@ describe('Node', function() {
                 throw new Error("test error");
             });
             n.receive(message);
-            n.error.called.should.be.true();
-            n.error.firstCall.args[1].should.equal(message);
-            done();
+            setTimeout(function() {
+                n.error.called.should.be.true();
+                n.error.firstCall.args[1].should.equal(message);
+                done();
+            },50);
+        });
 
+        it('calls parent flow handleComplete when callback provided', function(done) {
+            var n = new RedNode({id:'123',type:'abc', _flow: {
+                handleComplete: function(node,msg) {
+                    try {
+                        msg.should.deepEqual(message);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                }
+            }});
+
+            var message = {payload:"hello world"};
+            n.on('input',function(msg, nodeDone) {
+                nodeDone();
+            });
+            n.receive(message);
+        });
+        it('logs error if callback provides error', function(done) {
+            var n = new RedNode({id:'123',type:'abc'});
+            sinon.stub(n,"error",function(err,msg) {});
+
+            var message = {payload:"hello world"};
+            n.on('input',function(msg, nodeDone) {
+                nodeDone(new Error("test error"));
+                setTimeout(function() {
+                    try {
+                        n.error.called.should.be.true();
+                        n.error.firstCall.args[0].toString().should.equal("Error: test error");
+                        n.error.firstCall.args[1].should.equal(message);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                },50);
+            });
+            n.receive(message);
         });
     });
 
@@ -172,15 +212,45 @@ describe('Node', function() {
             var n1 = new RedNode({_flow:flow,id:'n1',type:'abc',wires:[['n2']]});
             var n2 = new RedNode({_flow:flow,id:'n2',type:'abc'});
             var message = {payload:"hello world"};
-
+            var messageReceived = false;
             n2.on('input',function(msg) {
                 // msg equals message, and is not a new copy
+                messageReceived = true;
                 should.deepEqual(msg,message);
                 should.strictEqual(msg,message);
                 done();
             });
-
             n1.send(message);
+            messageReceived.should.be.false();
+        });
+
+        it('emits a single message - synchronous mode', function(done) {
+            var flow = {
+                getNode: (id) => { return {'n1':n1,'n2':n2}[id]},
+                asyncMessageDelivery: false
+            };
+            var n1 = new RedNode({_flow:flow,id:'n1',type:'abc',wires:[['n2']]});
+            var n2 = new RedNode({_flow:flow,id:'n2',type:'abc'});
+            var message = {payload:"hello world"};
+            var messageReceived = false;
+            var notSyncErr;
+            n2.on('input',function(msg) {
+                try {
+                    // msg equals message, and is not a new copy
+                    messageReceived = true;
+                    should.deepEqual(msg,message);
+                    should.strictEqual(msg,message);
+                    done(notSyncErr);
+                } catch(err) {
+                    done(err);
+                }
+            });
+            n1.send(message);
+            try {
+                messageReceived.should.be.true();
+            } catch(err) {
+                notSyncErr = err;
+            }
         });
 
         it('emits multiple messages on a single output', function(done) {
@@ -356,12 +426,13 @@ describe('Node', function() {
 
          it("logs the uuid for all messages sent", function(done) {
             var logHandler = {
+                msgIds:[],
                 messagesSent: 0,
                 emit: function(event, msg) {
                     if (msg.event == "node.abc.send" && msg.level == Log.METRIC) {
                         this.messagesSent++;
+                        this.msgIds.push(msg.msgid);
                         (typeof msg.msgid).should.not.be.equal("undefined");
-                        done();
                     }
                 }
             };
@@ -375,6 +446,17 @@ describe('Node', function() {
             var receiver1 = new RedNode({_flow:flow,id:'n2',type:'abc'});
             var receiver2 = new RedNode({_flow:flow,id:'n3',type:'abc'});
             sender.send({"some": "message"});
+            setTimeout(function() {
+                try {
+                    logHandler.messagesSent.should.equal(1);
+                    should.exist(logHandler.msgIds[0])
+                    Log.removeHandler(logHandler);
+                    done();
+                } catch(err) {
+                    Log.removeHandler(logHandler);
+                    done(err);
+                }
+            },50)
         })
     });
 
diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
index e7430a6c2..c1f7b0f3e 100644
--- a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
@@ -122,6 +122,7 @@ describe('Flow', function() {
         currentNodes[node.id] = node;
         this.on('input',function(msg) {
             node.handled++;
+            msg.handled = node.handled;
             node.messages.push(msg);
             node.send(msg);
         });
@@ -136,12 +137,42 @@ describe('Flow', function() {
     }
     util.inherits(TestAsyncNode,Node);
 
+    var TestDoneNode = function(n) {
+        Node.call(this,n);
+        var node = this;
+        this.scope = n.scope;
+        this.uncaught = n.uncaught;
+        this.foo = n.foo;
+        this.handled = 0;
+        this.messages = [];
+        this.stopped = false;
+        this.closeDelay = n.closeDelay || 50;
+        currentNodes[node.id] = node;
+        this.on('input',function(msg, done) {
+            node.handled++;
+            node.messages.push(msg);
+            node.send(msg);
+            done();
+        });
+        this.on('close',function(done) {
+            setTimeout(function() {
+                node.stopped = true;
+                stoppedNodes[node.id] = node;
+                delete currentNodes[node.id];
+                done();
+            },node.closeDelay);
+        });
+    }
+    util.inherits(TestDoneNode,Node);
+
     before(function() {
         getType = sinon.stub(typeRegistry,"get",function(type) {
             if (type=="test") {
                 return TestNode;
             } else if (type=="testError"){
                 return TestErrorNode;
+            } else if (type=="testDone"){
+                return TestDoneNode;
             } else {
                 return TestAsyncNode;
             }
@@ -189,28 +220,28 @@ describe('Flow', function() {
             currentNodes["2"].should.have.a.property("handled",0);
             currentNodes["3"].should.have.a.property("handled",0);
 
+            currentNodes["3"].on("input", function() {
+                currentNodes["1"].should.have.a.property("handled",1);
+                currentNodes["2"].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",1);
 
-            currentNodes["1"].receive({payload:"test"});
-
-            currentNodes["1"].should.have.a.property("handled",1);
-            currentNodes["2"].should.have.a.property("handled",1);
-            currentNodes["3"].should.have.a.property("handled",1);
-
-            flow.stop().then(function() {
-                try {
-                    currentNodes.should.not.have.a.property("1");
-                    currentNodes.should.not.have.a.property("2");
-                    currentNodes.should.not.have.a.property("3");
-                    currentNodes.should.not.have.a.property("4");
-                    stoppedNodes.should.have.a.property("1");
-                    stoppedNodes.should.have.a.property("2");
-                    stoppedNodes.should.have.a.property("3");
-                    stoppedNodes.should.have.a.property("4");
-                    done();
-                } catch(err) {
-                    done(err);
-                }
+                flow.stop().then(function() {
+                    try {
+                        currentNodes.should.not.have.a.property("1");
+                        currentNodes.should.not.have.a.property("2");
+                        currentNodes.should.not.have.a.property("3");
+                        currentNodes.should.not.have.a.property("4");
+                        stoppedNodes.should.have.a.property("1");
+                        stoppedNodes.should.have.a.property("2");
+                        stoppedNodes.should.have.a.property("3");
+                        stoppedNodes.should.have.a.property("4");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
             });
+            currentNodes["1"].receive({payload:"test"});
         });
 
         it("instantiates config nodes in the right order",function(done) {
@@ -350,25 +381,27 @@ describe('Flow', function() {
 
             currentNodes["1"].receive({payload:"test"});
 
-            currentNodes["1"].should.have.a.property("handled",1);
-            // Message doesn't reach 3 as 2 is disabled
-            currentNodes["3"].should.have.a.property("handled",0);
+            setTimeout(function() {
+                currentNodes["1"].should.have.a.property("handled",1);
+                // Message doesn't reach 3 as 2 is disabled
+                currentNodes["3"].should.have.a.property("handled",0);
 
-            flow.stop().then(function() {
-                try {
-                    currentNodes.should.not.have.a.property("1");
-                    currentNodes.should.not.have.a.property("2");
-                    currentNodes.should.not.have.a.property("3");
-                    currentNodes.should.not.have.a.property("4");
-                    stoppedNodes.should.have.a.property("1");
-                    stoppedNodes.should.not.have.a.property("2");
-                    stoppedNodes.should.have.a.property("3");
-                    stoppedNodes.should.have.a.property("4");
-                    done();
-                } catch(err) {
-                    done(err);
-                }
-            });
+                flow.stop().then(function() {
+                    try {
+                        currentNodes.should.not.have.a.property("1");
+                        currentNodes.should.not.have.a.property("2");
+                        currentNodes.should.not.have.a.property("3");
+                        currentNodes.should.not.have.a.property("4");
+                        stoppedNodes.should.have.a.property("1");
+                        stoppedNodes.should.not.have.a.property("2");
+                        stoppedNodes.should.have.a.property("3");
+                        stoppedNodes.should.have.a.property("4");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+            },50);
         });
 
     });
@@ -551,31 +584,34 @@ describe('Flow', function() {
 
             flow.handleStatus(config.flows["t1"].nodes["1"],{text:"my-status",random:"otherProperty"});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","my-status");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","1");
-            statusMessage.status.source.should.have.a.property("type","test");
-            statusMessage.status.source.should.have.a.property("name","a");
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            currentNodes["sn2"].should.have.a.property("handled",1);
-            statusMessage = currentNodes["sn2"].messages[0];
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","my-status");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","1");
+                statusMessage.status.source.should.have.a.property("type","test");
+                statusMessage.status.source.should.have.a.property("name","a");
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","my-status");
-            statusMessage.status.should.have.a.property("random","otherProperty");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","1");
-            statusMessage.status.source.should.have.a.property("type","test");
-            statusMessage.status.source.should.have.a.property("name","a");
+                currentNodes["sn2"].should.have.a.property("handled",1);
+                statusMessage = currentNodes["sn2"].messages[0];
+
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","my-status");
+                statusMessage.status.should.have.a.property("random","otherProperty");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","1");
+                statusMessage.status.source.should.have.a.property("type","test");
+                statusMessage.status.source.should.have.a.property("name","a");
 
 
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50)
         });
         it("passes a status event to the adjacent scoped status node ",function(done) {
             var config = flowUtils.parseConfig([
@@ -596,21 +632,23 @@ describe('Flow', function() {
 
             flow.handleStatus(config.flows["t1"].nodes["1"],{text:"my-status"});
 
-            currentNodes["sn"].should.have.a.property("handled",0);
-            currentNodes["sn2"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn2"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",0);
+                currentNodes["sn2"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn2"].messages[0];
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","my-status");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","1");
-            statusMessage.status.source.should.have.a.property("type","test");
-            statusMessage.status.source.should.have.a.property("name","a");
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","my-status");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","1");
+                statusMessage.status.source.should.have.a.property("type","test");
+                statusMessage.status.source.should.have.a.property("name","a");
 
 
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
 
     });
@@ -636,33 +674,35 @@ describe('Flow', function() {
 
             flow.handleError(config.flows["t1"].nodes["1"],"my-error",{a:"foo"});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","my-error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("id","1");
-            statusMessage.error.source.should.have.a.property("type","test");
-            statusMessage.error.source.should.have.a.property("name","a");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","my-error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("id","1");
+                statusMessage.error.source.should.have.a.property("type","test");
+                statusMessage.error.source.should.have.a.property("name","a");
 
-            currentNodes["sn2"].should.have.a.property("handled",1);
-            statusMessage = currentNodes["sn2"].messages[0];
+                currentNodes["sn2"].should.have.a.property("handled",1);
+                statusMessage = currentNodes["sn2"].messages[0];
 
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","my-error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("id","1");
-            statusMessage.error.source.should.have.a.property("type","test");
-            statusMessage.error.source.should.have.a.property("name","a");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","my-error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("id","1");
+                statusMessage.error.source.should.have.a.property("type","test");
+                statusMessage.error.source.should.have.a.property("name","a");
 
-            // Node sn3 has uncaught:true - so should not get called
-            currentNodes["sn3"].should.have.a.property("handled",0);
+                // Node sn3 has uncaught:true - so should not get called
+                currentNodes["sn3"].should.have.a.property("handled",0);
 
 
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
         it("passes an error event to the adjacent scoped catch node ",function(done) {
             var config = flowUtils.parseConfig([
@@ -684,39 +724,42 @@ describe('Flow', function() {
 
             flow.handleError(config.flows["t1"].nodes["1"],"my-error",{a:"foo"});
 
-            currentNodes["sn"].should.have.a.property("handled",0);
-            currentNodes["sn2"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn2"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",0);
+                currentNodes["sn2"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn2"].messages[0];
 
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","my-error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("id","1");
-            statusMessage.error.source.should.have.a.property("type","test");
-            statusMessage.error.source.should.have.a.property("name","a");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","my-error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("id","1");
+                statusMessage.error.source.should.have.a.property("type","test");
+                statusMessage.error.source.should.have.a.property("name","a");
 
-            // Node sn3/4 have uncaught:true - so should not get called
-            currentNodes["sn3"].should.have.a.property("handled",0);
-            currentNodes["sn4"].should.have.a.property("handled",0);
+                // Node sn3/4 have uncaught:true - so should not get called
+                currentNodes["sn3"].should.have.a.property("handled",0);
+                currentNodes["sn4"].should.have.a.property("handled",0);
 
-            // Inject error that sn1/2 will ignore - so should get picked up by sn3
-            flow.handleError(config.flows["t1"].nodes["3"],"my-error-2",{a:"foo-2"});
+                // Inject error that sn1/2 will ignore - so should get picked up by sn3
+                flow.handleError(config.flows["t1"].nodes["3"],"my-error-2",{a:"foo-2"});
+                setTimeout(function() {
+                    currentNodes["sn"].should.have.a.property("handled",0);
+                    currentNodes["sn2"].should.have.a.property("handled",1);
+                    currentNodes["sn3"].should.have.a.property("handled",1);
+                    currentNodes["sn4"].should.have.a.property("handled",1);
 
-            currentNodes["sn"].should.have.a.property("handled",0);
-            currentNodes["sn2"].should.have.a.property("handled",1);
-            currentNodes["sn3"].should.have.a.property("handled",1);
-            currentNodes["sn4"].should.have.a.property("handled",1);
+                    statusMessage = currentNodes["sn3"].messages[0];
+                    statusMessage.should.have.a.property("error");
+                    statusMessage.error.should.have.a.property("message","my-error-2");
+                    statusMessage.error.should.have.a.property("source");
+                    statusMessage.error.source.should.have.a.property("id","3");
+                    statusMessage.error.source.should.have.a.property("type","test");
 
-            statusMessage = currentNodes["sn3"].messages[0];
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","my-error-2");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("id","3");
-            statusMessage.error.source.should.have.a.property("type","test");
-
-            flow.stop().then(function() {
-                done();
-            });
+                    flow.stop().then(function() {
+                        done();
+                    });
+                },50);
+            },50);
         });
         it("moves any existing error object sideways",function(done){
             var config = flowUtils.parseConfig([
@@ -733,22 +776,54 @@ describe('Flow', function() {
             var activeNodes = flow.getActiveNodes();
 
             flow.handleError(config.flows["t1"].nodes["1"],"my-error",{a:"foo",error:"existing"});
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+                statusMessage.should.have.a.property("_error","existing");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","my-error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("id","1");
+                statusMessage.error.source.should.have.a.property("type","test");
+                statusMessage.error.source.should.have.a.property("name","a");
 
-            statusMessage.should.have.a.property("_error","existing");
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","my-error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("id","1");
-            statusMessage.error.source.should.have.a.property("type","test");
-            statusMessage.error.source.should.have.a.property("name","a");
-
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
         it("prevents an error looping more than 10 times",function(){});
     });
+
+    describe("#handleComplete",function() {
+        it("passes a complete event to the adjacent Complete node",function(done) {
+            var config = flowUtils.parseConfig([
+                {id:"t1",type:"tab"},
+                {id:"1",x:10,y:10,z:"t1",type:"testDone",name:"a",wires:["2"]},
+                {id:"2",x:10,y:10,z:"t1",type:"test",wires:["3"]},
+                {id:"3",x:10,y:10,z:"t1",type:"testDone",foo:"a",wires:[]},
+                {id:"cn",x:10,y:10,z:"t1",type:"complete",scope:["1","3"],foo:"a",wires:[]}
+            ]);
+            var flow = Flow.create({},config,config.flows["t1"]);
+
+            flow.start();
+
+            var activeNodes = flow.getActiveNodes();
+            Object.keys(activeNodes).should.have.length(4);
+
+            var msg = {payload: "hello world"}
+            var n1 = currentNodes["1"].receive(msg);
+            setTimeout(function() {
+                currentNodes["cn"].should.have.a.property("handled",2);
+                currentNodes["cn"].messages[0].should.have.a.property("handled",1);
+                currentNodes["cn"].messages[1].should.have.a.property("handled",2);
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
+        });
+    });
+
+
 });
diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
index d6cab9732..f92a01328 100644
--- a/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
@@ -271,32 +271,34 @@ describe('Subflow', function() {
 
             currentNodes["1"].receive({payload:"test"});
 
-            currentNodes["1"].should.have.a.property("handled",1);
-            // currentNodes[sfInstanceId].should.have.a.property("handled",1);
-            // currentNodes[sfInstanceId2].should.have.a.property("handled",1);
-            currentNodes["3"].should.have.a.property("handled",1);
-            currentNodes["4"].should.have.a.property("handled",1);
+            setTimeout(function() {
+                currentNodes["1"].should.have.a.property("handled",1);
+                // currentNodes[sfInstanceId].should.have.a.property("handled",1);
+                // currentNodes[sfInstanceId2].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",1);
+                currentNodes["4"].should.have.a.property("handled",1);
 
 
 
-            flow.stop().then(function() {
-                Object.keys(currentNodes).should.have.length(0);
-                Object.keys(stoppedNodes).should.have.length(6);
+                flow.stop().then(function() {
+                    Object.keys(currentNodes).should.have.length(0);
+                    Object.keys(stoppedNodes).should.have.length(6);
 
-                // currentNodes.should.not.have.a.property("1");
-                // currentNodes.should.not.have.a.property("3");
-                // currentNodes.should.not.have.a.property("4");
-                // // currentNodes.should.not.have.a.property(sfInstanceId);
-                // // currentNodes.should.not.have.a.property(sfInstanceId2);
-                // // currentNodes.should.not.have.a.property(sfConfigId);
-                // stoppedNodes.should.have.a.property("1");
-                // stoppedNodes.should.have.a.property("3");
-                // stoppedNodes.should.have.a.property("4");
-                // // stoppedNodes.should.have.a.property(sfInstanceId);
-                // // stoppedNodes.should.have.a.property(sfInstanceId2);
-                // // stoppedNodes.should.have.a.property(sfConfigId);
-                done();
-            });
+                    // currentNodes.should.not.have.a.property("1");
+                    // currentNodes.should.not.have.a.property("3");
+                    // currentNodes.should.not.have.a.property("4");
+                    // // currentNodes.should.not.have.a.property(sfInstanceId);
+                    // // currentNodes.should.not.have.a.property(sfInstanceId2);
+                    // // currentNodes.should.not.have.a.property(sfConfigId);
+                    // stoppedNodes.should.have.a.property("1");
+                    // stoppedNodes.should.have.a.property("3");
+                    // stoppedNodes.should.have.a.property("4");
+                    // // stoppedNodes.should.have.a.property(sfInstanceId);
+                    // // stoppedNodes.should.have.a.property(sfInstanceId2);
+                    // // stoppedNodes.should.have.a.property(sfConfigId);
+                    done();
+                });
+            },50);
         });
         it("instantiates a subflow inside a subflow and stops it",function(done) {
             var config = flowUtils.parseConfig([
@@ -322,17 +324,14 @@ describe('Subflow', function() {
 
             currentNodes["1"].receive({payload:"test"});
 
-            currentNodes["1"].should.have.a.property("handled",1);
-
-
-            currentNodes["3"].should.have.a.property("handled",1);
-
-
-
-            flow.stop().then(function() {
-                Object.keys(currentNodes).should.have.length(0);
-                done();
-            });
+            setTimeout(function() {
+                currentNodes["1"].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",1);
+                flow.stop().then(function() {
+                    Object.keys(currentNodes).should.have.length(0);
+                    done();
+                });
+            },50);
         });
         it("rewires a subflow node on update/start",function(done){
 
@@ -369,27 +368,31 @@ describe('Subflow', function() {
 
             currentNodes["1"].receive({payload:"test"});
 
-            currentNodes["1"].should.have.a.property("handled",1);
-            // currentNodes[sfInstanceId].should.have.a.property("handled",1);
-            // currentNodes[sfInstanceId2].should.have.a.property("handled",1);
-            currentNodes["3"].should.have.a.property("handled",1);
-            currentNodes["4"].should.have.a.property("handled",0);
+            setTimeout(function() {
+                currentNodes["1"].should.have.a.property("handled",1);
+                // currentNodes[sfInstanceId].should.have.a.property("handled",1);
+                // currentNodes[sfInstanceId2].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",1);
+                currentNodes["4"].should.have.a.property("handled",0);
 
-            flow.update(newConfig,newConfig.flows["t1"]);
-            flow.start(diff)
+                flow.update(newConfig,newConfig.flows["t1"]);
+                flow.start(diff)
 
-            currentNodes["1"].receive({payload:"test2"});
+                currentNodes["1"].receive({payload:"test2"});
+                setTimeout(function() {
 
-            currentNodes["1"].should.have.a.property("handled",2);
-            // currentNodes[sfInstanceId].should.have.a.property("handled",2);
-            // currentNodes[sfInstanceId2].should.have.a.property("handled",2);
-            currentNodes["3"].should.have.a.property("handled",1);
-            currentNodes["4"].should.have.a.property("handled",1);
+                    currentNodes["1"].should.have.a.property("handled",2);
+                    // currentNodes[sfInstanceId].should.have.a.property("handled",2);
+                    // currentNodes[sfInstanceId2].should.have.a.property("handled",2);
+                    currentNodes["3"].should.have.a.property("handled",1);
+                    currentNodes["4"].should.have.a.property("handled",1);
 
 
-            flow.stop().then(function() {
-                done();
-            });
+                    flow.stop().then(function() {
+                        done();
+                    });
+                },50);
+            },50);
         });
     });
     describe('#stop', function() {
@@ -436,20 +439,20 @@ describe('Subflow', function() {
             var activeNodes = flow.getActiveNodes();
 
             activeNodes["1"].receive({payload:"test"});
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","test status");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("type","testStatus");
+                statusMessage.status.source.should.have.a.property("name","test-status-node");
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","test status");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("type","testStatus");
-            statusMessage.status.source.should.have.a.property("name","test-status-node");
-
-            flow.stop().then(function() {
-
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
         it("passes a status event to the subflow's parent tab status node - targetted scope",function(done) {
             var config = flowUtils.parseConfig([
@@ -472,21 +475,23 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({payload:"test"});
 
-            parentFlowStatusCalled.should.be.false();
+            setTimeout(function() {
+                parentFlowStatusCalled.should.be.false();
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","test status");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("type","testStatus");
-            statusMessage.status.source.should.have.a.property("name","test-status-node");
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","test status");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("type","testStatus");
+                statusMessage.status.source.should.have.a.property("name","test-status-node");
 
-            flow.stop().then(function() {
+                flow.stop().then(function() {
 
-                done();
-            });
+                    done();
+                });
+            },50);
         });
     });
 
@@ -517,19 +522,21 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({payload:"test-payload"});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","test-payload");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","2");
-            statusMessage.status.source.should.have.a.property("type","subflow:sf1");
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","test-payload");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","2");
+                statusMessage.status.source.should.have.a.property("type","subflow:sf1");
 
-            flow.stop().then(function() {
+                flow.stop().then(function() {
 
-                done();
-            });
+                    done();
+                });
+            },50);
         });
         it("emits a status event when a message is passed to a subflow-status node - msg.payload as status obj", function(done) {
             var config = flowUtils.parseConfig([
@@ -557,19 +564,21 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({payload:{text:"payload-obj"}});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","payload-obj");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","2");
-            statusMessage.status.source.should.have.a.property("type","subflow:sf1");
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","payload-obj");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","2");
+                statusMessage.status.source.should.have.a.property("type","subflow:sf1");
 
-            flow.stop().then(function() {
+                flow.stop().then(function() {
 
-                done();
-            });
+                    done();
+                });
+            },50);
         });
         it("emits a status event when a message is passed to a subflow-status node - msg.status", function(done) {
             var config = flowUtils.parseConfig([
@@ -597,19 +606,21 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({status:{text:"status-obj"}});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("status");
-            statusMessage.status.should.have.a.property("text","status-obj");
-            statusMessage.status.should.have.a.property("source");
-            statusMessage.status.source.should.have.a.property("id","2");
-            statusMessage.status.source.should.have.a.property("type","subflow:sf1");
+                statusMessage.should.have.a.property("status");
+                statusMessage.status.should.have.a.property("text","status-obj");
+                statusMessage.status.should.have.a.property("source");
+                statusMessage.status.source.should.have.a.property("id","2");
+                statusMessage.status.source.should.have.a.property("type","subflow:sf1");
 
-            flow.stop().then(function() {
+                flow.stop().then(function() {
 
-                done();
-            });
+                    done();
+                });
+            },50);
         });
         it("does not emit a regular status event if it contains a subflow-status node", function(done) {
             var config = flowUtils.parseConfig([
@@ -666,18 +677,20 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({payload:"test"});
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+            setTimeout(function() {
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","test error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("type","testError");
-            statusMessage.error.source.should.have.a.property("name","test-error-node");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","test error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("type","testError");
+                statusMessage.error.source.should.have.a.property("name","test-error-node");
 
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
         it("passes an error event to the subflow's parent tab catch node - targetted scope",function(done) {
             var config = flowUtils.parseConfig([
@@ -699,20 +712,22 @@ describe('Subflow', function() {
 
             activeNodes["1"].receive({payload:"test"});
 
-            parentFlowErrorCalled.should.be.false();
+            setTimeout(function() {
+                parentFlowErrorCalled.should.be.false();
 
-            currentNodes["sn"].should.have.a.property("handled",1);
-            var statusMessage = currentNodes["sn"].messages[0];
+                currentNodes["sn"].should.have.a.property("handled",1);
+                var statusMessage = currentNodes["sn"].messages[0];
 
-            statusMessage.should.have.a.property("error");
-            statusMessage.error.should.have.a.property("message","test error");
-            statusMessage.error.should.have.a.property("source");
-            statusMessage.error.source.should.have.a.property("type","testError");
-            statusMessage.error.source.should.have.a.property("name","test-error-node");
+                statusMessage.should.have.a.property("error");
+                statusMessage.error.should.have.a.property("message","test error");
+                statusMessage.error.should.have.a.property("source");
+                statusMessage.error.source.should.have.a.property("type","testError");
+                statusMessage.error.source.should.have.a.property("name","test-error-node");
 
-            flow.stop().then(function() {
-                done();
-            });
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
 
         });
     });
@@ -756,11 +771,13 @@ describe('Subflow', function() {
             process.env["__KEY__"] = "__VAL__";
 
             currentNodes["1"].receive({payload: "test"});
-            currentNodes["3"].should.have.a.property("received", "__VAL__");
-            
-            flow.stop().then(function() {
-                done();
-            });
+            setTimeout(function() {
+                currentNodes["3"].should.have.a.property("received", "__VAL__");
+
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
 
         it("can access subflow env var", function(done) {
@@ -792,13 +809,15 @@ describe('Subflow', function() {
             }
             process.env["__KEY__"] = "__VAL0__";
             setEnv(testenv_node, "__KEY__", "__VAL1__");
-            
-            currentNodes["1"].receive({payload: "test"});
-            currentNodes["3"].should.have.a.property("received", "__VAL1__");
 
-            flow.stop().then(function() {
-                done();
-            });
+            currentNodes["1"].receive({payload: "test"});
+            setTimeout(function() {
+                currentNodes["3"].should.have.a.property("received", "__VAL1__");
+
+                flow.stop().then(function() {
+                    done();
+                });
+            },50);
         });
 
         it("can access nested subflow env var", function(done) {
@@ -840,21 +859,27 @@ describe('Subflow', function() {
 
             process.env["__KEY__"] = "__VAL0__";
             currentNodes["1"].receive({payload: "test"});
-            currentNodes["3"].should.have.a.property("received", "__VAL0__");
+            setTimeout(function() {
+                currentNodes["3"].should.have.a.property("received", "__VAL0__");
 
-            setEnv(node_sf1_1, "__KEY__", "__VAL1__");
-            currentNodes["1"].receive({payload: "test"});
-            currentNodes["3"].should.have.a.property("received", "__VAL1__");
+                setEnv(node_sf1_1, "__KEY__", "__VAL1__");
+                currentNodes["1"].receive({payload: "test"});
+                setTimeout(function() {
+                    currentNodes["3"].should.have.a.property("received", "__VAL1__");
 
-            setEnv(node_sf2_1, "__KEY__", "__VAL2__");
-            currentNodes["1"].receive({payload: "test"});
-            currentNodes["3"].should.have.a.property("received", "__VAL2__");
+                    setEnv(node_sf2_1, "__KEY__", "__VAL2__");
+                    currentNodes["1"].receive({payload: "test"});
+                    setTimeout(function() {
+                        currentNodes["3"].should.have.a.property("received", "__VAL2__");
 
-            flow.stop().then(function() {
-                done();
-            });
+                        flow.stop().then(function() {
+                            done();
+                        });
+                    },50);
+                },50);
+            },50);
         });
-        
+
     });
-    
+
 });

From f52289b2c3ed2ef7f676ed515ee802c9c848f3f1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 9 Jul 2019 11:40:55 +0100
Subject: [PATCH 006/305] Add send to input handler signature

---
 .../@node-red/nodes/core/core/58-debug.js     |  2 +-
 .../@node-red/nodes/core/logic/15-change.js   |  4 +--
 .../@node-red/runtime/lib/nodes/Node.js       | 20 +++++++++----
 .../@node-red/runtime/lib/nodes/Node_spec.js  | 28 +++++++++++++++++--
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
index badbad25e..9beff7809 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
@@ -81,7 +81,7 @@ module.exports = function(RED) {
             }
         }
 
-        this.on("input", function(msg, done) {
+        this.on("input", function(msg, send, done) {
             if (this.complete === "true") {
                 // debug complete msg object
                 if (this.console === "true") {
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.js b/packages/node_modules/@node-red/nodes/core/logic/15-change.js
index fb25939c0..ae377ed1e 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/15-change.js
@@ -328,12 +328,12 @@ module.exports = function(RED) {
         }
 
         if (valid) {
-            this.on('input', function(msg, done) {
+            this.on('input', function(msg, send, done) {
                 applyRules(msg, 0, (err,msg) => {
                     if (err) {
                         node.error(err,msg);
                     } else if (msg) {
-                        node.send(msg);
+                        send(msg);
                     }
                     done();
                 })
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index f4ecabc86..2f95fa5b4 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -137,7 +137,11 @@ Node.prototype._emitInput = function(arg) {
     var node = this;
     if (node._inputCallback) {
         try {
-            node._inputCallback(arg,function(err) { node._complete(arg,err); });
+            node._inputCallback(
+                arg,
+                function() { node.send.apply(node,arguments) },
+                function(err) { node._complete(arg,err); }
+            );
         } catch(err) {
             node.error(err,arg);
         }
@@ -149,12 +153,16 @@ Node.prototype._emitInput = function(arg) {
                 c++;
             }
             try {
-                node._inputCallbacks[i](arg,function(err) {
-                    c--;
-                    if (c === 0) {
-                        node._complete(arg,err);
+                node._inputCallbacks[i](
+                    arg,
+                    function() { node.send.apply(node,arguments) },
+                    function(err) {
+                        c--;
+                        if (c === 0) {
+                            node._complete(arg,err);
+                        }
                     }
-                });
+                );
             } catch(err) {
                 node.error(err,msg);
             }
diff --git a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
index 8267411fb..5ad52211e 100644
--- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
@@ -176,7 +176,7 @@ describe('Node', function() {
             }});
 
             var message = {payload:"hello world"};
-            n.on('input',function(msg, nodeDone) {
+            n.on('input',function(msg, nodeSend, nodeDone) {
                 nodeDone();
             });
             n.receive(message);
@@ -186,7 +186,7 @@ describe('Node', function() {
             sinon.stub(n,"error",function(err,msg) {});
 
             var message = {payload:"hello world"};
-            n.on('input',function(msg, nodeDone) {
+            n.on('input',function(msg, nodeSend, nodeDone) {
                 nodeDone(new Error("test error"));
                 setTimeout(function() {
                     try {
@@ -253,6 +253,30 @@ describe('Node', function() {
             }
         });
 
+        it('emits a message with callback provided send', function(done) {
+            var flow = {
+                getNode: (id) => { return {'n1':n1,'n2':n2}[id]},
+                handleComplete: (node,msg) => {}
+            };
+            var n1 = new RedNode({_flow:flow,id:'n1',type:'abc',wires:[['n2']]});
+            var n2 = new RedNode({_flow:flow,id:'n2',type:'abc'});
+            var message = {payload:"hello world"};
+            var messageReceived = false;
+            n1.on('input',function(msg,nodeSend,nodeDone) {
+                nodeSend(msg);
+                nodeDone();
+            });
+            n2.on('input',function(msg) {
+                // msg equals message, and is not a new copy
+                messageReceived = true;
+                should.deepEqual(msg,message);
+                should.strictEqual(msg,message);
+                done();
+            });
+            n1.receive(message);
+            messageReceived.should.be.false();
+        });
+
         it('emits multiple messages on a single output', function(done) {
             var flow = {
                 getNode: (id) => { return {'n1':n1,'n2':n2}[id]},

From a2dedba0eff88c944dc3691a6d2fd250b8cd1d7b Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 9 Jul 2019 21:04:53 +0100
Subject: [PATCH 007/305] change internal type to hask

---
 .../@node-red/nodes/core/logic/10-switch.html        | 12 ++++++------
 .../@node-red/nodes/core/logic/10-switch.js          |  2 +-
 .../@node-red/nodes/locales/en-US/messages.json      |  2 +-
 test/nodes/core/logic/10-switch_spec.js              |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 83d3f8765..79ffe8d5c 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -1,4 +1,4 @@
-<!--
+has<!--
   Copyright JS Foundation and other contributors, http://js.foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,7 +48,7 @@
         {v:"lte",t:"<=",kind:'V'},
         {v:"gt",t:">",kind:'V'},
         {v:"gte",t:">=",kind:'V'},
-        {v:"exists",t:"switch.rules.exists",kind:'V'},
+        {v:"hask",t:"switch.rules.hask",kind:'V'},
         {v:"btwn",t:"switch.rules.btwn",kind:'V'},
         {v:"cont",t:"switch.rules.cont",kind:'V'},
         {v:"regex",t:"switch.rules.regex",kind:'V'},
@@ -162,7 +162,7 @@
                     numField.typedInput("width",(newWidth-selectWidth-70));
                 } else if (type === "jsonata_exp") {
                     expField.typedInput("width",(newWidth-selectWidth-70));
-                } else if (type === "exists") {
+                } else if (type === "hask") {
                     keyField.typedInput("width",(newWidth-selectWidth-70));
                 } else if (type === "istype") {
                     typeField.typedInput("width",(newWidth-selectWidth-70));
@@ -253,7 +253,7 @@
                             numValueField.typedInput('show');
                             typeValueField.typedInput('hide');
                             valueField.typedInput('hide');
-                        } else if (type === "exists") {
+                        } else if (type === "hask") {
                             btwnValueField.typedInput('hide');
                             btwnValue2Field.typedInput('hide');
                             expValueField.typedInput('hide');
@@ -314,7 +314,7 @@
                     } else if (rule.t === "istype") {
                         typeValueField.typedInput('value',rule.vt);
                         typeValueField.typedInput('type',rule.vt);
-                    } else if (rule.t === "exists") {
+                    } else if (rule.t === "hask") {
                         keyValueField.typedInput('value',rule.v);
                         keyValueField.typedInput('type',rule.vt);
                     }else if (rule.t === "jsonata_exp") {
@@ -392,7 +392,7 @@
                     } else if (type === "istype") {
                         r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                         r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
-                    } else if (type === "exists") {
+                    } else if (type === "hask") {
                         r.v = rule.find(".node-input-rule-key-value").typedInput('value');
                         r.vt = rule.find(".node-input-rule-key-value").typedInput('type');
                     } else if (type === "jsonata_exp") {
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
index ef999ce3c..ad4b5ea78 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
@@ -71,7 +71,7 @@ module.exports = function(RED) {
             var index = parts.index;
             return ((min <= index) && (index <= max));
         },
-        'exists': function(a, b) {
+        'hask': function(a, b) {
             if (typeof b !== "object" ) {  return a.hasOwnProperty(b+""); }
         },
         'jsonata_exp': function(a, b) { return (b === true); },
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 1bf5f86d6..13683869d 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -622,7 +622,7 @@
             "index":"index between",
             "exp":"JSONata exp",
             "else":"otherwise",
-            "exists":"has key"
+            "hask":"has key"
         },
         "errors": {
             "invalid-expr": "Invalid JSONata expression: __error__",
diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/logic/10-switch_spec.js
index a1b1424ca..034198ccf 100644
--- a/test/nodes/core/logic/10-switch_spec.js
+++ b/test/nodes/core/logic/10-switch_spec.js
@@ -255,13 +255,13 @@ describe('switch Node', function() {
     });
 
     it('should match if a payload has a required property', function(done) {
-        genericSwitchTest("exists", "a", true, true, {a:1}, done);
+        genericSwitchTest("hask", "a", true, true, {a:1}, done);
     });
     it('should not match if a payload does not have a required property', function(done) {
-        genericSwitchTest("exists", "a", true, false, {b:1}, done);
+        genericSwitchTest("hask", "a", true, false, {b:1}, done);
     });
     it('should not match if the key is not a string', function(done) {
-        genericSwitchTest("exists", 1, true, false, {a:1}, done);
+        genericSwitchTest("hask", 1, true, false, {a:1}, done);
     });
 
     it('should check if payload is between given values', function(done) {

From 93ad9a3aa644894ee9cb78147d816ed38425065a Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@users.noreply.github.com>
Date: Wed, 10 Jul 2019 10:01:09 +0100
Subject: [PATCH 008/305] Update
 packages/node_modules/@node-red/nodes/core/logic/10-switch.js

Co-Authored-By: Nick O'Leary <nick.oleary@gmail.com>
---
 packages/node_modules/@node-red/nodes/core/logic/10-switch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
index ad4b5ea78..296851e14 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.js
@@ -72,7 +72,7 @@ module.exports = function(RED) {
             return ((min <= index) && (index <= max));
         },
         'hask': function(a, b) {
-            if (typeof b !== "object" ) {  return a.hasOwnProperty(b+""); }
+            return (typeof b !== "object" )  &&  a.hasOwnProperty(b+"");
         },
         'jsonata_exp': function(a, b) { return (b === true); },
         'else': function(a) { return a === true; }

From b7a62bd9e7596a0cacc29d2c50f9a7d644dcf7b3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@users.noreply.github.com>
Date: Wed, 10 Jul 2019 10:01:17 +0100
Subject: [PATCH 009/305] Update
 packages/node_modules/@node-red/nodes/core/logic/10-switch.html

Co-Authored-By: Nick O'Leary <nick.oleary@gmail.com>
---
 packages/node_modules/@node-red/nodes/core/logic/10-switch.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 79ffe8d5c..140448f28 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -401,7 +401,6 @@ has<!--
                     } else {
                         r.v = rule.find(".node-input-rule-value").typedInput('value');
                         r.vt = rule.find(".node-input-rule-value").typedInput('type');
-                        console.log("DONG",r)
                     }
                     if (type === "regex") {
                         r.case = rule.find(".node-input-rule-case").prop("checked");

From d06dbbb4bd87007067ec6e528908854a57498a6b Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 11 Jul 2019 08:22:31 +0900
Subject: [PATCH 010/305] changed to color change reflect immediately on OK

---
 .../@node-red/editor-client/src/js/ui/editor.js           | 4 +++-
 .../@node-red/editor-client/src/js/ui/palette.js          | 8 +++++++-
 .../@node-red/editor-client/src/js/ui/utils.js            | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index f26967148..05d99cac8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2219,6 +2219,8 @@ RED.editor = (function() {
                             editing_node.color = newColor;
                             changes.color = newColor;
                             changed = true;
+                            RED.utils.clearNodeColorCache();
+                            RED.palette.changeSubflowColor(editing_node, newColor);
                         }
 
                         var old_env = editing_node.env;
@@ -2228,7 +2230,6 @@ RED.editor = (function() {
                             changes.env = editing_node.env;
                             changed = true;
                         }
-
                         RED.palette.refresh();
 
                         if (changed) {
@@ -2242,6 +2243,7 @@ RED.editor = (function() {
                                         id:n.id,
                                         changed:n.changed
                                     })
+                                    n._def.color = editing_node.color;
                                     n.changed = true;
                                     n.dirty = true;
                                     updateNodeProperties(n);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 256c8eb1b..7eaa914b7 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -593,6 +593,11 @@ RED.palette = (function() {
         setTimeout(function() { $(window).trigger("resize"); } ,200);
     }
 
+    function changeSubflowColor(sf, color) {
+        var paletteNode = getPaletteNode('subflow:'+sf.id);
+        paletteNode.css("backgroundColor", color);
+    }
+
 
     function getCategories() {
         var categories = [];
@@ -608,6 +613,7 @@ RED.palette = (function() {
         hide:hideNodeType,
         show:showNodeType,
         refresh:refreshNodeTypes,
-        getCategories: getCategories
+        getCategories: getCategories,
+        changeSubflowColor: changeSubflowColor
     };
 })();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index d26ed4a4c..d35d1f1ba 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -912,6 +912,10 @@ RED.utils = (function() {
     }
 
     var nodeColorCache = {};
+    function clearNodeColorCache() {
+        nodeColorCache = {};
+    }
+
     function getNodeColor(type, def) {
         var result = def.color;
         var paletteTheme = RED.settings.theme('palette.theme') || [];
@@ -1044,6 +1048,7 @@ RED.utils = (function() {
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
         getNodeColor: getNodeColor,
+        clearNodeColorCache: clearNodeColorCache,
         addSpinnerOverlay: addSpinnerOverlay,
         decodeObject: decodeObject,
         parseContextKey: parseContextKey,

From 25a27733b906646ce099da59c2786ee441ed8f61 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 15 Jul 2019 11:23:27 +0900
Subject: [PATCH 011/305] fix reference error on deleting tab

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 63027aed1..c1a8e42a9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -324,7 +324,7 @@ RED.nodes = (function() {
     }
     function removeWorkspace(id) {
         delete workspaces[id];
-        delete nodeTabMap[ws.id];
+        delete nodeTabMap[id];
         workspacesOrder.splice(workspacesOrder.indexOf(id),1);
 
         var removedNodes = [];

From d5176975644dc341196088ee0434c348c83d4c93 Mon Sep 17 00:00:00 2001
From: 3Anology <kent1026+3a@gmail.com>
Date: Mon, 15 Jul 2019 19:15:29 +0800
Subject: [PATCH 012/305] zh-TW
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

繁體中文(台灣)
---
 .../editor-client/locales/zh-TW/editor.json   | 945 ++++++++++++++++++
 .../editor-client/locales/zh-TW/infotips.json |  23 +
 .../editor-client/locales/zh-TW/jsonata.json  | 218 ++++
 3 files changed, 1186 insertions(+)
 create mode 100644 packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
 create mode 100644 packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
 create mode 100644 packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json

diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
new file mode 100644
index 000000000..95129acb3
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
@@ -0,0 +1,945 @@
+{
+    "common": {
+        "label": {
+            "name": "名稱",
+            "ok": "確認",
+            "done": "完成",
+            "cancel": "取消",
+            "delete": "刪除",
+            "close": "關閉",
+            "load": "讀取",
+            "save": "保存",
+            "import": "匯入",
+            "export": "匯出",
+            "back": "返回",
+            "next": "下一步",
+            "clone": "複製專案",
+            "cont": "Continue"
+        }
+    },
+    "workspace": {
+        "defaultName": "流程__number__",
+        "editFlow": "編輯流程: __name__",
+        "confirmDelete": "確認刪除",
+        "delete": "確定想要刪除 '__label__'?",
+        "dropFlowHere": "把流程放到這裡",
+        "addFlow": "新增流程",
+        "listFlows": "流程列表",
+        "status": "狀態",
+        "enabled": "有效",
+        "disabled": "無效",
+        "info": "詳細描述",
+        "selectNodes": "點擊節點用於選擇",
+        "tip": "詳細描述支援Markdown羽量級標記語言，並將出現在資訊標籤中。"
+    },
+    "menu": {
+        "label": {
+            "view": {
+                "view": "顯示",
+                "grid": "格線",
+                "showGrid": "顯示格線",
+                "snapGrid": "對齊格線",
+                "gridSize": "格線尺寸",
+                "textDir": "文本方向",
+                "defaultDir": "默認方向",
+                "ltr": "從左到右",
+                "rtl": "從右到左",
+                "auto": "上下文",
+                "language": "Language",
+                "browserDefault": "Browser default"
+            },
+            "sidebar": {
+                "show": "顯示側邊欄"
+            },
+            "palette": {
+                "show": "Show palette"
+            },
+            "settings": "設置",
+            "userSettings": "使用者設置",
+            "nodes": "節點",
+            "displayStatus": "顯示節點狀態",
+            "displayConfig": "修改節點配置",
+            "import": "匯入",
+            "export": "匯出",
+            "search": "搜尋流程",
+            "searchInput": "搜尋流程",
+            "subflows": "子流程",
+            "createSubflow": "新建子流程",
+            "selectionToSubflow": "將選擇部分更改為子流程",
+            "flows": "流程",
+            "add": "增加",
+            "rename": "重新命名",
+            "delete": "刪除",
+            "keyboardShortcuts": "鍵盤快速鍵",
+            "login": "登入",
+            "logout": "退出",
+            "editPalette": "節點管理",
+            "other": "其他",
+            "showTips": "顯示小提示",
+            "help": "Node-RED website",
+            "projects": "專案",
+            "projects-new": "新專案",
+            "projects-open": "開啟專案",
+            "projects-settings": "專案設定",
+            "showNodeLabelDefault": "顯示新添加節點的標籤",
+            "clipboard": "剪貼簿",
+            "library": "庫",
+            "examples": "範例"
+        }
+    },
+    "actions": {
+        "toggle-navigator": "切換導航器",
+        "zoom-out": "縮小",
+        "zoom-reset": "重置縮放",
+        "zoom-in": "放大"
+    },
+    "user": {
+        "loggedInAs": "作為__name__登入",
+        "username": "帳號",
+        "password": "密碼",
+        "login": "登入",
+        "loginFailed": "登入失敗",
+        "notAuthorized": "未授權",
+        "errors": {
+            "settings": "設置資訊需要登入後才能訪問",
+            "deploy": "改動需要登入後才能部署",
+            "notAuthorized": "此操作需要登入後才能執行"
+        }
+    },
+    "notification": {
+        "warning": "<strong>警告</strong>: __message__",
+        "warnings": {
+            "undeployedChanges": "節點中存在未部署的更改",
+            "nodeActionDisabled": "節點動作在子流程中被禁用",
+            "nodeActionDisabledSubflow": "node actions disabled within subflow",
+            "missing-types": "流程由於缺少節點類型而停止。請檢查日誌的詳細資訊",
+            "safe-mode": "<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
+            "restartRequired": "Node-RED必須重新啟動，以啟用升級的模組",
+            "credentials_load_failed": "<p>Flows stopped as the credentials could not be decrypted.</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p>",
+            "credentials_load_failed_reset": "<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
+            "missing_flow_file": "<p>Project flow file not found.</p><p>The project is not configured with a flow file.</p>",
+            "missing_package_file": "<p>Project package file not found.</p><p>The project is missing a package.json file.</p>",
+            "project_empty": "<p>The project is empty.</p><p>Do you want to create a default set of project files?<br/>Otherwise, you will have to manually add files to the project outside of the editor.</p>",
+            "project_not_found": "<p>Project '__project__' not found.</p>",
+            "git_merge_conflict": "<p>Automatic merging of changes failed.</p><p>Fix the unmerged conflicts then commit the results.</p>"
+        },
+        "error": "<strong>Error</strong>: __message__",
+        "errors": {
+            "lostConnection": "丟失與伺服器的連接，重新連接...",
+            "lostConnectionReconnect": "丟失與伺服器的連接，__time__秒後重新連接",
+            "lostConnectionTry": "現在嘗試",
+            "cannotAddSubflowToItself": "無法向其自身添加子流程",
+            "cannotAddCircularReference": "無法添加子流程 - 迴圈引用",
+            "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>請升級到最新版本的Node.js LTS",
+            "failedToAppendNode": "<p>Failed to load '__module__'</p><p>__error__</p>"
+        },
+        "project": {
+            "change-branch": "Change to local branch '__project__'",
+            "merge-abort": "Git merge aborted",
+            "loaded": "Project '__project__' loaded",
+            "updated": "Project '__project__' updated",
+            "pull": "Project '__project__' reloaded",
+            "revert": "Project '__project__' reverted",
+            "merge-complete": "Git merge completed",
+            "setupCredentials": "Setup credentials",
+            "setupProjectFiles": "Setup project files",
+            "no": "No thanks",
+            "createDefault": "Create default project files",
+            "mergeConflict": "Show merge conflicts"
+        },
+        "label": {
+            "manage-project-dep": "Manage project dependencies",
+            "setup-cred": "Setup credentials",
+            "setup-project": "Setup project files",
+            "create-default-package": "Create default package file",
+            "no-thanks": "No thanks",
+            "create-default-project": "Create default project files",
+            "show-merge-conflicts": "Show merge conflicts"
+        }
+    },
+    "clipboard": {
+        "clipboard": "剪貼簿",
+        "nodes": "節點",
+        "node": "__count__ 節點",
+        "node_plural": "__count__ 多個節點",
+        "configNode": "__count__ 節點組態",
+        "configNode_plural": "__count__ 多節點組態",
+        "flow": "__count__ 流程",
+        "flow_plural": "__count__ 多流程",
+        "subflow": "__count__ 子流程",
+        "subflow_plural": "__count__ 多子流程",
+        "pasteNodes": "在這裡粘貼節點",
+        "selectFile": "匯入所選檔案",
+        "importNodes": "匯入節點",
+        "exportNodes": "匯出節點至剪貼簿",
+        "download": "下載",
+        "importUnrecognised": "匯入了無法識別的類型:",
+        "importUnrecognised_plural": "匯入了無法識別的類型:",
+        "nodesExported": "節點匯出到了剪貼簿",
+        "nodesImported": "已匯入:",
+        "nodeCopied": "已複製__count__個節點",
+        "nodeCopied_plural": "已複製__count__個節點",
+        "invalidFlow": "無效的流程: __message__",
+        "export": {
+            "selected": "已選擇的節點",
+            "current": "現在的節點",
+            "all": "所有流程",
+            "compact": "緊湊",
+            "formatted": "已格式化",
+            "copy": "匯出到剪貼簿",
+            "export": "匯出到庫",
+            "exportAs": "匯出為",
+            "overwrite": "取代",
+            "exists": "<p><b>\"__file__\"</b> 已經存在.</p><p>是否要取代?</p>"
+        },
+        "import": {
+            "import": "匯入到",
+            "newFlow": "新流程",
+            "errors": {
+                "notArray": "Input not a JSON Array",
+                "itemNotObject": "Input not a valid flow - item __index__ not a node object",
+                "missingId": "Input not a valid flow - item __index__ missing 'id' property",
+                "missingType": "Input not a valid flow - item __index__ missing 'type' property"
+            }
+        },
+        "copyMessagePath": "已複製路徑",
+        "copyMessageValue": "已複製數值",
+        "copyMessageValue_truncated": "已複製捨棄的數值",
+        "selectNodes": "選擇上面的文本並複製到剪貼簿"
+    },
+    "deploy": {
+        "deploy": "部署",
+        "full": "全面",
+        "fullDesc": "在工作區中部署所有內容",
+        "modifiedFlows": "已修改的流程",
+        "modifiedFlowsDesc": "只部署包含已更改節點的流",
+        "modifiedNodes": "已更改的節點",
+        "modifiedNodesDesc": "只部署已經更改的節點",
+        "restartFlows": "Restart Flows",
+        "restartFlowsDesc": "Restarts the current deployed flows",
+        "successfulDeploy": "部署成功",
+        "successfulRestart": "Successfully restarted flows",
+        "deployFailed": "部署失敗: __message__",
+        "unusedConfigNodes": "您有一些未使用的配置節點",
+        "unusedConfigNodesLink": "點擊此處查看它們",
+        "errors": {
+            "noResponse": "伺服器沒有回應"
+        },
+        "confirm": {
+            "button": {
+                "ignore": "忽略",
+                "confirm": "確認部署",
+                "review": "查看更改",
+                "cancel": "取消",
+                "merge": "合併",
+                "overwrite": "忽略 & 部署"
+            },
+            "undeployedChanges": "您有未部署的更改。\n\n離開此頁面將丟失這些更改。",
+            "improperlyConfigured": "工作區包含一些未正確配置的節點:",
+            "unknown": "工作區包含一些未知的節點類型:",
+            "confirm": "你確定要部署嗎?",
+            "doNotWarn": "do not warn about this again",
+            "conflict": "伺服器正在運行較新的一組流程。",
+            "backgroundUpdate": "伺服器上的流程已更新。",
+            "conflictChecking": "檢查是否可以自動合併更改",
+            "conflictAutoMerge": "此更改不包括衝突，可以自動合併",
+            "conflictManualMerge": "這些更改包括了在部署之前必須解決的衝突。",
+            "plusNMore": "+ __count__ more"
+        }
+    },
+    "eventLog": {
+        "title": "事件日誌",
+        "view": "查看日誌"
+    },
+    "diff": {
+        "unresolvedCount": "__count__個未解決的衝突",
+        "unresolvedCount_plural": "__count__個未解決的衝突",
+        "globalNodes": "Global nodes",
+        "flowProperties": "Flow Properties",
+        "type": {
+            "added": "已添加",
+            "changed": "已更改",
+            "unchanged": "未更改",
+            "deleted": "已刪除",
+            "flowDeleted": "已刪除流程",
+            "flowAdded": "已添加流程",
+            "movedTo": "移動至__id__",
+            "movedFrom": "從__id__移動"
+        },
+        "nodeCount": "__count__個節點",
+        "nodeCount_plural": "__count__個節點",
+        "local": "本地",
+        "remote": "遠端",
+        "reviewChanges": "Review Changes",
+        "noBinaryFileShowed": "Cannot show binary file contents",
+        "viewCommitDiff": "View Commit Changes",
+        "compareChanges": "Compare Changes",
+        "saveConflict": "Save conflict resolution",
+        "conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
+        "commonVersionError": "Common Version doesn't contain valid JSON:",
+        "oldVersionError": "Old Version doesn't contain valid JSON:",
+        "newVersionError": "New Version doesn't contain valid JSON:"
+    },
+    "subflow": {
+        "editSubflowInstance": "Edit subflow instance: __name__",
+        "editSubflow": "編輯流程範本: __name__",
+        "edit": "編輯流程範本",
+        "subflowInstances": "這個子流程範本有__count__個實例",
+        "subflowInstances_plural": "這個子流程範本有__count__個實例",
+        "editSubflowProperties": "編輯屬性",
+        "input": "輸入:",
+        "output": "輸出:",
+        "status": "status node",
+        "deleteSubflow": "刪除子流程",
+        "info": "詳細描述",
+        "category": "Category",
+        "env": {
+            "restore": "Restore to subflow default",
+            "remove": "Remove environment variable"
+        },
+        "errors": {
+            "noNodesSelected": "<strong>無法創建子流程</strong>: 未選擇節點",
+            "multipleInputsToSelection": "<strong>無法創建子流程</strong>: 多個輸入到了選擇"
+        },
+        "format": "標記格式"
+    },
+    "editor": {
+        "configEdit": "編輯",
+        "configAdd": "添加",
+        "configUpdate": "更新",
+        "configDelete": "刪除",
+        "nodesUse": "__count__個節點使用此配置",
+        "nodesUse_plural": "__count__個節點使用此配置",
+        "addNewConfig": "添加新的__type__配置",
+        "editNode": "編輯__type__節點",
+        "editConfig": "編輯__type__配置",
+        "addNewType": "添加新的__type__節點",
+        "nodeProperties": "節點屬性",
+        "label": "Label",
+        "portLabels": "埠標籤",
+        "labelInputs": "輸入",
+        "labelOutputs": "輸出",
+        "settingIcon": "Icon",
+        "noDefaultLabel": "無",
+        "defaultLabel": "使用默認標籤",
+        "searchIcons": "搜尋 icons",
+        "useDefault": "use default",
+        "description": "Description",
+        "show": "Show",
+        "hide": "Hide",
+        "errors": {
+            "scopeChange": "更改範圍將使其他流中的節點無法使用",
+            "invalidProperties": "Invalid properties:"
+        }
+    },
+    "keyboard": {
+        "title": "鍵盤快速鍵",
+        "keyboard": "Keyboard",
+        "filterActions": "filter actions",
+        "shortcut": "shortcut",
+        "scope": "scope",
+        "unassigned": "未分配",
+        "global": "global",
+        "workspace": "workspace",
+        "selectAll": "選擇所有節點",
+        "selectAllConnected": "選擇所有連接的節點",
+        "addRemoveNode": "從選擇中添加/刪除節點",
+        "editSelected": "編輯選定節點",
+        "deleteSelected": "刪除選定節點或連結",
+        "importNode": "匯入節點",
+        "exportNode": "匯出節點",
+        "nudgeNode": "移動所選節點(1px)",
+        "moveNode": "移動所選節點(20px)",
+        "toggleSidebar": "切換側邊欄",
+        "togglePalette": "Toggle palette",
+        "copyNode": "複製所選節點",
+        "cutNode": "剪切所選節點",
+        "pasteNode": "粘貼節點",
+        "undoChange": "撤銷上次執行的更改",
+        "searchBox": "打開搜索框",
+        "managePalette": "管理面板"
+    },
+    "library": {
+        "library": "Library",
+        "openLibrary": "打開庫...",
+        "saveToLibrary": "保存到庫...",
+        "typeLibrary": "__type__型別程式庫",
+        "unnamedType": "無名__type__",
+        "exportedToLibrary": "Nodes exported to library",
+        "dialogSaveOverwrite": "一個叫做__libraryName__的__libraryType__已經存在，您需要覆蓋麼？",
+        "invalidFilename": "無效的檔案名",
+        "savedNodes": "保存的節點",
+        "savedType": "已保存__type__",
+        "saveFailed": "保存失敗: __message__",
+        "types": {
+            "local": "Local",
+            "examples": "Examples"
+        },
+        "exportToLibrary": "將節點匯出到庫",
+        "filename": "檔案名",
+        "folder": "資料夾",
+        "filenamePlaceholder": "文件",
+        "fullFilenamePlaceholder": "a/b/文件",
+        "folderPlaceholder": "a/b",
+        "breadcrumb": "庫"
+    },
+    "palette": {
+        "noInfo": "無可用資訊",
+        "filter": "過濾節點",
+        "search": "搜索模組",
+        "addCategory": "Add new...",
+        "label": {
+            "subflows": "子流程",
+            "input": "輸入",
+            "output": "輸出",
+            "function": "功能",
+            "social": "社交",
+            "storage": "存儲",
+            "analysis": "分析",
+            "advanced": "高級"
+        },
+        "actions": {
+            "collapse-all": "Collapse all categories",
+            "expand-all": "Expand all categories"
+        },
+        "event": {
+            "nodeAdded": "添加到面板中的節點:",
+            "nodeAdded_plural": "添加到面板中的多個節點",
+            "nodeRemoved": "從面板中刪除的節點:",
+            "nodeRemoved_plural": "從面板中刪除的多個節點:",
+            "nodeEnabled": "啟用節點:",
+            "nodeEnabled_plural": "啟用多個節點:",
+            "nodeDisabled": "禁用節點:",
+            "nodeDisabled_plural": "禁用多個節點:",
+            "nodeUpgraded": "節點模組__module__升級到__version__版本"
+        },
+        "editor": {
+            "title": "面板管理",
+            "palette": "Palette",
+            "times": {
+                "seconds": "秒前",
+                "minutes": "分前",
+                "minutesV": "__count__分前",
+                "hoursV": "__count__小時前",
+                "hoursV_plural": "__count__小時前",
+                "daysV": "__count__天前",
+                "daysV_plural": "__count__天前",
+                "weeksV": "__count__周前",
+                "weeksV_plural": "__count__周前",
+                "monthsV": "__count__月前",
+                "monthsV_plural": "__count__月前",
+                "yearsV": "__count__年前",
+                "yearsV_plural": "__count__年前",
+                "yearMonthsV": "__y__年, __count__月前",
+                "yearMonthsV_plural": "__y__年, __count__月前",
+                "yearsMonthsV": "__y__年, __count__月前",
+                "yearsMonthsV_plural": "__y__年, __count__月前"
+            },
+            "nodeCount": "__label__個節點",
+            "nodeCount_plural": "__label__個節點",
+            "moduleCount": "__count__個可用模組",
+            "moduleCount_plural": "__count__個可用模組",
+            "inuse": "使用中",
+            "enableall": "全部啟用",
+            "disableall": "全部禁用",
+            "enable": "啟用",
+            "disable": "禁用",
+            "remove": "移除",
+            "update": "更新至__version__版本",
+            "updated": "已更新",
+            "install": "安裝",
+            "installed": "已安裝",
+            "conflict": "conflict",
+            "conflictTip": "<p>This module cannot be installed as it includes a<br/>node type that has already been installed</p><p>Conflicts with <code>__module__</code></p>",
+            "loading": "載入目錄...",
+            "tab-nodes": "節點",
+            "tab-install": "安裝",
+            "sort": "排序:",
+            "sortAZ": "a-z順序",
+            "sortRecent": "日期順序",
+            "more": "增加__count__個",
+            "errors": {
+                "catalogLoadFailed": "無法載入節點目錄。<br>查看流覽器控制台瞭解更多資訊",
+                "installFailed": "無法安裝: __module__<br>__message__<br>查看日誌瞭解更多資訊",
+                "removeFailed": "無法刪除: __module__<br>__message__<br>查看日誌瞭解更多資訊",
+                "updateFailed": "無法更新: __module__<br>__message__<br>查看日誌瞭解更多資訊",
+                "enableFailed": "無法啟用: __module__<br>__message__<br>查看日誌瞭解更多資訊",
+                "disableFailed": "無法禁用: __module__<br>__message__<br>查看日誌瞭解更多資訊"
+            },
+            "confirm": {
+                "install": {
+                    "body": "在安裝之前，請閱讀節點的文檔，某些節點的依賴關係不能自動解決，可能需要重新啟動Node-RED。",
+                    "title": "安裝節點"
+                },
+                "remove": {
+                    "body": "刪除節點將從Node-RED卸載它。節點可能會繼續使用資源，直到重新啟動Node-RED。",
+                    "title": "刪除節點"
+                },
+                "update": {
+                    "body": "更新節點將需要重新啟動Node-RED來完成更新，該過程必須由手動完成。",
+                    "title": "更新節點"
+                },
+                "cannotUpdate": {
+                    "body": "此節點的更新可用，但不會安裝在面板管理器可以更新的位置。<br/><br/>請參閱有關如何更新此節點的文檔。"
+                },
+                "button": {
+                    "review": "打開節點資訊",
+                    "install": "安裝",
+                    "remove": "刪除",
+                    "update": "更新"
+                }
+            }
+        }
+    },
+    "sidebar": {
+        "info": {
+            "name": "節點信息",
+            "tabName": "名稱",
+            "label": "信息",
+            "node": "節點",
+            "type": "類型",
+            "module": "Module",
+            "id": "ID",
+            "status": "狀態",
+            "enabled": "啟用",
+            "disabled": "禁用",
+            "subflow": "子流程",
+            "instances": "實例",
+            "properties": "屬性",
+            "info": "信息",
+            "desc": "Description",
+            "blank": "空白",
+            "null": "空",
+            "showMore": "展開",
+            "showLess": "收起",
+            "flow": "流程",
+            "selection": "選擇",
+            "nodes": "__count__ 個節點",
+            "flowDesc": "流程描述",
+            "subflowDesc": "子流程描述",
+            "nodeHelp": "節點幫助",
+            "none": "無",
+            "arrayItems": "__count__個項目",
+            "showTips": "您可以從設置面板啟用提示資訊"
+        },
+        "config": {
+            "name": "配置節點",
+            "label": "配置",
+            "global": "所有流程",
+            "none": "無",
+            "subflows": "子流程",
+            "flows": "流程",
+            "filterUnused": "未使用",
+            "filterAll": "所有",
+            "filtered": "__count__ 個隱藏"
+        },
+        "context": {
+            "name": "Context Data",
+            "label": "context",
+            "none": "none selected",
+            "refresh": "refresh to load",
+            "empty": "empty",
+            "node": "Node",
+            "flow": "Flow",
+            "global": "Global",
+            "deleteConfirm": "Are you sure you want to delete this item?",
+            "autoRefresh": "Auto-refresh"
+        },
+        "palette": {
+            "name": "節點管理",
+            "label": "節點"
+        },
+        "project": {
+            "label": "項目",
+            "name": "名稱",
+            "description": "描述",
+            "dependencies": "依賴",
+            "settings": "設置",
+            "noSummaryAvailable": "No summary available",
+            "editDescription": "編輯專案描述",
+            "editDependencies": "編輯項目依賴",
+            "editReadme": "Edit README.md",
+            "showProjectSettings": "Show project settings",
+            "projectSettings": {
+                "title": "Project Settings",
+                "edit": "edit",
+                "none": "None",
+                "install": "install",
+                "removeFromProject": "remove from project",
+                "addToProject": "add to project",
+                "files": "Files",
+                "package": "Package",
+                "flow": "Flow",
+                "credentials": "Credentials",
+                "packageCreate": "File will be created when changes are saved",
+                "fileNotExist": "File does not exist",
+                "selectFile": "Select File",
+                "invalidEncryptionKey": "Invalid encryption key",
+                "encryptionEnabled": "Encryption enabled",
+                "encryptionDisabled": "Encryption disabled",
+                "setTheEncryptionKey": "Set the encryption key",
+                "resetTheEncryptionKey": "Reset the encryption key",
+                "changeTheEncryptionKey": "Change the encryption key",
+                "currentKey": "Current key",
+                "newKey": "New key",
+                "credentialsAlert": "This will delete all existing credentials",
+                "versionControl": "Version Control",
+                "branches": "Branches",
+                "noBranches": "No branches",
+                "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.",
+                "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?",
+                "deleteUnmergedBranch": "Delete unmerged branch",
+                "gitRemotes": "Git remotes",
+                "addRemote": "add remote",
+                "addRemote2": "Add remote",
+                "remoteName": "Remote name",
+                "nameRule": "Must contain only A-Z 0-9 _ -",
+                "url": "URL",
+                "urlRule": "https://, ssh:// or file://",
+                "urlRule2": "Do not include the username/password in the URL",
+                "noRemotes": "No remotes",
+                "deleteRemoteConfrim": "Are you sure you want to delete the remote '__name__'?",
+                "deleteRemote": "Delete remote"
+            },
+            "userSettings": {
+                "committerDetail": "Committer Details",
+                "committerTip": "Leave blank to use system default",
+                "userName": "Username",
+                "email": "Email",
+                "sshKeys": "SSH Keys",
+                "sshKeysTip": "Allows you to create secure connections to remote git repositories.",
+                "add": "add key",
+                "addSshKey": "Add SSH Key",
+                "addSshKeyTip": "Generate a new public/private key pair",
+                "name": "Name",
+                "nameRule": "Must contain only A-Z 0-9 _ -",
+                "passphrase": "Passphrase",
+                "passphraseShort": "Passphrase too short",
+                "optional": "Optional",
+                "cancel": "Cancel",
+                "generate": "Generate key",
+                "noSshKeys": "No SSH keys",
+                "copyPublicKey": "Copy public key to clipboard",
+                "delete": "Delete key",
+                "gitConfig": "Git config",
+                "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone."
+            },
+            "versionControl": {
+                "unstagedChanges": "Unstaged changes",
+                "stagedChanges": "Staged changes",
+                "unstageChange": "Unstage change",
+                "stageChange": "Stage change",
+                "unstageAllChange": "Unstage all changes",
+                "stageAllChange": "Stage all changes",
+                "commitChanges": "Commit changes",
+                "resolveConflicts": "Resolve conflicts",
+                "head": "HEAD",
+                "staged": "Staged",
+                "unstaged": "Unstaged",
+                "local": "Local",
+                "remote": "Remote",
+                "revert": "Are you sure you want to revert the changes to '__file__'? This cannot be undone.",
+                "revertChanges": "Revert changes",
+                "localChanges": "Local Changes",
+                "none": "None",
+                "conflictResolve": "All conflicts resolved. Commit the changes to complete the merge.",
+                "localFiles": "Local files",
+                "all": "all",
+                "unmergedChanges": "Unmerged changes",
+                "abortMerge": "abort merge",
+                "commit": "commit",
+                "changeToCommit": "Changes to commit",
+                "commitPlaceholder": "Enter your commit message",
+                "cancelCapital": "Cancel",
+                "commitCapital": "Commit",
+                "commitHistory": "Commit History",
+                "branch": "Branch:",
+                "moreCommits": " more commit(s)",
+                "changeLocalBranch": "Change local branch",
+                "createBranchPlaceholder": "Find or create a branch",
+                "upstream": "upstream",
+                "localOverwrite": "You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",
+                "manageRemoteBranch": "Manage remote branch",
+                "unableToAccess": "Unable to access remote repository",
+                "retry": "Retry",
+                "setUpstreamBranch": "Set as upstream branch",
+                "createRemoteBranchPlaceholder": "Find or create a remote branch",
+                "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.",
+                "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.",
+                "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.",
+                "push": "push",
+                "pull": "pull",
+                "unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>",
+                "showUnstagedChanges": "Show unstaged changes",
+                "connectionFailed": "Could not connect to remote repository: ",
+                "pullUnrelatedHistory": "<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",
+                "pullChanges": "Pull changes",
+                "history": "history",
+                "projectHistory": "Project History",
+                "daysAgo": "__count__ day ago",
+                "daysAgo_plural": "__count__ days ago",
+                "hoursAgo": "__count__ hour ago",
+                "hoursAgo_plural": "__count__ hours ago",
+                "minsAgo": "__count__ min ago",
+                "minsAgo_plural": "__count__ mins ago",
+                "secondsAgo": "Seconds ago",
+                "notTracking": "Your local branch is not currently tracking a remote branch.",
+                "statusUnmergedChanged": "Your repository has unmerged changes. You need to fix the conflicts and commit the result.",
+                "repositoryUpToDate": "Your repository is up to date.",
+                "commitsAhead": "Your repository is __count__ commit ahead of the remote. You can push this commit now.",
+                "commitsAhead_plural": "Your repository is __count__ commits ahead of the remote. You can push these commits now.",
+                "commitsBehind": "Your repository is __count__ commit behind of the remote. You can pull this commit now.",
+                "commitsBehind_plural": "Your repository is __count__ commits behind of the remote. You can pull these commits now.",
+                "commitsAheadAndBehind1": "Your repository is __count__ commit behind and ",
+                "commitsAheadAndBehind1_plural": "Your repository is __count__ commits behind and ",
+                "commitsAheadAndBehind2": "__count__ commit ahead of the remote. ",
+                "commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ",
+                "commitsAheadAndBehind3": "You must pull the remote commit down before pushing.",
+                "commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing.",
+                "refreshCommitHistory": "Refresh commit history",
+                "refreshChanges": "Refresh changes"
+            }
+        }
+    },
+    "typedInput": {
+        "type": {
+            "str": "文字列",
+            "num": "數字",
+            "re": "規則運算式",
+            "bool": "布林",
+            "json": "JSON",
+            "bin": "二進位流",
+            "date": "時間戳記",
+            "jsonata": "expression",
+            "env": "env variable"
+        }
+    },
+    "editableList": {
+        "add": "添加"
+    },
+    "search": {
+        "empty": "找不到匹配",
+        "addNode": "添加一個節點..."
+    },
+    "expressionEditor": {
+        "functions": "功能",
+        "functionReference": "Function reference",
+        "insert": "插入",
+        "title": "JSONata運算式編輯器",
+        "test": "Test",
+        "data": "示例消息",
+        "result": "結果",
+        "format": "格式表達方法",
+        "compatMode": "相容模式啟用",
+        "compatModeDesc": "<h3>JSONata的相容模式</h3><p> 目前的運算式仍然參考<code>msg</code>，所以將以相容性模式進行評估。請更新運算式，使其不使用<code>msg</code>，因為此模式將在將來刪除。</p><p> 當JSONata支持首次添加到Node-RED時，它需要運算式引用<code>msg</code>物件。例如<code>msg.payload</code>將用於訪問有效負載。</p><p> 這樣便不再需要運算式直接針對消息進行評估。要訪問有效負載，運算式應該只是<code>payload</code>.</p>",
+        "noMatch": "無匹配結果",
+        "errors": {
+            "invalid-expr": "無效的JSONata運算式:\n  __message__",
+            "invalid-msg": "無效的示例JSON消息:\n  __message__",
+            "context-unsupported": "無法測試上下文函數\n $flowContext 或 $globalContext",
+            "eval": "評估運算式錯誤:\n  __message__"
+        }
+    },
+    "jsEditor": {
+        "title": "JavaScript 編輯器"
+    },
+    "textEditor": {
+        "title": "Text 編輯器"
+    },
+    "jsonEditor": {
+        "title": "JSON編輯器",
+        "format": "格式化JSON"
+    },
+    "markdownEditor": {
+        "title": "Markdown 編輯器",
+        "format": "F使用markdown格式化",
+        "heading1": "Heading 1",
+        "heading2": "Heading 2",
+        "heading3": "Heading 3",
+        "bold": "粗體",
+        "italic": "斜體",
+        "code": "程式碼",
+        "ordered-list": "編號清單",
+        "unordered-list": "符號清單",
+        "quote": "引用",
+        "link": "連結",
+        "horizontal-rule": "分隔線",
+        "toggle-preview": "預覽"
+    },
+    "bufferEditor": {
+        "title": "緩衝區編輯器",
+        "modeString": "作為UTF-8字串處理",
+        "modeArray": "作為JSON陣列處理",
+        "modeDesc": "<h3>緩衝區編輯器</h3><p>緩衝區類型被存儲為位元組值的JSON陣列。編輯器將嘗試將輸入的數值解析為JSON陣列。如果它不是有效的JSON，它將被視為UTF-8字串，並被轉換為單個字元代碼點的陣列。</p><p>例如，<code>Hello World</code>的值會被轉換為JSON陣列：<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+    },
+    "projects": {
+        "config-git": "Configure Git client",
+        "welcome": {
+            "hello": "Hello! We have introduced 'projects' to Node-RED.",
+            "desc0": "This is a new way for you to manage your flow files and includes version control of your flows.",
+            "desc1": "To get started you can create your first project or clone an existing project from a git repository.",
+            "desc2": "If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.",
+            "create": "Create Project",
+            "clone": "Clone Repository",
+            "openExistingProject": "Open existing project",
+            "not-right-now": "Not right now"
+        },
+        "git-config": {
+            "setup": "Setup your version control client",
+            "desc0": "Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.",
+            "desc1": "When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.",
+            "desc2": "Your Git client is already configured with the details below.",
+            "desc3": "You can change these settings later under the 'Git config' tab of the settings dialog.",
+            "username": "Username",
+            "email": "Email"
+        },
+        "project-details": {
+            "create": "Create your project",
+            "desc0": "A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.",
+            "desc1": "You can create multiple projects and quickly switch between them from the editor.",
+            "desc2": "To begin, your project needs a name and an optional description.",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "project-name": "Project name",
+            "desc": "描述",
+            "opt": "Optional"
+        },
+        "clone-project": {
+            "clone": "Clone a project",
+            "desc0": "If you already have a git repository containing a project, you can clone it to get started.",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "project-name": "Project name",
+            "no-info-in-url": "Do not include the username/password in the url",
+            "git-url": "Git repository URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "Authentication failed",
+            "username": "Username",
+            "passwd": "Password",
+            "ssh-key": "SSH Key",
+            "passphrase": "Passphrase",
+            "ssh-key-desc": "Before you can clone a repository over ssh you must add an SSH key to access it.",
+            "ssh-key-add": "Add an ssh key",
+            "credential-key": "Credentials encryption key",
+            "cant-get-ssh-key": "Error! Can't get selected SSH key path.",
+            "already-exists2": "already exists",
+            "git-error": "git error",
+            "connection-failed": "Connection failed",
+            "not-git-repo": "Not a git repository",
+            "repo-not-found": "Repository not found"
+        },
+        "default-files": {
+            "create": "Create your project files",
+            "desc0": "A project contains your flow files, a README file and a package.json file.",
+            "desc1": "It can contain any other files you want to maintain in the Git repository.",
+            "desc2": "Your existing flow and credential files will be copied into the project.",
+            "flow-file": "Flow file",
+            "credentials-file": "Credentials file"
+        },
+        "encryption-config": {
+            "setup": "Setup encryption of your credentials file",
+            "desc0": "Your flow credentials file can be encrypted to keep its contents secure.",
+            "desc1": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
+            "desc2": "Your flow credentials file is not currently encrypted.",
+            "desc3": "That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.",
+            "desc4": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
+            "desc5": "Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.",
+            "desc6": "Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.",
+            "desc7": "The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.",
+            "credentials": "Credentials",
+            "enable": "Enable encryption",
+            "disable": "Disable encryption",
+            "disabled": "disabled",
+            "copy": "Copy over existing key",
+            "use-custom": "Use custom key",
+            "desc8": "The credentials file will not be encrypted and its contents easily read",
+            "create-project-files": "Create project files",
+            "create-project": "Create project",
+            "already-exists": "already exists",
+            "git-error": "git error",
+            "git-auth-error": "git auth error"
+        },
+        "create-success": {
+            "success": "You have successfully created your first project!",
+            "desc0": "You can now continue to use Node-RED just as you always have.",
+            "desc1": "The 'info' tab in the sidebar shows you what your current active project is. The button next to the name can be used to access the project settings view.",
+            "desc2": "The 'history' tab in the sidebar can be used to view files that have changed in your project and to commit them. It shows you a complete history of your commits and allows you to push your changes to a remote repository."
+        },
+        "create": {
+            "projects": "Projects",
+            "already-exists": "Project already exists",
+            "must-contain": "Must contain only A-Z 0-9 _ -",
+            "no-info-in-url": "Do not include the username/password in the url",
+            "open": "Open Project",
+            "create": "Create Project",
+            "clone": "Clone Repository",
+            "project-name": "Project name",
+            "desc": "描述",
+            "opt": "Optional",
+            "flow-file": "Flow file",
+            "credentials": "Credentials",
+            "enable-encryption": "Enable encryption",
+            "disable-encryption": "Disable encryption",
+            "encryption-key": "Encryption key",
+            "desc0": "A phrase to secure your credentials with",
+            "desc1": "The credentials file will not be encrypted and its contents easily read",
+            "git-url": "Git repository URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "Authentication failed",
+            "username": "Username",
+            "password": "Password",
+            "ssh-key": "SSH Key",
+            "passphrase": "Passphrase",
+            "desc2": "Before you can clone a repository over ssh you must add an SSH key to access it.",
+            "add-ssh-key": "Add an ssh key",
+            "credentials-encryption-key": "Credentials encryption key",
+            "already-exists-2": "already exists",
+            "git-error": "git error",
+            "con-failed": "Connection failed",
+            "not-git": "Not a git repository",
+            "no-resource": "Repository not found",
+            "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
+            "unexpected_error": "unexpected_error"
+        },
+        "delete": {
+            "confirm": "Are you sure you want to delete this project?"
+        },
+        "create-project-list": {
+            "search": "search your projects",
+            "current": "current"
+        },
+        "require-clean": {
+            "confirm": "<p>You have undeployed changes that will be lost.</p><p>Do you want to continue?</p>"
+        },
+        "send-req": {
+            "auth-req": "Authentication required for repository",
+            "username": "Username",
+            "password": "Password",
+            "passphrase": "Passphrase",
+            "retry": "Retry",
+            "update-failed": "Failed to update auth",
+            "unhandled": "Unhandled error response"
+        },
+        "create-branch-list": {
+            "invalid": "Invalid branch",
+            "create": "Create branch",
+            "current": "current"
+        },
+        "create-default-file-set": {
+            "no-active": "Cannot create default file set without an active project",
+            "no-empty": "Cannot create default file set on a non-empty project",
+            "git-error": "git error"
+        },
+        "errors": {
+            "no-username-email": "Your Git client is not configured with a username/email.",
+            "unexpected": "An unexpected error occurred",
+            "code": "code"
+        }
+    },
+    "editor-tab": {
+        "properties": "Properties",
+        "description": "描述",
+        "appearance": "Appearance",
+        "env": "Environment Variables"
+    }
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
new file mode 100644
index 000000000..9e67a71cf
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
@@ -0,0 +1,23 @@
+{
+    "info": {
+        "tip0" : "您可以用 {{core:delete-selection}} 刪除選擇的節點或連結。",
+        "tip1" : "{{core:search}} 可以在流程內搜索節點。",
+        "tip2": "{{core:toggle-sidebar}} 可以顯示或隱藏邊側欄。",
+        "tip3": "您可以在 {{core:manage-palette}} 中管理節點的控制台。",
+        "tip4": "側邊欄中會列出流程中所有的配置節點。您可以通過功能表或者 {{core:show-config-tab}} 來訪問這些節點。",
+        "tip5": "您可以在設定中選擇顯示或隱藏這些提示。",
+        "tip6": "您可以用[left] [up] [down] [right]鍵來移動被選中的節點。按住[shift]可以更快地移動節點。",
+        "tip7": "把節點拖到連接上可以向連接中插入節點。",
+        "tip8": "您可以用 {{core:show-export-dialog}} 來匯出被選中的節點或標籤頁中的流程。",
+        "tip9": "您可以將流程的json檔拖入編輯方塊或 {{core:show-import-dialog}} 來導入流程。",
+        "tip10": "按住[shift]後按一下並拖動節點可以將該節點的多個連接一併移動到其他節點的埠。",
+        "tip11": "{{core:show-info-tab}} 可以顯示「資訊」標籤頁。 {{core:show-debug-tab}} 可以顯示「調試」標籤頁。",
+        "tip12": "按住[ctrl]的同時點擊工作介面可以在節點的對話欄中快速添加節點。",
+        "tip13": "按住[ctrl]的同時點擊節點的埠或後續節點可以快速連接多個節點。",
+        "tip14": "按住[shift]的同時點擊節點會選中所有被連接的節點。",
+        "tip15": "按住[ctrl]的同時點擊節點可以在選中或取消選中節點。",
+        "tip16": "{{core:show-previous-tab}} 和 {{core:show-next-tab}} 可以切換標籤頁。",
+        "tip17": "您可以在節點的屬性配置畫面中通過 {{core:confirm-edit-tray}} 來更改設置，或者用 {{core:cancel-edit-tray}} 來取消更改。",
+        "tip18": "您可以通過點擊 {{core:edit-selected-node}} 來顯示被選中節點的屬性設置畫面。"
+    }
+}
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
new file mode 100644
index 000000000..ae62fe068
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
@@ -0,0 +1,218 @@
+{
+    "$string": {
+        "args": "arg",
+        "desc": "通過以下的類型轉換規則將參數*arg*轉換成字串:\n\n - 字串不轉換。\n -函數轉換成空的字串。\n - JSON的值無法用數字表示所以用無限大或者NaN（非數）表示。\n - 用’JSON.stringify’函數將其他值轉換成JSON字串。"
+    },
+    "$length": {
+        "args": "str",
+        "desc": "輸出字串’str’的字數。如果’str’不是字串，拋出錯誤。"
+    },
+    "$substring": {
+        "args": "str, start[, length]",
+        "desc": "輸出`start`位置後的的首次出現的包括`str`的子字串。 如果`length`被指定，那麼的字串中將只包括前`length`個文字。如果`start`是負數則輸出從`str`末尾開始的`length`個文字"
+    },
+    "$substringBefore": {
+        "args": "str, chars",
+        "desc": "輸出’str’中首次出現的’chars’之前的子字串，如果’str’中不包括’chars’則輸出’str’。"
+    },
+    "$substringAfter": {
+        "args": "str, chars",
+        "desc": "輸出’str’中首次出現的’chars’之後的子字串，如果’str’中不包括’chars’則輸出’str’。"
+    },
+    "$uppercase": {
+        "args": "str",
+        "desc": "`將’str’中的所有字母變為大寫後輸出。"
+    },
+    "$lowercase": {
+        "args": "str",
+        "desc": "將’str’中的所有字母變為小寫後輸出。"
+    },
+    "$trim": {
+        "args": "str",
+        "desc": "將以下步驟應用於`str`來去除所有空白文字並實現標準化。\n\n – 將全部tab定位字元、Enter鍵、換行字元用空白代替。\n- 將連續的空白文字變成一個空白文字。\n- 消除開頭和末尾的空白文字。\n\n如果`str`沒有被指定(即在無輸入參數的情況下調用本函數)，將上下文的值作為`str`來使用。 如果`str` 不是字串則拋出錯誤。"
+    },
+    "$contains": {
+        "args": "str, pattern",
+        "desc": "字串`str` 和 `pattern`匹配的話輸出`true`，不匹配的情況下輸出 `false`。 不指定`str`的情況下(比如用一個參數調用本函數時)、將上下文的值作為`str`來使用。參數 `pattern`可以為字串或正則表達。"
+    },
+    "$split": {
+        "args": "str[, separator][, limit]",
+        "desc": "將參數`str`分解成由子字串組成的陣列。 如果`str`不是字串拋出錯誤。可以省略的參數 `separator`中指定字串`str`的分隔符號。分隔符號可以是文字或規則運算式。在不指定`separator`的情況下、將分隔符號看作空的字串並把`str`拆分成由單個字母組成的陣列。如果`separator`不是字串則拋出錯誤。在可省略的參數`limit`中指定分割後的子字串的最大個數。超出個數的子字串將被捨棄。如果`limit`沒有被指定，`str` 將不考慮子字串的個數而將字串完全分隔。如果`limit`是負數則拋出錯誤。"
+    },
+    "$join": {
+        "args": "array[, separator]",
+        "desc": "用可以省略的參數 `separator`來把多個字元串連接。如果`array`不是字串則拋出錯誤。 如果沒有指定`separator`，則用空字串來連接字元(即字串之間沒有`separator`)。 如果`separator`不是字元則拋出錯誤。"
+    },
+    "$match": {
+        "args": "str, pattern [, limit]",
+        "desc": "對字串`str`使用規則運算式`pattern`並輸出與`str`相匹配的部分資訊。"
+    },
+    "$replace": {
+        "args": "str, pattern, replacement [, limit]",
+        "desc": "在字串`str`中搜索`pattern`並用`replacement`來替換。\n\n可選參數`limit`用來指定替換次數的上限。"
+    },
+    "$now": {
+        "args": "",
+        "desc": "生成ISO 8601互換格式的時刻，並作為字串輸出。"
+    },
+    "$base64encode": {
+        "args": "string",
+        "desc": "將ASCII格式的字串轉換為Base 64格式。將字串中的文字視作二進位形式的資料處理。包含URI編碼在內的字串文字必須在0x00到0xFF的範圍內，否則不會被支持。"
+    },
+    "$base64decode": {
+        "args": "string",
+        "desc": "用UTF-8內碼表將Base 64形式二進位值轉換為字串。"
+    },
+    "$number": {
+        "args": "arg",
+        "desc": "用下述的規則將參數 `arg`轉換為數值。:\n\n – 數值不做轉換。\n – 將字串中合法的JSON數値表示轉換成數値。\n – 其他形式的值則拋出錯誤。"
+    },
+    "$abs": {
+        "args": "number",
+        "desc": "輸出參數`number`的絕對值。"
+    },
+    "$floor": {
+        "args": "number",
+        "desc": "輸出比`number`的值小的最大整數。"
+    },
+    "$ceil": {
+        "args": "number",
+        "desc": "輸出比`number`的值大的最小整數。"
+    },
+    "$round": {
+        "args": "number [, precision]",
+        "desc": "輸出四捨五入後的參數`number`。可省略的參數 `precision`指定四捨五入後小數點下的位數。"
+    },
+    "$power": {
+        "args": "base, exponent",
+        "desc": "輸出底數`base`的`exponent`次冪。"
+    },
+    "$sqrt": {
+        "args": "number",
+        "desc": "輸出參數 `number`的平方根。"
+    },
+    "$random": {
+        "args": "",
+        "desc": "輸出比0大，比1小的偽亂數。"
+    },
+    "$millis": {
+        "args": "",
+        "desc": "返回從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。在同一個運算式的測試中所有對`$millis()`的調用將會返回相同的值。"
+    },
+    "$sum": {
+        "args": "array",
+        "desc": "輸出陣列`array`的總和。如果`array`不是數值則拋出錯誤。"
+    },
+    "$max": {
+        "args": "array",
+        "desc": "輸出陣列`array`的最大值。如果`array`不是數值則拋出錯誤。"
+    },
+    "$min": {
+        "args": "array",
+        "desc": "輸出陣列`array`的最小值。如果`array`不是數值則拋出錯誤。。"
+    },
+    "$average": {
+        "args": "array",
+        "desc": "輸出陣列`array`的平均數。如果`array`不是數值則拋出錯誤。。"
+    },
+    "$boolean": {
+        "args": "arg",
+        "desc": "用下述規則將資料轉換成布林值。:\n\n - 不轉換布林值`Boolean`。\n – 將空的字串`string`轉換為`false`\n – 將不為空的字串`string`轉換為`true`\n – 將為0的數位`number`轉換成`false`\n –將不為0的數位`number`轉換成`true`\n –將`null`轉換成`false`\n –將空的陣列`array`轉換成`false`\n –如果陣列`array`中含有可以轉換成`true`的要素則轉換成`true`\n –如果`array`中沒有可轉換成`true`的要素則轉換成`false`\n – 空的物件`object`轉換成`false`\n – 非空的物件`object`轉換成`true`\n –將函數`function`轉換成`false`"
+    },
+    "$not": {
+        "args": "arg",
+        "desc": "輸出做反轉運算後的布林值。首先將`arg`轉換為布林值。"
+    },
+    "$exists": {
+        "args": "arg",
+        "desc": "如果算式`arg`的值存在則輸出`true`。如果算式的值不存在(比如指向不存在區域的引用)則輸出`false`。"
+    },
+    "$count": {
+        "args": "array",
+        "desc": "輸出陣列中的元素數。"
+    },
+    "$append": {
+        "args": "array, array",
+        "desc": "將兩個陣列連接。"
+    },
+    "$sort": {
+        "args": "array [, function]",
+        "desc": "輸出排序後的陣列`array`。\n\n如果使用了比較函數`function`，則下述兩個參數需要被指定。\n\n`function(left, right)`\n\n該比較函數是為了比較left和right兩個值而被排序演算法調用的。如果使用者希望left的值被置於right的值之後，那麼該函數必須輸出布林值`true`來表示位置交換。而在不需要位置交換時函數必須輸出`false`。"
+    },
+    "$reverse": {
+        "args": "array",
+        "desc": "輸出倒序後的陣列`array`。"
+    },
+    "$shuffle": {
+        "args": "array",
+        "desc": "輸出隨機排序後的陣列 `array`。"
+    },
+    "$zip": {
+        "args": "array, ...",
+        "desc": "將陣列中的值按索引順序打包後輸出。"
+    },
+    "$keys": {
+        "args": "object",
+        "desc": "輸出由物件內的鍵組成的陣列。如果參數是物件的陣列則輸出由所有物件中的鍵去重後組成的佇列。"
+    },
+    "$lookup": {
+        "args": "object, key",
+        "desc": "輸出對象中與參數`key`對應的值。如果第一個參數`object`是陣列，那麼陣列中所有的物件都將被搜索並輸出這些物件中與參數`key`對應的值。"
+    },
+    "$spread": {
+        "args": "object",
+        "desc": "將物件中的鍵值對分隔成每個要素中只含有一個鍵值對的陣列。如果參數`object`是陣列，那麼返回值的陣列中包含所有物件中的鍵值對。"
+    },
+    "$merge": {
+        "args": "array&lt;object&gt;",
+        "desc": "將輸入陣列`objects`中所有的鍵值對合併到一個`object`中並返回。如果輸入陣列的要素中含有重複的鍵，則返回的`object`中將只包含陣列中最後出現要素的值。如果輸入陣列中包括物件以外的元素，則拋出錯誤。"
+    },
+    "$sift": {
+        "args": "object, function",
+        "desc": "輸出參數`object`中符合`function`的鍵值對。\n\n`function`必須含有下述參數。\n\n`function(value [, key [, object]])`"
+    },
+    "$each": {
+        "args": "object, function",
+        "desc": "將函數`function`應用於`object`中的所有鍵值對並輸出由所有返回值組成的陣列。"
+    },
+    "$map": {
+        "args": "array, function",
+        "desc": "將函數`function`應用於陣列`array`中所有的值並輸出由返回值組成的陣列。\n\n`function`中必須含有下述參數。\n\n`function(value [, index [, array]])`"
+    },
+    "$filter": {
+        "args": "array, function",
+        "desc": "輸出陣列`array`中符合函數`function`條件的值組成的陣列。\n\n`function`必須包括下述參數。\n\n`function(value [, index [, array]])`"
+    },
+    "$reduce": {
+        "args": "array, function [, init]",
+        "desc": "將`function`依次應用於陣列中的各要素值。 其中，前一個要素值的計算結果將參與到下一次的函數運算中。。\n\n函數`function`接受兩個參數並作為中綴標記法中的操作符。\n\n可省略的參數`init`將作為運算的初始值。"
+    },
+    "$flowContext": {
+        "args": "string",
+        "desc": "獲取流上下文(流等級的上下文，可以讓所有節點共用)的屬性。"
+    },
+    "$globalContext": {
+        "args": "string",
+        "desc": "獲取全域上下文的屬性。"
+    },
+    "$pad": {
+        "args": "string, width [, char]",
+        "desc": "根據需要，向字串`string`的副本中填充文字使該字串的字數達到`width`的絕對值並返回填充文字後的字串。\n\n如果`width`的值為正，則向字串`string`的右側填充文字，如果`width`為負，則向字串`string`的左側填充文字。\n\n可選參數`char`用來指定填充的文字。如果未指定該參數，則填充空白文字。"
+    },
+    "$fromMillis": {
+        "args": "number",
+        "desc": "將表示從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數的數值轉換成ISO 8601形式時間戳記的字串。"
+    },
+    "$formatNumber": {
+        "args": "number, picture [, options]",
+        "desc": "將`number`轉換成具有`picture`所指定的數值格式的字串。\n\n此函數的功能與XPath F&O 3.1規格中定義的XPath/XQuery函數的fn:format-number功能相一致。參數`picture`用於指定數值的轉換格式，其語法與fn:format-number中的定義一致。\n\n可選的第三參數`options`用來覆蓋預設的局部環境格式，如小數點分隔符號。如果指定該參數，那麼該參數必須是包含name/value對的物件，並且name/value對必須符合XPath F&O 3.1規格中記述的數值格式。"
+    },
+    "$formatBase": {
+        "args": "number [, radix]",
+        "desc": "將`number`變換為以參數`radix`的值為基數形式的字串。如果不指定`radix`的值，則默認基數為10。指定的`radix`值必須在2～36之間，否則拋出錯誤。"
+    },
+    "$toMillis": {
+        "args": "timestamp",
+        "desc": "將ISO 8601格式的字串`timestamp`轉換為從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。如果該字串的格式不正確，則拋出錯誤。"
+    }
+}

From 2254e4c57e47d56fe856b694f9b49d0da5bb73fe Mon Sep 17 00:00:00 2001
From: Kunihiko Toumura <kunihiko.toumura.yv@hitachi.com>
Date: Wed, 17 Jul 2019 09:12:47 +0900
Subject: [PATCH 013/305] minor fix (add semicolon)

---
 packages/node_modules/@node-red/editor-client/src/js/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index 36acb4a2c..5099f84d2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -479,7 +479,7 @@ RED.history = (function() {
             }
         },
         list: function() {
-            return undo_history
+            return undo_history;
         },
         depth: function() {
             return undo_history.length;

From 260a9723a4b979450472bb90b2b474ef191ef9bc Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 21 Jul 2019 22:55:25 +0900
Subject: [PATCH 014/305] use custom color picker instead of color input type

---
 .../editor-client/src/js/ui/editor.js         | 145 ++++++++++++++----
 .../editor-client/src/sass/editor.scss        |  20 +++
 2 files changed, 137 insertions(+), 28 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 05d99cac8..026fd76ac 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -948,6 +948,120 @@ RED.editor = (function() {
         searchInput.trigger("focus");
     }
 
+    function createColorPicker(colorRow, color) {
+        var colorSpec = $("<span/>", {
+            class: "red-ui-subflow-color-spec"
+        }).appendTo(colorRow);
+        var colorButton = $("<label/>").appendTo(colorSpec);
+        var colorIcon = $("<span><i class='fa fa-caret-down'/> </span>").css({
+            width: "30px",
+            height: "20px",
+            "padding-left": "15px",
+            "padding-right": "5px"
+        }).appendTo(colorButton);
+        var colorDisp = $("<label/>").css({
+            width: "40px",
+            height: "20px",
+            margin: "6px",
+            "vertical-align": "middle",
+            "background-color": color
+        }).appendTo(colorButton);
+        var selector = $("<input/>", {
+            id: "red-ui-editor-node-color",
+            type: "text",
+            value: color
+        }).css({
+            width: "150px",
+            border: "none"
+        }).appendTo(colorSpec);
+
+        selector.on("change", function (e) {
+            var color = selector.val();
+            colorDisp.css({
+                "background-color": color
+            });
+        });
+        selector.hover(function (e) {
+            selector.css({
+                "border": "solid 1px #ccc"
+            });
+        }, function() {
+            selector.css({
+                "border": "none"
+            });
+        });
+
+        colorButton.on("click", function (e) {
+            var recommendedColors = [
+                "#3FADB5", "#87A980", "#A6BBCF",
+                "#AAAA66", "#C0C0C0", "#C0DEED",
+                "#C7E9C0", "#D7D7A0", "#D8BFD8",
+                "#DAC4B4", "#DEB887", "#DEBD5C",
+                "#E2D96E", "#E6E0F8", "#E7E7AE",
+                "#E9967A", "#F3B567", "#FDD0A2",
+                "#FDF0C2", "#FFAAAA", "#FFCC66",
+                "#FFF0F0", "#FFFFFF"
+            ];
+            var numColors = recommendedColors.length;
+            var width = 58;
+            var height = 28;
+            var picker = $("<div/>", {
+                class: "red-ui-color-picker"
+            }).css({
+                width: (width*4)+"px",
+                height: Math.ceil(numColors/4)*height+"+px"
+            });
+
+            var pickerBackground = $('<div>').css({
+                position: "absolute",
+                top: 0,
+                bottom: 0,
+                left: 0,
+                right: 0,
+                zIndex: 20
+            }).appendTo("body");
+            var colorPos = colorDisp.offset();
+            picker.css({
+                top: (colorPos.top +32) +"px",
+                left: (colorPos.left -20) +"px"
+            }).appendTo("body");
+
+            function hide() {
+                pickerBackground.remove();
+                picker.remove();
+                RED.keyboard.remove("escape");
+            }
+
+            var count = 0;
+            var row = null;
+            recommendedColors.forEach(function (col) {
+                if ((count % 4) == 0) {
+                    row = $("<div/>").appendTo(picker);
+                }
+                var button = $("<button/>", {
+                }).css({
+                    width: "50px",
+                    height: "20px",
+                    margin: "4px",
+                    backgroundColor: col,
+                    "border-style": "none"
+                }).appendTo(row);
+                button.on("click",  function (e) {
+                    e.preventDefault();
+                    hide();
+                    selector.val(col);
+                    selector.change();
+                });
+                count++;
+            });
+
+            RED.keyboard.add("*", "escape", hide);
+            pickerBackground.on("mousedown", hide);
+            pickerBackground.show();
+            picker.show();
+        });                
+    }
+
     function buildAppearanceForm(container,node) {
         var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
 
@@ -1003,38 +1117,13 @@ RED.editor = (function() {
 
         if (node.type === "subflow") {
             // subflow template can select its color
+            var color = node.color ? node.color : "#E9967A";
             var colorRow = $("<div/>", {
                 class: "form-row"
             }).appendTo(dialogForm);
             $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
-            var selector = $("<input/>", {
-                id: "red-ui-editor-node-color",
-                type: "color",
-                value: "#E9967A",
-                list: "red-ui-editor-node-colors"
-            }).css({
-                width: "100px"
-            }).appendTo(colorRow);
-            var colors = $("<datalist id='red-ui-editor-node-colors'>").appendTo(colorRow);
-            var recommendedColors = [
-                "#3FADB5", "#87A980", "#A6BBCF",
-                "#AAAA66", "#C0C0C0", "#C0DEED",
-                "#C7E9C0", "#D7D7A0", "#D8BFD8",
-                "#DAC4B4", "#DEB887", "#DEBD5C",
-                "#E2D96E", "#E6E0F8", "#E7E7AE",
-                "#E9967A", "#F3B567", "#FDD0A2",
-                "#FDF0C2", "#FFAAAA", "#FFCC66",
-                "#FFF0F0", "#FFFFFF"
-            ];
-            recommendedColors.forEach(function (col) {
-                var opt = $("<option>").appendTo(colors);
-                opt.val(col);
-            });
-            if (node.color) {
-                selector.val(node.color);
-            }
-            selector.change();
-        }        
+            createColorPicker(colorRow, color);
+        }
 
         $('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
 
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 6338eb73e..d0d24245b 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -579,3 +579,23 @@ button.red-ui-button-small
 button.red-ui-toggleButton.toggle {
     text-align: left;
 }
+
+.red-ui-color-picker {
+    position: absolute;
+    border: 1px solid $primary-border-color;
+    box-shadow: 0 1px 6px -3px black;
+    background: $secondary-background;
+    z-Index: 21;
+    display: none;
+}
+
+.red-ui-subflow-color-spec {
+    width: fit-content;
+    height: fit-content;
+    padding-top: 8px;
+    padding-bottom: 10px;
+    padding-left: 0px;
+    padding-right: 0px;
+    border: solid 1px $primary-border-color;
+    border-radius: 2px;
+}

From 14ac6446de3742184ba97b1b2c2113264fb24a6d Mon Sep 17 00:00:00 2001
From: Tyler Eastman <tyler.eastman@gmail.com>
Date: Mon, 22 Jul 2019 14:25:52 -0700
Subject: [PATCH 015/305] Handle undefined node._def in edit stack title.

---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 1f4cf0ae9..e8c4b9b63 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -517,7 +517,7 @@ RED.editor = (function() {
             } else if (node.type.indexOf("subflow:")===0) {
                 var subflow = RED.nodes.subflow(node.type.substring(8));
                 label = RED._("subflow.editSubflowInstance",{name:RED.utils.sanitize(subflow.name)})
-            } else {
+            } else if (node._def !== undefined) {
                 if (typeof node._def.paletteLabel !== "undefined") {
                     try {
                         label = RED.utils.sanitize((typeof node._def.paletteLabel === "function" ? node._def.paletteLabel.call(node._def) : node._def.paletteLabel)||"");

From 2f5ec8b5bf4a0b1af7d2c806c09a66e1adbb9148 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 26 Jul 2019 17:51:49 +0900
Subject: [PATCH 016/305] Fix inserting new subflow node to existing wire
 between nodes

---
 .../@node-red/editor-client/src/js/ui/palette.js             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 28d5af46e..c50af60d0 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -243,7 +243,6 @@ RED.palette = (function() {
                 RED.sidebar.info.set(helpText,RED._("sidebar.info.nodeHelp"));
             });
             var chart = $("#chart");
-            var chartOffset = chart.offset();
             var chartSVG = $("#chart>svg").get(0);
             var activeSpliceLink;
             var mouseX;
@@ -267,8 +266,8 @@ RED.palette = (function() {
                     ui.originalPosition.left = $('#' + e.target.id).offset().left;
 
                     if (def.inputs > 0 && def.outputs > 0) {
-                        mouseX = ui.position.left-paletteWidth+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();
-                        mouseY = ui.position.top-paletteTop+(ui.helper.height()/2) - chartOffset.top + chart.scrollTop();
+                        mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
+                        mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop();
                         if (!spliceTimer) {
                             spliceTimer = setTimeout(function() {
                                 var nodes = [];

From 86928bbb2d41c3a927a25cd7c3d5b7d003e99950 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 26 Jul 2019 23:06:56 +0900
Subject: [PATCH 017/305] fix converting selection to subflow

---
 .../@node-red/editor-client/src/js/nodes.js         | 13 +++++++++++++
 .../@node-red/editor-client/src/js/ui/subflow.js    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 63027aed1..c14126a00 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -301,6 +301,17 @@ RED.nodes = (function() {
         return {links:removedLinks,nodes:removedNodes};
     }
 
+    function moveNodeToTab(node, z) {
+        if (nodeTabMap[node.z]) {
+            delete nodeTabMap[node.z][node.id];
+        }
+        if (!nodeTabMap[z]) {
+            nodeTabMap[z] = {};
+        }
+        nodeTabMap[z][node.iz] = node;
+        node.z = z;
+    }
+    
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -1466,6 +1477,8 @@ RED.nodes = (function() {
         remove: removeNode,
         clear: clear,
 
+        moveNodeToTab: moveNodeToTab,
+        
         addLink: addLink,
         removeLink: removeLink,
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index e136f7df6..a8be067d6 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -723,7 +723,7 @@ RED.subflow = (function() {
             }
             n.x -= offsetX;
             n.y -= offsetY;
-            n.z = subflow.id;
+            RED.nodes.moveNodeToTab(n, subflow.id);
         }
 
         RED.history.push({

From 5ab90b85dae8bfba8e9b2eedd7fd20cc3134faf7 Mon Sep 17 00:00:00 2001
From: Ben Hardill <hardillb@gmail.com>
Date: Thu, 25 Jul 2019 17:18:59 +0100
Subject: [PATCH 018/305] Limit the regex for the /nodes/ api end points

fixes #2240

It looks like the regex for the /nodes/... endpoints over matches.

I've added `^` to the start to anchor the matches to the start of the
URL.
---
 .../@node-red/editor-api/lib/admin/index.js        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/index.js b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
index 32bf010c5..50d7b168f 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
@@ -48,13 +48,13 @@ module.exports = {
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,apiUtil.errorHandler);
         adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
-        adminApp.delete(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
+        adminApp.delete(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
 
         // Context
         adminApp.get("/context/:scope(global)",needsPermission("context.read"),context.get,apiUtil.errorHandler);

From cbce9b8637f818a179ed9b4998e1cb19470d17cc Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 30 Jul 2019 11:07:55 +0900
Subject: [PATCH 019/305] fix undo handling & typo

---
 packages/node_modules/@node-red/editor-client/src/js/history.js | 2 ++
 packages/node_modules/@node-red/editor-client/src/js/nodes.js   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index 930598dd5..f0e248689 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -276,11 +276,13 @@ RED.history = (function() {
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
                 if (ev.nodes) {
+                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        RED.nodes.moveNodeToTab(n, z);
                     });
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.remove(ev.nodes[i]);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index c14126a00..2a800322b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -308,7 +308,7 @@ RED.nodes = (function() {
         if (!nodeTabMap[z]) {
             nodeTabMap[z] = {};
         }
-        nodeTabMap[z][node.iz] = node;
+        nodeTabMap[z][node.id] = node;
         node.z = z;
     }
     

From b9e97792f348b3698c4cb21ecc63b1a2aff50d12 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 30 Jul 2019 19:52:28 +0900
Subject: [PATCH 020/305] Fix wrong variable name

---
 CHANGELOG.md                               | 2 +-
 packages/node_modules/node-red/settings.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6de1ce2..b1bdc154c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -677,7 +677,7 @@ Nodes
  - Initial support of sequence rules for SWITCH node (#1545)
  - initial support of SORT node (#1500)
  - Inject node - let once delay be editable (#1541)
- - Introduce `nodeMaxMessageBufferLength` setting for msg sequence nodes
+ - Introduce `nodeMessageBufferMaxLength` setting for msg sequence nodes
  - Let CSV correct parts if we remove header row.
  - let default apply if msg.delay not set in override mode. (#1397)
  - let trigger node be reset by boolean message (#1554)
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index a15e533c5..679d24065 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -55,7 +55,7 @@ module.exports = {
     // The maximum number of messages nodes will buffer internally as part of their
     // operation. This applies across a range of nodes that operate on message sequences.
     //  defaults to no limit. A value of 0 also means no limit is applied.
-    //nodeMaxMessageBufferLength: 0,
+    //nodeMessageBufferMaxLength: 0,
 
     // To disable the option for using local files for storing keys and certificates in the TLS configuration
     //  node, set this to true

From 45c7f3f3caab8763c94fa14a7241b94a2f1dbedb Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 30 Jul 2019 23:06:18 +0100
Subject: [PATCH 021/305] Update
 packages/node_modules/@node-red/nodes/core/logic/10-switch.html

---
 packages/node_modules/@node-red/nodes/core/logic/10-switch.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 140448f28..3687ae484 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -1,4 +1,4 @@
-has<!--
+<!--
   Copyright JS Foundation and other contributors, http://js.foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");

From 0ad3eceb82f78596841f1b9f4ffcb5c58c279652 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 31 Jul 2019 16:06:30 +0900
Subject: [PATCH 022/305] Remove unused variables

---
 packages/node_modules/@node-red/nodes/core/logic/10-switch.html | 1 -
 packages/node_modules/@node-red/nodes/core/logic/15-change.html | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 65e83ca09..3cd3fb032 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -352,7 +352,6 @@
         },
         oneditsave: function() {
             var rules = $("#node-input-rule-container").editableList('items');
-            var ruleset;
             var node = this;
             node.rules = [];
             rules.each(function(i) {
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.html b/packages/node_modules/@node-red/nodes/core/logic/15-change.html
index d60c8c38e..0731fce75 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/15-change.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/15-change.html
@@ -226,7 +226,6 @@
         },
         oneditsave: function() {
             var rules = $("#node-input-rule-container").editableList('items');
-            var ruleset;
             var node = this;
             node.rules= [];
             rules.each(function(i) {

From db65460ec00c649bfe12576a033b00578c07ff4a Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 31 Jul 2019 22:59:29 +0900
Subject: [PATCH 023/305] fix SUBFLOW palette node update & SUBFLOW default
 color

---
 .../@node-red/editor-client/src/js/ui/editor.js    |  3 +--
 .../@node-red/editor-client/src/js/ui/palette.js   | 14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 026fd76ac..2e3412e9b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1117,7 +1117,7 @@ RED.editor = (function() {
 
         if (node.type === "subflow") {
             // subflow template can select its color
-            var color = node.color ? node.color : "#E9967A";
+            var color = node.color ? node.color : "#da9";
             var colorRow = $("<div/>", {
                 class: "form-row"
             }).appendTo(dialogForm);
@@ -2309,7 +2309,6 @@ RED.editor = (function() {
                             changes.color = newColor;
                             changed = true;
                             RED.utils.clearNodeColorCache();
-                            RED.palette.changeSubflowColor(editing_node, newColor);
                         }
 
                         var old_env = editing_node.env;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 7eaa914b7..ae78b2e1d 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -429,10 +429,9 @@ RED.palette = (function() {
                         currentCategoryNode.find("i").toggleClass("expanded");
                     }
                 }
-
-
-
             }
+
+            paletteNode.css("backgroundColor", sf.color);
         });
     }
 
@@ -593,12 +592,6 @@ RED.palette = (function() {
         setTimeout(function() { $(window).trigger("resize"); } ,200);
     }
 
-    function changeSubflowColor(sf, color) {
-        var paletteNode = getPaletteNode('subflow:'+sf.id);
-        paletteNode.css("backgroundColor", color);
-    }
-
-
     function getCategories() {
         var categories = [];
         $("#red-ui-palette-container .red-ui-palette-category").each(function(i,d) {
@@ -613,7 +606,6 @@ RED.palette = (function() {
         hide:hideNodeType,
         show:showNodeType,
         refresh:refreshNodeTypes,
-        getCategories: getCategories,
-        changeSubflowColor: changeSubflowColor
+        getCategories: getCategories
     };
 })();

From fe18df25ba74ff596f846f80234fbfe7945dea9b Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 1 Aug 2019 20:50:35 +0900
Subject: [PATCH 024/305] Add Japanese translation to delay node

---
 .../@node-red/nodes/locales/en-US/core/89-delay.html | 12 ++++++------
 .../@node-red/nodes/locales/ja/core/89-delay.html    |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html
index 87deebe2b..d6977a34a 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html
@@ -22,12 +22,12 @@
         <dd>Sets the delay, in milliseconds, to be applied to the message. This
             option only applies if the node is configured to allow the message to
             override the configured default delay interval.</dd>
-            <dt class="optional">reset</dt>
-            <dd>If the received message has this property set to any value, all
-                outstanding messages held by the node are cleared without being sent.</dd>
-            <dt class="optional">flush</dt>
-            <dd>If the received message has this property set to any value, all
-                outstanding messages held by the node are sent immediately.</dd>
+        <dt class="optional">reset</dt>
+        <dd>If the received message has this property set to any value, all
+            outstanding messages held by the node are cleared without being sent.</dd>
+        <dt class="optional">flush</dt>
+        <dd>If the received message has this property set to any value, all
+            outstanding messages held by the node are sent immediately.</dd>
     </dl>
     <h3>Details</h3>
     <p>When configured to delay messages, the delay interval can be a fixed value,
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html
index 43eda93a7..ed5046f03 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html
@@ -22,6 +22,8 @@
         <dd>メッセージの遅延時間をミリ秒単位で設定します。これはノードの設定でデフォルトの遅延時間を上書きできるようノードを設定した場合にのみ適用します。</dd>
         <dt class="optional">reset</dt>
         <dd>受信メッセージでこのプロパティを任意の値に設定すると、ノードが保持する全ての未送信メッセージをクリアします。</dd>
+        <dt class="optional">flush</dt>
+        <dd>受信メッセージでこのプロパティを任意の値に設定すると、ノードが保持する全ての未送信メッセージを直ちに送信します。</dd>
     </dl>
     <h3>詳細</h3>
     <p>メッセージを遅延させるように設定する場合、遅延時間は固定値、範囲内の乱数値、メッセージ毎の動的な指定値のいずれかを指定できます。</p>

From 3a6448f727173fed1bc0e4c48e63118d8445ef14 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 2 Aug 2019 13:56:37 +0900
Subject: [PATCH 025/305] Fix splitters in split node

---
 packages/node_modules/@node-red/nodes/core/logic/17-split.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.js b/packages/node_modules/@node-red/nodes/core/logic/17-split.js
index c644b9e36..869fbaa3d 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/17-split.js
+++ b/packages/node_modules/@node-red/nodes/core/logic/17-split.js
@@ -42,7 +42,7 @@ module.exports = function(RED) {
         node.addname = n.addname || "";
         try {
             if (node.spltType === "str") {
-                this.splt = (n.splt || "\\n").replace(/\\n/,"\n").replace(/\\r/,"\r").replace(/\\t/,"\t").replace(/\\e/,"\e").replace(/\\f/,"\f").replace(/\\0/,"\0");
+                this.splt = (n.splt || "\\n").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\t/g,"\t").replace(/\\e/g,"\e").replace(/\\f/g,"\f").replace(/\\0/g,"\0");
             } else if (node.spltType === "bin") {
                 var spltArray = JSON.parse(n.splt);
                 if (Array.isArray(spltArray)) {

From b749a27f864869eab519ef3f61165a8021bda37d Mon Sep 17 00:00:00 2001
From: Kunihiko Toumura <kunihiko.toumura.yv@hitachi.com>
Date: Mon, 5 Aug 2019 10:20:46 +0900
Subject: [PATCH 026/305] Eliminate snake_case and use camelCase, and change
 assignment of keyboard shortcut

---
 .../@node-red/editor-client/src/js/history.js | 186 +++++++++---------
 .../editor-client/src/js/keymap.json          |   6 +-
 2 files changed, 93 insertions(+), 99 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index d8a3ae1e7..c015716c2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  **/
 RED.history = (function() {
-    var undo_history = [];
-    var redo_history = [];
+    var undoHistory = [];
+    var redoHistory = [];
 
     function undoEvent(ev) {
         var i;
@@ -23,20 +23,20 @@ RED.history = (function() {
         var node;
         var subflow;
         var modifiedTabs = {};
-        var inv_ev;
+        var inverseEv;
         if (ev) {
             if (ev.t == 'multi') {
-                inv_ev = {
+                inverseEv = {
                     t: 'multi',
                     events: []
                 };                
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
                     var r = undoEvent(ev.events[i]);
-                    inv_ev.events.push(r);
+                    inverseEv.events.push(r);
                 }
             } else if (ev.t == 'replace') {
-                inv_ev = {
+                inverseEv = {
                     t: 'replace',
                     config: RED.nodes.createCompleteNodeSet(),
                     changed: [],
@@ -47,57 +47,57 @@ RED.history = (function() {
                 imported[0].forEach(function(n) {
                     if (ev.changed[n.id]) {
                         n.changed = true;
-                        inv_ev.changed[n.id] = true;
+                        inverseEv.changed[n.id] = true;
                     }
                 })
 
                 RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
-                inv_ev = {
+                inverseEv = {
                     t: "delete",
                 };
                 if (ev.nodes) {
-                    inv_ev.nodes = [];
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         node = RED.nodes.node(ev.nodes[i]);
                         if (node.z) {
                             modifiedTabs[node.z] = true;
                         }
-                        inv_ev.nodes.push(node);
+                        inverseEv.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inv_ev.links.push(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.workspaces) {
-                    inv_ev.workspaces = [];
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
                         var workspaceOrder = RED.nodes.getWorkspaceOrder();
                         ev.workspaces[i]._index = workspaceOrder.indexOf(ev.workspaces[i].id);
-                        inv_ev.workspaces.push(ev.workspaces[i]);
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.removeWorkspace(ev.workspaces[i].id);
                         RED.workspaces.remove(ev.workspaces[i]);
                     }
                 }
                 if (ev.subflows) {
-                    inv_ev.subflows = [];
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
-                        inv_ev.subflows.push(ev.subflows[i]);
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.removeSubflow(ev.subflows[i]);
                         RED.workspaces.remove(ev.subflows[i]);
                     }
                 }
                 if (ev.subflow) {
-                    inv_ev.subflow = {};
+                    inverseEv.subflow = {};
                     if (ev.subflow.instances) {
-                        inv_ev.subflow.instances = [];
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
-                            inv_ev.subflow.instances.push(n);
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -113,30 +113,30 @@ RED.history = (function() {
                     }
                 }
                 if (ev.removedLinks) {
-                    inv_ev.createdLinks = [];
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inv_ev.createdLinks.push(ev.removedLinks[i]);
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
 
             } else if (ev.t == "delete") {
-                inv_ev = {
+                inverseEv = {
                     t: "add"
                 };
                 if (ev.workspaces) {
-                    inv_ev.workspaces = [];
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
-                        inv_ev.workspaces.push(ev.workspaces[i]);
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.addWorkspace(ev.workspaces[i],ev.workspaces[i]._index);
                         RED.workspaces.add(ev.workspaces[i],undefined,ev.workspaces[i]._index);
                         delete ev.workspaces[i]._index;
                     }
                 }
                 if (ev.subflows) {
-                    inv_ev.subflows = [];
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
-                        inv_ev.subflows.push(ev.subflows[i]);
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.addSubflow(ev.subflows[i]);
                     }
                 }
@@ -165,11 +165,11 @@ RED.history = (function() {
                     }
                 }
                 if (ev.subflow) {
-                    inv_ev.subflow = {};
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('instances')) {
-                        inv_ev.subflow.instances = [];
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
-                            inv_ev.subflow.instances.push(n);
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -194,24 +194,24 @@ RED.history = (function() {
                     });
                 }
                 if (ev.nodes) {
-                    inv_ev.nodes = [];
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
-                        inv_ev.nodes.push(ev.nodes[i].id);
+                        inverseEv.nodes.push(ev.nodes[i].id);
                     }
                 }
                 if (ev.links) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
-                        inv_ev.links.push(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
                     }
                 }
                 if (ev.createdLinks) {
-                    inv_ev.removedLinks = [];
+                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.createdLinks.length;i++) {
-                        inv_ev.removedLinks.push(ev.createdLinks[i]);
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
                         RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
@@ -232,14 +232,14 @@ RED.history = (function() {
 
                 }
             } else if (ev.t == "move") {
-                inv_ev = {
+                inverseEv = {
                     t: 'move',
                     nodes: []
                 };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
                     var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
-                    inv_ev.nodes.push(rn);
+                    inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
                     n.n.dirty = true;
@@ -247,28 +247,28 @@ RED.history = (function() {
                 }
                 // A move could have caused a link splice
                 if (ev.links) {
-                    inv_ev.removedLinks = [];
+                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inv_ev.removedLinks.push(ev.links[i]);
+                        inverseEv.removedLinks.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.removedLinks) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inv_ev.links.push(ev.removedLinks[i]);
+                        inverseEv.links.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "edit") {
-                inv_ev = {
+                inverseEv = {
                     t: "edit",
                     changes: {}
                 };
-                inv_ev.node = ev.node;
+                inverseEv.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
-                        inv_ev.changes[i] = ev.node[i];
+                        inverseEv.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
                             // This is a config node property
                             var currentConfigNode = RED.nodes.node(ev.node[i]);
@@ -288,29 +288,29 @@ RED.history = (function() {
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
                 }
                 if (ev.subflow) {
-                    inv_ev.subflow = {};
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('inputCount')) {
-                        inv_ev.subflow.inputCount = ev.node.in.length;
+                        inverseEv.subflow.inputCount = ev.node.in.length;
                         if (ev.node.in.length > ev.subflow.inputCount) {
-                            inv_ev.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
+                            inverseEv.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
                             ev.node.in.splice(ev.subflow.inputCount);
                         } else if (ev.subflow.inputs.length > 0) {
                             ev.node.in = ev.node.in.concat(ev.subflow.inputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('outputCount')) {
-                        inv_ev.subflow.outputCount = ev.node.out.length;
+                        inverseEv.subflow.outputCount = ev.node.out.length;
                         if (ev.node.out.length > ev.subflow.outputCount) {
-                            inv_ev.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
+                            inverseEv.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
                             ev.node.out.splice(ev.subflow.outputCount);
                         } else if (ev.subflow.outputs.length > 0) {
                             ev.node.out = ev.node.out.concat(ev.subflow.outputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('instances')) {
-                        inv_ev.subflow.instances = [];
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
-                            inv_ev.subflow.instances.push(n);
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -334,11 +334,11 @@ RED.history = (function() {
                     var outputMap;
                     if (ev.outputMap) {
                         outputMap = {};
-                        inv_ev.outputMap = {};
+                        inverseEv.outputMap = {};
                         for (var port in ev.outputMap) {
                             if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
                                 outputMap[ev.outputMap[port]] = port;
-                                inv_ev.outputMap[ev.outputMap[port]] = port;
+                                inverseEv.outputMap[ev.outputMap[port]] = port;
                             }
                         }
                     }
@@ -346,84 +346,78 @@ RED.history = (function() {
                     RED.editor.validateNode(ev.node);
                 }
                 if (ev.links) {
-                    inv_ev.createdLinks = [];
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
-                        inv_ev.createdLinks.push(ev.links[i]);
+                        inverseEv.createdLinks.push(ev.links[i]);
                     }
                 }
                 if (ev.createdLinks) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.createdLinks.length;i++) {
                         RED.nodes.removeLink(ev.createdLinks[i]);
-                        inv_ev.links.push(ev.createdLinks[i]);
+                        inverseEv.links.push(ev.createdLinks[i]);
                     }
                 }
                 ev.node.dirty = true;
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
-                inv_ev = {
+                inverseEv = {
                     t: "deleteSubflow",
                     activeWorkspace: ev.activeWorkspace,
                     dirty: RED.nodes.dirty()
                 };
                 if (ev.nodes) {
-<<<<<<< HEAD
-                    inv_ev.movedNodes = [];
-=======
+                    inverseEv.movedNodes = [];
                     var z = ev.activeWorkspace;
->>>>>>> upstream/dev
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.z = ev.activeWorkspace;
                         n.dirty = true;
-<<<<<<< HEAD
-                        inv_ev.movedNodes.push(n.id);
-=======
+                        inverseEv.movedNodes.push(n.id);
                         RED.nodes.moveNodeToTab(n, z);
->>>>>>> upstream/dev
                     });
-                    inv_ev.subflows = [];
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
-                        inv_ev.subflows.push(RED.nodes.node(ev.nodes[i]));
+                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inv_ev.links.push(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
 
-                inv_ev.subflow = ev.subflow;
+                inverseEv.subflow = ev.subflow;
                 RED.nodes.removeSubflow(ev.subflow.subflow);
                 RED.workspaces.remove(ev.subflow.subflow);
 
                 if (ev.removedLinks) {
-                    inv_ev.createdLinks = [];
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
-                        inv_ev.createdLinks.push(ev.removedLinks[i]);
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "deleteSubflow") {
-                inv_ev = {
+                inverseEv = {
                     t: "createSubflow",
                     activeWorkspace: ev.activeWorkspace,
                     ditry: RED.nodes.dirty(),
                 };
                 if (ev.subflow) {
                     RED.nodes.addSubflow(ev.subflow.subflow);
-                    inv_ev.subflow = ev.subflow;
+                    inverseEv.subflow = ev.subflow;
                 }
                 if (ev.subflows) {
-                    inv_ev.nodes = [];
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.subflows.length;i++) {
                         RED.nodes.add(ev.subflows[i]);
-                        inv_ev.nodes.push(ev.subflows[i].id);
+                        inverseEv.nodes.push(ev.subflows[i].id);
                     }
                 }
                 if (ev.movedNodes) {
@@ -436,21 +430,21 @@ RED.history = (function() {
                     });
                 }
                 if (ev.links) {
-                    inv_ev.links = [];
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
-                        inv_ev.links.push(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.addLink(ev.links[i]);
                     }
                 }
                 if  (ev.createdLinks) {
-                    inv_ev.removedLinks = [];
+                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.createdLinks.length;i++) {
-                        inv_ev.removedLinks.push(ev.createdLinks[i]);
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
                         RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
             } else if (ev.t == "reorder") {
-                inv_ev = {
+                inverseEv = {
                     t: 'reorder',
                     order: RED.nodes.getWorkspaceOrder()
                 };                
@@ -474,7 +468,7 @@ RED.history = (function() {
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
 
-            return inv_ev;
+            return inverseEv;
         }
 
     }
@@ -482,40 +476,40 @@ RED.history = (function() {
     return {
         //TODO: this function is a placeholder until there is a 'save' event that can be listened to
         markAllDirty: function() {
-            for (var i=0;i<undo_history.length;i++) {
-                undo_history[i].dirty = true;
+            for (var i=0;i<undoHistory.length;i++) {
+                undoHistory[i].dirty = true;
             }
         },
         list: function() {
-            return undo_history;
+            return undoHistory;
         },
         depth: function() {
-            return undo_history.length;
+            return undoHistory.length;
         },
         push: function(ev) {
-            undo_history.push(ev);
-            redo_history = [];
+            undoHistory.push(ev);
+            redoHistory = [];
         },
         pop: function() {
-            var ev = undo_history.pop();
+            var ev = undoHistory.pop();
             var rev = undoEvent(ev);
             if (rev) {
-                redo_history.push(rev);
+                redoHistory.push(rev);
             }
         },
         peek: function() {
-            return undo_history[undo_history.length-1];
+            return undoHistory[undoHistory.length-1];
         },
         clear: function() {
-            undo_history = [];
-            redo_history = [];
+            undoHistory = [];
+            redoHistory = [];
         },
         redo: function() {
-            var ev = redo_history.pop();
+            var ev = redoHistory.pop();
             if (ev) {
                 var uev = undoEvent(ev);
                 if (uev) {
-                    undo_history.push(uev);
+                    undoHistory.push(uev);
                 }
             }
         }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
index 870cc89e6..2677321b7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -31,7 +31,7 @@
         "delete": "core:delete-config-selection",
         "ctrl-a": "core:select-all-config-nodes",
         "ctrl-z": "core:undo",
-        "ctrl-shift-z": "core:redo"
+        "ctrl-y": "core:redo"
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
@@ -41,6 +41,7 @@
         "ctrl-x": "core:cut-selection-to-internal-clipboard",
         "ctrl-v": "core:paste-from-internal-clipboard",
         "ctrl-z": "core:undo",
+        "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
         "up": "core:move-selection-up",
@@ -52,7 +53,6 @@
         "shift-down": "core:step-selection-down",
         "shift-left": "core:step-selection-left",
         "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab",
-        "ctrl-shift-z": "core:redo"
+        "ctrl-shift-k": "core:show-next-tab"
      }
 }

From 9d66ca4a498a9ef3ccb940ac8c80a66f100f7484 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 5 Aug 2019 19:03:30 +0900
Subject: [PATCH 027/305] Fix duplicated tooltip

---
 .../@node-red/editor-client/src/js/ui/tab-context.js          | 2 +-
 .../@node-red/nodes/core/core/lib/debug/debug-utils.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
index b62ad13c3..916fa711f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
@@ -37,7 +37,7 @@ RED.sidebar.context = (function() {
         //     '</div>').appendTo(content);
 
         var footerToolbar = $('<div>'+
-            // '<span class="button-group"><a class="sidebar-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
+            // '<span class="button-group"><a class="sidebar-footer-button" href="#"><i class="fa fa-desktop"></i></a></span> ' +
             '</div>');
 
 
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
index edc349507..980f18790 100644
--- a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
@@ -42,14 +42,14 @@ RED.debug = (function() {
         var content = $("<div>").css({"position":"relative","height":"100%"});
         var toolbar = $('<div class="sidebar-header">'+
             '<span class="button-group"><a id="debug-tab-filter" class="sidebar-header-button" href="#"><i class="fa fa-filter"></i> <span></span></a></span>'+
-            '<span class="button-group"><a id="debug-tab-clear" class="sidebar-header-button" href="#" data-i18n="[title]node-red:debug.sidebar.clearLog"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
+            '<span class="button-group"><a id="debug-tab-clear" class="sidebar-header-button" href="#"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
 
         var footerToolbar = $('<div>'+
             // '<span class="button-group">'+
             //     '<a class="sidebar-footer-button-toggle text-button selected" id="debug-tab-view-list" href="#"><span data-i18n="">list</span></a>'+
             //     '<a class="sidebar-footer-button-toggle text-button" id="debug-tab-view-table" href="#"><span data-i18n="">table</span></a> '+
             // '</span>'+
-            '<span class="button-group"><a id="debug-tab-open" class="sidebar-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
+            '<span class="button-group"><a id="debug-tab-open" class="sidebar-footer-button" href="#"><i class="fa fa-desktop"></i></a></span> ' +
             '</div>');
 
         messageList = $('<div class="debug-content debug-content-list"/>').appendTo(content);

From 15b99c574980357eb3414da6533a7f0cf0ef1295 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 6 Aug 2019 19:24:45 +0900
Subject: [PATCH 028/305] Use appropriate the version of Node.js

---
 packages/node_modules/@node-red/runtime/lib/index.js | 2 +-
 packages/node_modules/node-red/lib/red.js            | 6 +++---
 packages/node_modules/node-red/red.js                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index 58b7df986..66bff6ff2 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -129,7 +129,7 @@ function start() {
             log.info(log._("runtime.version",{component:"Node.js ",version:process.version}));
             if (settings.UNSUPPORTED_VERSION) {
                 log.error("*****************************************************************");
-                log.error("* "+log._("runtime.unsupported_version",{component:"Node.js",version:process.version,requires: ">=4"})+" *");
+                log.error("* "+log._("runtime.unsupported_version",{component:"Node.js",version:process.version,requires: ">=8.9.0"})+" *");
                 log.error("*****************************************************************");
                 events.emit("runtime-event",{id:"runtime-unsupported-version",payload:{type:"error",text:"notification.errors.unsupportedVersion"},retain:true});
             }
diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
index 2a04df578..4d7269518 100644
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -27,9 +27,9 @@ var apiEnabled = false;
 
 function checkVersion(userSettings) {
     var semver = require('semver');
-    if (!semver.satisfies(process.version,">=4.8.0")) {
+    if (!semver.satisfies(process.version,">=8.9.0")) {
         // TODO: in the future, make this a hard error.
-        // var e = new Error("Unsupported version of node.js");
+        // var e = new Error("Unsupported version of Node.js");
         // e.code = "unsupported_version";
         // throw e;
         userSettings.UNSUPPORTED_VERSION = process.version;
@@ -39,7 +39,7 @@ function checkVersion(userSettings) {
  * This module provides the full Node-RED application, with both the runtime
  * and editor components built in.
  *
- * The API this module exposes allows it to be embedded within another node.js
+ * The API this module exposes allows it to be embedded within another Node.js
  * application.
  *
  * @namespace node-red
diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js
index 337eb44e8..040f2db53 100755
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -197,8 +197,8 @@ try {
     RED.init(server,settings);
 } catch(err) {
     if (err.code == "unsupported_version") {
-        console.log("Unsupported version of node.js:",process.version);
-        console.log("Node-RED requires node.js v4 or later");
+        console.log("Unsupported version of Node.js:",process.version);
+        console.log("Node-RED requires Node.js v8.9.0 or later");
     } else if (err.code == "not_built") {
         console.log("Node-RED has not been built. See README.md for details");
     } else {

From fe91295704fcc313139256b3b673031d6e9720fa Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 6 Aug 2019 19:27:46 +0900
Subject: [PATCH 029/305] Replace node.js with Node.js

---
 .github/ISSUE_TEMPLATE.md              | 2 +-
 .github/ISSUE_TEMPLATE/--bug_report.md | 2 +-
 CONTRIBUTING.md                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5d4d87bb7..07efaf18e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -28,7 +28,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:
diff --git a/.github/ISSUE_TEMPLATE/--bug_report.md b/.github/ISSUE_TEMPLATE/--bug_report.md
index ff13e2ace..63923455e 100644
--- a/.github/ISSUE_TEMPLATE/--bug_report.md
+++ b/.github/ISSUE_TEMPLATE/--bug_report.md
@@ -33,7 +33,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 33a2f582f..f0f4096c5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:
 
  - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of node.js - what does `node -v` say?
+ - Version of Node.js - what does `node -v` say?
 
 ## Feature requests
 

From fde85481666c7da333599d1d07c3b643ce59d536 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 6 Aug 2019 19:30:05 +0900
Subject: [PATCH 030/305] Remove handling for unused error code

---
 packages/node_modules/node-red/red.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js
index 040f2db53..94cebdfaa 100755
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -199,8 +199,6 @@ try {
     if (err.code == "unsupported_version") {
         console.log("Unsupported version of Node.js:",process.version);
         console.log("Node-RED requires Node.js v8.9.0 or later");
-    } else if (err.code == "not_built") {
-        console.log("Node-RED has not been built. See README.md for details");
     } else {
         console.log("Failed to start server:");
         if (err.stack) {

From 2505ac3f9815a57a45cd3065ff678475cc6c57ae Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 6 Aug 2019 19:57:39 +0900
Subject: [PATCH 031/305] Update Japanese message catalog

---
 .../editor-client/locales/ja/editor.json      | 28 +++++++++++++------
 .../@node-red/nodes/locales/ja/messages.json  | 11 ++++++--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 770c75589..9d6ceaf6a 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -80,7 +80,7 @@
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
-            "showNodeLabelDefault": "追加したノードのラベルを表示する"
+            "showNodeLabelDefault": "追加したノードのラベルを表示"
         }
     },
     "actions": {
@@ -351,7 +351,8 @@
         "pasteNode": "ノードを貼り付け",
         "undoChange": "変更操作を戻す",
         "searchBox": "ノードを検索",
-        "managePalette": "パレットの管理"
+        "managePalette": "パレットの管理",
+        "actionList": "動作一覧"
     },
     "library": {
         "library": "ライブラリ",
@@ -527,11 +528,13 @@
             "none": "選択されていません",
             "refresh": "読み込みのため更新してください",
             "empty": "データが存在しません",
-            "node": "Node",
-            "flow": "Flow",
-            "global": "Global",
+            "node": "ノード",
+            "flow": "フロー",
+            "global": "グローバル",
             "deleteConfirm": "データを削除しても良いですか?",
-            "autoRefresh": "自動更新"
+            "autoRefresh": "自動更新",
+            "refrsh": "更新",
+            "delete": "削除"
         },
         "palette": {
             "name": "パレットの管理",
@@ -736,7 +739,16 @@
     },
     "jsonEditor": {
         "title": "JSONエディタ",
-        "format": "JSONフォーマット"
+        "format": "JSONフォーマット",
+        "rawMode": "JSONを編集",
+        "uiMode": "ビジュアルエディタ",
+        "insertAbove": "上に挿入",
+        "insertBelow": "下に挿入",
+        "addItem": "要素を追加",
+        "copyPath": "要素のパスをコピー",
+        "expandItems": "要素を展開",
+        "collapseItems": "要素を折り畳む",
+        "duplicate": "複製"
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
@@ -930,7 +942,7 @@
         "appearance": "外観",
         "env": "環境変数"
     },
-    "languages" : {
+    "languages": {
         "de": "ドイツ語",
         "en-US": "英語",
         "ja": "日本語",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index ef899908e..1f244d824 100755
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -7,7 +7,8 @@
             "username": "ユーザ名",
             "password": "パスワード",
             "property": "プロパティ",
-            "selectNodes": "ノードを選択..."
+            "selectNodes": "ノードを選択...",
+            "expand": "展開"
         },
         "status": {
             "connected": "接続済",
@@ -137,7 +138,10 @@
             "debugNodes": "debugノード",
             "clearLog": "ログを削除",
             "filterLog": "ログのフィルタリング",
-            "openWindow": "新しいウィンドウで開く"
+            "openWindow": "新しいウィンドウで開く",
+            "copyPath": "パスをコピー",
+            "copyPayload": "値をコピー",
+            "pinPath": "展開を固定"
         },
         "messageMenu": {
             "collapseAll": "全パスを折りたたむ",
@@ -615,7 +619,8 @@
             "tail": "tail",
             "index": "index between",
             "exp": "JSONata式",
-            "else": "その他"
+            "else": "その他",
+            "hask": "has key"
         },
         "errors": {
             "invalid-expr": "不正な表現: __error__",

From fb9828badc7c2b859cea6790569a08a0529246f1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 14:27:56 +0100
Subject: [PATCH 032/305] Update Function node to add node.done

---
 .../@node-red/nodes/core/core/80-function.js  |  34 ++--
 .../@node-red/runtime/lib/nodes/Node.js       | 147 +++++++++++++++++-
 2 files changed, 169 insertions(+), 12 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/core/80-function.js
index 8347433a5..ae6fae9bb 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.js
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.js
@@ -19,7 +19,7 @@ module.exports = function(RED) {
     var util = require("util");
     var vm = require("vm");
 
-    function sendResults(node,_msgid,msgs) {
+    function sendResults(node,send,_msgid,msgs) {
         if (msgs == null) {
             return;
         } else if (!util.isArray(msgs)) {
@@ -49,7 +49,7 @@ module.exports = function(RED) {
             }
         }
         if (msgCount>0) {
-            node.send(msgs);
+            send(msgs);
         }
     }
 
@@ -58,8 +58,17 @@ module.exports = function(RED) {
         var node = this;
         this.name = n.name;
         this.func = n.func;
+
+        var handleNodeDoneCall = true;
+        // Check to see if the Function appears to call `node.done()`. If so,
+        // we will assume it is well written and does actually call node.done().
+        // Otherwise, we will call node.done() after the function returns regardless.
+        if (/node\.done\s*\(\s*\)/.test(this.func)) {
+            handleNodeDoneCall = false;
+        }
+
         var functionText = "var results = null;"+
-                           "results = (function(msg){ "+
+                           "results = (function(msg,__send__,__done__){ "+
                               "var __msgid__ = msg._msgid;"+
                               "var node = {"+
                                  "id:__node__.id,"+
@@ -71,10 +80,11 @@ module.exports = function(RED) {
                                  "trace:__node__.trace,"+
                                  "on:__node__.on,"+
                                  "status:__node__.status,"+
-                                 "send:function(msgs){ __node__.send(__msgid__,msgs);}"+
+                                 "send:function(msgs){ __node__.send(__send__,__msgid__,msgs);},"+
+                                 "done:__done__"+
                               "};\n"+
                               this.func+"\n"+
-                           "})(msg);";
+                           "})(msg,send,done);";
         this.topic = n.topic;
         this.outstandingTimers = [];
         this.outstandingIntervals = [];
@@ -104,8 +114,8 @@ module.exports = function(RED) {
                 trace: function() {
                     node.trace.apply(node, arguments);
                 },
-                send: function(id, msgs) {
-                    sendResults(node, id, msgs);
+                send: function(send, id, msgs) {
+                    sendResults(node, send, id, msgs);
                 },
                 on: function() {
                     if (arguments[0] === "input") {
@@ -223,12 +233,18 @@ module.exports = function(RED) {
                 // lineOffset: -11, // line number offset to be used for stack traces
                 // columnOffset: 0, // column number offset to be used for stack traces
             });
-            this.on("input", function(msg) {
+            this.on("input", function(msg,send,done) {
                 try {
                     var start = process.hrtime();
                     context.msg = msg;
+                    context.send = send;
+                    context.done = done;
+
                     this.script.runInContext(context);
-                    sendResults(this,msg._msgid,context.results);
+                    sendResults(this,send,msg._msgid,context.results);
+                    if (handleNodeDoneCall) {
+                        done();
+                    }
 
                     var duration = process.hrtime(start);
                     var converted = Math.floor((duration[0] * 1e9 + duration[1])/10000)/100;
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index 2f95fa5b4..e76466235 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -18,10 +18,20 @@ var util = require("util");
 var EventEmitter = require("events").EventEmitter;
 
 var redUtil = require("@node-red/util").util;
-var Log = require("@node-red/util").log; // TODO: separate module
+var Log = require("@node-red/util").log;
 var context = require("./context");
 var flows = require("./flows");
 
+const NOOP_SEND = function() {}
+
+/**
+ * The Node object is the heart of a Node-RED flow. It is the object that all
+ * nodes extend.
+ *
+ * The Node object itself inherits from EventEmitter, although it provides
+ * custom implementations of some of the EE functions in order to handle
+ * `input` and `close` events properly.
+ */
 function Node(n) {
     this.id = n.id;
     this.type = n.type;
@@ -55,6 +65,21 @@ function Node(n) {
 
 util.inherits(Node, EventEmitter);
 
+/**
+ * Update the wiring configuration for this node.
+ *
+ * We try to optimise the message handling path. To do this there are three
+ * cases to consider:
+ *  1. this node is wired to nothing. In this case we replace node.send with a
+ *     NO-OP function.
+ *  2. this node is wired to one other node. In this case we set `this._wire`
+ *     as a reference to the node it is wired to. This means we avoid unnecessary
+ *     iterations over what would otherwise be a 1-element array.
+ *  3. this node is wired to multiple things. The normal node.send processing of
+ *     this.wires applies.
+ *
+ * @param  {array} wires the new wiring configuration
+ */
 Node.prototype.updateWires = function(wires) {
     //console.log("UPDATE",this.id);
     this.wires = wires || [];
@@ -67,7 +92,7 @@ Node.prototype.updateWires = function(wires) {
     this._wireCount = wc;
     if (wc === 0) {
         // With nothing wired to the node, no-op send
-        this.send = function(msg) {}
+        this.send = NOOP_SEND
     } else {
         this.send = Node.prototype.send;
         if (this.wires.length === 1 && this.wires[0].length === 1) {
@@ -78,6 +103,13 @@ Node.prototype.updateWires = function(wires) {
     }
 
 }
+/**
+ * Get the context object for this node.
+ *
+ * As most nodes do not use context, this is a lazy function that will only
+ * create a context instance for the node if it is needed.
+ * @return {object} the context object
+ */
 Node.prototype.context = function() {
     if (!this._context) {
         this._context = context.get(this._alias||this.id,this.z);
@@ -85,6 +117,12 @@ Node.prototype.context = function() {
     return this._context;
 }
 
+/**
+ * Handle the complete event for a message
+ *
+ * @param  {object} msg  The message that has completed
+ * @param  {error} error (optional) an error hit whilst handling the message
+ */
 Node.prototype._complete = function(msg,error) {
     if (error) {
         // For now, delegate this to this.error
@@ -96,7 +134,15 @@ Node.prototype._complete = function(msg,error) {
     }
 }
 
+/**
+ * An internal reference to the original EventEmitter.on() function
+ */
 Node.prototype._on = Node.prototype.on;
+
+/**
+ * Register a callback function for a named event.
+ * 'close' and 'input' events are handled locally, other events defer to EventEmitter.on()
+ */
 Node.prototype.on = function(event, callback) {
     var node = this;
     if (event == "close") {
@@ -115,7 +161,14 @@ Node.prototype.on = function(event, callback) {
     }
 };
 
+/**
+ * An internal reference to the original EventEmitter.emit() function
+ */
 Node.prototype._emit = Node.prototype.emit;
+
+/**
+ * Emit an event to all registered listeners.
+ */
 Node.prototype.emit = function(event,arg) {
     var node = this;
     if (event === "input") {
@@ -133,9 +186,15 @@ Node.prototype.emit = function(event,arg) {
     }
 }
 
+/**
+ * Handle the 'input' event.
+ *
+ * This will call all registered handlers for the 'input' event.
+ */
 Node.prototype._emitInput = function(arg) {
     var node = this;
     if (node._inputCallback) {
+        // Just one callback registered.
         try {
             node._inputCallback(
                 arg,
@@ -146,6 +205,7 @@ Node.prototype._emitInput = function(arg) {
             node.error(err,arg);
         }
     } else if (node._inputCallbacks) {
+        // Multiple callbacks registered. Call each one, tracking eventual completion
         var c = node._inputCallbacks.length;
         for (var i=0;i<c;i++) {
             var cb = node._inputCallbacks[i];
@@ -170,7 +230,50 @@ Node.prototype._emitInput = function(arg) {
     }
 }
 
+/**
+ * An internal reference to the original EventEmitter.removeListener() function
+ */
+Node.prototype._removeListener = Node.prototype.removeListener;
+
+/**
+ * Remove a listener for an event
+ */
+Node.prototype.removeListener = function(name, listener) {
+    var index;
+    if (name === "input") {
+        if (this._inputCallback && this._inputCallback === listener) {
+            // Removing the only callback
+            this._inputCallback = null;
+        } else if (this._inputCallbacks) {
+            // Removing one of many callbacks
+            index = this._inputCallbacks.indexOf(listener);
+            if (index > -1) {
+                this._inputCallbacks.splice(index,1);
+            }
+            // Check if we can optimise back to a single callback
+            if (this._inputCallbacks.length === 1) {
+                this._inputCallback = this._inputCallbacks[0];
+                this._inputCallbacks = null;
+            }
+        }
+    } else if (name === "close") {
+        index = this._closeCallbacks.indexOf(listener);
+        if (index > -1) {
+            this._closeCallbacks.splice(index,1);
+        }
+    } else {
+        this._removeListener(name, listener);
+    }
+}
+
+/**
+ * An internal reference to the original EventEmitter.removeAllListeners() function
+ */
 Node.prototype._removeAllListeners = Node.prototype.removeAllListeners;
+
+/**
+ * Remove all listeners for an event
+ */
 Node.prototype.removeAllListeners = function(name) {
     if (name === "input") {
         this._inputCallback = null;
@@ -182,18 +285,26 @@ Node.prototype.removeAllListeners = function(name) {
     }
 }
 
+/**
+ * Called when the node is being stopped
+ * @param  {boolean} removed Whether the node has been removed, or just being stopped
+ * @return {Promise} resolves when the node has closed
+ */
 Node.prototype.close = function(removed) {
     //console.log(this.type,this.id,removed);
     var promises = [];
     var node = this;
+    // Call all registered close callbacks.
     for (var i=0;i<this._closeCallbacks.length;i++) {
         var callback = this._closeCallbacks[i];
         if (callback.length > 0) {
+            // The callback takes a 'done' callback and (maybe) the removed flag
             promises.push(
                 new Promise((resolve) => {
                     try {
                         var args = [];
                         if (callback.length === 2) {
+                            // The listener expects the removed flag
                             args.push(!!removed);
                         }
                         args.push(() => {
@@ -208,6 +319,7 @@ Node.prototype.close = function(removed) {
                 })
             );
         } else {
+            // No done callback so handle synchronously
             try {
                 callback.call(node);
             } catch(err) {
@@ -230,6 +342,12 @@ Node.prototype.close = function(removed) {
     }
 };
 
+/**
+ * Send a message to the nodes wired.
+ *
+ *
+ * @param  {object} msg A message or array of messages to send
+ */
 Node.prototype.send = function(msg) {
     var msgSent = false;
     var node;
@@ -317,6 +435,12 @@ Node.prototype.send = function(msg) {
     }
 };
 
+/**
+ * Receive a message.
+ *
+ * This will emit the `input` event with the provided message.
+ * As of 1.0, this will return *before* any 'input' callback handler is invoked.
+ */
 Node.prototype.receive = function(msg) {
     if (!msg) {
         msg = {};
@@ -346,15 +470,23 @@ function log_helper(self, level, msg) {
     }
     Log.log(o);
 }
-
+/**
+ * Log an INFO level message
+ */
 Node.prototype.log = function(msg) {
     log_helper(this, Log.INFO, msg);
 };
 
+/**
+ * Log a WARN level message
+ */
 Node.prototype.warn = function(msg) {
     log_helper(this, Log.WARN, msg);
 };
 
+/**
+ * Log an ERROR level message
+ */
 Node.prototype.error = function(logMessage,msg) {
     if (typeof logMessage != 'boolean') {
         logMessage = logMessage || "";
@@ -368,15 +500,22 @@ Node.prototype.error = function(logMessage,msg) {
     }
 };
 
+/**
+ * Log an DEBUG level message
+ */
 Node.prototype.debug = function(msg) {
     log_helper(this, Log.DEBUG, msg);
 }
 
+/**
+ * Log an TRACE level message
+ */
 Node.prototype.trace = function(msg) {
     log_helper(this, Log.TRACE, msg);
 }
 
 /**
+ * Log a metric event.
  * If called with no args, returns whether metric collection is enabled
  */
 Node.prototype.metric = function(eventname, msg, metricValue) {
@@ -393,6 +532,8 @@ Node.prototype.metric = function(eventname, msg, metricValue) {
 }
 
 /**
+ * Set the node's status object
+ *
  * status: { fill:"red|green", shape:"dot|ring", text:"blah" }
  * or
  * status: "simple text status"

From 542cf3147dedaabb05a619b862e50066b3655786 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 15:12:13 +0100
Subject: [PATCH 033/305] Support displaying falsey node status values Fixes
 #2246

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 16883d28a..0db014d46 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -3056,7 +3056,7 @@ RED.view = (function() {
                                 }
                                 thisNode.selectAll(".node_status").style(style);
                             }
-                            if (d.status.text) {
+                            if (d.status.hasOwnProperty('text')) {
                                 thisNode.selectAll(".node_status_label").text(d.status.text);
                             } else {
                                 thisNode.selectAll(".node_status_label").text("");

From 6c3913785d8fde78037013002ddea4479bfa0dbb Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 15:21:57 +0100
Subject: [PATCH 034/305] Add error event handler to ssh-keygen child_process
 Fixes #2255

---
 .../lib/storage/localfilesystem/projects/ssh/keygen.js      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
index 218144c12..5555f841b 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
@@ -51,6 +51,12 @@ function runSshKeygenCommand(args,cwd,env) {
                 resolve(stdout);
             }
         });
+        child.error('error', function(err) {
+            if (/ENOENT/.test(err.toString())) {
+                err.code = "command_not_found";
+            }
+            reject(err);
+        });
     });
 }
 

From 9b938f6515e82fcc6a242f2e9967ba148f286814 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 15:55:25 +0100
Subject: [PATCH 035/305] Fix default value handling on context array access
 Fixes #2252

---
 .../node_modules/@node-red/runtime/lib/nodes/context/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
index f8de26070..322fa2868 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
@@ -234,7 +234,7 @@ function createContext(id,seed,parent) {
                         if (err.code === "INVALID_EXPR") {
                             throw err;
                         }
-                        value[0] = undefined;
+                        values[0] = undefined;
                     }
                 }
             } else {
@@ -246,7 +246,7 @@ function createContext(id,seed,parent) {
                             if (err.code === "INVALID_EXPR") {
                                 throw err;
                             }
-                            value[i] = undefined;
+                            values[i] = undefined;
                         }
                     }
                 }

From 6e3fa974ba361e1bf32620d5b7dcb109d1f86c85 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 16:32:46 +0100
Subject: [PATCH 036/305] Remove all ui test dependencies from package.json

Given chromedriver was already an extra dependency that needed to
be manually installed, I have now moved all of the webdriver.io
dependencies out as well.

A new script has been added to install all of the ui test dependencies.

The Grunt file has been updated on how it checks for the missing
deps.
---
 Gruntfile.js                            | 20 ++++++++++++++------
 package.json                            |  5 -----
 scripts/install-ui-test-dependencies.sh |  7 +++++++
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100755 scripts/install-ui-test-dependencies.sh

diff --git a/Gruntfile.js b/Gruntfile.js
index 8b7b85a25..66ebf4f38 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -496,7 +496,9 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
-    grunt.loadNpmTasks('grunt-webdriver');
+    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.loadNpmTasks('grunt-webdriver');
+    }
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
     grunt.loadNpmTasks('grunt-npm-command');
@@ -555,8 +557,8 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "chromedriver"))) {
-            grunt.fail.fatal('You need to run "npm install chromedriver@2" before running UI test.');
+        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
             return false;
         }
     });
@@ -579,9 +581,15 @@ module.exports = function(grunt) {
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    grunt.registerTask('test-ui',
-        'Builds editor content then runs unit tests on editor ui',
-        ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies']);
+    } else {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    }
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
diff --git a/package.json b/package.json
index 92bc8020d..e0997ce16 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,6 @@
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~2.0.0",
         "grunt-simple-mocha": "~0.4.1",
-        "grunt-webdriver": "^2.0.3",
         "http-proxy": "^1.16.2",
         "istanbul": "0.4.5",
         "minami": "1.2.3",
@@ -105,10 +104,6 @@
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",
         "supertest": "3.4.2",
-        "wdio-chromedriver-service": "^0.1.5",
-        "wdio-mocha-framework": "^0.6.4",
-        "wdio-spec-reporter": "^0.1.5",
-        "webdriverio": "^4.14.1",
         "node-red-node-test-helper": "^0.2.3",
         "jsdoc-nr-template": "node-red/jsdoc-nr-template"
     },
diff --git a/scripts/install-ui-test-dependencies.sh b/scripts/install-ui-test-dependencies.sh
new file mode 100755
index 000000000..0148633be
--- /dev/null
+++ b/scripts/install-ui-test-dependencies.sh
@@ -0,0 +1,7 @@
+npm install --no-save \
+ grunt-webdriver@^2.0.3 \
+ wdio-chromedriver-service@^0.1.5 \
+ wdio-mocha-framework@^0.6.4 \
+ wdio-spec-reporter@^0.1.5 \
+ webdriverio@^4.14.1 \
+ chromedriver@2

From 77a913f8584f5cb113d7688c983435c38d79c067 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 16:34:43 +0100
Subject: [PATCH 037/305] Add Node 12 to full build matrix on Travis

Having removed the ui test dependencies out of package.json
we can remove the 'allow failures' flag from the node 12 build.

Given how close Node 12 is to being LTS, we really need to pay
proper attention to it.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 14236730a..a101eecb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,5 +9,3 @@ matrix:
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"
-  allow_failures:
-    - node_js: "12"

From defa9a227066a160bb907083c67724d386f95f01 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 6 Aug 2019 17:12:40 +0100
Subject: [PATCH 038/305] Fix ssh-keygen error handling

---
 .../runtime/lib/storage/localfilesystem/projects/ssh/keygen.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
index 5555f841b..cb739643b 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/keygen.js
@@ -51,7 +51,7 @@ function runSshKeygenCommand(args,cwd,env) {
                 resolve(stdout);
             }
         });
-        child.error('error', function(err) {
+        child.on('error', function(err) {
             if (/ENOENT/.test(err.toString())) {
                 err.code = "command_not_found";
             }

From c8e14f91e749aeb2bd4804181900f1fcdfaef1b8 Mon Sep 17 00:00:00 2001
From: Nam Giang <kyng@ece.ubc.ca>
Date: Tue, 6 Aug 2019 17:23:57 -0700
Subject: [PATCH 039/305] optimization for switch node

---
 .../@node-red/nodes/core/logic/10-switch.html | 124 +++++++++++++-----
 1 file changed, 90 insertions(+), 34 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index 3cd3fb032..cef869741 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -208,14 +208,33 @@
                             selectField.append($("<option></option>").val(operators[d].v).text(/^switch/.test(operators[d].t)?node._(operators[d].t):operators[d].t));
                         }
                     }
-                    var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
-                    var numValueField = $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['flow','global','num','jsonata','env']});
-                    var expValueField = $('<input/>',{class:"node-input-rule-exp-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'jsonata',types:['jsonata']});
-                    var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
-                    var btwnAndLabel = $('<span/>',{class:"node-input-rule-btwn-label"}).text(" "+andLabel+" ").appendTo(row3);
-                    var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"margin-left:2px;"}).appendTo(row3).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
-                    var typeValueField = $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row)
-                        .typedInput({default:'string',types:[
+
+                    function createValueField(){
+                        return $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+                    }
+
+                    function createNumValueField(){
+                        return $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['flow','global','num','jsonata','env']});
+                    }
+
+                    function createExpValueField(){
+                        return $('<input/>',{class:"node-input-rule-exp-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'jsonata',types:['jsonata']});
+                    }
+
+                    function createBtwnValueField(){
+                        return $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+                    }
+
+                    function createBtwnAndLabel(){
+                        return $('<span/>',{class:"node-input-rule-btwn-label"}).text(" "+andLabel+" ").appendTo(row3);
+                    }
+
+                    function createBtwnValue2Field(){
+                        return $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"margin-left:2px;"}).appendTo(row3).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+                    }
+
+                    function createTypeValueField(){
+                        return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'string',types:[
                             {value:"string",label:"string",hasValue:false},
                             {value:"number",label:"number",hasValue:false},
                             {value:"boolean",label:"boolean",hasValue:false},
@@ -226,6 +245,15 @@
                             {value:"undefined",label:"undefined",hasValue:false},
                             {value:"null",label:"null",hasValue:false}
                         ]});
+                    }
+
+                    var valueField = null;
+                    var numValueField = null;
+                    var expValueField = null;
+                    var btwnAndLabel = null;
+                    var btwnValue2Field = null;
+                    var typeValueField = null;
+                        
                     var finalspan = $('<span/>',{style:"float: right;margin-top: 6px;"}).appendTo(row);
                     finalspan.append(' &#8594; <span class="node-input-rule-index">'+(i+1)+'</span> ');
                     var caseSensitive = $('<input/>',{id:"node-input-rule-case-"+i,class:"node-input-rule-case",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
@@ -233,43 +261,49 @@
                     selectField.change(function() {
                         resizeRule(container);
                         var type = selectField.val();
-                        if ((type === "btwn") || (type === "index")) {
+                        
+                        try {
                             valueField.typedInput('hide');
+                        } catch(e){}
+                        try {
                             expValueField.typedInput('hide');
+                        } catch(e){}
+                        try {
                             numValueField.typedInput('hide');
+                        } catch(e){}
+                        try {
                             typeValueField.typedInput('hide');
+                        } catch(e){}
+                        try {
+                            btwnValue2Field.typedInput('hide');
+                        } catch(e){}
+                        
+                        if ((type === "btwn") || (type === "index")) {
+                            if (!btwnValueField){
+                                btwnValueField = createBtwnValueField();
+                            }
                             btwnValueField.typedInput('show');
                         } else if ((type === "head") || (type === "tail")) {
-                            btwnValueField.typedInput('hide');
-                            btwnValue2Field.typedInput('hide');
-                            expValueField.typedInput('hide');
-                            numValueField.typedInput('show');
-                            typeValueField.typedInput('hide');
-                            valueField.typedInput('hide');
-                        } else if (type === "jsonata_exp") {
-                            btwnValueField.typedInput('hide');
-                            btwnValue2Field.typedInput('hide');
-                            expValueField.typedInput('show');
-                            numValueField.typedInput('hide');
-                            typeValueField.typedInput('hide');
-                            valueField.typedInput('hide');
-                        } else {
-                            btwnValueField.typedInput('hide');
-                            expValueField.typedInput('hide');
-                            numValueField.typedInput('hide');
-                            typeValueField.typedInput('hide');
-                            valueField.typedInput('hide');
-                            if (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "empty" || type === "nempty" || type === "else") {
-                                valueField.typedInput('hide');
-                                typeValueField.typedInput('hide');
+                            if (!numValueField){
+                                numValueField = createNumValueField();
                             }
-                            else
+                            numValueField.typedInput('show');
+                        } else if (type === "jsonata_exp") {
+                            if (!expValueField){
+                                expValueField = createExpValueField();
+                            }
+                            expValueField.typedInput('show');
+                        } else {
                             if (type === "istype") {
-                                valueField.typedInput('hide');
+                                if (!typeValueField){
+                                    typeValueField = createTypeValueField();
+                                }
                                 typeValueField.typedInput('show');
                             }
                             else {
-                                typeValueField.typedInput('hide');
+                                if (!valueField){
+                                    valueField = createValueField();
+                                }
                                 valueField.typedInput('show');
                             }
                         }
@@ -279,6 +313,9 @@
                         } else if ((type === "btwn") || (type === "index")) {
                             row2.hide();
                             row3.show();
+                            if (!btwnValue2Field){
+                                btwnValue2Field = createBtwnValue2Field();
+                            }
                             btwnValue2Field.typedInput('show');
                         } else {
                             row2.hide();
@@ -287,20 +324,39 @@
                     });
                     selectField.val(rule.t);
                     if ((rule.t == "btwn") || (rule.t == "index")) {
+                        if (!btwnValueField){
+                            btwnValueField = createBtwnValueField();
+                        }
                         btwnValueField.typedInput('value',rule.v);
                         btwnValueField.typedInput('type',rule.vt||'num');
+
+                        if (!btwnValue2Field){
+                            btwnValue2Field = createBtwnValue2Field();
+                        }
                         btwnValue2Field.typedInput('value',rule.v2);
                         btwnValue2Field.typedInput('type',rule.v2t||'num');
                     } else if ((rule.t === "head") || (rule.t === "tail")) {
+                        if (!numValueField){
+                            numValueField = createNumValueField();
+                        }
                         numValueField.typedInput('value',rule.v);
                         numValueField.typedInput('type',rule.vt||'num');
                     } else if (rule.t === "istype") {
+                        if (!typeValueField){
+                            typeValueField =createTypeValueField();
+                        }
                         typeValueField.typedInput('value',rule.vt);
                         typeValueField.typedInput('type',rule.vt);
                     } else if (rule.t === "jsonata_exp") {
+                        if (!expValueField){
+                            expValueField = createExpValueField();
+                        }
                         expValueField.typedInput('value',rule.v);
                         expValueField.typedInput('type',rule.vt||'jsonata');
                     } else if (typeof rule.v != "undefined") {
+                        if (!valueField){
+                            valueField = createValueField();
+                        }
                         valueField.typedInput('value',rule.v);
                         valueField.typedInput('type',rule.vt||'str');
                     }

From c082bb97e09677d34065283b2924b07aa340b67f Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 7 Aug 2019 12:29:20 +0900
Subject: [PATCH 040/305] Remove tab menu from node property UI for subflow and
 config nodes

---
 .../@node-red/editor-client/src/js/ui/editor.js             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index e8c4b9b63..f904a94a8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1686,7 +1686,8 @@ RED.editor = (function() {
                             RED.tray.resize();
                         }
                     },
-                    collapsible: true
+                    collapsible: true,
+                    menu: false
                 });
 
                 var nodePropertiesTab = {
@@ -2226,7 +2227,8 @@ RED.editor = (function() {
                             RED.tray.resize();
                         }
                     },
-                    collapsible: true
+                    collapsible: true,
+                    menu: false
                 });
 
                 var nodePropertiesTab = {

From 6a4760e29147f9df2c9ad9b7bed55d3d662f5d72 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 9 Aug 2019 10:24:52 +0100
Subject: [PATCH 041/305] Mark workspace dirty when shift-click-drag detaches
 wires Fixes #2260

---
 .../@node-red/editor-client/src/js/ui/view.js     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 0db014d46..363b74f41 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1221,12 +1221,15 @@ RED.view = (function() {
                     removedLinks.push(drag_lines[i].link)
                 }
             }
-            historyEvent = {
-                t:"delete",
-                links: removedLinks,
-                dirty:RED.nodes.dirty()
-            };
-            RED.history.push(historyEvent);
+            if (removedLinks.length > 0) {
+                historyEvent = {
+                    t:"delete",
+                    links: removedLinks,
+                    dirty:RED.nodes.dirty()
+                };
+                RED.history.push(historyEvent);
+                RED.nodes.dirty(true);
+            }
             hideDragLines();
         }
         if (lasso) {

From be2dd6dc3257dbe5eeb22b8e91e99cca26002ca5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 9 Aug 2019 16:56:11 +0100
Subject: [PATCH 042/305] Add req back to audit log events and extend to
 Projects api

---
 .../@node-red/editor-api/lib/admin/context.js |  6 +-
 .../@node-red/editor-api/lib/admin/flow.js    | 12 ++-
 .../@node-red/editor-api/lib/admin/flows.js   |  6 +-
 .../@node-red/editor-api/lib/admin/nodes.js   | 30 ++++---
 .../editor-api/lib/editor/projects.js         | 90 ++++++++++++-------
 .../@node-red/editor-api/lib/util.js          |  7 ++
 .../@node-red/runtime/lib/api/context.js      | 22 ++---
 .../@node-red/runtime/lib/api/flows.js        | 37 ++++----
 .../@node-red/runtime/lib/api/library.js      | 14 +--
 .../@node-red/runtime/lib/api/nodes.js        | 71 +++++++++------
 .../@node-red/runtime/lib/api/projects.js     | 53 ++++++++++-
 .../@node-red/runtime/lib/api/settings.js     | 13 ++-
 .../node_modules/@node-red/util/lib/log.js    |  2 +-
 13 files changed, 249 insertions(+), 114 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/context.js b/packages/node_modules/@node-red/editor-api/lib/admin/context.js
index 6a2efd82d..54bfd9f85 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/context.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/context.js
@@ -30,7 +30,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
@@ -45,7 +46,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.delete(opts).then(function(result) {
             res.status(204).end();
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/flow.js b/packages/node_modules/@node-red/editor-api/lib/admin/flow.js
index 5ba5d7a04..98ae997ff 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/flow.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/flow.js
@@ -24,7 +24,8 @@ module.exports = {
     get: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlow(opts).then(function(result) {
             return res.json(result);
@@ -35,7 +36,8 @@ module.exports = {
     post: function(req,res) {
         var opts = {
             user: req.user,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.addFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -47,7 +49,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params.id,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.updateFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -58,7 +61,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.deleteFlow(opts).then(function() {
             res.status(204).end();
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/flows.js b/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
index ccad8718f..11b30e446 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/flows.js
@@ -27,7 +27,8 @@ module.exports = {
             return res.status(400).json({code:"invalid_api_version", message:"Invalid API Version requested"});
         }
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlows(opts).then(function(result) {
             if (version === "v1") {
@@ -46,7 +47,8 @@ module.exports = {
         }
         var opts = {
             user: req.user,
-            deploymentType: req.get("Node-RED-Deployment-Type")||"full"
+            deploymentType: req.get("Node-RED-Deployment-Type")||"full",
+            req: apiUtils.getRequestLogObject(req)
         }
 
         if (opts.deploymentType !== 'reload') {
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
index 59a137587..2787a5c36 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
@@ -24,7 +24,8 @@ module.exports = {
     },
     getAll: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") == "application/json") {
             runtimeAPI.nodes.getNodeList(opts).then(function(list) {
@@ -42,7 +43,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.body.module,
-            version: req.body.version
+            version: req.body.version,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.addModule(opts).then(function(info) {
             res.json(info);
@@ -54,7 +56,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.removeModule(opts).then(function() {
             res.status(204).end();
@@ -66,7 +69,8 @@ module.exports = {
     getSet: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params[0] + "/" + req.params[2]
+            id: req.params[0] + "/" + req.params[2],
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") === "application/json") {
             runtimeAPI.nodes.getNodeInfo(opts).then(function(result) {
@@ -87,7 +91,8 @@ module.exports = {
     getModule: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleInfo(opts).then(function(result) {
             res.send(result);
@@ -106,7 +111,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params[0] + "/" + req.params[2],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setNodeSetState(opts).then(function(result) {
             res.send(result);
@@ -125,7 +131,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setModuleState(opts).then(function(result) {
             res.send(result);
@@ -139,7 +146,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalog(opts).then(function(result) {
             res.json(result);
@@ -152,7 +160,8 @@ module.exports = {
     getModuleCatalogs: function(req,res) {
         var opts = {
             user: req.user,
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalogs(opts).then(function(result) {
             res.json(result);
@@ -164,7 +173,8 @@ module.exports = {
 
     getIcons: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getIconList(opts).then(function(list) {
             res.json(list);
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
index ff7fc5e85..0849c8ff8 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
@@ -22,7 +22,8 @@ var needsPermission = require("../auth").needsPermission;
 
 function listProjects(req,res) {
     var opts = {
-        user: req.user
+        user: req.user,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.listProjects(opts).then(function(result) {
         res.json(result);
@@ -33,7 +34,8 @@ function listProjects(req,res) {
 function getProject(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getProject(opts).then(function(data) {
         if (data) {
@@ -49,7 +51,8 @@ function getProjectStatus(req,res) {
     var opts = {
         user: req.user,
         id: req.params.id,
-        remote: req.query.remote
+        remote: req.query.remote,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getStatus(opts).then(function(data){
         if (data) {
@@ -64,7 +67,8 @@ function getProjectStatus(req,res) {
 function getProjectRemotes(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getRemotes(opts).then(function(data) {
         res.json(data);
@@ -98,7 +102,8 @@ module.exports = {
         app.post("/", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.createProject(opts).then(function(result) {
                 res.json(result);
@@ -112,7 +117,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
 
             if (req.body.active) {
@@ -150,7 +156,8 @@ module.exports = {
         app.delete("/:id", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteProject(opts).then(function() {
                 res.status(204).end();
@@ -168,7 +175,8 @@ module.exports = {
         app.get("/:id/files", needsPermission("projects.read"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFiles(opts).then(function(data) {
                 res.json(data);
@@ -185,7 +193,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                tree: req.params.treeish
+                tree: req.params.treeish,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFile(opts).then(function(data) {
                 res.json({content:data});
@@ -199,7 +208,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
 
             runtimeAPI.projects.revertFile(opts).then(function() {
@@ -214,7 +224,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -228,7 +239,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.body.files
+                path: req.body.files,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -242,7 +254,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                message: req.body.message
+                message: req.body.message,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.commit(opts).then(function() {
                 getProjectStatus(req,res);
@@ -256,7 +269,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -269,7 +283,8 @@ module.exports = {
         app.delete("/:id/stage", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -284,7 +299,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                type: req.params.type
+                type: req.params.type,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFileDiff(opts).then(function(data) {
                 res.json({
@@ -301,7 +317,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 limit: req.query.limit || 20,
-                before: req.query.before
+                before: req.query.before,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommits(opts).then(function(data) {
                 res.json(data);
@@ -315,7 +332,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                sha: req.params.sha
+                sha: req.params.sha,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommit(opts).then(function(data) {
                 res.json({commit:data});
@@ -330,7 +348,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 remote: req.params[0],
-                track: req.query.u
+                track: req.query.u,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.push(opts).then(function(data) {
                 res.status(204).end();
@@ -346,7 +365,8 @@ module.exports = {
                 id: req.params.id,
                 remote: req.params[0],
                 track: req.query.setUpstream,
-                allowUnrelatedHistories: req.query.allowUnrelatedHistories
+                allowUnrelatedHistories: req.query.allowUnrelatedHistories,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.pull(opts).then(function(data) {
                 res.status(204).end();
@@ -359,7 +379,8 @@ module.exports = {
         app.delete("/:id/merge", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.abortMerge(opts).then(function() {
                 res.status(204).end();
@@ -374,7 +395,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                resolution: req.body.resolutions
+                resolution: req.body.resolutions,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.resolveMerge(opts).then(function() {
                 res.status(204).end();
@@ -388,7 +410,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: false
+                remote: false,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -403,7 +426,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.params.branchName,
-                force: !!req.query.force
+                force: !!req.query.force,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteBranch(opts).then(function(data) {
                 res.status(204).end();
@@ -417,7 +441,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: true
+                remote: true,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -431,7 +456,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                branch: req.params[0]
+                branch: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranchStatus(opts).then(function(data) {
                 res.json(data);
@@ -446,7 +472,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.body.name,
-                create: req.body.create
+                create: req.body.create,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.setBranch(opts).then(function(data) {
                 res.json(data);
@@ -463,7 +490,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.body
+                remote: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             if (/^https?:\/\/[^/]+@/i.test(req.body.url)) {
                 res.status(400).json({error:"unexpected_error", message:"Git http url must not include username/password"});
@@ -481,7 +509,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.params.remoteName
+                remote: req.params.remoteName,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.removeRemote(opts).then(function(data) {
                 getProjectRemotes(req,res);
@@ -497,7 +526,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: remote
+                remote: remote,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.updateRemote(opts).then(function() {
                 res.status(204).end();
diff --git a/packages/node_modules/@node-red/editor-api/lib/util.js b/packages/node_modules/@node-red/editor-api/lib/util.js
index 1984bd5f1..0cef96bbb 100644
--- a/packages/node_modules/@node-red/editor-api/lib/util.js
+++ b/packages/node_modules/@node-red/editor-api/lib/util.js
@@ -47,5 +47,12 @@ module.exports = {
             code: err.code||"unexpected_error",
             message: err.message||err.toString()
         });
+    },
+    getRequestLogObject: function(req) {
+        return {
+            user: req.user,
+            path: req.path,
+            ip: (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined
+        }
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/context.js b/packages/node_modules/@node-red/runtime/lib/api/context.js
index 0b2fefcc9..f69349a62 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/context.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/context.js
@@ -67,7 +67,7 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the context
     * @param {String} opts.store - the context store
     * @param {String} opts.key - the context key
-
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - the node information
     * @memberof @node-red/runtime_context
     */
@@ -81,7 +81,7 @@ var api = module.exports = {
             var availableStores = runtime.nodes.listContextStores();
             //{ default: 'default', stores: [ 'default', 'file' ] }
             if (store && availableStores.stores.indexOf(store) === -1) {
-                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"});
+                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -106,7 +106,7 @@ var api = module.exports = {
                         if (store !== availableStores.default) {
                             encoded.store = store;
                         }
-                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key});
+                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key}, opts.req);
                         resolve(encoded);
                     });
                     return;
@@ -127,7 +127,7 @@ var api = module.exports = {
                                 // TODO: proper error reporting
                                 if (!errorReported) {
                                     errorReported = true;
-                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"unexpected_error"});
+                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"unexpected_error"}, opts.req);
                                     var err = new Error();
                                     err.code = "unexpected_error";
                                     err.status = 400;
@@ -139,7 +139,7 @@ var api = module.exports = {
                             c--;
                             if (c === 0) {
                                 if (!errorReported) {
-                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key});
+                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key},opts.req);
                                     resolve(result);
                                 }
                             }
@@ -147,7 +147,7 @@ var api = module.exports = {
                     })
                 }
             } else {
-                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key});
+                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key},opts.req);
                 resolve({});
             }
         })
@@ -161,7 +161,7 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the context
     * @param {String} opts.store - the context store
     * @param {String} opts.key - the context key
-
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - the node information
     * @memberof @node-red/runtime_context
     */
@@ -175,7 +175,7 @@ var api = module.exports = {
             var availableStores = runtime.nodes.listContextStores();
             //{ default: 'default', stores: [ 'default', 'file' ] }
             if (store && availableStores.stores.indexOf(store) === -1) {
-                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"});
+                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"},opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -196,13 +196,13 @@ var api = module.exports = {
                 if (key) {
                     store = store || availableStores.default;
                     ctx.set(key,undefined,store,function(err) {
-                        runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key});
+                        runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key},opts.req);
                         resolve();
                     });
                     return;
                 } else {
                     // TODO: support deleting whole context
-                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"});
+                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"},opts.req);
                     var err = new Error();
                     err.code = "not_found";
                     err.status = 404;
@@ -243,7 +243,7 @@ var api = module.exports = {
                     // })
                 }
             } else {
-                runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key});
+                runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key},opts.req);
                 resolve();
             }
 
diff --git a/packages/node_modules/@node-red/runtime/lib/api/flows.js b/packages/node_modules/@node-red/runtime/lib/api/flows.js
index 735e295fc..1e6e72dc7 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/flows.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/flows.js
@@ -43,12 +43,13 @@ var api = module.exports = {
     * Gets the current flow configuration
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Flows>} - the active flow configuration
     * @memberof @node-red/runtime_flows
     */
     getFlows: function(opts) {
         return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "flows.get"}/*,req*/);
+            runtime.log.audit({event: "flows.get"}, opts.req);
             return resolve(runtime.nodes.getFlows());
         });
     },
@@ -56,6 +57,7 @@ var api = module.exports = {
     * Sets the current flow configuration
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Flows>} - the active flow configuration
     * @memberof @node-red/runtime_flows
     */
@@ -64,7 +66,7 @@ var api = module.exports = {
 
             var flows = opts.flows;
             var deploymentType = opts.deploymentType||"full";
-            runtime.log.audit({event: "flows.set",type:deploymentType}/*,req*/);
+            runtime.log.audit({event: "flows.set",type:deploymentType}, opts.req);
 
             var apiPromise;
             if (deploymentType === 'reload') {
@@ -98,6 +100,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.flow - the flow to add
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the id of the added flow
     * @memberof @node-red/runtime_flows
     */
@@ -105,10 +108,10 @@ var api = module.exports = {
         return new Promise(function(resolve,reject) {
             var flow = opts.flow;
             runtime.nodes.addFlow(flow).then(function(id) {
-                runtime.log.audit({event: "flow.add",id:id});
+                runtime.log.audit({event: "flow.add",id:id}, opts.req);
                 return resolve(id);
             }).catch(function(err) {
-                runtime.log.audit({event: "flow.add",error:err.code||"unexpected_error",message:err.toString()});
+                runtime.log.audit({event: "flow.add",error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                 err.status = 400;
                 return reject(err);
             })
@@ -122,6 +125,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.id - the id of the flow to retrieve
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Flow>} - the active flow configuration
     * @memberof @node-red/runtime_flows
     */
@@ -129,10 +133,10 @@ var api = module.exports = {
         return new Promise(function (resolve,reject) {
             var flow = runtime.nodes.getFlow(opts.id);
             if (flow) {
-                runtime.log.audit({event: "flow.get",id:opts.id});
+                runtime.log.audit({event: "flow.get",id:opts.id}, opts.req);
                 return resolve(flow);
             } else {
-                runtime.log.audit({event: "flow.get",id:opts.id,error:"not_found"});
+                runtime.log.audit({event: "flow.get",id:opts.id,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -147,6 +151,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.id - the id of the flow to update
     * @param {Object} opts.flow - the flow configuration
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the id of the updated flow
     * @memberof @node-red/runtime_flows
     */
@@ -156,22 +161,22 @@ var api = module.exports = {
             var id = opts.id;
             try {
                 runtime.nodes.updateFlow(id,flow).then(function() {
-                    runtime.log.audit({event: "flow.update",id:id});
+                    runtime.log.audit({event: "flow.update",id:id}, opts.req);
                     return resolve(id);
                 }).catch(function(err) {
-                    runtime.log.audit({event: "flow.update",error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "flow.update",error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     err.status = 400;
                     return reject(err);
                 })
             } catch(err) {
                 if (err.code === 404) {
-                    runtime.log.audit({event: "flow.update",id:id,error:"not_found"});
+                    runtime.log.audit({event: "flow.update",id:id,error:"not_found"}, opts.req);
                     // TODO: this swap around of .code and .status isn't ideal
                     err.status = 404;
                     err.code = "not_found";
                     return reject(err);
                 } else {
-                    runtime.log.audit({event: "flow.update",error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "flow.update",error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     err.status = 400;
                     return reject(err);
                 }
@@ -184,6 +189,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.id - the id of the flow to delete
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - resolves if successful
     * @memberof @node-red/runtime_flows
     */
@@ -192,22 +198,22 @@ var api = module.exports = {
             var id = opts.id;
             try {
                 runtime.nodes.removeFlow(id).then(function() {
-                    runtime.log.audit({event: "flow.remove",id:id});
+                    runtime.log.audit({event: "flow.remove",id:id}, opts.req);
                     return resolve();
                 }).catch(function(err) {
-                    runtime.log.audit({event: "flow.remove",id:id,error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "flow.remove",id:id,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     err.status = 400;
                     return reject(err);
                 });
             } catch(err) {
                 if (err.code === 404) {
-                    runtime.log.audit({event: "flow.remove",id:id,error:"not_found"});
+                    runtime.log.audit({event: "flow.remove",id:id,error:"not_found"}, opts.req);
                     // TODO: this swap around of .code and .status isn't ideal
                     err.status = 404;
                     err.code = "not_found";
                     return reject(err);
                 } else {
-                    runtime.log.audit({event: "flow.remove",id:id,error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "flow.remove",id:id,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     err.status = 400;
                     return reject(err);
                 }
@@ -221,12 +227,13 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.type - the node type to return the credential information for
     * @param {String} opts.id - the node id
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the safe credentials
     * @memberof @node-red/runtime_flows
     */
     getNodeCredentials: function(opts) {
         return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "credentials.get",type:opts.type,id:opts.id});
+            runtime.log.audit({event: "credentials.get",type:opts.type,id:opts.id}, opts.req);
             var credentials = runtime.nodes.getCredentials(opts.id);
             if (!credentials) {
                 return resolve({});
diff --git a/packages/node_modules/@node-red/runtime/lib/api/library.js b/packages/node_modules/@node-red/runtime/lib/api/library.js
index 31037858b..f252d3264 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/library.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/library.js
@@ -32,13 +32,14 @@ var api = module.exports = {
     * @param {String} opts.library - the library
     * @param {String} opts.type - the type of entry
     * @param {String} opts.path - the path of the entry
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String|Object>} - resolves when complete
     * @memberof @node-red/runtime_library
     */
     getEntry: function(opts) {
         return new Promise(function(resolve,reject) {
             runtime.library.getEntry(opts.library,opts.type,opts.path).then(function(result) {
-                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path});
+                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path}, opts.req);
                 return resolve(result);
             }).catch(function(err) {
                 if (err) {
@@ -51,10 +52,10 @@ var api = module.exports = {
                     } else {
                         err.status = 400;
                     }
-                    runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path,error:err.code});
+                    runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path,error:err.code}, opts.req);
                     return reject(err);
                 }
-                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,error:"not_found"});
+                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,error:"not_found"}, opts.req);
                 var error = new Error();
                 error.code = "not_found";
                 error.status = 404;
@@ -72,22 +73,23 @@ var api = module.exports = {
     * @param {String} opts.path - the path of the entry
     * @param {Object} opts.meta - any meta data associated with the entry
     * @param {String} opts.body - the body of the entry
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - resolves when complete
     * @memberof @node-red/runtime_library
     */
     saveEntry: function(opts) {
         return new Promise(function(resolve,reject) {
             runtime.library.saveEntry(opts.library,opts.type,opts.path,opts.meta,opts.body).then(function() {
-                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path});
+                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path}, opts.req);
                 return resolve();
             }).catch(function(err) {
                 runtime.log.warn(runtime.log._("api.library.error-save-entry",{path:opts.path,message:err.toString()}));
                 if (err.code === 'forbidden') {
-                    runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"forbidden"});
+                    runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"forbidden"}, opts.req);
                     err.status = 403;
                     return reject(err);
                 }
-                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"unexpected_error",message:err.toString()});
+                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"unexpected_error",message:err.toString()}, opts.req);
                 var error = new Error();
                 error.status = 400;
                 return reject(error);
diff --git a/packages/node_modules/@node-red/runtime/lib/api/nodes.js b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
index ca67acc17..ee4d3bc1a 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/nodes.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
@@ -48,6 +48,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the node set to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<NodeInfo>} - the node information
     * @memberof @node-red/runtime_nodes
     */
@@ -56,11 +57,11 @@ var api = module.exports = {
             var id = opts.id;
             var result = runtime.nodes.getNodeInfo(id);
             if (result) {
-                runtime.log.audit({event: "nodes.info.get",id:id});
+                runtime.log.audit({event: "nodes.info.get",id:id}, opts.req);
                 delete result.loaded;
                 return resolve(result);
             } else {
-                runtime.log.audit({event: "nodes.info.get",id:id,error:"not_found"});
+                runtime.log.audit({event: "nodes.info.get",id:id,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -73,12 +74,13 @@ var api = module.exports = {
     * Gets the list of node modules installed in the runtime
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<NodeList>} - the list of node modules
     * @memberof @node-red/runtime_nodes
     */
     getNodeList: function(opts) {
         return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.list.get"});
+            runtime.log.audit({event: "nodes.list.get"}, opts.req);
             return resolve(runtime.nodes.getNodeList());
         })
     },
@@ -89,6 +91,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the node set to return
     * @param {String} opts.lang - the locale language to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the node html content
     * @memberof @node-red/runtime_nodes
     */
@@ -98,10 +101,10 @@ var api = module.exports = {
             var lang = opts.lang;
             var result = runtime.nodes.getNodeConfig(id,lang);
             if (result) {
-                runtime.log.audit({event: "nodes.config.get",id:id});
+                runtime.log.audit({event: "nodes.config.get",id:id}, opts.req);
                 return resolve(result);
             } else {
-                runtime.log.audit({event: "nodes.config.get",id:id,error:"not_found"});
+                runtime.log.audit({event: "nodes.config.get",id:id,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -114,12 +117,13 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.lang - the locale language to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the node html content
     * @memberof @node-red/runtime_nodes
     */
     getNodeConfigs: function(opts) {
         return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.configs.get"});
+            runtime.log.audit({event: "nodes.configs.get"}, opts.req);
             return resolve(runtime.nodes.getNodeConfigs(opts.lang));
         });
     },
@@ -129,6 +133,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<ModuleInfo>} - the node module info
     * @memberof @node-red/runtime_nodes
     */
@@ -136,10 +141,10 @@ var api = module.exports = {
         return new Promise(function(resolve,reject) {
             var result = runtime.nodes.getModuleInfo(opts.module);
             if (result) {
-                runtime.log.audit({event: "nodes.module.get",id:opts.module});
+                runtime.log.audit({event: "nodes.module.get",id:opts.module}, opts.req);
                 return resolve(result);
             } else {
-                runtime.log.audit({event: "nodes.module.get",id:opts.module,error:"not_found"});
+                runtime.log.audit({event: "nodes.module.get",id:opts.module,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -154,13 +159,14 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module to install
     * @param {String} opts.version - (optional) the version of the module to install
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<ModuleInfo>} - the node module info
     * @memberof @node-red/runtime_nodes
     */
     addModule: function(opts) {
         return new Promise(function(resolve,reject) {
             if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"});
+                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
                 var err = new Error("Settings unavailable");
                 err.code = "settings_unavailable";
                 err.status = 400;
@@ -170,7 +176,7 @@ var api = module.exports = {
                 var existingModule = runtime.nodes.getModuleInfo(opts.module);
                 if (existingModule) {
                     if (!opts.version || existingModule.version === opts.version) {
-                        runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"});
+                        runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}, opts.req);
                         var err = new Error("Module already loaded");
                         err.code = "module_already_loaded";
                         err.status = 400;
@@ -178,24 +184,24 @@ var api = module.exports = {
                     }
                 }
                 runtime.nodes.installModule(opts.module,opts.version).then(function(info) {
-                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version});
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version}, opts.req);
                     return resolve(info);
                 }).catch(function(err) {
                     if (err.code === 404) {
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:"not_found"});
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:"not_found"}, opts.req);
                         // TODO: code/status
                         err.status = 404;
                     } else if (err.code) {
                         err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code});
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code}, opts.req);
                     } else {
                         err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code||"unexpected_error",message:err.toString()});
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     }
                     return reject(err);
                 })
             } else {
-                runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"});
+                runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"}, opts.req);
                 var err = new Error("Invalid request");
                 err.code = "invalid_request";
                 err.status = 400;
@@ -209,13 +215,14 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module to remove
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - resolves when complete
     * @memberof @node-red/runtime_nodes
     */
     removeModule: function(opts) {
         return new Promise(function(resolve,reject) {
             if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"});
+                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
                 var err = new Error("Settings unavailable");
                 err.code = "settings_unavailable";
                 err.status = 400;
@@ -223,7 +230,7 @@ var api = module.exports = {
             }
             var module = runtime.nodes.getModuleInfo(opts.module);
             if (!module) {
-                runtime.log.audit({event: "nodes.remove",module:opts.module,error:"not_found"});
+                runtime.log.audit({event: "nodes.remove",module:opts.module,error:"not_found"}, opts.req);
                 var err = new Error();
                 err.code = "not_found";
                 err.status = 404;
@@ -231,15 +238,15 @@ var api = module.exports = {
             }
             try {
                 runtime.nodes.uninstallModule(opts.module).then(function() {
-                    runtime.log.audit({event: "nodes.remove",module:opts.module});
+                    runtime.log.audit({event: "nodes.remove",module:opts.module}, opts.req);
                     resolve();
                 }).catch(function(err) {
                     err.status = 400;
-                    runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     return reject(err);
                 })
             } catch(error) {
-                runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()});
+                runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
                 error.status = 400;
                 return reject(error);
             }
@@ -252,6 +259,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module to enable or disable
     * @param {String} opts.enabled - whether the module should be enabled or disabled
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<ModuleInfo>} - the module info object
     * @memberof @node-red/runtime_nodes
     */
@@ -259,7 +267,7 @@ var api = module.exports = {
         var mod = opts.module;
         return new Promise(function(resolve,reject) {
             if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"});
+                runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"}, opts.req);
                 var err = new Error("Settings unavailable");
                 err.code = "settings_unavailable";
                 err.status = 400;
@@ -268,7 +276,7 @@ var api = module.exports = {
             try {
                 var module = runtime.nodes.getModuleInfo(mod);
                 if (!module) {
-                    runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"});
+                    runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"}, opts.req);
                     var err = new Error();
                     err.code = "not_found";
                     err.status = 404;
@@ -287,7 +295,7 @@ var api = module.exports = {
                     return reject(err);
                 });
             } catch(error) {
-                runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()});
+                runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
                 error.status = 400;
                 return reject(error);
             }
@@ -300,13 +308,14 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the node-set to enable or disable
     * @param {String} opts.enabled - whether the module should be enabled or disabled
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<ModuleInfo>} - the module info object
     * @memberof @node-red/runtime_nodes
     */
     setNodeSetState: function(opts) {
         return new Promise(function(resolve,reject) {
             if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"});
+                runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"}, opts.req);
                 var err = new Error("Settings unavailable");
                 err.code = "settings_unavailable";
                 err.status = 400;
@@ -318,7 +327,7 @@ var api = module.exports = {
             try {
                 var node = runtime.nodes.getNodeInfo(id);
                 if (!node) {
-                    runtime.log.audit({event: "nodes.info.set",id:id,error:"not_found"});
+                    runtime.log.audit({event: "nodes.info.set",id:id,error:"not_found"}, opts.req);
                     var err = new Error();
                     err.code = "not_found";
                     err.status = 404;
@@ -326,16 +335,16 @@ var api = module.exports = {
                 } else {
                     delete node.loaded;
                     putNode(node,enabled).then(function(result) {
-                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled});
+                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled}, opts.req);
                         return resolve(result);
                     }).catch(function(err) {
-                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:err.code||"unexpected_error",message:err.toString()});
+                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                         err.status = 400;
                         return reject(err);
                     });
                 }
             } catch(error) {
-                runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()});
+                runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
                 error.status = 400;
                 return reject(error);
             }
@@ -347,6 +356,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {User} opts.lang - the i18n language to return. If not set, uses runtime default (en-US)
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the message catalogs
     * @memberof @node-red/runtime_nodes
     */
@@ -376,6 +386,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {User} opts.module - the module
     * @param {User} opts.lang - the i18n language to return. If not set, uses runtime default (en-US)
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the message catalog
     * @memberof @node-red/runtime_nodes
     */
@@ -397,12 +408,13 @@ var api = module.exports = {
     * Gets the list of all icons available in the modules installed within the runtime
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<IconList>} - the list of all icons
     * @memberof @node-red/runtime_nodes
     */
     getIconList: function(opts) {
         return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.icons.get"});
+            runtime.log.audit({event: "nodes.icons.get"}, opts.req);
             return resolve(runtime.nodes.getNodeIcons());
         });
 
@@ -413,6 +425,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module requesting the icon
     * @param {String} opts.icon - the name of the icon
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Buffer>} - the icon file as a Buffer or null if no icon available
     * @memberof @node-red/runtime_nodes
     */
diff --git a/packages/node_modules/@node-red/runtime/lib/api/projects.js b/packages/node_modules/@node-red/runtime/lib/api/projects.js
index 27aef8c7b..53a0e64f3 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/projects.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/projects.js
@@ -27,11 +27,12 @@ var api = module.exports = {
     available: function(opts) {
         return Promise.resolve(!!runtime.storage.projects);
     },
-
     /**
     * List projects known to the runtime
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
@@ -56,10 +57,12 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.project - the project information
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     createProject: function(opts) {
+        runtime.log.audit({event: "projects.create",name:opts.project.name}, opts.req);
         return runtime.storage.projects.createProject(opts.user, opts.project)
     },
 
@@ -69,11 +72,13 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project to initialise
     * @param {Object} opts.project - the project information
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     initialiseProject: function(opts) {
         // Initialised set when creating default files for an empty repo
+        runtime.log.audit({event: "projects.initialise",id:opts.id}, opts.req);
         return runtime.storage.projects.initialiseProject(opts.user, opts.id, opts.project)
     },
 
@@ -81,6 +86,7 @@ var api = module.exports = {
     * Gets the active project
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the active project
     * @memberof @node-red/runtime_projects
     */
@@ -93,11 +99,13 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project to activate
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     setActiveProject: function(opts) {
         var currentProject = runtime.storage.projects.getActiveProject(opts.user);
+        runtime.log.audit({event: "projects.set",id:opts.id}, opts.req);
         if (!currentProject || opts.id !== currentProject.name) {
             return runtime.storage.projects.setActiveProject(opts.user, opts.id);
         } else {
@@ -110,6 +118,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project to get
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the project metadata
     * @memberof @node-red/runtime_projects
     */
@@ -123,10 +132,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project to update
     * @param {Object} opts.project - the project information
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     updateProject: function(opts) {
+        runtime.log.audit({event: "projects.update",id:opts.id}, opts.req);
         return runtime.storage.projects.updateProject(opts.user, opts.id, opts.project);
     },
 
@@ -135,10 +146,12 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project to update
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     deleteProject: function(opts) {
+        runtime.log.audit({event: "projects.delete",id:opts.id}, opts.req);
         return runtime.storage.projects.deleteProject(opts.user, opts.id);
     },
 
@@ -148,6 +161,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {Boolean} opts.remote - whether to include status of remote repos
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the project status
     * @memberof @node-red/runtime_projects
     */
@@ -161,6 +175,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {Boolean} opts.remote - whether to return remote branches (true) or local (false)
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - a list of the local branches
     * @memberof @node-red/runtime_projects
     */
@@ -174,6 +189,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.branch - the name of the branch
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the status of the branch
     * @memberof @node-red/runtime_projects
     */
@@ -188,10 +204,12 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.branch - the name of the branch
     * @param {Boolean} opts.create - whether to create the branch if it doesn't exist
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     setBranch: function(opts) {
+        runtime.log.audit({event: "projects.branch.set",id:opts.id, branch: opts.branch, create:opts.create}, opts.req);
         return runtime.storage.projects.setBranch(opts.user, opts.id, opts.branch, opts.create)
     },
 
@@ -202,10 +220,12 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.branch - the name of the branch
     * @param {Boolean} opts.force - whether to force delete
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     deleteBranch: function(opts) {
+        runtime.log.audit({event: "projects.branch.delete",id:opts.id, branch: opts.branch, force:opts.force}, opts.req);
         return runtime.storage.projects.deleteBranch(opts.user, opts.id, opts.branch, false, opts.force);
     },
 
@@ -215,10 +235,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.message - the message to associate with the commit
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     commit: function(opts) {
+        runtime.log.audit({event: "projects.commit",id:opts.id}, opts.req);
         return runtime.storage.projects.commit(opts.user, opts.id,{message: opts.message});
     },
 
@@ -228,6 +250,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.sha - the sha of the commit to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the commit details
     * @memberof @node-red/runtime_projects
     */
@@ -242,6 +265,7 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.limit - limit how many to return
     * @param {String} opts.before - id of the commit to work back from
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Array>} - an array of commits
     * @memberof @node-red/runtime_projects
     */
@@ -257,10 +281,12 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     abortMerge: function(opts) {
+        runtime.log.audit({event: "projects.merge.abort",id:opts.id}, opts.req);
         return runtime.storage.projects.abortMerge(opts.user, opts.id);
     },
 
@@ -271,10 +297,12 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.path - the path of the file being merged
     * @param {String} opts.resolutions - how to resolve the merge conflict
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     resolveMerge: function(opts) {
+        runtime.log.audit({event: "projects.merge.resolve",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.resolveMerge(opts.user, opts.id, opts.path, opts.resolution);
     },
 
@@ -283,6 +311,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the file listing
     * @memberof @node-red/runtime_projects
     */
@@ -297,6 +326,7 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.path - the path of the file
     * @param {String} opts.tree - the version control tree to use
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the content of the file
     * @memberof @node-red/runtime_projects
     */
@@ -310,10 +340,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String|Array} opts.path - the path of the file, or an array of paths
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     stageFile: function(opts) {
+        runtime.log.audit({event: "projects.file.stage",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.stageFile(opts.user, opts.id, opts.path);
     },
 
@@ -323,10 +355,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.path - the path of the file. If not set, all staged files are unstaged
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     unstageFile: function(opts) {
+        runtime.log.audit({event: "projects.file.unstage",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.unstageFile(opts.user, opts.id, opts.path);
     },
 
@@ -336,10 +370,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.path - the path of the file
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     revertFile: function(opts) {
+        runtime.log.audit({event: "projects.file.revert",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.revertFile(opts.user, opts.id,opts.path)
     },
 
@@ -350,6 +386,7 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.path - the path of the file
     * @param {String} opts.type - the type of diff
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the requested diff
     * @memberof @node-red/runtime_projects
     */
@@ -362,6 +399,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - a list of project remotes
     * @memberof @node-red/runtime_projects
     */
@@ -378,10 +416,12 @@ var api = module.exports = {
     * @param {Object} opts.remote - the remote metadata
     * @param {String} opts.remote.name - the name of the remote
     * @param {String} opts.remote.url - the url of the remote
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     addRemote: function(opts) {
+        runtime.log.audit({event: "projects.remote.add",id:opts.id, remote:opts.remote.name}, opts.req);
         return runtime.storage.projects.addRemote(opts.user, opts.id, opts.remote)
     },
 
@@ -391,10 +431,12 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.id - the id of the project
     * @param {String} opts.remote - the name of the remote
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     removeRemote: function(opts) {
+        runtime.log.audit({event: "projects.remote.delete",id:opts.id, remote:opts.remote}, opts.req);
         return runtime.storage.projects.removeRemote(opts.user, opts.id, opts.remote);
     },
 
@@ -405,10 +447,12 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {Object} opts.remote - the remote metadata
     * @param {String} opts.remote.name - the name of the remote
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     updateRemote: function(opts) {
+        runtime.log.audit({event: "projects.remote.update",id:opts.id, remote:opts.remote.name}, opts.req);
         return runtime.storage.projects.updateRemote(opts.user, opts.id, opts.remote.name, opts.remote)
     },
 
@@ -416,10 +460,15 @@ var api = module.exports = {
     * Pull changes from the remote
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {String} opts.remote - the remote to pull
+    * @param {Boolean} opts.track - whether to track this remote
+    * @param {Boolean} opts.allowUnrelatedHistories -
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     pull: function(opts) {
+        runtime.log.audit({event: "projects.pull",id:opts.id, remote: opts.remote, track:opts.track}, opts.req);
         return runtime.storage.projects.pull(opts.user, opts.id, opts.remote, opts.track, opts.allowUnrelatedHistories);
     },
 
@@ -430,10 +479,12 @@ var api = module.exports = {
     * @param {String} opts.id - the id of the project
     * @param {String} opts.remote - the name of the remote
     * @param {String} opts.track - whether to set the remote as the upstream
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
     push: function(opts) {
+        runtime.log.audit({event: "projects.push",id:opts.id, remote: opts.remote, track:opts.track}, opts.req);
         return runtime.storage.projects.push(opts.user, opts.id, opts.remote, opts.track);
     }
 
diff --git a/packages/node_modules/@node-red/runtime/lib/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
index 3ae83d0cf..96bb6c973 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -60,6 +60,7 @@ var api = module.exports = {
     * Gets the runtime settings object
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the runtime settings
     * @memberof @node-red/runtime_settings
     */
@@ -125,6 +126,7 @@ var api = module.exports = {
     * Gets an individual user's settings object
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the user settings
     * @memberof @node-red/runtime_settings
     */
@@ -143,6 +145,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {Object} opts.settings - the updates to the user settings
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the user settings
     * @memberof @node-red/runtime_settings
     */
@@ -158,16 +161,16 @@ var api = module.exports = {
             currentSettings = extend(currentSettings, opts.settings);
             try {
                 runtime.settings.setUserSettings(username, currentSettings).then(function() {
-                    runtime.log.audit({event: "settings.update",username:username});
+                    runtime.log.audit({event: "settings.update",username:username}, opts.req);
                     return resolve();
                 }).catch(function(err) {
-                    runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()});
+                    runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     err.status = 400;
                     return reject(err);
                 });
             } catch(err) {
                 runtime.log.warn(runtime.log._("settings.user-not-available",{message:runtime.log._("settings.not-available")}));
-                runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()});
+                runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                 err.status = 400;
                 return reject(err);
             }
@@ -178,6 +181,7 @@ var api = module.exports = {
     * Gets a list of a user's ssh keys
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<Object>} - the user's ssh keys
     * @memberof @node-red/runtime_settings
     */
@@ -198,6 +202,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {User} opts.id - the id of the key to return
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the user's ssh public key
     * @memberof @node-red/runtime_settings
     */
@@ -229,6 +234,7 @@ var api = module.exports = {
     * @param {User} opts.password - (optional) the password for the key pair
     * @param {User} opts.comment - (option) a comment to associate with the key pair
     * @param {User} opts.size - (optional) the size of the key. Default: 2048
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<String>} - the id of the generated key
     * @memberof @node-red/runtime_settings
     */
@@ -249,6 +255,7 @@ var api = module.exports = {
     * @param {Object} opts
     * @param {User} opts.user - the user calling the api
     * @param {User} opts.id - the id of the key to delete
+    * @param {Object} opts.req - the request to log (optional)
     * @return {Promise} - resolves when deleted
     * @memberof @node-red/runtime_settings
     */
diff --git a/packages/node_modules/@node-red/util/lib/log.js b/packages/node_modules/@node-red/util/lib/log.js
index abce5fa99..155863802 100644
--- a/packages/node_modules/@node-red/util/lib/log.js
+++ b/packages/node_modules/@node-red/util/lib/log.js
@@ -214,7 +214,7 @@ var log = module.exports = {
         if (req) {
             msg.user = req.user;
             msg.path = req.path;
-            msg.ip = (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined;
+            msg.ip = req.ip || (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined;
         }
         log.log(msg);
     }

From 16440072fb5f7ae7c3acd75d70358f1c07679d1a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 9 Aug 2019 17:09:03 +0100
Subject: [PATCH 043/305] Add audit log to project spec tests

---
 .../@node-red/runtime/lib/api/projects.js     |   2 +-
 .../runtime/lib/api/projects_spec.js          | 120 +++++++++++++-----
 2 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/api/projects.js b/packages/node_modules/@node-red/runtime/lib/api/projects.js
index 53a0e64f3..d792f3765 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/projects.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/projects.js
@@ -62,7 +62,7 @@ var api = module.exports = {
     * @memberof @node-red/runtime_projects
     */
     createProject: function(opts) {
-        runtime.log.audit({event: "projects.create",name:opts.project.name}, opts.req);
+        runtime.log.audit({event: "projects.create",name:opts.project?opts.project.name:"missing-name"}, opts.req);
         return runtime.storage.projects.createProject(opts.user, opts.project)
     },
 
diff --git a/test/unit/@node-red/runtime/lib/api/projects_spec.js b/test/unit/@node-red/runtime/lib/api/projects_spec.js
index c8f0c25c8..2fe7ca221 100644
--- a/test/unit/@node-red/runtime/lib/api/projects_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/projects_spec.js
@@ -57,7 +57,9 @@ describe("runtime-api/settings", function() {
 
     });
     describe("listProjects", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+            log: mockLog(),
+            storage: {projects: {
             listProjects: sinon.spy(function(user) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -105,7 +107,9 @@ describe("runtime-api/settings", function() {
 
     });
     describe("createProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             createProject: sinon.spy(function(user,project) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -138,7 +142,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("initialiseProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             initialiseProject: sinon.spy(function(user,id,project) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -172,7 +178,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getActiveProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getActiveProject: sinon.spy(function(user) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -209,7 +217,9 @@ describe("runtime-api/settings", function() {
         var activeProject;
         var runtime;
         beforeEach(function() {
-            runtime = {storage: {projects: {
+            runtime = {
+        log: mockLog(),
+        storage: {projects: {
                 getActiveProject: sinon.spy(function() { return activeProject;}),
                 setActiveProject: sinon.spy(function(user,id) {
                     if (user === "error") {
@@ -258,7 +268,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getProject: sinon.spy(function(user,id) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -291,7 +303,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("updateProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             updateProject: sinon.spy(function(user,id,project) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -325,7 +339,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("deleteProject", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             deleteProject: sinon.spy(function(user,id) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -359,7 +375,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getStatus", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getStatus: sinon.spy(function(user,id,remote) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -392,7 +410,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("getBranches", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getBranches: sinon.spy(function(user,id,remote) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -425,7 +445,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("getBranchStatus", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getBranchStatus: sinon.spy(function(user,id,branch) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -459,7 +481,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("setBranch", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             setBranch: sinon.spy(function(user,id,branch,create) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -493,7 +517,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("deleteBranch", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             deleteBranch: sinon.spy(function(user,id,branch,something,force) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -527,7 +553,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("commit", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             commit: sinon.spy(function(user,id,message) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -560,7 +588,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("getCommit", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getCommit: sinon.spy(function(user,id,sha) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -594,7 +624,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getCommits", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getCommits: sinon.spy(function(user,id,options) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -634,7 +666,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("abortMerge", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             abortMerge: sinon.spy(function(user,id) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -668,7 +702,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("resolveMerge", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             resolveMerge: sinon.spy(function(user,id,path,resolution) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -702,7 +738,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getFiles", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getFiles: sinon.spy(function(user,id) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -736,7 +774,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getFile", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getFile: sinon.spy(function(user,id,path,tree) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -770,7 +810,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("stageFile", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             stageFile: sinon.spy(function(user,id,path) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -803,7 +845,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("unstageFile", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             unstageFile: sinon.spy(function(user,id,path) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -837,7 +881,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("revertFile", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             revertFile: sinon.spy(function(user,id,path) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -871,7 +917,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getFileDiff", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getFileDiff: sinon.spy(function(user,id,path,type) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -905,7 +953,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("getRemotes", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             getRemotes: sinon.spy(function(user,id) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -939,7 +989,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("addRemote", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             addRemote: sinon.spy(function(user,id,remote) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -973,7 +1025,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("removeRemote", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             removeRemote: sinon.spy(function(user,id,remote) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -1007,7 +1061,9 @@ describe("runtime-api/settings", function() {
     });
 
     describe("updateRemote", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             updateRemote: sinon.spy(function(user,id,name,remote) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -1040,7 +1096,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("pull", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             pull: sinon.spy(function(user,id,remote,track,allowUnrelatedHistories) {
                 if (user === "error") {
                     var err = new Error("error");
@@ -1073,7 +1131,9 @@ describe("runtime-api/settings", function() {
         });
     });
     describe("push", function() {
-        var runtime = {storage: {projects: {
+        var runtime = {
+        log: mockLog(),
+        storage: {projects: {
             push: sinon.spy(function(user,id,remote,track) {
                 if (user === "error") {
                     var err = new Error("error");

From e2db958510d853a20c25bc3172e3622e9d2c73e1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 9 Aug 2019 17:27:32 +0100
Subject: [PATCH 044/305] Fix up admin nodes test for audit log changes

---
 test/unit/@node-red/editor-api/lib/admin/nodes_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
index 6fbbeff67..ef98fb677 100644
--- a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
+++ b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
@@ -441,7 +441,7 @@ describe("api/admin/nodes", function() {
             nodes.init({
                 nodes:{
                     getModuleCatalog: function(opts) {
-                        return Promise.resolve(opts);
+                        return Promise.resolve({a:123});
                     }
                 }
             });
@@ -452,7 +452,7 @@ describe("api/admin/nodes", function() {
                     if (err) {
                         throw err;
                     }
-                    res.body.should.eql({ module: 'module/set' });
+                    res.body.should.eql({a:123});
                     done();
                 });
         });

From 78bee3dc59dcb7291dcceb95ffc5acee5132e06a Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Fri, 9 Aug 2019 21:20:45 +0300
Subject: [PATCH 045/305] Update messages.json

Added the HTTP Persistent item
---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 82e466fdb..f917e7e9f 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -413,6 +413,7 @@
         "digest": "digest authentication",
         "bearer": "bearer authentication",
         "use-proxy": "Use proxy",
+        "http-persistent": "HTTP Persistent",
         "proxy-config": "Proxy Configuration",
         "use-proxyauth": "Use proxy authentication",
         "noproxy-hosts": "Ignore hosts",

From 4d60447242479da22dceea86bda1f6d2afc7397a Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Fri, 9 Aug 2019 21:23:28 +0300
Subject: [PATCH 046/305] Update 21-httprequest.js

Adding HTTP persistent definition and function
---
 packages/node_modules/@node-red/nodes/core/io/21-httprequest.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
index ec5290835..49fb033c5 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
@@ -29,6 +29,7 @@ module.exports = function(RED) {
         var isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
         var nodeMethod = n.method || "GET";
         var paytoqs = n.paytoqs;
+        var nodeHTTPPersistent = n["http-persistent"];
         if (n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
         }
@@ -94,6 +95,7 @@ module.exports = function(RED) {
             opts.maxRedirects = 21;
             opts.jar = request.jar();
             opts.proxy = null;
+            opts.forever = nodeHTTPPersistent;
             if (msg.requestTimeout !== undefined) {
                 if (isNaN(msg.requestTimeout)) {
                     node.warn(RED._("httpin.errors.timeout-isnan"));

From d5b0d2a886e92b1ded4fcb868e410b27854a42b8 Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Fri, 9 Aug 2019 21:26:14 +0300
Subject: [PATCH 047/305] Update 21-httprequest.html

Adding the HTTP Persistent web configuration
---
 .../@node-red/nodes/core/io/21-httprequest.html             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index 4c2a7c0d6..b2545828a 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -67,6 +67,11 @@
             </div>
         </div>
     </div>
+    
+    <div class="form-row">
+        <input type="checkbox" id="node-input-http-persistent" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-http-persistent" style="width: auto" data-i18n="httpin.http-persistent"></label>
+    </div>
 
     <div class="form-row">
         <input type="checkbox" id="node-input-useProxy" style="display: inline-block; width: auto; vertical-align: top;">
@@ -102,6 +107,7 @@
             paytoqs: {value: false},
             url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} },
             tls: {type:"tls-config",required: false},
+            "http-persistent":{value:true},
             proxy: {type:"http proxy",required: false},
             authType: {value: ""}
         },

From 7b5a41c3ff8f2cfde007c53628881090c64abbe0 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 12 Aug 2019 13:49:34 +0900
Subject: [PATCH 048/305] fix subflow category change on palette

---
 .../@node-red/editor-client/src/js/ui/palette.js             | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 359d0dead..8948017b6 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -415,7 +415,7 @@ RED.palette = (function() {
                 createCategory(newCategory,category,category,"node-red");
 
                 var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
-                var newCategoryNode = $("#palette-"+category);
+                var newCategoryNode = $("#red-ui-palette-"+category);
                 newCategoryNode.append(paletteNode);
                 if (newCategoryNode.find(".red-ui-palette-node").length === 1) {
                     categoryContainers[category].open();
@@ -428,9 +428,6 @@ RED.palette = (function() {
                         currentCategoryNode.find("i").toggleClass("expanded");
                     }
                 }
-
-
-
             }
         });
     }

From e5255b0c7c83cc2e36e8699553d379472c60fb46 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 12 Aug 2019 14:36:26 +0100
Subject: [PATCH 049/305] Ensure 2nd arg to node.error is an object Fixes #2228

---
 packages/node_modules/@node-red/runtime/lib/nodes/Node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index b1003d717..d4e1ae00f 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -272,7 +272,7 @@ Node.prototype.error = function(logMessage,msg) {
         logMessage = logMessage || "";
     }
     var handled = false;
-    if (msg) {
+    if (msg && typeof msg === 'object') {
         handled = this._flow.handleError(this,logMessage,msg);
     }
     if (!handled) {

From c8acc6a12e06dbdbf7365b52eafc8893a6c1f785 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 12 Aug 2019 14:51:01 +0100
Subject: [PATCH 050/305] Fix redo of subflow create

---
 .../@node-red/editor-client/src/js/history.js            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index c015716c2..db54701bb 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -29,7 +29,7 @@ RED.history = (function() {
                 inverseEv = {
                     t: 'multi',
                     events: []
-                };                
+                };
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
                     var r = undoEvent(ev.events[i]);
@@ -373,7 +373,6 @@ RED.history = (function() {
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
-                        n.z = ev.activeWorkspace;
                         n.dirty = true;
                         inverseEv.movedNodes.push(n.id);
                         RED.nodes.moveNodeToTab(n, z);
@@ -407,7 +406,7 @@ RED.history = (function() {
                 inverseEv = {
                     t: "createSubflow",
                     activeWorkspace: ev.activeWorkspace,
-                    ditry: RED.nodes.dirty(),
+                    dirty: RED.nodes.dirty(),
                 };
                 if (ev.subflow) {
                     RED.nodes.addSubflow(ev.subflow.subflow);
@@ -425,8 +424,8 @@ RED.history = (function() {
                         nn = RED.nodes.node(nid);
                         nn.x -= ev.subflow.offsetX;
                         nn.y -= ev.subflow.offsetY;
-                        nn.z = ev.subflow.subflow.id;
                         nn.dirty = true;
+                        RED.nodes.moveNodeToTab(nn, ev.subflow.subflow.id);
                     });
                 }
                 if (ev.links) {
@@ -447,7 +446,7 @@ RED.history = (function() {
                 inverseEv = {
                     t: 'reorder',
                     order: RED.nodes.getWorkspaceOrder()
-                };                
+                };
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }

From 880757fb5de7818e1e33ec5b81ea2e38469af646 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 12 Aug 2019 15:01:54 +0100
Subject: [PATCH 051/305] Rework Subflow Instance property UI (#2236)

* Add support of Subflow UI definition

* new UI definition for env var

* fix label

* fixed value obtaining

* fixed label width

* fix checkbox

* fix subflow info

* remove old subflow ui tests

* add tests

* merge ui new changes

* fix initial open button

* fix environment variable edit tab

* WIP: cp-1

* Rework subflow ui property

* Restrict SF value type according to input selection

* Move subflow property UI code to subflow.js

* Update subflow ui type select appearance

* Present subflow instance properties as table rather than generated UI

* Move subflow instance properties to separate tab

* Fix subflow property ui element layout issues
---
 .../editor-client/locales/en-US/editor.json   |  29 +-
 .../editor-client/locales/ja/editor.json      |  27 +-
 .../@node-red/editor-client/src/js/i18n.js    |  13 +
 .../@node-red/editor-client/src/js/nodes.js   |  14 +-
 .../src/js/ui/common/editableList.js          |  25 +-
 .../editor-client/src/js/ui/common/menu.js    |   2 +-
 .../editor-client/src/js/ui/common/popover.js |  65 ++
 .../src/js/ui/common/typedInput.js            | 274 +++--
 .../editor-client/src/js/ui/editor.js         | 217 +---
 .../editor-client/src/js/ui/subflow.js        | 973 +++++++++++++++++-
 .../editor-client/src/sass/base.scss          |   2 +
 .../editor-client/src/sass/dropdownMenu.scss  |   3 +
 .../editor-client/src/sass/editor.scss        | 417 ++++++++
 .../editor-client/src/sass/forms.scss         |   6 +-
 .../editor-client/src/sass/header.scss        |   1 +
 .../editor-client/src/sass/popover.scss       |  12 +
 .../src/sass/ui/common/typedInput.scss        | 231 +++--
 .../runtime/lib/nodes/flows/Subflow.js        |  82 +-
 test/nodes/subflow/subflow_spec.js            | 113 ++
 19 files changed, 2125 insertions(+), 381 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 9a53a870c..6e88bf14c 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -321,6 +321,31 @@
         "description": "Description",
         "show": "Show",
         "hide": "Hide",
+        "locale": "Select UI Language",
+        "icon": "Icon",
+        "inputType": "Input type",
+        "previewUI": "Preview UI",
+        "previewOK": "Preview OK",
+        "types": {
+            "str": "string",
+            "num": "number",
+            "bool": "bool",
+            "json": "json",
+            "bin": "buffer",
+            "env": "env var",
+            "no-value": "no value"
+        },
+        "menu": {
+            "input": "input",
+            "select": "select",
+            "checkbox": "checkbox",
+            "spinner": "spinner",
+            "hidden": "label only"
+        },
+        "spinner": {
+            "min": "min",
+            "max": "max"
+        },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
             "invalidProperties": "Invalid properties:"
@@ -939,9 +964,11 @@
     },
     "editor-tab": {
         "properties": "Properties",
+        "envProperties": "Environment Variables",
         "description": "Description",
         "appearance": "Appearance",
-        "env": "Environment Variables"
+        "preview": "UI Preview",
+        "defaultValue": "Default value"
     },
     "languages" : {
         "de": "German",
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 9d6ceaf6a..57ffa6e2c 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -321,6 +321,31 @@
         "description": "詳細",
         "show": "表示",
         "hide": "非表示",
+        "locale": "UI言語の選択",
+        "icon": "記号",
+        "inputType": "入力形式",
+        "previewUI": "UI確認",
+        "previewOK": "確認OK",
+        "types": {
+            "str": "文字列",
+            "num": "数値",
+            "bool": "真偽",
+            "json": "JSON",
+            "bin": "バッファ",
+            "env": "環境変数",
+            "no-value": "値無し"
+        },
+        "menu": {
+            "input": "入力",
+            "select": "選択",
+            "checkbox": "チェックボックス",
+            "spinner": "数値",
+            "hidden": "ラベルのみ"
+        },
+        "spinner": {
+            "min": "最小",
+            "max": "最大"
+        },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
             "invalidProperties": "プロパティが不正です:"
@@ -940,7 +965,7 @@
         "properties": "プロパティ",
         "description": "説明",
         "appearance": "外観",
-        "env": "環境変数"
+        "env": "サブフロープロパティ"
     },
     "languages": {
         "de": "ドイツ語",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/i18n.js b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
index 87afc3ebc..f1d0edfaf 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/i18n.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
@@ -50,6 +50,19 @@ RED.i18n = (function() {
             }
 
         },
+        lang: function() {
+            // Gets the active message catalog language. This is based on what
+            // locale the editor is using and what languages are available.
+            //
+            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var knownLangs = RED.settings.theme("languages")||["en-US"];
+            for (var i=0;i<preferredLangs.length;i++) {
+                if (knownLangs.indexOf(preferredLangs[i]) > -1) {
+                    return preferredLangs[i]
+                }
+            }
+            return 'end-US'
+        },
         loadNodeCatalog: function(namespace,done) {
             var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index bca4fab04..c2df8335e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -399,14 +399,14 @@ RED.nodes = (function() {
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
             oneditresize: function(size) {
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
+                // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
                 var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
-                }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-80);
+                // for (var i=0; i<rows.size(); i++) {
+                //     height -= $(rows[i]).outerHeight(true);
+                // }
+                // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $("ol.red-ui-editor-subflow-env-list").editableList('height',height);
             },
             set:{
                 module: "node-red"
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index d4fa53dfa..06ccc97d9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -34,6 +34,8 @@
  *   - addItem(itemData)
  *   - insertItemAt : function(data,index) - add an item at the specified index
  *   - removeItem(itemData)
+ *   - getItemAt(index)
+ *   - indexOf(itemData)
  *   - width(width)
  *   - height(height)
  *   - items()
@@ -186,7 +188,11 @@
             }
         },
         _destroy: function() {
-            this.topContainer.remove();
+            if (this.topContainer) {
+                var tc = this.topContainer;
+                delete this.topContainer;
+                tc.remove();
+            }
         },
         _refreshFilter: function() {
             var that = this;
@@ -232,6 +238,23 @@
             this.uiHeight = desiredHeight;
             this._resize();
         },
+        getItemAt: function(index) {
+            var items = this.items();
+            if (index >= 0 && index < items.length) {
+                return $(items[index]).data('data');
+            } else {
+                return;
+            }
+        },
+        indexOf: function(data) {
+            var items = this.items();
+            for (var i=0;i<items.length;i++) {
+                if ($(items[i]).data('data') === data) {
+                    return i
+                }
+            }
+            return -1
+        },
         insertItemAt: function(data,index) {
             var that = this;
             data = data || {};
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
index e4599f99c..3e16ef9d3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -225,7 +225,7 @@ RED.menu = (function() {
                 triggerAction(opt.id,state);
             }
         }
-        if (!alreadySet) {
+        if (!opt.local && !alreadySet) {
             RED.settings.set(opt.setting||("menu-"+opt.id), state);
         }
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
index 00fc0d435..554ea8afe 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -253,6 +253,71 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
+        },
+        panel: function(content) {
+            var panel = $('<div class="red-ui-editor-dialog red-ui-popover-panel"></div>');
+            panel.css({ display: "none" });
+            panel.appendTo(document.body);
+            content.appendTo(panel);
+            var closeCallback;
+
+            function hide() {
+                $(document).off("mousedown.red-ui-popover-panel-close");
+                panel.hide();
+                panel.css({
+                    height: "auto"
+                });
+                panel.remove();
+            }
+            function show(options) {
+                var closeCallback = options.onclose;
+                var target = options.target;
+                var align = options.align || "left";
+
+                var pos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+                var panelHeight = panel.height();
+                var panelWidth = panel.width();
+
+                var top = (targetHeight+pos.top);
+                if (top+panelHeight > $(window).height()) {
+                    top -= (top+panelHeight)-$(window).height() + 5;
+                }
+                if (top < 0) {
+                    panelHeight.height(panelHeight+top)
+                    top = 0;
+                }
+                if (align === "left") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left)+"px",
+                    });
+                } else if(align === "right") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left-panelWidth)+"px",
+                    });
+                }
+                panel.slideDown(100);
+
+                $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
+                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                        if (closeCallback) {
+                            closeCallback();
+                        }
+                        hide();
+                    }
+                    // if ($(event.target).closest(target).length) {
+                    //     event.preventDefault();
+                    // }
+                })
+            }
+            return  {
+                container: panel,
+                show:show,
+                hide:hide
+            }
         }
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index daef61f64..7b3ed45f2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -81,7 +81,7 @@
             }
         },
         re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.svg"},
-        date: {value:"date",label:"timestamp",hasValue:false},
+        date: {value:"date",label:"timestamp",icon:"fa fa-clock-o",hasValue:false},
         jsonata: {
             value: "jsonata",
             label: "expression",
@@ -298,7 +298,8 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
             this.type(this.options.default||this.typeList[0].value);
         }catch(err) {
             console.log(err.stack);
@@ -336,6 +337,17 @@
             menu.css({
                 height: "auto"
             });
+
+            if (menu.opts.multiple) {
+                var selected = [];
+                menu.find('input[type="checkbox"]').each(function() {
+                    if ($(this).prop("checked")) {
+                        selected.push($(this).data('value'))
+                    }
+                })
+                menu.callback(selected);
+            }
+
             if (this.elementDiv.is(":visible")) {
                 this.input.trigger("focus");
             } else if (this.optionSelectTrigger.is(":visible")){
@@ -344,10 +356,12 @@
                 this.selectTrigger.trigger("focus");
             }
         },
-        _createMenu: function(opts,callback) {
+        _createMenu: function(menuOptions,opts,callback) {
             var that = this;
-            var menu = $("<div>").addClass("red-ui-typedInput-options");
-            opts.forEach(function(opt) {
+            var menu = $("<div>").addClass("red-ui-typedInput-options red-ui-editor-dialog");
+            menu.opts = opts;
+            menu.callback = callback;
+            menuOptions.forEach(function(opt) {
                 if (typeof opt === 'string') {
                     opt = {value:opt,label:opt};
                 }
@@ -369,12 +383,20 @@
                 if (!opt.icon && !opt.label) {
                     op.text(opt.value);
                 }
+                var cb;
+                if (opts.multiple) {
+                    cb = $('<input type="checkbox">').css("pointer-events","none").data('value',opt.value).prependTo(op).on("mousedown", function(evt) { evt.preventDefault() });
+                }
 
                 op.on("click", function(event) {
                     event.preventDefault();
                     event.stopPropagation();
-                    callback(opt.value);
-                    that._hideMenu(menu);
+                    if (!opts.multiple) {
+                        callback(opt.value);
+                        that._hideMenu(menu);
+                    } else {
+                        cb.prop("checked",!cb.prop("checked"));
+                    }
                 });
             });
             menu.css({
@@ -398,9 +420,6 @@
                 }
                 evt.stopPropagation();
             })
-
-
-
             return menu;
 
         },
@@ -409,11 +428,22 @@
                 this.disarmClick = false;
                 return
             }
+            if (menu.opts.multiple) {
+                var selected = {};
+                 this.value().split(",").forEach(function(f) {
+                     selected[f] = true;
+                 })
+                menu.find('input[type="checkbox"]').each(function() {
+                    $(this).prop("checked",selected[$(this).data('value')])
+                })
+            }
+
+
             var that = this;
             var pos = relativeTo.offset();
             var height = relativeTo.height();
             var menuHeight = menu.height();
-            var top = (height+pos.top-3);
+            var top = (height+pos.top);
             if (top+menuHeight > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
@@ -423,7 +453,7 @@
             }
             menu.css({
                 top: top+"px",
-                left: (2+pos.left)+"px",
+                left: (pos.left)+"px",
             });
             menu.slideDown(100);
             this._delay(function() {
@@ -471,7 +501,7 @@
                 this._getLabelWidth(this.selectTrigger, function(labelWidth) {
                     that.elementDiv.css('left',labelWidth+"px");
                     that.valueLabelContainer.css('left',labelWidth+"px");
-                    if (that.optionExpandButton.is(":visible")) {
+                    if (that.optionExpandButton.shown) {
                         that.elementDiv.css('right',"22px");
                         that.valueLabelContainer.css('right',"22px");
                     } else {
@@ -496,7 +526,7 @@
                         } else {
                             that.optionSelectLabel.css({'left':'0'})
                             that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
-                            if (!that.optionExpandButton.is(":visible")) {
+                            if (!that.optionExpandButton.shown) {
                                 that.elementDiv.css({'right':0});
                                 that.input.css({
                                     'border-top-right-radius': '4px',
@@ -511,25 +541,35 @@
         _updateOptionSelectLabel: function(o) {
             var opt = this.typeMap[this.propertyType];
             this.optionSelectLabel.empty();
-            if (o.icon) {
-                if (o.icon.indexOf("<") === 0) {
-                    $(o.icon).prependTo(this.optionSelectLabel);
-                } else if (o.icon.indexOf("/") !== -1) {
-                    // url
-                    $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+            if (this.typeMap[this.propertyType].valueLabel) {
+                if (opt.multiple) {
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
                 } else {
-                    // icon class
-                    $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
+                }
+            } else if (!opt.multiple) {
+                if (o.icon) {
+                    if (o.icon.indexOf("<") === 0) {
+                        $(o.icon).prependTo(this.optionSelectLabel);
+                    } else if (o.icon.indexOf("/") !== -1) {
+                        // url
+                        $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+                    } else {
+                        // icon class
+                        $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    }
+                } else if (o.label) {
+                    this.optionSelectLabel.text(o.label);
+                } else {
+                    this.optionSelectLabel.text(o.value);
+                }
+                if (opt.hasValue) {
+                    this.optionValue = o.value;
+                    this._resize();
+                    this.input.trigger('change',this.propertyType,this.value());
                 }
-            } else if (o.label) {
-                this.optionSelectLabel.text(o.label);
             } else {
-                this.optionSelectLabel.text(o.value);
-            }
-            if (opt.hasValue) {
-                this.optionValue = o.value;
-                this._resize();
-                this.input.trigger('change',this.propertyType,this.value());
+                this.optionSelectLabel.text(o.length+" selected");
             }
         },
         _destroy: function() {
@@ -558,7 +598,7 @@
             if (this.menu) {
                 this.menu.remove();
             }
-            this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
+            this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
             } else {
@@ -572,38 +612,51 @@
             this._resize();
         },
         value: function(value) {
+            var that = this;
+            var opt = this.typeMap[this.propertyType];
             if (!arguments.length) {
                 var v = this.input.val();
-                if (this.typeMap[this.propertyType].export) {
-                    v = this.typeMap[this.propertyType].export(v,this.optionValue)
+                if (opt.export) {
+                    v = opt.export(v,this.optionValue)
                 }
                 return v;
             } else {
-                var selectedOption;
-                if (this.typeMap[this.propertyType].options) {
-                    for (var i=0;i<this.typeMap[this.propertyType].options.length;i++) {
-                        var op = this.typeMap[this.propertyType].options[i];
-                        if (typeof op === "string") {
-                            if (op === value) {
-                                selectedOption = this.activeOptions[op];
+                var selectedOption = [];
+                if (opt.options) {
+                    var checkValues = [value];
+                    if (opt.multiple) {
+                        selectedOption = [];
+                        checkValues = value.split(",");
+                    }
+                    checkValues.forEach(function(value) {
+                        for (var i=0;i<opt.options.length;i++) {
+                            var op = opt.options[i];
+                            if (typeof op === "string") {
+                                if (op === value) {
+                                    selectedOption.push(that.activeOptions[op]);
+                                    break;
+                                }
+                            } else if (op.value === value) {
+                                selectedOption.push(op);
                                 break;
                             }
-                        } else if (op.value === value) {
-                            selectedOption = op;
-                            break;
                         }
-                    }
-                    if (!selectedOption) {
-                        selectedOption = {value:""}
-                    }
+                    })
                     this.input.val(value);
-                    this._updateOptionSelectLabel(selectedOption)
+                    if (!opt.multiple) {
+                        if (!selectedOption.length === 0) {
+                            selectedOption = [{value:""}];
+                        }
+                        this._updateOptionSelectLabel(selectedOption[0])
+                    } else {
+                        this._updateOptionSelectLabel(selectedOption)
+                    }
                 } else {
                     this.input.val(value);
-                }
-                if (this.typeMap[this.propertyType].valueLabel) {
-                    this.valueLabelContainer.empty();
-                    this.typeMap[this.propertyType].valueLabel.call(this,this.valueLabelContainer,value);
+                    if (opt.valueLabel) {
+                        this.valueLabelContainer.empty();
+                        opt.valueLabel.call(this,this.valueLabelContainer,value);
+                    }
                 }
                 this.input.trigger('change',this.type(),value);
             }
@@ -621,7 +674,7 @@
                     }
                     this.selectLabel.empty();
                     var image;
-                    if (opt.icon) {
+                    if (opt.icon && opt.showLabel !== false) {
                         if (opt.icon.indexOf("<") === 0) {
                             $(opt.icon).prependTo(this.selectLabel);
                         }
@@ -636,7 +689,8 @@
                         else {
                             $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
                         }
-                    } else {
+                    }
+                    if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
                         this.selectLabel.text(opt.label);
                     }
                     if (this.optionMenu) {
@@ -646,6 +700,7 @@
                     if (opt.options) {
                         if (this.optionExpandButton) {
                             this.optionExpandButton.hide();
+                            this.optionExpandButton.shown = false;
                         }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
@@ -668,36 +723,50 @@
                             if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
                                 that.optionValue = null;
                             }
-                            this.optionMenu = this._createMenu(opt.options,function(v){
-                                that._updateOptionSelectLabel(that.activeOptions[v]);
-                                if (!opt.hasValue) {
-                                    that.value(that.activeOptions[v].value)
-                                }
-                            });
+
                             var op;
                             if (!opt.hasValue) {
-                                var currentVal = this.input.val();
                                 var validValue = false;
-                                for (var i=0;i<opt.options.length;i++) {
-                                    op = opt.options[i];
-                                    if (typeof op === "string" && op === currentVal) {
-                                        that._updateOptionSelectLabel({value:currentVal});
-                                        validValue = true;
-                                        break;
-                                    } else if (op.value === currentVal) {
-                                        that._updateOptionSelectLabel(op);
-                                        validValue = true;
-                                        break;
+                                var currentVal = this.input.val();
+                                if (!opt.multiple) {
+                                    for (var i=0;i<opt.options.length;i++) {
+                                        op = opt.options[i];
+                                        if (typeof op === "string" && op === currentVal) {
+                                            that._updateOptionSelectLabel({value:currentVal});
+                                            validValue = true;
+                                            break;
+                                        } else if (op.value === currentVal) {
+                                            that._updateOptionSelectLabel(op);
+                                            validValue = true;
+                                            break;
+                                        }
                                     }
-                                }
-                                if (!validValue) {
-                                    op = opt.options[0];
-                                    if (typeof op === "string") {
-                                        this.value(op);
-                                        that._updateOptionSelectLabel({value:op});
-                                    } else {
-                                        this.value(op.value);
-                                        that._updateOptionSelectLabel(op);
+                                    if (!validValue) {
+                                        op = opt.options[0];
+                                        if (typeof op === "string") {
+                                            this.value(op);
+                                            that._updateOptionSelectLabel({value:op});
+                                        } else {
+                                            this.value(op.value);
+                                            that._updateOptionSelectLabel(op);
+                                        }
+                                    }
+                                } else {
+                                    // Check to see if value is a valid csv of
+                                    // options.
+                                    var currentValues = {};
+                                    currentVal.split(",").forEach(function(v) {
+                                        if (v) {
+                                            currentValues[v] = true;
+                                        }
+                                    });
+                                    for (var i=0;i<opt.options.length;i++) {
+                                        op = opt.options[i];
+                                        delete currentValues[op.value||op];
+                                    }
+                                    if (!$.isEmptyObject(currentValues)) {
+                                        // Invalid, set to default/empty
+                                        this.value((opt.default||[]).join(","));
                                     }
                                 }
                             } else {
@@ -733,7 +802,21 @@
                                     this.optionSelectTrigger.hide();
                                 }
                             }
+                            this.optionMenu = this._createMenu(opt.options,opt,function(v){
+                                if (!opt.multiple) {
+                                    that._updateOptionSelectLabel(that.activeOptions[v]);
+                                    if (!opt.hasValue) {
+                                        that.value(that.activeOptions[v].value)
+                                    }
+                                } else {
+                                    that._updateOptionSelectLabel(v);
+                                    if (!opt.hasValue) {
+                                        that.value(v.join(","))
+                                    }
+                                }
+                            });
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     } else {
                         if (this.optionSelectTrigger) {
@@ -758,17 +841,44 @@
                             this.elementDiv.show();
                         }
                         if (this.optionExpandButton) {
-                            if (opt.expand && typeof opt.expand === 'function') {
+                            if (opt.expand) {
+                                if (opt.expand.icon) {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa "+opt.expand.icon)
+                                } else {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa fa-ellipsis-h")
+                                }
+                                this.optionExpandButton.shown = true;
                                 this.optionExpandButton.show();
                                 this.optionExpandButton.off('click');
                                 this.optionExpandButton.on('click',function(evt) {
                                     evt.preventDefault();
-                                    opt.expand.call(that);
+                                    if (typeof opt.expand === 'function') {
+                                        opt.expand.call(that);
+                                    } else {
+                                        var container = $('<div>');
+                                        var content = opt.expand.content.call(that,container);
+                                        var panel = RED.popover.panel(container);
+                                        panel.container.css({
+                                            width:that.valueLabelContainer.width()
+                                        });
+                                        if (opt.expand.minWidth) {
+                                            panel.container.css({
+                                                minWidth: opt.expand.minWidth+"px"
+                                            });
+                                        }
+                                        panel.show({
+                                            target:that.optionExpandButton,
+                                            onclose:content.onclose,
+                                            align: "right"
+                                        });
+                                    }
                                 })
                             } else {
+                                this.optionExpandButton.shown = false;
                                 this.optionExpandButton.hide();
                             }
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     }
                     if (!image) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 1abace286..c3d1f5bd7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -19,7 +19,6 @@
  */
 RED.editor = (function() {
 
-
     var editStack = [];
     var editing_node = null;
     var editing_config_node = null;
@@ -546,148 +545,7 @@ RED.editor = (function() {
         return label;
     }
 
-    function buildEnvForm(container, node) {
-        var env_container = $('#node-input-env-container');
-        env_container
-            .css({
-                'min-height':'150px',
-                'min-width':'450px'
-            })
-            .editableList({
-                addItem: function(container, i, opt) {
-                    var row = $('<div/>').appendTo(container);
-                    if (opt.parent) {
-                        $('<div/>', {
-                            class:"uneditable-input",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                        }).appendTo(row).text(opt.name);
-                    } else {
-                        $('<input/>', {
-                            class: "node-input-env-name",
-                            type: "text",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                            placeholder: RED._("common.label.name")
-                        }).attr("autocomplete","disable").appendTo(row).val(opt.name);
-                    }
-                    var valueField = $('<input/>',{
-                        class: "node-input-env-value",
-                        type: "text",
-                        style: "margin-left: 5px; width: calc(60% - 8px)"
-                    }).attr("autocomplete","disable").appendTo(row)
-
-                    valueField.typedInput({default:'str',
-                                           types:['str','num','bool','json','bin','env']
-                                          });
-
-                    valueField.typedInput('type', opt.parent?(opt.type||opt.parent.type):opt.type);
-                    valueField.typedInput('value', opt.parent?((opt.value !== undefined)?opt.value:opt.parent.value):opt.value);
-
-                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(container);
-                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
-                    container.parent().addClass("red-ui-editableList-item-removable");
-                    if (opt.parent) {
-                        if ((opt.value !== undefined) && (opt.value !== opt.parent.value || opt.type !== opt.parent.type)) {
-                            actionButton.show();
-                        } else {
-                            actionButton.hide();
-                        }
-                        var restoreTip = RED.popover.tooltip(actionButton,RED._("subflow.env.restore"));
-                        valueField.on("change", function(evt) {
-                            var newType = valueField.typedInput('type');
-                            var newValue = valueField.typedInput('value');
-                            if (newType === opt.parent.type && newValue === opt.parent.value) {
-                                actionButton.hide();
-                            } else {
-                                actionButton.show();
-                            }
-                        })
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            restoreTip.close();
-                            valueField.typedInput('type', opt.parent.type);
-                            valueField.typedInput('value', opt.parent.value);
-                        })
-                    } else {
-                        var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            removeTip.close();
-                            container.parent().addClass("red-ui-editableList-item-deleting")
-                            container.fadeOut(300, function() {
-                                env_container.editableList('removeItem',opt);
-                            });
-                        });
-                    }
-                },
-                sortable: false,
-                removable: false
-            });
-        var parentEnv = {};
-        var envList = [];
-        if (/^subflow:/.test(node.type)) {
-            var subflowDef = RED.nodes.subflow(node.type.substring(8));
-            if (subflowDef.env) {
-                subflowDef.env.forEach(function(env) {
-                    var item = {
-                        name:env.name,
-                        parent: {
-                            type: env.type,
-                            value: env.value
-                        }
-                    }
-                    envList.push(item);
-                    parentEnv[env.name] = item;
-                })
-            }
-        }
-
-        if (node.env) {
-            for (var i = 0; i < node.env.length; i++) {
-                var env = node.env[i];
-                if (parentEnv.hasOwnProperty(env.name)) {
-                    parentEnv[env.name].type = env.type;
-                    parentEnv[env.name].value = env.value;
-                } else {
-                    envList.push({
-                        name: env.name,
-                        type: env.type,
-                        value: env.value
-                    });
-                }
-            }
-        }
-        envList.forEach(function(env) {
-            env_container.editableList('addItem', env);
-        })
-    }
-
-    function exportEnvList(list) {
-        if (list) {
-            var env = [];
-            list.each(function(i) {
-                var entry = $(this);
-                var item = entry.data('data');
-                var name = (item.parent?item.name:entry.find(".node-input-env-name").val()).trim();
-                if (name !== "") {
-                    var valueInput = entry.find(".node-input-env-value");
-                    var value = valueInput.typedInput("value");
-                    var type = valueInput.typedInput("type");
-                    if (!item.parent || (item.parent.value !== value || item.parent.type !== type)) {
-                        var item = {
-                            name: name,
-                            type: type,
-                            value: value
-                        };
-                        env.push(item);
-                    }
-                }
-            });
-            return env;
-        }
-        return null;
-    }
-
-    function isSameEnv(env0, env1) {
+    function isSameObj(env0, env1) {
         return (JSON.stringify(env0) === JSON.stringify(env1));
     }
 
@@ -713,8 +571,8 @@ RED.editor = (function() {
             $(this).attr("data-i18n",keys.join(";"));
         });
 
-        if ((type === "subflow") || (type === "subflow-template")) {
-            buildEnvForm(dialogForm, node);
+        if (type === "subflow-template" || type === "subflow") {
+            RED.subflow.buildEditForm(dialogForm,type,node);
         }
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
@@ -857,7 +715,7 @@ RED.editor = (function() {
         }
         return result;
     }
-    function showIconPicker(container, node, iconPath, done) {
+    function showIconPicker(container, node, iconPath, faOnly, done) {
         var containerPos = container.offset();
         var pickerBackground = $('<div>').css({
             position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
@@ -912,7 +770,14 @@ RED.editor = (function() {
             done(null);
         });
         var iconSets = RED.nodes.getIconSets();
+        var backgroundColor = node && RED.utils.getNodeColor(node.type, node._def);
+        if (!node && faOnly) {
+            iconList.addClass("red-ui-icon-list-dark");
+        }
         Object.keys(iconSets).forEach(function(moduleName) {
+            if (faOnly && (moduleName !== "font-awesome")) {
+                return;
+            }
             var icons = iconSets[moduleName];
             if (icons.length > 0) {
                 // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
@@ -921,10 +786,13 @@ RED.editor = (function() {
                 icons.forEach(function(icon) {
                     var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
                     var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
-                    var colour = RED.utils.getNodeColor(node.type, node._def);
                     var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
                     iconDiv.data('icon',icon_url);
-                    nodeDiv.css('backgroundColor',colour);
+                    if (node) {
+                        nodeDiv.css({
+                            'backgroundColor': backgroundColor
+                        });
+                    }
                     var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                     RED.utils.createIconElement(icon_url, iconContainer, true);
 
@@ -1049,7 +917,7 @@ RED.editor = (function() {
                 } else {
                     iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 }
-                showIconPicker(iconRow,node,iconPath,function(newIcon) {
+                showIconPicker(iconRow,node,iconPath,false,function(newIcon) {
                     $("#red-ui-editor-node-icon").text(newIcon||"");
                     var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
                     RED.utils.createIconElement(icon_url, iconContainer, true);
@@ -1093,6 +961,7 @@ RED.editor = (function() {
         }
     }
 
+
     function updateLabels(editing_node, changes, outputMap) {
         var inputLabels = $("#red-ui-editor-node-label-form-inputs").children().find("input");
         var outputLabels = $("#red-ui-editor-node-label-form-outputs").children().find("input");
@@ -1483,13 +1352,13 @@ RED.editor = (function() {
 
                         if (type === "subflow") {
                             var old_env = editing_node.env;
-                            var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
-                            if (!isSameEnv(old_env, new_env)) {
+                            var new_env = RED.subflow.exportSubflowInstanceEnv(editing_node);
+                            if (!isSameObj(old_env, new_env)) {
                                 editing_node.env = new_env;
                                 changes.env = editing_node.env;
                                 changed = true;
                             }
-                        }
+                         }
 
                         if (changed) {
                             var wasChanged = editing_node.changed;
@@ -1607,6 +1476,19 @@ RED.editor = (function() {
                 buildEditForm(nodePropertiesTab.content,"dialog-form",type,ns,node);
                 editorTabs.addTab(nodePropertiesTab);
 
+                if (/^subflow:/.test(node.type)) {
+                    var subflowPropertiesTab = {
+                        id: "editor-subflow-envProperties",
+                        label: RED._("editor-tab.envProperties"),
+                        name: RED._("editor-tab.envProperties"),
+                        content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                        iconClass: "fa fa-list"
+                    };
+
+                    RED.subflow.buildPropertiesForm(subflowPropertiesTab.content,node);
+                    editorTabs.addTab(subflowPropertiesTab);
+                }
+
                 if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
                     var descriptionTab = {
                         id: "editor-tab-description",
@@ -1875,7 +1757,6 @@ RED.editor = (function() {
                     var configId = editing_config_node.id;
                     var configAdding = adding;
                     var configTypeDef = RED.nodes.getType(configType);
-
                     if (configTypeDef.oneditcancel) {
                         // TODO: what to pass as this to call
                         if (configTypeDef.oneditcancel) {
@@ -2234,6 +2115,15 @@ RED.editor = (function() {
                             editing_node.category = newCategory;
                             changed = true;
                         }
+
+                        var old_env = editing_node.env;
+                        var new_env = RED.subflow.exportSubflowTemplateEnv($("#node-input-env-container").editableList("items"));
+                        if (!isSameObj(old_env, new_env)) {
+                            editing_node.env = new_env;
+                            changes.env = editing_node.env;
+                            changed = true;
+                        }
+
                         RED.palette.refresh();
 
                         if (changed) {
@@ -2274,15 +2164,18 @@ RED.editor = (function() {
             ],
             resize: function(size) {
                 $(".red-ui-tray-content").height(size.height - 50);
-                // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
-                var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
+                var envContainer = $("#node-input-env-container");
+                if (envContainer.length) {
+                    // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
+                    var rows = $("#dialog-form>div:not(#subflow-env-tabs-content)");
+                    var height = size.height;
+                    for (var i=0; i<rows.size(); i++) {
+                        height -= $(rows[i]).outerHeight(true);
+                    }
+                    // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                    // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                    $("#node-input-env-container").editableList('height',height-95);
                 }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-60);
             },
             open: function(tray) {
                 var trayFooter = tray.find(".red-ui-tray-footer");
@@ -2518,6 +2411,8 @@ RED.editor = (function() {
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties, // TODO: only exposed for edit-undo
 
+        showIconPicker:showIconPicker,
+
         /**
          * Show a type editor.
          * @param {string} type - the type to display
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index a8be067d6..66d016d92 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -16,16 +16,29 @@
 
 RED.subflow = (function() {
 
+    var currentLocale = "en-US";
+
     var _subflowEditTemplate = '<script type="text/x-red" data-template-name="subflow">'+
         '<div class="form-row"><label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label><input type="text" id="node-input-name"></div>'+
-        '<div class="form-row" style="margin-bottom: 0px;"><label style="width: auto;" data-i18n="[append]editor:editor-tab.env"><i class="fa fa-th-list"></i> </label></div>'+
-        '<div class="form-row node-input-env-container-row"><ol id="node-input-env-container"></ol></div>'+
+        '<div id="subflow-input-ui"></div>'+
         '</script>';
 
     var _subflowTemplateEditTemplate = '<script type="text/x-red" data-template-name="subflow-template">'+
-        '<div class="form-row"><i class="fa fa-tag"></i> <label for="subflow-input-name" data-i18n="common.label.name"></label><input type="text" id="subflow-input-name"></div>'+
-        '<div class="form-row" style="margin-bottom: 0px;"><label style="width: auto;" data-i18n="[append]editor:editor-tab.env"><i class="fa fa-th-list"></i> </label></div>'+
-        '<div class="form-row node-input-env-container-row"><ol id="node-input-env-container"></ol></div>'+
+        '<div class="form-row"><label for="subflow-input-name" data-i18n="[append]common.label.name"><i class="fa fa-tag"></i>  </label><input type="text" id="subflow-input-name"></div>'+
+        '<div class="form-row">'+
+            '<ul style="margin-bottom: 20px;" id="subflow-env-tabs"></ul>'+
+        '</div>'+
+        '<div id="subflow-env-tabs-content">'+
+            '<div id="subflow-env-tab-edit">'+
+                '<div class="form-row node-input-env-container-row" id="subflow-input-edit-ui">'+
+                    '<ol class="red-ui-editor-subflow-env-list" id="node-input-env-container"></ol>'+
+                    '<div class="node-input-env-locales-row"><i class="fa fa-language"></i> <select id="subflow-input-env-locale"></select></div>'+
+                '</div>'+
+            '</div>'+
+            '<div id="subflow-env-tab-preview">'+
+                '<div id="subflow-input-ui"/>'+
+            '</div>'+
+        '</div>'+
         '</script>';
 
     function findAvailableSubflowIOPosition(subflow,isInput) {
@@ -747,6 +760,946 @@ RED.subflow = (function() {
         RED.view.redraw(true);
     }
 
+
+    /**
+     * Create interface for controlling env var UI definition
+     */
+    function buildEnvControl(envList) {
+
+        var tabs = RED.tabs.create({
+            id: "subflow-env-tabs",
+            onchange: function(tab) {
+                if (tab.id === "subflow-env-tab-preview") {
+                    var inputContainer = $("#subflow-input-ui");
+                    var list = envList.editableList("items");
+                    var exportedEnv = exportEnvList(list, true);
+                    buildEnvUI(inputContainer, exportedEnv);
+                }
+                $("#subflow-env-tabs-content").children().hide();
+                $("#" + tab.id).show();
+            }
+        });
+        tabs.addTab({
+            id: "subflow-env-tab-edit",
+            label: RED._("editor-tab.envProperties")
+        });
+        tabs.addTab({
+            id: "subflow-env-tab-preview",
+            label:  RED._("editor-tab.preview")
+        });
+
+        var localesList = RED.settings.theme("languages")
+            .map(function(lc) { var name = RED._("languages."+lc); return {text: (name ? name : lc), val: lc}; })
+            .sort(function(a, b) { return a.text.localeCompare(b.text) });
+        RED.popover.tooltip($(".node-input-env-locales-row i"),RED._("editor.locale"))
+        var locales = $("#subflow-input-env-locale")
+        localesList.forEach(function(item) {
+            var opt = {
+                value: item.val
+            };
+            if (item.val === "en-US") { // make en-US default selected
+                opt.selected = "";
+            }
+            $("<option/>", opt).text(item.text).appendTo(locales);
+        });
+        currentLocale = RED.i18n.lang();
+        locales.val(currentLocale);
+
+        locales.on("change", function() {
+            currentLocale = $(this).val();
+            var items = $("#node-input-env-container").editableList("items");
+            items.each(function (i, item) {
+                var entry = $(this).data('data');
+                var labelField = entry.ui.labelField;
+                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
+                if (labelField.timeout) {
+                    clearTimeout(labelField.timeout);
+                    delete labelField.timeout;
+                }
+                labelField.addClass("input-updated");
+                labelField.timeout = setTimeout(function() {
+                    delete labelField.timeout
+                    labelField.removeClass("input-updated");
+                },3000);
+            });
+        });
+    }
+
+    /**
+     * Create env var edit interface
+     * @param container - container
+     * @param node - subflow node
+     */
+    function buildPropertiesList(envContainer, node) {
+
+        var isTemplateNode = (node.type === "subflow");
+
+        if (isTemplateNode) {
+            buildEnvControl(envContainer);
+        }
+        envContainer
+            .css({
+                'min-height':'150px',
+                'min-width':'450px'
+            })
+            .editableList({
+                header: isTemplateNode?$('<div><div><div></div><div data-i18n="common.label.name"></div><div data-i18n="editor-tab.defaultValue"></div><div></div></div></div>'):undefined,
+                addItem: function(container, i, opt) {
+                    if (isTemplateNode) {
+                        container.addClass("red-ui-editor-subflow-env-editable")
+                    }
+
+                    var envRow = $('<div/>').appendTo(container);
+                    var nameField = null;
+                    var valueField = null;
+
+                    // if (opt.parent) {
+                    //     buildEnvUIRow(envRow,opt,opt.parent.ui||{})
+                    // } else {
+                        nameField = $('<input/>', {
+                            class: "node-input-env-name",
+                            type: "text",
+                            placeholder: RED._("common.label.name")
+                        }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
+                        valueField = $('<input/>',{
+                            style: "width:100%",
+                            class: "node-input-env-value",
+                            type: "text",
+                        }).attr("autocomplete","disable").appendTo(envRow)
+                        valueField.typedInput({default:'str',types:['str','num','bool','json','bin','env']});
+                        valueField.typedInput('type', opt.parent?(opt.type||opt.parent.type):opt.type);
+                        valueField.typedInput('value', opt.parent?((opt.value !== undefined)?opt.value:opt.parent.value):opt.value);
+                    // }
+
+
+                    opt.nameField = nameField;
+                    opt.valueField = valueField;
+
+                    if (!opt.parent) {
+                        var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
+                        $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
+                        var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
+                        actionButton.on("click", function(evt) {
+                            evt.preventDefault();
+                            removeTip.close();
+                            container.parent().addClass("red-ui-editableList-item-deleting")
+                            container.fadeOut(300, function() {
+                                envContainer.editableList('removeItem',opt);
+                            });
+                        });
+                    }
+
+                    if (isTemplateNode) {
+                        // Add the UI customisation row
+                        // if `opt.ui` does not exist, then apply defaults. If these
+                        // defaults do not change then they will get stripped off
+                        // before saving.
+                        opt.ui = opt.ui || {
+                            icon: "",
+                            label: {},
+                            type: "input",
+                            opts: {types:['str','num','bool','json','bin','env']}
+                        }
+                        opt.ui.label = opt.ui.label || {};
+                        opt.ui.type = opt.ui.type || "input";
+
+                        var uiRow = $('<div/>').appendTo(container).hide();
+                        // save current info for reverting on cancel
+                        // var copy = $.extend(true, {}, ui);
+
+                         $('<a href="#"><i class="fa fa-angle-right"></a>').prependTo(envRow).on("click", function (evt) {
+                            evt.preventDefault();
+                            if ($(this).hasClass('expanded')) {
+                                uiRow.slideUp();
+                                $(this).removeClass('expanded');
+                            } else {
+                                uiRow.slideDown();
+                                $(this).addClass('expanded');
+                            }
+                        });
+
+                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
+                        nameField.trigger('change');
+                    }
+                },
+                sortable: ".red-ui-editableList-item-handle",
+                removable: false
+            });
+        var parentEnv = {};
+        var envList = [];
+        if (/^subflow:/.test(node.type)) {
+            var subflowDef = RED.nodes.subflow(node.type.substring(8));
+            if (subflowDef.env) {
+                subflowDef.env.forEach(function(env) {
+                    var item = {
+                        name:env.name,
+                        parent: {
+                            type: env.type,
+                            value: env.value,
+                            ui: env.ui
+                        }
+                    }
+                    envList.push(item);
+                    parentEnv[env.name] = item;
+                })
+            }
+        }
+
+        if (node.env) {
+            for (var i = 0; i < node.env.length; i++) {
+                var env = node.env[i];
+                if (parentEnv.hasOwnProperty(env.name)) {
+                    parentEnv[env.name].type = env.type;
+                    parentEnv[env.name].value = env.value;
+                } else {
+                    envList.push({
+                        name: env.name,
+                        type: env.type,
+                        value: env.value,
+                        ui: env.ui
+                    });
+                }
+            }
+        }
+        envList.forEach(function(env) {
+            if (env.parent && env.parent.ui && env.parent.ui.type === 'hide') {
+                return;
+            }
+            if (!isTemplateNode && env.parent) {
+                return;
+            }
+            envContainer.editableList('addItem', JSON.parse(JSON.stringify(env)));
+        });
+    }
+
+    /**
+     * Create UI edit interface for environment variable
+     * @param container - container
+     * @param env - env var definition
+     * @param nameField - name field of env var
+     * @param valueField - value field of env var
+     */
+     function buildEnvEditRow(container, ui, nameField, valueField) {
+         container.addClass("red-ui-editor-subflow-env-ui-row")
+         var topRow = $('<div></div>').appendTo(container);
+         $('<div></div>').appendTo(topRow);
+         $('<div>').text(RED._("editor.icon")).appendTo(topRow);
+         $('<div>').text(RED._("editor.label")).appendTo(topRow);
+         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);
+
+         var row = $('<div></div>').appendTo(container);
+         $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
+
+         var typeOptions = {
+             'input': {types:['str','num','bool','json','bin','env']},
+             'select': {opts:[]},
+             'spinner': {}
+         };
+         if (ui.opts) {
+             typeOptions[ui.type] = ui.opts;
+         } else {
+             // Pick up the default values if not otherwise provided
+             ui.opts = typeOptions[ui.type];
+         }
+         var iconCell = $('<div></div>').appendTo(row);
+
+         var iconButton = $('<a href="#"></a>').appendTo(iconCell);
+         iconButton.on("click", function(evt) {
+             evt.preventDefault();
+             var icon = ui.icon || "";
+             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
+             RED.editor.showIconPicker(row, null, iconPath, true, function (newIcon) {
+                 iconButton.empty();
+                 var path = newIcon || "";
+                 var newPath = RED.utils.separateIconPath(path);
+                 if (newPath) {
+                     $('<i class="fa"></i>').addClass(newPath.file).appendTo(iconButton);
+                 }
+                 ui.icon = path;
+             });
+         })
+
+         if (ui.icon) {
+             var newPath = RED.utils.separateIconPath(ui.icon);
+             $('<i class="fa '+newPath.file+'"></i>').appendTo(iconButton);
+         }
+
+         var labelCell = $('<div></div>').appendTo(row);
+
+         var label = ui.label && ui.label[currentLocale] || "";
+         var labelInput = $('<input type="text">').val(label).appendTo(labelCell);
+         ui.labelField = labelInput;
+         labelInput.on('change', function(evt) {
+             ui.label = ui.label || {};
+             var val = $(this).val().trim();
+             if (val === "") {
+                 delete ui.label[currentLocale];
+             } else {
+                 ui.label[currentLocale] = val;
+             }
+         })
+         var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelCell);
+         RED.popover.tooltip(labelIcon,function() {
+             var langs = Object.keys(ui.label);
+             var content = $("<div>");
+             if (langs.indexOf(currentLocale) === -1) {
+                 langs.push(currentLocale);
+                 langs.sort();
+             }
+             langs.forEach(function(l) {
+                 var row = $('<div>').appendTo(content);
+                 $('<span>').css({display:"inline-block",width:"50px"}).text(l+(l===currentLocale?"*":"")).appendTo(row);
+                 $('<span>').text(ui.label[l]||"").appendTo(row);
+             });
+             return content;
+         })
+
+         nameField.on('change',function(evt) {
+            labelInput.attr("placeholder",$(this).val())
+         });
+
+         var inputCell = $('<div></div>').appendTo(row);
+         var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+         if (ui.type === "input") {
+             inputCellInput.val(ui.opts.types.join(","));
+         }
+         var checkbox;
+         var selectBox;
+
+         inputCellInput.typedInput({
+             types: [
+                 {value:"input",
+                    label:"input", icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
+                         {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
+                         {value:"num",label:"number",icon:"red/images/typedInput/09.svg"},
+                         {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg"},
+                         {value:"json",label:"JSON",icon:"red/images/typedInput/json.svg"},
+                         {value: "bin",label: "buffer",icon: "red/images/typedInput/bin.svg"},
+                         {value: "env",label: "env variable",icon: "red/images/typedInput/env.svg"}
+                     ],
+                     default: ['str','num','bool','json','bin','env'],
+                     valueLabel: function(container,value) {
+                         container.css("padding",0);
+                         var innerContainer = $('<div>').css({
+                             "background":"white",
+                             "height":"100%",
+                             "box-sizing": "border-box"
+                         }).appendTo(container);
+
+                         var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                         $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
+                         if (value.length) {
+                             value.forEach(function(v) {
+                                 $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 3px"}).appendTo(input);
+                             })
+                         } else {
+                             $("<span>").css({
+                                 "color":"#aaa",
+                                 "padding-left": "4px"
+                             }).text("select types...").appendTo(input);
+                         }
+                     }
+                 },
+                 {value:"select",
+                    label:"select", icon:"fa fa-tasks",showLabel:false,
+                     valueLabel: function(container,value) {
+                         container.css("padding","0");
+
+                         selectBox = $('<select></select>').appendTo(container);
+                         if (ui.opts && Array.isArray(ui.opts.opts)) {
+                             ui.opts.opts.forEach(function(o) {
+                                 var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
+                                 // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
+                                 $('<option>').val(o.v).text(label).appendTo(selectBox);
+                             })
+                         }
+                         selectBox.on('change', function(evt) {
+                             var v = selectBox.val();
+                             // var parts = v.split(":");
+                             // var t = parts.shift();
+                             // v = parts.join(":");
+                             //
+                             // valueField.typedInput("type",'str')
+                             valueField.typedInput("value",v)
+                         });
+                         selectBox.val(valueField.typedInput("value"));
+                         // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
+                     },
+                     expand: {
+                         icon: "fa-caret-down",
+                         minWidth: 400,
+                         content: function(container) {
+                             var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                             var optList = $('<ol>').appendTo(content).editableList({
+                                 header:$("<div><div>Label</div><div>Value</div></div>"),
+                                 addItem: function(row,index,itemData) {
+                                     var labelDiv = $('<div>').appendTo(row);
+                                     var label = lookupLabel(itemData.l, "", currentLocale);
+                                     itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
+                                     itemData.label.on('keydown', function(evt) {
+                                         if (evt.keyCode === 13) {
+                                             itemData.input.focus();
+                                             evt.preventDefault();
+                                         }
+                                     });
+                                     var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
+                                     RED.popover.tooltip(labelIcon,function() {
+                                         return currentLocale;
+                                     })
+                                     itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
+
+                                     // Problem using a TI here:
+                                     //  - this is in a popout panel
+                                     //  - clicking the expand button in the TI will close the parent edit tray
+                                     //    and open the type editor.
+                                     //  - but it leaves the popout panel over the top.
+                                     //  - there is no way to get back to the popout panel after closing the type editor
+                                     //.typedInput({default:itemData.t||'str', types:['str','num','bool','json','bin','env']});
+                                     itemData.input.on('keydown', function(evt) {
+                                         if (evt.keyCode === 13) {
+                                             // Enter or Tab
+                                             var index = optList.editableList('indexOf',itemData);
+                                             var length = optList.editableList('length');
+                                             if (index + 1 === length) {
+                                                 var newItem = {};
+                                                 optList.editableList('addItem',newItem);
+                                                 setTimeout(function() {
+                                                     if (newItem.label) {
+                                                         newItem.label.focus();
+                                                     }
+                                                 },100)
+                                             } else {
+                                                 var nextItem = optList.editableList('getItemAt',index+1);
+                                                 if (nextItem.label) {
+                                                     nextItem.label.focus()
+                                                 }
+                                             }
+                                             evt.preventDefault();
+                                         }
+                                     });
+                                 },
+                                 sortable: true,
+                                 removable: true,
+                                 height: 160
+                             })
+                             if (ui.opts.opts.length > 0) {
+                                 ui.opts.opts.forEach(function(o) {
+                                     optList.editableList('addItem',$.extend(true,{},o))
+                                 })
+                             } else {
+                                 optList.editableList('addItem',{})
+                             }
+                             return {
+                                 onclose: function() {
+                                     var items = optList.editableList('items');
+                                     var vals = [];
+                                     items.each(function (i,el) {
+                                         var data = el.data('data');
+                                         var l = data.label.val().trim();
+                                         var v = data.input.val();
+                                         // var t = data.input.typedInput('type');
+                                         // var v = data.input.typedInput('value');
+                                         if (l.length > 0) {
+                                             data.l = data.l || {};
+                                             data.l[currentLocale] = l;
+                                         }
+                                         data.v = v;
+
+                                         if (l.length > 0 || v.length > 0) {
+                                             var val = {l:data.l,v:data.v};
+                                             // if (t !== 'str') {
+                                             //     val.t = t;
+                                             // }
+                                             vals.push(val);
+                                         }
+                                     });
+                                     ui.opts.opts = vals;
+                                     inputCellInput.typedInput('value',Date.now())
+                                 }
+                             }
+                         }
+                     }
+                 },
+                 {value:"checkbox",
+                    label:"checkbox", icon:"fa fa-check-square-o",showLabel:false,
+                     valueLabel: function(container,value) {
+                         container.css("padding",0);
+                         checkbox = $('<input type="checkbox">').appendTo(container);
+                         checkbox.on('change', function(evt) {
+                             valueField.typedInput('value',$(this).prop('checked')?"true":"false");
+                         })
+                         checkbox.prop('checked',valueField.typedInput('value')==="true");
+                     }
+                 },
+                 {value:"spinner",
+                    label:"spinner", icon:"fa fa-sort-numeric-asc", showLabel:false,
+                     valueLabel: function(container,value) {
+                         container.css("padding",0);
+                         var innerContainer = $('<div>').css({
+                             "background":"white",
+                             "height":"100%",
+                             "box-sizing": "border-box"
+                         }).appendTo(container);
+
+                         var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                         $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
+
+                         var min = ui.opts && ui.opts.min;
+                         var max = ui.opts && ui.opts.max;
+                         var label = "";
+                         if (min !== undefined && max !== undefined) {
+                             label = Math.min(min,max)+" - "+Math.max(min,max);
+                         } else if (min !== undefined) {
+                             label = "> "+min;
+                         } else if (max !== undefined) {
+                             label = "< "+max;
+                         }
+                         $('<span>').css("margin-left","15px").text(label).appendTo(input);
+                     },
+                     expand: {
+                         icon: "fa-caret-down",
+                         content: function(container) {
+                             var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                             content.css("padding","8px 5px")
+                             var min = ui.opts.min;
+                             var max = ui.opts.max;
+                             var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                             minInput.val(min);
+                             var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                             maxInput.val(max);
+                             $('<div class="form-row" style="margin-bottom:3px"><label>Minimum</label></div>').append(minInput).appendTo(content);
+                             $('<div class="form-row" style="margin-bottom:0"><label>Maximum</label></div>').append(maxInput).appendTo(content);
+                             return {
+                                 onclose: function() {
+                                     var min = minInput.val().trim();
+                                     var max = maxInput.val().trim();
+                                     if (min !== "") {
+                                         ui.opts.min = parseInt(min);
+                                     } else {
+                                         delete ui.opts.min;
+                                     }
+                                     if (max !== "") {
+                                         ui.opts.max = parseInt(max);
+                                     } else {
+                                         delete ui.opts.max;
+                                     }
+                                     inputCellInput.typedInput('value',Date.now())
+                                 }
+                             }
+                         }
+                     }
+                 },
+                 {value:"none",
+                 label:"none", icon:"fa fa-times",hasValue:false},
+                 {value:"hide",
+                 label:"hide property", icon:"fa fa-ban",hasValue:false}
+
+             ],
+             default: 'none'
+         }).on("typedinputtypechange", function(evt,type) {
+             ui.type = $(this).typedInput("type");
+             ui.opts = typeOptions[ui.type];
+             if (ui.type === 'input') {
+                 // In the case of 'input' type, the typedInput uses the multiple-option
+                 // mode. Its value needs to be set to a comma-separately list of the
+                 // selected options.
+                 inputCellInput.typedInput('value',ui.opts.types.join(","))
+             } else {
+                 // No other type cares about `value`, but doing this will
+                 // force a refresh of the label now that `ui.opts` has
+                 // been updated.
+                 inputCellInput.typedInput('value',Date.now())
+             }
+
+             switch (ui.type) {
+                 case 'input':
+                    valueField.typedInput('types',ui.opts.types);
+                    break;
+                case 'select':
+                   valueField.typedInput('types',['str']);
+                   break;
+                 case 'checkbox':
+                    valueField.typedInput('types',['bool']);
+                    break;
+                case 'spinner':
+                    valueField.typedInput('types',['num'])
+                    break;
+                default:
+                    valueField.typedInput('types',['str','num','bool','json','bin','env'])
+             }
+             if (ui.type === 'checkbox') {
+                 valueField.typedInput('type','bool');
+             } else if (ui.type === 'spinner') {
+                 valueField.typedInput('type','num');
+             }
+             if (ui.type !== 'checkbox') {
+                 checkbox = null;
+             }
+
+         }).on("change", function(evt,type) {
+             if (ui.type === 'input') {
+                 ui.opts.types = inputCellInput.typedInput('value').split(",");
+                 valueField.typedInput('types',ui.opts.types);
+             }
+         });
+         valueField.on("change", function(evt) {
+             if (checkbox) {
+                 checkbox.prop('checked',$(this).typedInput('value')==="true")
+             }
+         })
+         // Set the input to the right type. This will trigger the 'typedinputtypechange'
+         // event handler (just above ^^) to update the value if needed
+         inputCellInput.typedInput('type',ui.type)
+    }
+
+    function buildEnvUIRow(row, tenv, ui) {
+
+        ui.label = ui.label||{};
+        ui.opts = ui.opts||{};
+        if (!ui.type) {
+            ui.type = "input";
+            ui.opts = {types:['str','num','bool','json','bin','env']}
+        } else {
+            ui.opts = ui.opts || {};
+        }
+
+        var labels = ui.label || {};
+        var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, currentLocale);
+        var label = $('<label>').appendTo(row);
+        var labelContainer = $('<span></span>').appendTo(label);
+        if (ui.icon) {
+            var newPath = RED.utils.separateIconPath(ui.icon);
+            if (newPath) {
+                $("<i class='fa "+newPath.file +"'/>").appendTo(labelContainer);
+            }
+        }
+        if (ui.type !== "checkbox") {
+            $('<span>').css({"padding-left":"5px"}).text(labelText).appendTo(label);
+            if (ui.type === 'none') {
+                label.width('100%');
+            }
+        }
+        var input;
+        var val = {
+            value: "",
+            type: "str"
+        };
+        if (tenv.parent) {
+            val.value = tenv.parent.value;
+            val.type = tenv.parent.type;
+        }
+        if (tenv.hasOwnProperty('value')) {
+            val.value = tenv.value;
+        }
+        if (tenv.hasOwnProperty('type')) {
+            val.type = tenv.type;
+        }
+        switch(ui.type) {
+            case "input":
+                input = $('<input type="text">').css('width','70%').appendTo(row);
+                if (ui.opts.types && ui.opts.types.length > 0) {
+                    var inputType = val.type;
+                    if (ui.opts.types.indexOf(inputType) === -1) {
+                        inputType = ui.opts.types[0]
+                    }
+                    input.typedInput({
+                        types: ui.opts.types,
+                        default: inputType
+                    })
+                    input.typedInput('value',val.value)
+                } else {
+                    input.val(val.value)
+                }
+                break;
+            case "select":
+                input = $('<select>').css('width','70%').appendTo(row);
+                if (ui.opts.opts) {
+                    ui.opts.opts.forEach(function(o) {
+                        $('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, currentLocale)).appendTo(input);
+                    })
+                }
+                input.val(val.value);
+                break;
+            case "checkbox":
+                label.css("cursor","default");
+                var cblabel = $('<label>').css('width','70%').appendTo(row);
+                input = $('<input type="checkbox">').css({
+                    marginTop: 0,
+                    width: 'auto',
+                    height: '34px'
+                }).appendTo(cblabel);
+                labelContainer.css({"padding-left":"5px"}).appendTo(cblabel);
+                $('<span>').css({"padding-left":"5px"}).text(labelText).appendTo(cblabel);
+                var boolVal = false;
+                if (val.type === 'bool') {
+                    boolVal = val.value === 'true'
+                } else if (val.type === 'num') {
+                    boolVal = val.value !== "0"
+                } else {
+                    boolVal = val.value !== ""
+                }
+                input.prop("checked",boolVal);
+                break;
+            case "spinner":
+                input = $('<input>').css('width','70%').appendTo(row);
+                var spinnerOpts = {};
+                if (ui.opts.hasOwnProperty('min')) {
+                    spinnerOpts.min = ui.opts.min;
+                }
+                if (ui.opts.hasOwnProperty('max')) {
+                    spinnerOpts.max = ui.opts.max;
+                }
+                input.spinner(spinnerOpts).parent().width('70%');
+                input.val(val.value);
+                break;
+        }
+        if (input) {
+            input.attr('id',getSubflowEnvPropertyName(tenv.name))
+        }
+    }
+
+    /**
+     * Create environment variable input UI
+     * @param uiContainer - container for UI
+     * @param envList - env var definitions of template
+     */
+    function buildEnvUI(uiContainer, envList) {
+        uiContainer.empty();
+        var elementID = 0;
+        for (var i = 0; i < envList.length; i++) {
+            var tenv = envList[i];
+            if (tenv.ui && tenv.ui.type === 'hide') {
+                continue;
+            }
+            var row = $("<div/>", { class: "form-row" }).appendTo(uiContainer);
+            buildEnvUIRow(row,tenv, tenv.ui || {});
+
+            // console.log(ui);
+        }
+    }
+    // buildEnvUI
+
+    function exportEnvList(list, all) {
+        if (list) {
+            var env = [];
+            list.each(function(i) {
+                var entry = $(this);
+                var item = entry.data('data');
+                var name = (item.parent?item.name:item.nameField.val()).trim();
+                if (name !== "") {
+                    var valueInput = item.valueField;
+                    var value = valueInput.typedInput("value");
+                    var type = valueInput.typedInput("type");
+                    if (all || !item.parent || (item.parent.value !== value || item.parent.type !== type)) {
+                        var envItem = {
+                            name: name,
+                            type: type,
+                            value: value,
+                        };
+                        if (item.ui) {
+                            var ui = {
+                                icon: item.ui.icon,
+                                label: $.extend(true,{},item.ui.label),
+                                type: item.ui.type,
+                                opts: $.extend(true,{},item.ui.opts)
+                            }
+                            // Check to see if this is the default ui definition.
+                            // Delete any defaults to keep it compact
+                            // {
+                            //     icon: "",
+                            //     label: {},
+                            //     type: "input",
+                            //     opts: {types:['str','num','bool','json','bin','env']}
+                            // }
+                            if (!ui.icon) {
+                                delete ui.icon;
+                            }
+                            if ($.isEmptyObject(ui.label)) {
+                                delete ui.label;
+                            }
+                            switch (ui.type) {
+                                case "input":
+                                    if (JSON.stringify(ui.opts) === JSON.stringify({types:['str','num','bool','json','bin','env']})) {
+                                        // This is the default input config. Delete it as it will
+                                        // be applied automatically
+                                        delete ui.type;
+                                        delete ui.opts;
+                                    }
+                                    break;
+                                case "select":
+                                    if (ui.opts && $.isEmptyObject(ui.opts.opts)) {
+                                        // This is the default select config.
+                                        // Delete it as it will be applied automatically
+                                        delete ui.opts;
+                                    }
+                                    break;
+                                case "spinner":
+                                    if ($.isEmptyObject(ui.opts)) {
+                                        // This is the default spinner config.
+                                        // Delete as it will be applied automatically
+                                        delete ui.opts
+                                    }
+                                    break;
+                                default:
+                                    delete ui.opts;
+                            }
+                            if (!$.isEmptyObject(ui)) {
+                                envItem.ui = ui;
+                            }
+                        }
+                        env.push(envItem);
+                    }
+                }
+            });
+            return env;
+        }
+        return null;
+    }
+
+    function getSubflowInstanceParentEnv(node) {
+        var parentEnv = {};
+        var envList = [];
+        if (/^subflow:/.test(node.type)) {
+            var subflowDef = RED.nodes.subflow(node.type.substring(8));
+            if (subflowDef.env) {
+                subflowDef.env.forEach(function(env) {
+                    var item = {
+                        name:env.name,
+                        parent: {
+                            type: env.type,
+                            value: env.value
+                        },
+                        ui: env.ui
+                    }
+                    envList.push(item);
+                    parentEnv[env.name] = item;
+                })
+            }
+        }
+
+        if (node.env) {
+            for (var i = 0; i < node.env.length; i++) {
+                var env = node.env[i];
+                if (parentEnv.hasOwnProperty(env.name)) {
+                    parentEnv[env.name].type = env.type;
+                    parentEnv[env.name].value = env.value;
+                } else {
+                    // envList.push({
+                    //     name: env.name,
+                    //     type: env.type,
+                    //     value: env.value,
+                    // });
+                }
+            }
+        }
+        return envList;
+    }
+
+    function exportSubflowInstanceEnv(node) {
+        var env = [];
+
+        // First, get the values for the SubflowTemplate defined properties
+        //  - these are the ones with custom UI elements
+        var parentEnv = getSubflowInstanceParentEnv(node);
+        parentEnv.forEach(function(data) {
+            var item;
+            var ui = data.ui || {};
+            if (!ui.type) {
+                ui.type = "input";
+                ui.opts = {types:['str','num','bool','json','bin','env']}
+            } else {
+                ui.opts = ui.opts || {};
+            }
+            var input = $("#"+getSubflowEnvPropertyName(data.name));
+            if (input.length) {
+                item = { name: data.name };
+                switch(ui.type) {
+                    case "input":
+                        if (ui.opts.types && ui.opts.types.length > 0) {
+                            item.value = input.typedInput('value');
+                            item.type = input.typedInput('type');
+                        } else {
+                            item.value = input.val();
+                            item.type = 'str';
+                        }
+                        break;
+                    case "spinner":
+                        item.value = input.val();
+                        item.type = 'num';
+                        break;
+                    case "select":
+                        item.value = input.val();
+                        item.type = 'str';
+                        break;
+                    case "checkbox":
+                        item.type = 'bool';
+                        item.value = ""+input.prop("checked");
+                        break;
+                }
+                if (item.type !== data.parent.type || item.value !== data.parent.value) {
+                    env.push(item);
+                }
+            }
+        })
+        // Second, get the values from the Properties table tab
+        var items = $('#red-ui-editor-subflow-env-list').editableList('items');
+        items.each(function (i,el) {
+            var data = el.data('data');
+            var item;
+            if (data.nameField && data.valueField) {
+                item = {
+                    name: data.nameField.val(),
+                    value: data.valueField.typedInput("value"),
+                    type: data.valueField.typedInput("type")
+                }
+                if (item.name.trim() !== "") {
+                    env.push(item);
+                }
+            }
+        });
+        return env;
+    }
+
+    function getSubflowEnvPropertyName(name) {
+        return 'node-input-subflow-env-'+name.replace(/\s/g,"_");
+    }
+
+    /**
+     * Lookup text for specific locale
+     * @param labels - dict of labels
+     * @param defaultLabel - fallback label if not found
+     * @param locale - target locale
+     * @returns {string} text for specified locale
+     */
+    function lookupLabel(labels, defaultLabel, locale) {
+        if (labels) {
+            if (labels[locale]) {
+                return labels[locale];
+            }
+            if (locale) {
+                var lang = locale.substring(0, 2);
+                if (labels[lang]) {
+                    return labels[lang];
+                }
+            }
+        }
+        return defaultLabel;
+    }
+
+    function buildEditForm(container,type,node) {
+        if (type === "subflow-template") {
+            buildPropertiesList($('#node-input-env-container'), node);
+        } else  if (type === "subflow") {
+            buildEnvUI($("#subflow-input-ui"), getSubflowInstanceParentEnv(node));
+        }
+    }
+    function buildPropertiesForm(container, node) {
+        var form = $('<form class="dialog-form form-horizontal"></form>').appendTo(container);
+        var listContainer = $('<div class="form-row node-input-env-container-row"></div>').appendTo(form);
+        var list = $('<ol id="red-ui-editor-subflow-env-list" class="red-ui-editor-subflow-env-list"></ol>').appendTo(listContainer);
+        buildPropertiesList(list, node);
+    }
+
     return {
         init: init,
         createSubflow: createSubflow,
@@ -755,6 +1708,14 @@ RED.subflow = (function() {
         refresh: refresh,
         removeInput: removeSubflowInput,
         removeOutput: removeSubflowOutput,
-        removeStatus: removeSubflowStatus
+        removeStatus: removeSubflowStatus,
+
+
+        buildEditForm: buildEditForm,
+        buildPropertiesForm: buildPropertiesForm,
+
+        exportSubflowTemplateEnv: exportEnvList,
+        exportSubflowInstanceEnv: exportSubflowInstanceEnv
+
     }
 })();
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/base.scss b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
index 67abb8247..2aca0b8e1 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -60,10 +60,12 @@
 .red-ui-icon-picker {
     a {
         text-decoration: none;
+        color: $primary-text-color;
     }
     a:hover,
     a:focus {
         text-decoration: none;
+        color: $primary-text-color;
     }
 
     p {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss b/packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss
index f79d636f1..658094571 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/dropdownMenu.scss
@@ -79,6 +79,9 @@
     }
 
     a {
+        img {
+            max-width: 14px;
+        }
         .fa {
             width: 20px;
             margin-left: -25px;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 6338eb73e..ac2dabff7 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -190,6 +190,10 @@ button.red-ui-tray-resize-button {
         border-color: $form-input-border-error-color !important;
     }
 
+    .input-updated {
+        border-color: $node-selected-color !important;
+    }
+
     .form-row {
         clear: both;
         color: $form-text-color;
@@ -421,6 +425,15 @@ button.red-ui-button-small
     height: 200px;
     overflow-y: scroll;
     line-height: 0px;
+    &.red-ui-icon-list-dark {
+        .red-ui-palette-icon-fa {
+            color: $secondary-text-color;
+        }
+        .red-ui-palette-icon-container {
+            background: $secondary-background;
+            border-radius: 4px;
+        }
+    }
 }
 .red-ui-icon-list-icon {
     display: inline-block;
@@ -428,6 +441,7 @@ button.red-ui-button-small
     padding: 4px;
     cursor: pointer;
     border-radius: 4px;
+
     &:hover {
         background: $list-item-background-hover;
     }
@@ -579,3 +593,406 @@ button.red-ui-button-small
 button.red-ui-toggleButton.toggle {
     text-align: left;
 }
+
+
+.red-ui-editor-subflow-env-ui-row {
+    margin-right: 3px;
+    >div {
+        display: grid;
+        grid-template-columns: 16px 40px 35% auto;
+    }
+    >div:first-child {
+        font-size: 0.9em;
+        color: $tertiary-text-color;
+        margin: 3px 0 -4px;
+        >div {
+            padding-left: 3px;
+        }
+    }
+    >div:last-child {
+        >div {
+            height: 40px;
+            line-height: 30px;
+            display: inline-block;
+            box-sizing: border-box;
+            // border-left: 2px dashed $secondary-border-color;
+            // border-bottom: 2px dashed $secondary-border-color;
+            // border: 1px dashed $secondary-border-color;
+            border-right: none;
+            &:not(:first-child) {
+                padding: 3px;
+            }
+            // &:last-child {
+            //     border-right: 1px dashed $secondary-border-color;
+            // }
+            .placeholder-input {
+                position: relative;
+                padding: 0 3px;
+                line-height: 24px;
+                opacity: 0.8
+            }
+            .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
+                select,.placeholder-input  {
+                    margin: 3px;
+                    height: 26px;
+                    width: calc(100% - 10px);
+                    padding-left: 3px;
+                }
+                .placeholder-input {
+                    span:first-child {
+                        display:inline-block;
+                        height: 100%;
+                        width: 20px;
+                        text-align:center;
+                        border-right: 1px solid $secondary-border-color;
+                        background: $tertiary-background;
+                    }
+                }
+                input[type="checkbox"] {
+                    margin-left: 8px;
+                    margin-top: 0;
+                    height: 100%;
+                }
+            }
+        }
+        >div:nth-child(1) {
+            border: none;
+            padding: 2px;
+            .red-ui-editableList-item-handle {
+                position:relative;
+                top: 0px;
+                color: $tertiary-text-color;
+            }
+        }
+        >div:nth-child(2) {
+            margin: 4px;
+            height: 32px;
+            border: 1px dashed $secondary-border-color;
+            text-align: center;
+            a {
+                display: block;
+                width: 100%;
+                height: 100%;
+                line-height: 32px;
+                &:hover {
+                    background: $secondary-background-hover;
+                }
+                i {
+                    height: 100%;
+                    vertical-align: middle;
+                }
+            }
+        }
+        >div:nth-child(3) {
+            position: relative;
+            input {
+                width: 100%;
+            }
+        }
+    }
+}
+
+span.red-ui-editor-subflow-env-lang-icon {
+    position: absolute;
+    display: inline-block;
+    background: $secondary-background;
+    opacity: 0.8;
+    width: 20px;
+    line-height: 32px;
+    height: 32px;
+    text-align: center;
+    top: 4px;
+    right: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+
+}
+// .red-ui-editor-subflow-ui-grid {
+//     width: 100%;
+//     .red-ui-editableList-container {
+//         border: none;
+//         border-radius: 0;
+//     }
+//     .red-ui-editableList-container li {
+//         border: none;
+//         padding: 0;
+//         &:not(:first-child) .red-ui-editableList-item-content >div:first-child >div {
+//             border-top: none;
+//         }
+//         &.ui-sortable-helper {
+//             border: 2px dashed $secondary-border-color;
+//             .red-ui-editableList-item-content {
+//                 >div {
+//                     border: none;
+//                     opacity: 0.7
+//                 }
+//
+//             }
+//         }
+//     }
+//
+//     .red-ui-editableList-item-content {
+//         >div>div {
+//             display: inline-block;
+//             box-sizing: border-box;
+//             border-left: 1px dashed $secondary-border-color;
+//             border-bottom: 1px dashed $secondary-border-color;
+//         }
+//         >div:first-child {
+//             font-size: 0.9em;
+//             display: grid;
+//             grid-template-columns: 25px auto 20px;
+//             >div {
+//                 border-top: 1px dashed $secondary-border-color;
+//                 padding: 1px;
+//             }
+//             >div:nth-child(3) {
+//                 border-top: none;
+//                 border-bottom: none;
+//                 // width: 20px;
+//             }
+//         }
+//         >div:last-child {
+//             display: grid;
+//             grid-template-columns: 25px 140px auto 20px;
+//             >div {
+//                 height: 48px;
+//                 line-height: 30px;
+//                 // display: inline-block;
+//                 // height: 48px;
+//                 // line-height: 30px;
+//                 // box-sizing: border-box;
+//                 //
+//                 // border-left: 2px dashed $secondary-border-color;
+//                 border-top: none;
+//                 // border-bottom: 2px dashed $secondary-border-color;
+//                 &:not(:first-child) {
+//                     padding: 6px 3px;
+//                 }
+//                 .placeholder-input {
+//                     position: relative;
+//                     padding: 0 3px;
+//                     line-height: 24px;
+//                     opacity: 0.8
+//                 }
+//                 .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
+//                     select,.placeholder-input  {
+//                         margin: 3px;
+//                         height: 26px;
+//                         width: calc(100% - 10px);
+//                         padding-left: 3px;
+//                     }
+//                     input[type="checkbox"] {
+//                         margin-left: 8px;
+//                         margin-top: 0;
+//                         height: 100%;
+//                     }
+//                 }
+//             }
+//             >div:nth-child(1) {
+//                 text-align: center;
+//                 a {
+//                     display: block;
+//                     width: 100%;
+//                     height: 100%;
+//                     line-height: 45px;
+//                     &:hover {
+//                         background: $secondary-background-hover;
+//                     }
+//                 }
+//             }
+//             >div:nth-child(2) {
+//                 input {
+//                     width: 100%;
+//                 }
+//                 // width: 140px;
+//             }
+//             >div:nth-child(3) {
+//                 position: relative;
+//                 .options-button {
+//                     position: absolute;
+//                     top: calc(50% - 10px);
+//                     margin-right: 2px;
+//                     right: 2px;
+//                 }
+//             }
+//             >div:nth-child(4) {
+//                 border-top: none;
+//                 border-bottom: none;
+//                 // width: 20px;
+//             }
+//
+//         }
+//     }
+// }
+.red-ui-editor-subflow-ui-edit-panel {
+    padding-bottom: 3px;
+    background: $primary-background;
+    .red-ui-editableList-border {
+        border: none;
+        border-radius: 0;
+        border-bottom: 1px solid $secondary-border-color;
+    }
+    .red-ui-editableList-container {
+    }
+    .red-ui-editableList-addButton {
+        margin-left: 2px;
+    }
+    .red-ui-editableList-header {
+        background: $primary-background;
+        display: grid;
+        grid-template-columns: 50% 50%;
+        color: $secondary-text-color;
+        div:first-child {
+            padding-left: 23px;
+        }
+        div:last-child {
+            padding-left: 3px;
+        }
+    }
+    .red-ui-editableList-container {
+        padding: 0 1px;
+        li {
+            background: $secondary-background;
+            // border-bottom: none;
+            padding: 0;
+            .red-ui-editableList-item-content {
+                display: grid;
+                grid-template-columns: 50% 50%;
+                >div {
+                    position:relative;
+
+                }
+            }
+            input {
+                margin-bottom: 0;
+                border:none;
+                width: 100%;
+                border-right: 1px solid $secondary-border-color;
+
+                border-radius: 0;
+                &:focus {
+                    box-shadow: 0 0 0 1px inset $form-input-focus-color;
+                }
+                &:first-child {
+                    border-left: 1px solid $secondary-border-color;
+                }
+            }
+            button.red-ui-typedInput-type-select, button.red-ui-typedInput-option-expand, button.red-ui-typedInput-option-trigger {
+                border-radius: 0;
+                height: 34px;
+            }
+            .red-ui-typedInput-container {
+                border-radius: 0;
+                border: none;
+                input.red-ui-typedInput-input  {
+                    height: 34px;
+                    border-right: none;
+                }
+            }
+
+            .red-ui-editor-subflow-env-lang-icon {
+                top: 1px;
+                right: 1px;
+                border-top-right-radius:0;
+                border-bottom-right-radius:0;
+            }
+            .red-ui-editableList-item-remove {
+                right: 3px;
+            }
+        }
+    }
+}
+
+.node-input-env-locales-row {
+    position: relative;
+    top: -20px;
+    float: right;
+    select {
+        width: 160px;
+        height: 20px;
+        min-width: 20px;
+        line-height: 18px;
+        font-size: 10px;
+    }
+}
+.node-input-env-container-row {
+    min-width: 470px;
+    position: relative;
+    .red-ui-editableList-item-content {
+        label {
+            margin-bottom: 0;
+            line-height: 32px;
+            span {
+                display: inline-block;
+                width: 20px;
+                text-align: center;
+            }
+        }
+        >div:first-child {
+            display: grid;
+            padding-left: 5px;
+            grid-template-columns: 40% auto 37px;
+            > :first-child {
+                width: calc(100% - 5px);
+            }
+            input {
+                width: calc(100% - 5px);
+            }
+        }
+        &.red-ui-editor-subflow-env-editable {
+            >div:first-child {
+                padding-left: 0;
+                grid-template-columns: 24px 40% auto 37px;
+                > a:first-child {
+                    text-align: center;
+                    line-height: 32px;
+                    i.fa-angle-right {
+                        transition: all 0.2s linear;
+                    }
+                    &.expanded {
+                        i.fa-angle-right {
+                            transform: rotate(90deg);
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+    .red-ui-editableList-border .red-ui-editableList-header {
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+
+        background: $tertiary-background;
+        padding: 0;
+        >div {
+            display: grid;
+            grid-template-columns: 24px 40% auto 37px;
+            >div {
+                display: inline-block;
+            }
+        }
+    }
+    .red-ui-editableList-container {
+        padding: 0;
+        .red-ui-editableList-item-handle {
+            top: 25px;
+        }
+        .red-ui-editableList-item-remove {
+            top: 25px;
+            right: 5px;
+        }
+    }
+}
+#subflow-input-ui {
+    // .form-row {
+    //     display: grid;
+    //     grid-template-columns: 120px auto;
+    //     label span {
+    //         display: inline-block;
+    //         width: 20px;
+    //         text-align: center;
+    //     }
+    // }
+}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
index 97f4d4b19..8b08d8996 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
@@ -150,7 +150,8 @@
     input[type="tel"],
     input[type="color"],
     div[contenteditable="true"],
-    .uneditable-input {
+    .uneditable-input,
+    .placeholder-input {
         box-sizing: border-box;
         display: inline-block;
         height: 34px;
@@ -190,7 +191,8 @@
     input[type="tel"],
     input[type="color"],
     div[contenteditable="true"],
-    .uneditable-input {
+    .uneditable-input,
+    .placeholder-input {
         background-color: $form-input-background;
         border: 1px solid $form-input-border-color;
     }
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
index 6f6b50c66..ff7233cde 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -192,6 +192,7 @@
             color: $header-menu-color;
             padding: 3px 40px;
             img {
+                max-width: 100%;
                 margin-right: 10px;
                 padding: 4px;
                 border: 3px solid transparent;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/popover.scss b/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
index e87eb7502..95097a30e 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
@@ -162,3 +162,15 @@
     background: none;
     color: $tertiary-text-color;
 }
+
+
+.red-ui-popover-panel {
+    @include component-shadow;
+    font-family: $primary-font;
+    font-size: $primary-font-size;
+    position: absolute;
+    box-sizing: border-box;
+    border: 1px solid $primary-border-color;
+    background: $secondary-background;
+    z-index: 2000;
+}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
index 63e5e0d2d..247b6dfe2 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
@@ -58,118 +58,6 @@
         text-overflow: ellipsis;
 
     }
-    button.red-ui-typedInput-type-select,
-    button.red-ui-typedInput-option-expand,
-    button.red-ui-typedInput-option-trigger
-     {
-        text-align: left;
-        border: none;
-        position: absolute;
-        box-sizing: border-box;
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
-        padding: 0 1px 0 5px;
-        display:inline-block;
-        background: $form-button-background;
-        height: 32px;
-        line-height: 32px;
-        vertical-align: middle;
-        color: $form-text-color;
-        i.red-ui-typedInput-icon {
-            margin-left: 1px;
-            margin-right: 2px;
-            vertical-align: middle;
-        }
-        &.disabled {
-            cursor: default;
-            i.red-ui-typedInput-icon {
-                color: $secondary-text-color-disabled;
-            }
-        }
-        .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
-            display: inline-block;
-            height: 100%;
-            padding: 0 1px 0 5px;
-            img {
-                max-width: none;
-            }
-        }
-
-        &:not(.disabled):hover {
-            text-decoration: none;
-            background: $workspace-button-background-hover;
-        }
-        &:focus {
-            text-decoration: none;
-            outline: none;
-            box-shadow: inset 0 0 0 1px $form-input-focus-color;
-        }
-        &:not(.disabled):active {
-            background: $workspace-button-background-active;
-            text-decoration: none;
-        }
-        &.red-ui-typedInput-full-width {
-            width: 100%;
-            border-top-right-radius: 4px;
-            border-bottom-right-radius: 4px;
-        }
-        &:before {
-            content:'';
-            display: inline-block;
-            height: 100%;
-            vertical-align: middle;
-        }
-    }
-
-    button.red-ui-typedInput-option-expand {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        right: 0;
-    }
-
-    button.red-ui-typedInput-option-trigger {
-        border-top-left-radius: 0px;
-        border-bottom-left-radius: 0px;
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        padding: 0 0 0 0;
-        position:absolute;
-        right: 0;
-        .red-ui-typedInput-option-label {
-            background:$form-button-background;
-            color: $form-text-color;
-            position:absolute;
-            left:0;
-            right:23px;
-            top: 0;
-            padding: 0 5px 0 8px;
-            i.red-ui-typedInput-icon {
-                margin-right: 4px;
-            }
-        }
-        .red-ui-typedInput-option-caret {
-            top: 0;
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            width: 17px;
-            padding-left: 6px;
-            &:before {
-                content:'';
-                display: inline-block;
-                height: 100%;
-                vertical-align: middle;
-            }
-        }
-        &:focus {
-            box-shadow: none;
-        }
-        &:focus .red-ui-typedInput-option-caret {
-            box-shadow: inset 0 0 0 1px $form-input-focus-color;
-        }
-    }
 }
 .red-ui-typedInput-options {
     @include component-shadow;
@@ -180,6 +68,7 @@
     max-height: 350px;
     overflow-y: auto;
     border: 1px solid $primary-border-color;
+    box-sizing: border-box;
     background: $secondary-background;
     z-index: 2000;
     a {
@@ -200,8 +89,124 @@
             text-decoration: none;
             background: $workspace-button-background-active;
         }
+        input[type="checkbox"] {
+            margin-right: 6px;
+        }
     }
     .red-ui-typedInput-icon {
-        margin-right: 4px;
+        margin-right: 6px;
+    }
+}
+button.red-ui-typedInput-type-select,
+button.red-ui-typedInput-option-expand,
+button.red-ui-typedInput-option-trigger
+ {
+    text-align: left;
+    border: none;
+    position: absolute;
+    box-sizing: border-box;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    padding: 0 1px 0 5px;
+    display:inline-block;
+    background: $form-button-background;
+    height: 32px;
+    line-height: 30px;
+    min-width: 23px;
+    vertical-align: middle;
+    color: $form-text-color;
+    i.red-ui-typedInput-icon {
+        margin-left: 1px;
+        margin-right: 2px;
+        vertical-align: middle;
+    }
+    &.disabled {
+        cursor: default;
+        i.red-ui-typedInput-icon {
+            color: $secondary-text-color-disabled;
+        }
+    }
+    .red-ui-typedInput-type-label,.red-ui-typedInput-option-label {
+        display: inline-block;
+        vertical-align: middle;
+        height: 100%;
+        padding: 0 1px 0 5px;
+        img {
+            max-width: none;
+        }
+    }
+
+    &:not(.disabled):hover {
+        text-decoration: none;
+        background: $workspace-button-background-hover;
+    }
+    &:focus {
+        text-decoration: none;
+        outline: none;
+        box-shadow: inset 0 0 0 1px $form-input-focus-color;
+    }
+    &:not(.disabled):active {
+        background: $workspace-button-background-active;
+        text-decoration: none;
+    }
+    &.red-ui-typedInput-full-width {
+        width: 100%;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+    }
+    &:before {
+        content:'';
+        display: inline-block;
+        height: 100%;
+        vertical-align: middle;
+    }
+}
+button.red-ui-typedInput-option-expand {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    right: 0;
+}
+
+button.red-ui-typedInput-option-trigger {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    padding: 0 0 0 0;
+    position:absolute;
+    right: 0;
+    .red-ui-typedInput-option-label {
+        background:$form-button-background;
+        color: $form-text-color;
+        position:absolute;
+        left:0;
+        right:23px;
+        top: 0;
+        padding: 0 5px 0 8px;
+        i.red-ui-typedInput-icon {
+            margin-right: 4px;
+        }
+    }
+    .red-ui-typedInput-option-caret {
+        top: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        width: 17px;
+        padding-left: 5px;
+        &:before {
+            content:'';
+            display: inline-block;
+            height: 100%;
+            vertical-align: middle;
+        }
+    }
+    &:focus {
+        box-shadow: none;
+    }
+    &:focus .red-ui-typedInput-option-caret {
+        box-shadow: inset 0 0 0 1px $form-input-focus-color;
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
index dd4cc5495..47c382688 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
@@ -24,6 +24,54 @@ const flowUtil = require("./util");
 
 var Log;
 
+/**
+ * Create deep copy of object
+ */
+function deepCopy(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
+
+/**
+ * Evaluate Input Value
+ */
+function evaluateInputValue(value, type, node) {
+    if (type === "bool") {
+        return (value === "true") || (value === true);
+    }
+    return redUtil.evaluateNodeProperty(value, type, node, null, null);
+}
+
+/**
+ * Compose information object for env var
+ */
+function composeInfo(info, val) {
+    var result = {
+        name: info.name,
+        type: info.type,
+        value: val,
+    };
+    if (info.ui) {
+        var ui = info.ui;
+        result.ui = {
+            hasUI: ui.hasUI,
+            icon: ui.icon,
+            labels: ui.labels,
+            type: ui.type
+        };
+        var retUI = result.ui;
+        if (ui.type === "input") {
+            retUI.inputTypes = ui.inputTypes;
+        }
+        if (ui.type === "select") {
+            retUI.menu = ui.menu;
+        }
+        if (ui.type === "spinner") {
+            retUI.spinner = ui.spinner;
+        }
+    }
+    return result;
+}
+
 
 /**
  * This class represents a subflow - which is handled as a special type of Flow
@@ -95,10 +143,19 @@ class Subflow extends Flow {
 
         var env = [];
         if (this.subflowDef.env) {
-            this.subflowDef.env.forEach(e => { env[e.name] = e; });
+            this.subflowDef.env.forEach(e => {
+                env[e.name] = e;
+            });
         }
         if (this.subflowInstance.env) {
-            this.subflowInstance.env.forEach(e => { env[e.name] = e; });
+            this.subflowInstance.env.forEach(e => {
+                var old = env[e.name];
+                var ui = old ? old.ui : null;
+                env[e.name] = e;
+                if (ui) {
+                    env[e.name].ui = ui; 
+                }
+            });
         }
         this.env = env;
     }
@@ -257,6 +314,7 @@ class Subflow extends Flow {
         super.start(diff);
     }
 
+
     /**
      * Get environment variable of subflow
      * @param {String}   name   name of env var
@@ -266,8 +324,16 @@ class Subflow extends Flow {
         this.trace("getSetting:"+name);
         if (!/^\$parent\./.test(name)) {
             var env = this.env;
-            if (env && env.hasOwnProperty(name)) {
-                var val = env[name];
+            var is_info = name.endsWith("_info");
+            var is_type = name.endsWith("_type");
+            var ename = (is_info || is_type) ? name.substring(0, name.length -5) : name; // 5 = length of "_info"/"_type"
+
+            if (env && env.hasOwnProperty(ename)) {
+                var val = env[ename];
+
+                if (is_type) {
+                    return val ? val.type : undefined;
+                }
                 // If this is an env type property we need to be careful not
                 // to get into lookup loops.
                 // 1. if the value to lookup is the same as this one, go straight to parent
@@ -276,11 +342,15 @@ class Subflow extends Flow {
                 // See https://github.com/node-red/node-red/issues/2099
                 if (val.type !== 'env' || val.value !== name) {
                     let value = val.value;
-                    if (val.type === 'env') {
+                    var type = val.type;
+                    if (type === 'env') {
                         value = value.replace(new RegExp("\\${"+name+"}","g"),"${$parent."+name+"}");
                     }
                     try {
-                        var ret = redUtil.evaluateNodeProperty(value, val.type, this.node, null, null);
+                        var ret = evaluateInputValue(value, type, this.node);
+                        if (is_info) {
+                            return composeInfo(val, ret);
+                        }
                         return ret;
                     }
                     catch (e) {
diff --git a/test/nodes/subflow/subflow_spec.js b/test/nodes/subflow/subflow_spec.js
index 01c49c75a..84fba68dd 100644
--- a/test/nodes/subflow/subflow_spec.js
+++ b/test/nodes/subflow/subflow_spec.js
@@ -447,4 +447,117 @@ describe('subflow', function() {
         });
     });
 
+    it('should access env var type of subflow instance', function(done) {
+        var flow = [
+            {id:"t0", type:"tab", label:"", disabled:false, info:""},
+            {id:"n1", x:10, y:10, z:"t0", type:"subflow:s1",
+             env: [
+                 {name: "K", type: "str", value: "V"}
+             ],
+             wires:[["n2"]]},
+            {id:"n2", x:10, y:10, z:"t0", type:"helper", wires:[]},
+            // Subflow
+            {id:"s1", type:"subflow", name:"Subflow", info:"",
+             in:[{
+                 x:10, y:10,
+                 wires:[ {id:"s1-n1"} ]
+             }],
+             out:[{
+                 x:10, y:10,
+                 wires:[ {id:"s1-n1", port:0} ]
+             }]
+            },
+            {id:"s1-n1", x:10, y:10, z:"s1", type:"function",
+             func:"msg.V = env.get('K_type'); return msg;",
+             wires:[]}
+        ];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.should.have.property("V", "str");
+                    done();
+                }
+                catch (e) {
+                    console.log(e);
+                    done(e);
+                }
+            });
+            n1.receive({payload:"foo"});
+        });
+    });
+
+    it('should access env var info of subflow instance', function(done) {
+        var flow = [
+            {id:"t0", type:"tab", label:"", disabled:false, info:""},
+            {id:"n1", x:10, y:10, z:"t0", type:"subflow:s1",
+             env: [
+                 {name: "K", type: "str", value: "V"}
+             ],
+             wires:[["n2"]]},
+            {id:"n2", x:10, y:10, z:"t0", type:"helper", wires:[]},
+            // Subflow
+            {id:"s1", type:"subflow", name:"Subflow", info:"",
+             in:[{
+                 x:10, y:10,
+                 wires:[ {id:"s1-n1"} ]
+             }],
+             out:[{
+                 x:10, y:10,
+                 wires:[ {id:"s1-n1", port:0} ]
+             }],
+             env:[
+                 {
+                     name: "K", type: "str", value: "",
+                     ui: {
+                         hasUI: true,
+                         icon: "icon",
+                         labels: {
+                             "en-US": "label"
+                         },
+                         type: "input",
+                         inputTypes: {
+                             str: true
+                         }
+                     }
+                 }
+             ]
+            },
+            {id:"s1-n1", x:10, y:10, z:"s1", type:"function",
+             func:"msg.V = env.get('K_info'); return msg;",
+             wires:[]}
+        ];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.should.have.property("V");
+                    var v = msg.V;
+                    v.should.have.property("name", "K");
+                    v.should.have.property("value", "V");
+                    v.should.have.property("type", "str");
+                    v.should.have.property("ui");
+                    var ui = v.ui;
+                    ui.should.have.property("hasUI", true);
+                    ui.should.have.property("icon", "icon");
+                    ui.should.have.property("type", "input");
+                    ui.should.have.property("labels");
+                    var labels = ui.labels;
+                    labels.should.have.property("en-US", "label");
+                    ui.should.have.property("inputTypes");
+                    var types = ui.inputTypes;
+                    types.should.have.property("str", true);
+                    done();
+                }
+                catch (e) {
+                    console.log(e);
+                    done(e);
+                }
+            });
+            n1.receive({payload:"foo"});
+        });
+    });
+
 });

From 89d267d6a21d66bd337ef61e5c54c6fd2b7e0659 Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 20:29:09 +0300
Subject: [PATCH 052/305] Update
 packages/node_modules/@node-red/nodes/locales/en-US/messages.json

Co-Authored-By: Nick O'Leary <nick.oleary@gmail.com>
---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index f917e7e9f..551612a3c 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -413,7 +413,7 @@
         "digest": "digest authentication",
         "bearer": "bearer authentication",
         "use-proxy": "Use proxy",
-        "http-persistent": "HTTP Persistent",
+        "http-persistent": "Enable connection keep-alive",
         "proxy-config": "Proxy Configuration",
         "use-proxyauth": "Use proxy authentication",
         "noproxy-hosts": "Ignore hosts",

From 5e20134f4f760262679c462ae637d16cf19c65be Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 22:05:50 +0300
Subject: [PATCH 053/305] Update 21-httprequest.html

Change persistent to persist
---
 .../@node-red/nodes/core/io/21-httprequest.html             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index b2545828a..9f15c096a 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -69,8 +69,8 @@
     </div>
     
     <div class="form-row">
-        <input type="checkbox" id="node-input-http-persistent" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-http-persistent" style="width: auto" data-i18n="httpin.http-persistent"></label>
+        <input type="checkbox" id="node-input-http-persist" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-http-persist" style="width: auto" data-i18n="httpin.http-persist"></label>
     </div>
 
     <div class="form-row">
@@ -107,7 +107,7 @@
             paytoqs: {value: false},
             url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} },
             tls: {type:"tls-config",required: false},
-            "http-persistent":{value:true},
+            "http-persist":{value:true},
             proxy: {type:"http proxy",required: false},
             authType: {value: ""}
         },

From b52a47bd0325804a2fa2e282742b7c98469d7ecc Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 22:06:49 +0300
Subject: [PATCH 054/305] Update messages.json

Change persistent to persist
---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 551612a3c..f04fd0c61 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -413,7 +413,7 @@
         "digest": "digest authentication",
         "bearer": "bearer authentication",
         "use-proxy": "Use proxy",
-        "http-persistent": "Enable connection keep-alive",
+        "http-persist": "Enable connection keep-alive",
         "proxy-config": "Proxy Configuration",
         "use-proxyauth": "Use proxy authentication",
         "noproxy-hosts": "Ignore hosts",

From 9f062ec1b86afecfd643e48e330116fa8fa8add1 Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 22:49:41 +0300
Subject: [PATCH 055/305] Update messages.json

---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index f04fd0c61..e4e6b360b 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -413,7 +413,7 @@
         "digest": "digest authentication",
         "bearer": "bearer authentication",
         "use-proxy": "Use proxy",
-        "http-persist": "Enable connection keep-alive",
+        "persist": "Enable connection keep-alive",
         "proxy-config": "Proxy Configuration",
         "use-proxyauth": "Use proxy authentication",
         "noproxy-hosts": "Ignore hosts",

From 5b9df6d5f2e9b874484025ab932586fd75cbb6de Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 22:50:37 +0300
Subject: [PATCH 056/305] Update 21-httprequest.html

---
 .../@node-red/nodes/core/io/21-httprequest.html             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index 9f15c096a..1cd501962 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -69,8 +69,8 @@
     </div>
     
     <div class="form-row">
-        <input type="checkbox" id="node-input-http-persist" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-http-persist" style="width: auto" data-i18n="httpin.http-persist"></label>
+        <input type="checkbox" id="node-input-persist" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-persist" style="width: auto" data-i18n="httpin.persist"></label>
     </div>
 
     <div class="form-row">
@@ -107,7 +107,7 @@
             paytoqs: {value: false},
             url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} },
             tls: {type:"tls-config",required: false},
-            "http-persist":{value:true},
+            "persist":{value:true},
             proxy: {type:"http proxy",required: false},
             authType: {value: ""}
         },

From 3bc1f69e756d7a6377a80aa6fcecc9871d27705a Mon Sep 17 00:00:00 2001
From: Ibrahim Al-Mahfooz <ibrahim.nezar@gmail.com>
Date: Mon, 12 Aug 2019 22:52:00 +0300
Subject: [PATCH 057/305] Update 21-httprequest.js

---
 packages/node_modules/@node-red/nodes/core/io/21-httprequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
index 49fb033c5..4bc53148d 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
@@ -29,7 +29,7 @@ module.exports = function(RED) {
         var isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
         var nodeMethod = n.method || "GET";
         var paytoqs = n.paytoqs;
-        var nodeHTTPPersistent = n["http-persistent"];
+        var nodeHTTPPersistent = n["persist"];
         if (n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
         }

From ee6ee99577b40a2ccb9202a412905299c4173de7 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 12 Aug 2019 22:07:55 +0100
Subject: [PATCH 058/305] Make icon and color pickers more consistent

---
 .../editor-client/src/js/ui/editor.js         | 281 ++++++++----------
 .../editor-client/src/js/ui/subflow.js        |   2 +-
 .../editor-client/src/sass/editor.scss        |  52 +---
 3 files changed, 146 insertions(+), 189 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 1f9dcfac3..006fd6ec4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -715,30 +715,8 @@ RED.editor = (function() {
         }
         return result;
     }
-    function showIconPicker(container, node, iconPath, faOnly, done) {
-        var containerPos = container.offset();
-        var pickerBackground = $('<div>').css({
-            position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
-        }).appendTo("body");
-
-        var top = containerPos.top - 30;
-
-        if (top+280 > $( window ).height()) {
-            top = $( window ).height() - 280;
-        }
-        var picker = $('<div class="red-ui-icon-picker">').css({
-            top: top+"px",
-            left: containerPos.left+"px",
-        }).appendTo("#red-ui-editor");
-
-        var hide = function() {
-            pickerBackground.remove();
-            picker.remove();
-            RED.keyboard.remove("escape");
-        }
-        RED.keyboard.add("*","escape",function(){hide()});
-        pickerBackground.on("mousedown", hide);
-
+    function showIconPicker(container, backgroundColor, iconPath, faOnly, done) {
+        var picker = $('<div class="red-ui-icon-picker">');
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(picker);
         searchInput = $('<input type="text">').attr("placeholder",RED._("editor.searchIcons")).appendTo(searchDiv).searchBox({
             delay: 50,
@@ -766,99 +744,90 @@ RED.editor = (function() {
         var summary = $('<span>').appendTo(metaRow);
         var resetButton = $('<button type="button" class="red-ui-button red-ui-button-small">'+RED._("editor.useDefault")+'</button>').appendTo(metaRow).on("click", function(e) {
             e.preventDefault();
-            hide();
+            iconPanel.hide();
             done(null);
         });
-        var iconSets = RED.nodes.getIconSets();
-        var backgroundColor = node && RED.utils.getNodeColor(node.type, node._def);
-        if (!node && faOnly) {
+        if (!backgroundColor && faOnly) {
             iconList.addClass("red-ui-icon-list-dark");
         }
-        Object.keys(iconSets).forEach(function(moduleName) {
-            if (faOnly && (moduleName !== "font-awesome")) {
-                return;
-            }
-            var icons = iconSets[moduleName];
-            if (icons.length > 0) {
-                // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
-                var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
-                $('<i class="fa fa-cube"></i>').prependTo(header);
-                icons.forEach(function(icon) {
-                    var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
-                    var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
-                    var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
-                    iconDiv.data('icon',icon_url);
-                    if (node) {
-                        nodeDiv.css({
-                            'backgroundColor': backgroundColor
-                        });
-                    }
-                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
+        setTimeout(function() {
+            var iconSets = RED.nodes.getIconSets();
+            Object.keys(iconSets).forEach(function(moduleName) {
+                if (faOnly && (moduleName !== "font-awesome")) {
+                    return;
+                }
+                var icons = iconSets[moduleName];
+                if (icons.length > 0) {
+                    // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
+                    var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
+                    $('<i class="fa fa-cube"></i>').prependTo(header);
+                    icons.forEach(function(icon) {
+                        var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
+                        var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
+                        var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
+                        iconDiv.data('icon',icon_url);
+                        if (backgroundColor) {
+                            nodeDiv.css({
+                                'backgroundColor': backgroundColor
+                            });
+                        }
+                        var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
+                        RED.utils.createIconElement(icon_url, iconContainer, true);
 
-                    if (iconPath.module === moduleName && iconPath.file === icon) {
-                        iconDiv.addClass("selected");
-                    }
-                    iconDiv.on("mouseover", function() {
-                        summary.text(icon);
+                        if (iconPath.module === moduleName && iconPath.file === icon) {
+                            iconDiv.addClass("selected");
+                        }
+                        iconDiv.on("mouseover", function() {
+                            summary.text(icon);
+                        })
+                        iconDiv.on("mouseout", function() {
+                            summary.html("&nbsp;");
+                        })
+                        iconDiv.on("click", function() {
+                            iconPanel.hide();
+                            done(moduleName+"/"+icon);
+                        })
                     })
-                    iconDiv.on("mouseout", function() {
-                        summary.html("&nbsp;");
-                    })
-                    iconDiv.on("click", function() {
-                        hide();
-                        done(moduleName+"/"+icon);
-                    })
-                })
-            }
-        });
+                }
+            });
+            setTimeout(function() {
+                spinner.remove();
+            },50);
+        },300);
+        var spinner = RED.utils.addSpinnerOverlay(iconList,true);
+        var iconPanel = RED.popover.panel(picker);
+        iconPanel.show({
+            target: container
+        })
+
+
         picker.slideDown(100);
         searchInput.trigger("focus");
     }
 
     function createColorPicker(colorRow, color) {
-        var colorSpec = $("<span/>", {
-            class: "red-ui-subflow-color-spec"
-        }).appendTo(colorRow);
-        var colorButton = $("<label/>").appendTo(colorSpec);
-        var colorIcon = $("<span><i class='fa fa-caret-down'/> </span>").css({
-            width: "30px",
-            height: "20px",
-            "padding-left": "15px",
-            "padding-right": "5px"
-        }).appendTo(colorButton);
-        var colorDisp = $("<label/>").css({
-            width: "40px",
-            height: "20px",
-            margin: "6px",
-            "vertical-align": "middle",
-            "background-color": color
-        }).appendTo(colorButton);
+
+        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(colorRow);
+        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
+
+        var colorDisp = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
+
         var selector = $("<input/>", {
             id: "red-ui-editor-node-color",
             type: "text",
             value: color
         }).css({
+            marginLeft: "10px",
             width: "150px",
-            border: "none"
-        }).appendTo(colorSpec);
+        }).appendTo(colorRow);
 
         selector.on("change", function (e) {
             var color = selector.val();
-            colorDisp.css({
+            $(".red-ui-editor-node-appearance-button .red-ui-search-result-node").css({
                 "background-color": color
             });
         });
-        selector.hover(function (e) {
-            selector.css({
-                "border": "solid 1px #ccc"
-            });
-        }, function() {
-            selector.css({
-                "border": "none"
-            });
-        });
-
+        selector.trigger("change");
         colorButton.on("click", function (e) {
             var recommendedColors = [
                 "#3FADB5", "#87A980", "#A6BBCF",
@@ -869,65 +838,63 @@ RED.editor = (function() {
                 "#E9967A", "#F3B567", "#FDD0A2",
                 "#FDF0C2", "#FFAAAA", "#FFCC66",
                 "#FFF0F0", "#FFFFFF"
-            ];
+            ].map(function(c) {
+                var r = parseInt(c.substring(1, 3), 16) / 255;
+                var g = parseInt(c.substring(3, 5), 16) / 255;
+                var b = parseInt(c.substring(5, 7), 16) / 255;
+                return {
+                    hex: c,
+                    r: r,
+                    g: g,
+                    b: b,
+                    l: 0.3 * r + 0.59 * g + 0.11 * b
+                }
+            });
+            // Sort by luminosity.
+            recommendedColors.sort(function (a, b) {
+                return a.l - b.l;
+            });
+
             var numColors = recommendedColors.length;
-            var width = 58;
-            var height = 28;
+            var width = 30;
+            var height = 30;
+            var margin = 2;
+            var perRow = 6;
             var picker = $("<div/>", {
                 class: "red-ui-color-picker"
             }).css({
-                width: (width*4)+"px",
-                height: Math.ceil(numColors/4)*height+"+px"
+                width: ((width+margin+margin)*perRow)+"px",
+                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
             });
-
-            var pickerBackground = $('<div>').css({
-                position: "absolute",
-                top: 0,
-                bottom: 0,
-                left: 0,
-                right: 0,
-                zIndex: 20
-            }).appendTo("body");
-            var colorPos = colorDisp.offset();
-            picker.css({
-                top: (colorPos.top +32) +"px",
-                left: (colorPos.left -20) +"px"
-            }).appendTo("body");
-
-            function hide() {
-                pickerBackground.remove();
-                picker.remove();
-                RED.keyboard.remove("escape");
-            }
-
             var count = 0;
             var row = null;
             recommendedColors.forEach(function (col) {
-                if ((count % 4) == 0) {
+                if ((count % perRow) == 0) {
                     row = $("<div/>").appendTo(picker);
                 }
                 var button = $("<button/>", {
                 }).css({
-                    width: "50px",
-                    height: "20px",
-                    margin: "4px",
-                    backgroundColor: col,
-                    "border-style": "none"
+                    width: width+"px",
+                    height: height+"px",
+                    margin: margin+"px",
+                    backgroundColor: col.hex,
+                    "border-style": "solid",
+                    "border-width": "1px",
+                    "border-color": col.luma<0.92?col.hex:'#ccc'
                 }).appendTo(row);
                 button.on("click",  function (e) {
                     e.preventDefault();
-                    hide();
-                    selector.val(col);
-                    selector.change();
+                    colorPanel.hide();
+                    selector.val(col.hex);
+                    selector.trigger("change");
                 });
                 count++;
             });
-
-            RED.keyboard.add("*", "escape", hide);
-            pickerBackground.on("mousedown", hide);
-            pickerBackground.show();
-            picker.show();
-        });                
+            var colorPanel = RED.popover.panel(picker);
+            colorPanel.show({
+                target: colorButton
+            })
+        });
     }
 
     function buildAppearanceForm(container,node) {
@@ -1008,13 +975,24 @@ RED.editor = (function() {
         }
         $("#node-input-show-label").prop("checked",node.l).trigger("change");
 
+        if (node.type === "subflow") {
+            // subflow template can select its color
+            var color = node.color ? node.color : "#da9";
+            var colorRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
+            createColorPicker(colorRow, color);
+        }
+
+
         // If a node has icon property in defaults, the icon of the node cannot be modified. (e.g, ui_button node in dashboard)
         if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon"))) {
             var iconRow = $('<div class="form-row"></div>').appendTo(dialogForm);
             $('<label data-i18n="editor.settingIcon">').appendTo(iconRow);
 
-            var iconButton = $('<button type="button" class="red-ui-button" id="red-ui-editor-node-icon-button">').appendTo(iconRow);
-
+            var iconButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(iconRow);
+            $('<i class="fa fa-caret-down"></i>').appendTo(iconButton);
             var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconButton);
             var colour = RED.utils.getNodeColor(node.type, node._def);
             var icon_url = RED.utils.getNodeIcon(node._def,node);
@@ -1025,30 +1003,29 @@ RED.editor = (function() {
             iconButton.on("click", function(e) {
                 e.preventDefault();
                 var iconPath;
-                var icon = $("#red-ui-editor-node-icon").text()||"";
+                var icon = $("#red-ui-editor-node-icon").val()||"";
                 if (icon) {
                     iconPath = RED.utils.separateIconPath(icon);
                 } else {
                     iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 }
-                showIconPicker(iconRow,node,iconPath,false,function(newIcon) {
-                    $("#red-ui-editor-node-icon").text(newIcon||"");
+                var backgroundColor = RED.utils.getNodeColor(node.type, node._def);
+                if (node.type === "subflow") {
+                    backgroundColor = $("#red-ui-editor-node-color").val();
+                }
+                showIconPicker(iconButton,backgroundColor,iconPath,false,function(newIcon) {
+                    $("#red-ui-editor-node-icon").val(newIcon||"");
                     var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
                     RED.utils.createIconElement(icon_url, iconContainer, true);
                 });
             });
-            $('<div id="red-ui-editor-node-icon">').text(node.icon).appendTo(iconButton);
+
+            RED.popover.tooltip(iconButton, function() {
+                return $("#red-ui-editor-node-icon").val()||"default";
+            })
+            $('<input type="hidden" id="red-ui-editor-node-icon">').val(node.icon).appendTo(iconRow);
         }
 
-        if (node.type === "subflow") {
-            // subflow template can select its color
-            var color = node.color ? node.color : "#da9";
-            var colorRow = $("<div/>", {
-                class: "form-row"
-            }).appendTo(dialogForm);
-            $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
-            createColorPicker(colorRow, color);
-        }
 
         $('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
 
@@ -1373,7 +1350,7 @@ RED.editor = (function() {
                         }
 
                         if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
-                            var icon = $("#red-ui-editor-node-icon").text()||""
+                            var icon = $("#red-ui-editor-node-icon").val()||""
                             if (!isDefaultIcon) {
                                 if (icon !== editing_node.icon) {
                                     changes.icon = editing_node.icon;
@@ -2217,7 +2194,7 @@ RED.editor = (function() {
                         if (updateLabels(editing_node, changes, null)) {
                             changed = true;
                         }
-                        var icon = $("#red-ui-editor-node-icon").text()||"";
+                        var icon = $("#red-ui-editor-node-icon").val()||"";
                         if ((editing_node.icon === undefined && icon !== "node-red/subflow.svg") ||
                             (editing_node.icon !== undefined && editing_node.icon !== icon)) {
                             changes.icon = editing_node.icon;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 66d016d92..3714a1569 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1008,7 +1008,7 @@ RED.subflow = (function() {
              evt.preventDefault();
              var icon = ui.icon || "";
              var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
-             RED.editor.showIconPicker(row, null, iconPath, true, function (newIcon) {
+             RED.editor.showIconPicker(iconButton, null, iconPath, true, function (newIcon) {
                  iconButton.empty();
                  var path = newIcon || "";
                  var newPath = RED.utils.separateIconPath(path);
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 18d122b73..1125e3639 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -392,28 +392,26 @@ button.red-ui-button-small
     }
 }
 
-
-#red-ui-editor-node-icon-button {
+button.red-ui-button.red-ui-editor-node-appearance-button {
     position: relative;
-    padding-left: 30px;
-    width: calc(100% - 150px);
+    height: 35px !important;
+    text-align: left;
+    padding: 0 6px  0 3px;
+    >i {
+        width: 15px;
+        vertical-align: middle;
+        padding-left: 2px;
+    }
     .red-ui-search-result-node {
-        position: absolute;
-        top: 2px;
-        left: 2px;
+        vertical-align: middle;
+        float: none;
+        position: relative;
+        top: -1px;
+
     }
 }
-#red-ui-editor-node-icon {
-    margin-left: 10px;
-    width: calc(100% - 163px);
-}
+
 .red-ui-icon-picker {
-    position: absolute;
-    border: 1px solid $primary-border-color;
-    box-shadow: 0 1px 6px -3px black;
-    background: $secondary-background;
-    z-Index: 21;
-    display: none;
     select {
         box-sizing: border-box;
         margin: 3px;
@@ -425,6 +423,7 @@ button.red-ui-button-small
     height: 200px;
     overflow-y: scroll;
     line-height: 0px;
+    position: relative;
     &.red-ui-icon-list-dark {
         .red-ui-palette-icon-fa {
             color: $secondary-text-color;
@@ -594,25 +593,6 @@ button.red-ui-toggleButton.toggle {
     text-align: left;
 }
 
-.red-ui-color-picker {
-    position: absolute;
-    border: 1px solid $primary-border-color;
-    box-shadow: 0 1px 6px -3px black;
-    background: $secondary-background;
-    z-Index: 21;
-    display: none;
-}
-
-.red-ui-subflow-color-spec {
-    width: fit-content;
-    height: fit-content;
-    padding-top: 8px;
-    padding-bottom: 10px;
-    padding-left: 0px;
-    padding-right: 0px;
-    border: solid 1px $primary-border-color;
-    border-radius: 2px;
-}
 
 .red-ui-editor-subflow-env-ui-row {
     margin-right: 3px;

From 675b4bde14137b741a92783ac34fd55544610e6a Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 13 Aug 2019 14:51:59 +0900
Subject: [PATCH 059/305] remove unused entries in DE message catalogue

---
 .../editor-client/locales/de/editor.json      |  4 +--
 .../@node-red/nodes/locales/de/messages.json  | 34 ++-----------------
 .../nodes/locales/de/storage/28-tail.html     | 25 --------------
 3 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100755 packages/node_modules/@node-red/nodes/locales/de/storage/28-tail.html

diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
index 05ccfbed2..911816bcc 100755
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -26,8 +26,7 @@
     "status" : "Status",
     "enabled" : "Aktiviert",
     "disabled" : "Inaktiviert",
-    "info" : "Beschreibung",
-    "tip" : "Beschreibung akzeptiert Markdown und wird auf der Registerkarte Info angezeigt."
+    "info" : "Beschreibung"
   },
   "menu" : {
     "label" : {
@@ -237,7 +236,6 @@
     "deleteSubflow" : "Subflow löschen",
     "info" : "Beschreibung",
     "category" : "Kategorie",
-    "format" : "Markdown-Format",
     "errors" : {
       "noNodesSelected" : "<strong> Subflow kann nicht erstellt werden </strong>: Es wurden keine Nodes ausgewählt.",
       "multipleInputsToSelection" : "<strong> Subflow kann nicht erstellt werden </strong>: Mehrere Eingaben zur Auswahl"
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json
index acf0447c4..c36c309f3 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
@@ -127,14 +127,7 @@
   },
   "link" : {
     "linkIn" : "eingehende Verbindung",
-    "linkOut" : "ausgehende Verbindung",
-    "label" : {
-      "event" : "Ereignisname",
-      "node" : "Name",
-      "type" : "Fluss",
-      "sortByFlow" : "Nach Fluss sortieren",
-      "sortByLabel" : "Nach Namen sortieren"
-    }
+    "linkOut" : "ausgehende Verbindung"
   },
   "tls" : {
     "tls" : "TLS-Konfiguration",
@@ -188,8 +181,7 @@
     "error" : {
       "inputListener" : "Das Empfangsprogramm kann nicht zum 'input' -Ereignis in Funktion hinzugefügt werden.",
       "non-message-returned" : "Funktion hat versucht, eine Nachricht vom Typ __type__ zu senden"
-    },
-    "tip" : "Informationen zum Schreiben von Funktionen finden Sie auf der Registerkarte \"Info\"."
+    }
   },
   "template" : {
     "template" : "Vorlage",
@@ -299,12 +291,7 @@
     }
   },
   "comment" : {
-    "comment" : "Kommentar",
-    "label" : {
-      "title" : "Titel",
-      "body" : "Text"
-    },
-    "tip" : "Tipp: Der Text kann als  <a href=\"https://help.github.com/articles/markdown-basics/\" target=\"_blank\"> Github Markdown geschrieben werden</a>"
+    "comment" : "Kommentar"
   },
   "unknown" : {
     "label" : {
@@ -729,21 +716,6 @@
       "xml_js" : "Dieser Node verarbeitet nur XML-Zeichenfolgen oder JS-Objekte."
     }
   },
-  "tail" : {
-    "tail" : "Tail",
-    "label" : {
-      "filename" : "Name der Datei",
-      "type" : "Dateityp",
-      "splitlines" : "Zeilen in \\n teilen?"
-    },
-    "action" : {
-      "text" : "Textdatei: gibt Zeichenfolge zurück",
-      "binary" : "Binärdatei: gibt Buffer zurück"
-    },
-    "errors" : {
-      "windowsnotsupport" : "Wird derzeit unter Windows nicht unterstützt."
-    }
-  },
   "file" : {
     "label" : {
       "filename" : "Name der Datei",
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/28-tail.html b/packages/node_modules/@node-red/nodes/locales/de/storage/28-tail.html
deleted file mode 100755
index 1d61f45d7..000000000
--- a/packages/node_modules/@node-red/nodes/locales/de/storage/28-tail.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright JS Foundation and other contributors, http://js.foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-help-name="tail">
-    <p>Überwacht (prüft, ob Dinge hinzugefügt werden) die konfigurierte Datei (nur Linux/Mac)</p>
-    <p>Dies funktioniert nicht auf Windows-Dateisystemen, da es auf dem Befehl <b>tail -F</b> basiert.</p>
-    <h3>Ausgaben</h3>
-    <ul>
-        <li>Textdateien (UTF-8) werden als Strings zurückgegeben.</li>
-        <li>Binärdateien werden als Buffer-Objekte zurückgegeben.</li>
-    </ul>
-</script>

From 419a183167ea1149553c395679d7650dd4a9ca62 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 13 Aug 2019 15:05:14 +0900
Subject: [PATCH 060/305] remove unused entries in KO message catalogue

---
 .../@node-red/editor-client/locales/ko/editor.json        | 1 -
 .../node_modules/@node-red/nodes/locales/ko/messages.json | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
index 3e7811f53..7f3c9ea76 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
@@ -273,7 +273,6 @@
     "deleteSubflow": "서브 플로우 삭제",
     "info": "상세내역",
     "category": "카테고리",
-    "format": "Markdown 형식",
     "errors": {
       "noNodesSelected": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 노드가 선택되지 않았습니다",
       "multipleInputsToSelection": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 복수의 입력이 선택되었습니다"
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/messages.json b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
index 547b44f08..d87b2c0f5 100755
--- a/packages/node_modules/@node-red/nodes/locales/ko/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
@@ -90,11 +90,7 @@
         "catchUncaught": "catch: 미보충",
         "label": {
             "source": "에러 취득처",
-            "node": "노드",
-            "type": "타입",
             "selectAll": "모두 선택",
-            "sortByLabel": "노드 이름순으로 정렬",
-            "sortByType": "타입순으로 정렬",
             "uncaught": "Catch노드로 처리된 에러를 무시"
         },
         "scope": {
@@ -107,10 +103,6 @@
         "statusNodes": "status: __number__",
         "label": {
             "source": "상태취득처",
-            "node": "노드",
-            "type": "타입",
-            "selectAll": "모두 선택",
-            "sortByLabel": "노드 이름순으로 정렬",
             "sortByType": "타입순으로 정렬"
         },
         "scope": {

From 58784b7568f2d8743b8045762dfd34322be1e5f9 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 13 Aug 2019 10:31:21 +0100
Subject: [PATCH 061/305] Use ctrl-click on wire to splice node in place

---
 .../@node-red/editor-client/src/js/ui/view.js | 576 +++++++++---------
 1 file changed, 302 insertions(+), 274 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 1e5878e1b..7de739491 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -358,7 +358,7 @@ RED.view = (function() {
 
                 var spliceLink = $(ui.helper).data("splice");
                 if (spliceLink) {
-                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp
+                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
                     RED.nodes.removeLink(spliceLink);
                     var link1 = {
                         source:spliceLink.source,
@@ -695,280 +695,8 @@ RED.view = (function() {
         }
         if (mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) {
             if (d3.event.metaKey || d3.event.ctrlKey) {
-                point = d3.mouse(this);
-                var ox = point[0];
-                var oy = point[1];
-
-                if (RED.settings.get("editor").view['view-snap-grid']) {
-                    // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
-                    point[0] = Math.round(point[0] / gridSize) * gridSize;
-                    point[1] = Math.round(point[1] / gridSize) * gridSize;
-                    // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','blue')
-                }
-
                 d3.event.stopPropagation();
-                var mainPos = $("#red-ui-main-container").position();
-
-                if (mouse_mode !== RED.state.QUICK_JOINING) {
-                    mouse_mode = RED.state.QUICK_JOINING;
-                    $(window).on('keyup',disableQuickJoinEventHandler);
-                }
-                quickAddActive = true;
-
-                if (ghostNode) {
-                    ghostNode.remove();
-                }
-                ghostNode = eventLayer.append("g").attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
-                ghostNode.append("rect")
-                    .attr("class","red-ui-flow-node-placeholder")
-                    .attr("rx", 5)
-                    .attr("ry", 5)
-                    .attr("width",node_width)
-                    .attr("height",node_height)
-                    .attr("fill","none")
-                // var ghostLink = ghostNode.append("svg:path")
-                //     .attr("class","red-ui-flow-link-link")
-                //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
-                //     .attr("opacity",0);
-
-                var filter = undefined;
-                if (drag_lines.length > 0) {
-                    if (drag_lines[0].virtualLink) {
-                        filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
-                    } else if (drag_lines[0].portType === PORT_TYPE_OUTPUT) {
-                        filter = {input:true}
-                    } else {
-                        filter = {output:true}
-                    }
-
-                    quickAddLink = {
-                        node: drag_lines[0].node,
-                        port: drag_lines[0].port,
-                        portType: drag_lines[0].portType,
-                    }
-                    if (drag_lines[0].virtualLink) {
-                        quickAddLink.virtualLink = true;
-                    }
-                    hideDragLines();
-                }
-                var rebuildQuickAddLink = function() {
-                    if (!quickAddLink) {
-                        return;
-                    }
-                    if (!quickAddLink.el) {
-                        quickAddLink.el = dragGroupLayer.append("svg:path").attr("class", "red-ui-flow-drag-line");
-                    }
-                    var numOutputs = (quickAddLink.portType === PORT_TYPE_OUTPUT)?(quickAddLink.node.outputs || 1):1;
-                    var sourcePort = quickAddLink.port;
-                    var portY = -((numOutputs-1)/2)*13 +13*sourcePort;
-                    var sc = (quickAddLink.portType === PORT_TYPE_OUTPUT)?1:-1;
-                    quickAddLink.el.attr("d",generateLinkPath(quickAddLink.node.x+sc*quickAddLink.node.w/2,quickAddLink.node.y+portY,point[0]-sc*node_width/2,point[1],sc));
-                }
-                if (quickAddLink) {
-                    rebuildQuickAddLink();
-                }
-
-
-                var lastAddedX;
-                var lastAddedWidth;
-
-                RED.typeSearch.show({
-                    x:d3.event.clientX-mainPos.left-node_width/2 - (ox-point[0]),
-                    y:d3.event.clientY-mainPos.top+ node_height/2 + 5 - (oy-point[1]),
-                    filter: filter,
-                    move: function(dx,dy) {
-                        if (ghostNode) {
-                            var pos = d3.transform(ghostNode.attr("transform")).translate;
-                            ghostNode.attr("transform","translate("+(pos[0]+dx)+","+(pos[1]+dy)+")")
-                            point[0] += dx;
-                            point[1] += dy;
-                            rebuildQuickAddLink();
-                        }
-                    },
-                    cancel: function() {
-                        if (quickAddLink) {
-                            if (quickAddLink.el) {
-                                quickAddLink.el.remove();
-                            }
-                            quickAddLink = null;
-                        }
-                        quickAddActive = false;
-                        if (ghostNode) {
-                            ghostNode.remove();
-                        }
-                        resetMouseVars();
-                        updateSelection();
-                        hideDragLines();
-                        redraw();
-                    },
-                    add: function(type,keepAdding) {
-                        var result = addNode(type);
-                        if (!result) {
-                            return;
-                        }
-                        if (keepAdding) {
-                            mouse_mode = RED.state.QUICK_JOINING;
-                        }
-
-                        var nn = result.node;
-                        var historyEvent = result.historyEvent;
-                        nn.x = point[0];
-                        nn.y = point[1];
-                        var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
-                        if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
-                            nn.l = showLabel;
-                        }
-                        if (quickAddLink) {
-                            var drag_line = quickAddLink;
-                            var src = null,dst,src_port;
-                            if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
-                                src = drag_line.node;
-                                src_port = drag_line.port;
-                                dst = nn;
-                            } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
-                                src = nn;
-                                dst = drag_line.node;
-                                src_port = 0;
-                            }
-
-                            if (src !== null) {
-                                // Joining link nodes via virual wires. Need to update
-                                // the src and dst links property
-                                if (drag_line.virtualLink) {
-                                    historyEvent = {
-                                        t:'multi',
-                                        events: [historyEvent]
-                                    }
-                                    var oldSrcLinks = $.extend(true,{},{v:src.links}).v
-                                    var oldDstLinks = $.extend(true,{},{v:dst.links}).v
-                                    src.links.push(dst.id);
-                                    dst.links.push(src.id);
-                                    src.dirty = true;
-                                    dst.dirty = true;
-
-                                    historyEvent.events.push({
-                                        t:'edit',
-                                        node: src,
-                                        dirty: RED.nodes.dirty(),
-                                        changed: src.changed,
-                                        changes: {
-                                            links:oldSrcLinks
-                                        }
-                                    });
-                                    historyEvent.events.push({
-                                        t:'edit',
-                                        node: dst,
-                                        dirty: RED.nodes.dirty(),
-                                        changed: dst.changed,
-                                        changes: {
-                                            links:oldDstLinks
-                                        }
-                                    });
-                                    src.changed = true;
-                                    dst.changed = true;
-                                } else {
-                                    var link = {source: src, sourcePort:src_port, target: dst};
-                                    RED.nodes.addLink(link);
-                                    historyEvent.links = [link];
-                                }
-                                if (!keepAdding) {
-                                    quickAddLink.el.remove();
-                                    quickAddLink = null;
-                                    if (mouse_mode === RED.state.QUICK_JOINING) {
-                                        if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
-                                            showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                        } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
-                                            showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
-                                        } else {
-                                            resetMouseVars();
-                                        }
-                                    }
-                                } else {
-                                    quickAddLink.node = nn;
-                                    quickAddLink.port = 0;
-                                }
-                            } else {
-                                hideDragLines();
-                                resetMouseVars();
-                            }
-                        } else {
-                            if (!keepAdding) {
-                                if (mouse_mode === RED.state.QUICK_JOINING) {
-                                    if (nn.outputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (nn.inputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
-                                    } else {
-                                        resetMouseVars();
-                                    }
-                                }
-                            } else {
-                                if (nn.outputs > 0) {
-                                    quickAddLink = {
-                                        node: nn,
-                                        port: 0,
-                                        portType: PORT_TYPE_OUTPUT
-                                    }
-                                } else if (nn.inputs > 0) {
-                                    quickAddLink = {
-                                        node: nn,
-                                        port: 0,
-                                        portType: PORT_TYPE_INPUT
-                                    }
-                                } else {
-                                    resetMouseVars();
-                                }
-                            }
-                        }
-
-                        RED.history.push(historyEvent);
-                        RED.nodes.add(nn);
-                        RED.editor.validateNode(nn);
-                        RED.nodes.dirty(true);
-                        // auto select dropped node - so info shows (if visible)
-                        clearSelection();
-                        nn.selected = true;
-                        moving_set.push({n:nn});
-                        updateActiveNodes();
-                        updateSelection();
-                        redraw();
-                        // At this point the newly added node will have a real width,
-                        // so check if the position needs nudging
-                        if (lastAddedX !== undefined) {
-                            var lastNodeRHEdge = lastAddedX + lastAddedWidth/2;
-                            var thisNodeLHEdge = nn.x - nn.w/2;
-                            var gap = thisNodeLHEdge - lastNodeRHEdge;
-                            if (gap != gridSize *2) {
-                                nn.x = nn.x + gridSize * 2 - gap;
-                                nn.dirty = true;
-                                nn.x = Math.ceil(nn.x / gridSize) * gridSize;
-                                redraw();
-                            }
-                        }
-                        if (keepAdding) {
-                            if (lastAddedX === undefined) {
-                                // ghostLink.attr("opacity",1);
-                                setTimeout(function() {
-                                    RED.typeSearch.refresh({filter:{input:true}});
-                                },100);
-                            }
-
-                            lastAddedX = nn.x;
-                            lastAddedWidth = nn.w;
-
-                            point[0] = nn.x + nn.w/2 + node_width/2 + gridSize * 2;
-                            ghostNode.attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
-                            rebuildQuickAddLink();
-                        } else {
-                            quickAddActive = false;
-                            ghostNode.remove();
-                        }
-                    }
-                });
-
-                updateActiveNodes();
-                updateSelection();
-                redraw();
+                showQuickAddDialog(d3.mouse(this));
             }
         }
         if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
@@ -989,6 +717,302 @@ RED.view = (function() {
         }
     }
 
+    function showQuickAddDialog(point,spliceLink) {
+        var ox = point[0];
+        var oy = point[1];
+
+        if (RED.settings.get("editor").view['view-snap-grid']) {
+            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
+            point[0] = Math.round(point[0] / gridSize) * gridSize;
+            point[1] = Math.round(point[1] / gridSize) * gridSize;
+            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','blue')
+        }
+
+        var mainPos = $("#red-ui-main-container").position();
+
+        if (mouse_mode !== RED.state.QUICK_JOINING) {
+            mouse_mode = RED.state.QUICK_JOINING;
+            $(window).on('keyup',disableQuickJoinEventHandler);
+        }
+        quickAddActive = true;
+
+        if (ghostNode) {
+            ghostNode.remove();
+        }
+        ghostNode = eventLayer.append("g").attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
+        ghostNode.append("rect")
+            .attr("class","red-ui-flow-node-placeholder")
+            .attr("rx", 5)
+            .attr("ry", 5)
+            .attr("width",node_width)
+            .attr("height",node_height)
+            .attr("fill","none")
+        // var ghostLink = ghostNode.append("svg:path")
+        //     .attr("class","red-ui-flow-link-link")
+        //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
+        //     .attr("opacity",0);
+
+        var filter = undefined;
+        if (drag_lines.length > 0) {
+            if (drag_lines[0].virtualLink) {
+                filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
+            } else if (drag_lines[0].portType === PORT_TYPE_OUTPUT) {
+                filter = {input:true}
+            } else {
+                filter = {output:true}
+            }
+
+            quickAddLink = {
+                node: drag_lines[0].node,
+                port: drag_lines[0].port,
+                portType: drag_lines[0].portType,
+            }
+            if (drag_lines[0].virtualLink) {
+                quickAddLink.virtualLink = true;
+            }
+            hideDragLines();
+        } else if (spliceLink) {
+            filter = {input:true, output:true}
+        }
+        var rebuildQuickAddLink = function() {
+            if (!quickAddLink) {
+                return;
+            }
+            if (!quickAddLink.el) {
+                quickAddLink.el = dragGroupLayer.append("svg:path").attr("class", "red-ui-flow-drag-line");
+            }
+            var numOutputs = (quickAddLink.portType === PORT_TYPE_OUTPUT)?(quickAddLink.node.outputs || 1):1;
+            var sourcePort = quickAddLink.port;
+            var portY = -((numOutputs-1)/2)*13 +13*sourcePort;
+            var sc = (quickAddLink.portType === PORT_TYPE_OUTPUT)?1:-1;
+            quickAddLink.el.attr("d",generateLinkPath(quickAddLink.node.x+sc*quickAddLink.node.w/2,quickAddLink.node.y+portY,point[0]-sc*node_width/2,point[1],sc));
+        }
+        if (quickAddLink) {
+            rebuildQuickAddLink();
+        }
+
+
+        var lastAddedX;
+        var lastAddedWidth;
+
+        RED.typeSearch.show({
+            x:d3.event.clientX-mainPos.left-node_width/2 - (ox-point[0]),
+            y:d3.event.clientY-mainPos.top+ node_height/2 + 5 - (oy-point[1]),
+            filter: filter,
+            move: function(dx,dy) {
+                if (ghostNode) {
+                    var pos = d3.transform(ghostNode.attr("transform")).translate;
+                    ghostNode.attr("transform","translate("+(pos[0]+dx)+","+(pos[1]+dy)+")")
+                    point[0] += dx;
+                    point[1] += dy;
+                    rebuildQuickAddLink();
+                }
+            },
+            cancel: function() {
+                if (quickAddLink) {
+                    if (quickAddLink.el) {
+                        quickAddLink.el.remove();
+                    }
+                    quickAddLink = null;
+                }
+                quickAddActive = false;
+                if (ghostNode) {
+                    ghostNode.remove();
+                }
+                resetMouseVars();
+                updateSelection();
+                hideDragLines();
+                redraw();
+            },
+            add: function(type,keepAdding) {
+                var result = addNode(type);
+                if (!result) {
+                    return;
+                }
+                if (keepAdding) {
+                    mouse_mode = RED.state.QUICK_JOINING;
+                }
+
+                var nn = result.node;
+                var historyEvent = result.historyEvent;
+                nn.x = point[0];
+                nn.y = point[1];
+                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
+                    nn.l = showLabel;
+                }
+                if (!spliceLink) {
+                    if (quickAddLink) {
+                        var drag_line = quickAddLink;
+                        var src = null,dst,src_port;
+                        if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
+                            src = drag_line.node;
+                            src_port = drag_line.port;
+                            dst = nn;
+                        } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
+                            src = nn;
+                            dst = drag_line.node;
+                            src_port = 0;
+                        }
+
+                        if (src !== null) {
+                            // Joining link nodes via virual wires. Need to update
+                            // the src and dst links property
+                            if (drag_line.virtualLink) {
+                                historyEvent = {
+                                    t:'multi',
+                                    events: [historyEvent]
+                                }
+                                var oldSrcLinks = $.extend(true,{},{v:src.links}).v
+                                var oldDstLinks = $.extend(true,{},{v:dst.links}).v
+                                src.links.push(dst.id);
+                                dst.links.push(src.id);
+                                src.dirty = true;
+                                dst.dirty = true;
+
+                                historyEvent.events.push({
+                                    t:'edit',
+                                    node: src,
+                                    dirty: RED.nodes.dirty(),
+                                    changed: src.changed,
+                                    changes: {
+                                        links:oldSrcLinks
+                                    }
+                                });
+                                historyEvent.events.push({
+                                    t:'edit',
+                                    node: dst,
+                                    dirty: RED.nodes.dirty(),
+                                    changed: dst.changed,
+                                    changes: {
+                                        links:oldDstLinks
+                                    }
+                                });
+                                src.changed = true;
+                                dst.changed = true;
+                            } else {
+                                var link = {source: src, sourcePort:src_port, target: dst};
+                                RED.nodes.addLink(link);
+                                historyEvent.links = [link];
+                            }
+                            if (!keepAdding) {
+                                quickAddLink.el.remove();
+                                quickAddLink = null;
+                                if (mouse_mode === RED.state.QUICK_JOINING) {
+                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
+                                    } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
+                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                    } else {
+                                        resetMouseVars();
+                                    }
+                                }
+                            } else {
+                                quickAddLink.node = nn;
+                                quickAddLink.port = 0;
+                            }
+                        } else {
+                            hideDragLines();
+                            resetMouseVars();
+                        }
+                    } else {
+                        if (!keepAdding) {
+                            if (mouse_mode === RED.state.QUICK_JOINING) {
+                                if (nn.outputs > 0) {
+                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
+                                } else if (nn.inputs > 0) {
+                                    showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
+                                } else {
+                                    resetMouseVars();
+                                }
+                            }
+                        } else {
+                            if (nn.outputs > 0) {
+                                quickAddLink = {
+                                    node: nn,
+                                    port: 0,
+                                    portType: PORT_TYPE_OUTPUT
+                                }
+                            } else if (nn.inputs > 0) {
+                                quickAddLink = {
+                                    node: nn,
+                                    port: 0,
+                                    portType: PORT_TYPE_INPUT
+                                }
+                            } else {
+                                resetMouseVars();
+                            }
+                        }
+                    }
+                } else {
+                    resetMouseVars();
+                    // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
+                    RED.nodes.removeLink(spliceLink);
+                    var link1 = {
+                        source:spliceLink.source,
+                        sourcePort:spliceLink.sourcePort,
+                        target: nn
+                    };
+                    var link2 = {
+                        source:nn,
+                        sourcePort:0,
+                        target: spliceLink.target
+                    };
+                    RED.nodes.addLink(link1);
+                    RED.nodes.addLink(link2);
+                    historyEvent.links = [link1,link2];
+                    historyEvent.removedLinks = [spliceLink];
+                }
+                RED.history.push(historyEvent);
+                RED.nodes.add(nn);
+                RED.editor.validateNode(nn);
+                RED.nodes.dirty(true);
+                // auto select dropped node - so info shows (if visible)
+                clearSelection();
+                nn.selected = true;
+                moving_set.push({n:nn});
+                updateActiveNodes();
+                updateSelection();
+                redraw();
+                // At this point the newly added node will have a real width,
+                // so check if the position needs nudging
+                if (lastAddedX !== undefined) {
+                    var lastNodeRHEdge = lastAddedX + lastAddedWidth/2;
+                    var thisNodeLHEdge = nn.x - nn.w/2;
+                    var gap = thisNodeLHEdge - lastNodeRHEdge;
+                    if (gap != gridSize *2) {
+                        nn.x = nn.x + gridSize * 2 - gap;
+                        nn.dirty = true;
+                        nn.x = Math.ceil(nn.x / gridSize) * gridSize;
+                        redraw();
+                    }
+                }
+                if (keepAdding) {
+                    if (lastAddedX === undefined) {
+                        // ghostLink.attr("opacity",1);
+                        setTimeout(function() {
+                            RED.typeSearch.refresh({filter:{input:true}});
+                        },100);
+                    }
+
+                    lastAddedX = nn.x;
+                    lastAddedWidth = nn.w;
+
+                    point[0] = nn.x + nn.w/2 + node_width/2 + gridSize * 2;
+                    ghostNode.attr('transform','translate('+(point[0] - node_width/2)+','+(point[1] - node_height/2)+')');
+                    rebuildQuickAddLink();
+                } else {
+                    quickAddActive = false;
+                    ghostNode.remove();
+                }
+            }
+        });
+
+        updateActiveNodes();
+        updateSelection();
+        redraw();
+    }
+
     function canvasMouseMove() {
         var i;
         var node;
@@ -3205,6 +3229,10 @@ RED.view = (function() {
                         redraw();
                         focusView();
                         d3.event.stopPropagation();
+                        if (d3.event.metaKey || d3.event.ctrlKey) {
+                            l.classed("red-ui-flow-link-splice",true);
+                            showQuickAddDialog(d3.mouse(this), selected_link);
+                        }
                     })
                     .on("touchstart",function(d) {
                         if (mouse_mode === RED.state.SELECTING_NODE) {

From daa98e8925d501fc1612293eee6dacd28f1fbf6e Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 13 Aug 2019 21:17:31 +0900
Subject: [PATCH 062/305] fix i18n of new subflow feature

---
 .../editor-client/locales/en-US/editor.json   | 23 ++++++---
 .../editor-client/locales/ja/editor.json      | 23 +++++++--
 .../editor-client/src/js/ui/subflow.js        | 51 +++++++++++--------
 3 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index de38dad17..67dfa8a73 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -325,16 +325,21 @@
         "locale": "Select UI Language",
         "icon": "Icon",
         "inputType": "Input type",
-        "previewUI": "Preview UI",
-        "previewOK": "Preview OK",
+        "inputs" : {
+            "input": "input",
+            "select": "select",
+            "checkbox": "checkbox",
+            "spinner": "spinner",
+            "none": "none",
+            "hidden": "hide property"
+        },
         "types": {
             "str": "string",
             "num": "number",
             "bool": "bool",
-            "json": "json",
+            "json": "JSON",
             "bin": "buffer",
-            "env": "env var",
-            "no-value": "no value"
+            "env": "env variable"
         },
         "menu": {
             "input": "input",
@@ -343,9 +348,13 @@
             "spinner": "spinner",
             "hidden": "label only"
         },
+        "select": {
+            "label": "Label",
+            "value": "Value"
+        },
         "spinner": {
-            "min": "min",
-            "max": "max"
+            "min": "Minimum",
+            "max": "Maximum"
         },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index e0953396a..b95119530 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -327,14 +327,21 @@
         "inputType": "入力形式",
         "previewUI": "UI確認",
         "previewOK": "確認OK",
+        "inputs" : {
+            "input": "入力",
+            "select": "メニュー",
+            "checkbox": "チェックボックス",
+            "spinner": "スピナー",
+            "none": "無し",
+            "hidden": "非表示"
+        },
         "types": {
             "str": "文字列",
             "num": "数値",
             "bool": "真偽",
             "json": "JSON",
             "bin": "バッファ",
-            "env": "環境変数",
-            "no-value": "値無し"
+            "env": "環境変数"
         },
         "menu": {
             "input": "入力",
@@ -343,9 +350,13 @@
             "spinner": "数値",
             "hidden": "ラベルのみ"
         },
+        "select": {
+            "label": "ラベル",
+            "value": "値"
+        },
         "spinner": {
-            "min": "最小",
-            "max": "最大"
+            "min": "最小値",
+            "max": "最大値"
         },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
@@ -964,9 +975,11 @@
     },
     "editor-tab": {
         "properties": "プロパティ",
+        "envProperties": "環境変数",
         "description": "説明",
         "appearance": "外観",
-        "env": "サブフロープロパティ"
+        "preview": "UIプレビュー",
+        "defaultValue": "デフォルト値"
     },
     "languages": {
         "de": "ドイツ語",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 3714a1569..8e2bdf453 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1068,14 +1068,15 @@ RED.subflow = (function() {
 
          inputCellInput.typedInput({
              types: [
-                 {value:"input",
-                    label:"input", icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
-                         {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
-                         {value:"num",label:"number",icon:"red/images/typedInput/09.svg"},
-                         {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg"},
-                         {value:"json",label:"JSON",icon:"red/images/typedInput/json.svg"},
-                         {value: "bin",label: "buffer",icon: "red/images/typedInput/bin.svg"},
-                         {value: "env",label: "env variable",icon: "red/images/typedInput/env.svg"}
+                 {
+                     value:"input",
+                     label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
+                         {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
+                         {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
+                         {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
+                         {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
+                         {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
+                         {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"}
                      ],
                      default: ['str','num','bool','json','bin','env'],
                      valueLabel: function(container,value) {
@@ -1100,8 +1101,9 @@ RED.subflow = (function() {
                          }
                      }
                  },
-                 {value:"select",
-                    label:"select", icon:"fa fa-tasks",showLabel:false,
+                 {
+                     value:"select",
+                     label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
                      valueLabel: function(container,value) {
                          container.css("padding","0");
 
@@ -1131,7 +1133,7 @@ RED.subflow = (function() {
                          content: function(container) {
                              var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
                              var optList = $('<ol>').appendTo(content).editableList({
-                                 header:$("<div><div>Label</div><div>Value</div></div>"),
+                                 header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
                                  addItem: function(row,index,itemData) {
                                      var labelDiv = $('<div>').appendTo(row);
                                      var label = lookupLabel(itemData.l, "", currentLocale);
@@ -1220,8 +1222,9 @@ RED.subflow = (function() {
                          }
                      }
                  },
-                 {value:"checkbox",
-                    label:"checkbox", icon:"fa fa-check-square-o",showLabel:false,
+                 {
+                     value:"checkbox",
+                     label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
                      valueLabel: function(container,value) {
                          container.css("padding",0);
                          checkbox = $('<input type="checkbox">').appendTo(container);
@@ -1231,8 +1234,9 @@ RED.subflow = (function() {
                          checkbox.prop('checked',valueField.typedInput('value')==="true");
                      }
                  },
-                 {value:"spinner",
-                    label:"spinner", icon:"fa fa-sort-numeric-asc", showLabel:false,
+                 {
+                     value:"spinner",
+                     label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
                      valueLabel: function(container,value) {
                          container.css("padding",0);
                          var innerContainer = $('<div>').css({
@@ -1267,8 +1271,8 @@ RED.subflow = (function() {
                              minInput.val(min);
                              var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
                              maxInput.val(max);
-                             $('<div class="form-row" style="margin-bottom:3px"><label>Minimum</label></div>').append(minInput).appendTo(content);
-                             $('<div class="form-row" style="margin-bottom:0"><label>Maximum</label></div>').append(maxInput).appendTo(content);
+                             $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
+                             $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
                              return {
                                  onclose: function() {
                                      var min = minInput.val().trim();
@@ -1289,11 +1293,14 @@ RED.subflow = (function() {
                          }
                      }
                  },
-                 {value:"none",
-                 label:"none", icon:"fa fa-times",hasValue:false},
-                 {value:"hide",
-                 label:"hide property", icon:"fa fa-ban",hasValue:false}
-
+                 {
+                     value:"none",
+                     label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
+                 },
+                 {
+                     value:"hide",
+                     label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
+                 }
              ],
              default: 'none'
          }).on("typedinputtypechange", function(evt,type) {

From be49e1d3838f040b6adf87c0cda42686376c7061 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 13 Aug 2019 20:38:25 +0100
Subject: [PATCH 063/305] Add initial core:layout-flow action

---
 .../editor-client/src/js/ui/view-tools.js     | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
index 0814892be..66af9c083 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@@ -108,6 +108,168 @@ RED.view.tools = (function() {
         }
     }
 
+    function layoutFlow() {
+
+        var selection = RED.view.selection();
+        if (!selection.nodes || selection.nodes.length !== 1) {
+            RED.notify("Select exactly one node");
+            return;
+        }
+        var ns = RED.nodes.getAllFlowNodes(selection.nodes[0]);
+
+        // Find Input node
+
+        var nodes = {};
+        var minRank = 0;
+        var stack = [];
+        var candidateInputs = {};
+        var candidateOutputs = {};
+        ns.forEach(function(n) {
+            candidateInputs[n.id] = n;
+            candidateOutputs[n.id] = n;
+            nodes[n.id] = {
+                n:n,
+                i:[],
+                o:[],
+                d:-1, // depth from start
+                r:-1, // rank order at that depth
+                downstream: 0
+            }
+        });
+        RED.nodes.eachLink(function(link) {
+            if (nodes[link.source.id] || nodes[link.target.id]) {
+                nodes[link.source.id].o.push(link.target.id);
+                nodes[link.target.id].i.push(link.source.id);
+                delete candidateInputs[link.target.id]
+                delete candidateOutputs[link.source.id]
+            }
+        })
+
+        var inputs = Object.keys(candidateInputs);
+        var outputs = Object.keys(candidateOutputs);
+
+        if (inputs.length > 1) {
+            RED.notify("Multiple start points - bailing")
+            return;
+        }
+
+       if (outputs.length === 0) {
+           RED.notify("No outputs - is this a big loop? Bailing");
+           return;
+       }
+
+        function applyDepth(id,d) {
+            if (nodes[id].d < d) {
+                nodes[id].d = d;
+                nodes[id].o.forEach(function(nid) {
+                    applyDepth(nid,d+1);
+                })
+            }
+        }
+        applyDepth(inputs[0],0)
+
+        function calculateDownstream(id,downstream) {
+            nodes[id].downstream += downstream;
+            nodes[id].i.forEach(function(nid) {
+                calculateDownstream(nid, nodes[id].downstream+1);
+            })
+        }
+        outputs.forEach(function(id) {
+            calculateDownstream(id, 0)
+        })
+
+        var ranks = {};
+        function rankNodes(node) {
+            if (node.r === -1) {
+                ranks[node.d] = ranks[node.d] || [];
+                node.r = ranks[node.d].length;
+                ranks[node.d].push(node);
+                node.o.sort(function(a,b) {
+                    return nodes[b].downstream - nodes[a].downstream
+                })
+                node.o.forEach(function(nid) {
+                    rankNodes(nodes[nid])
+                })
+            }
+        }
+        rankNodes(nodes[inputs[0]]);
+        function shuffleRanks(node) {
+            var pushed = false;
+            if (node.o.length > 1) {
+                var outputs = node.o.slice(0);
+                outputs.sort(function(a,b) {
+                    if (nodes[a].d === nodes[b].d) {
+                        return nodes[a].r - nodes[b].r;
+                    } else {
+                        return nodes[b].d - nodes[a].d;
+                    }
+                })
+                // outputs.forEach(function(o,i) { console.log(" ",i," + "+nodes[o].n.type," d:",nodes[o].d," r:",nodes[o].r)});
+                var rank = nodes[outputs[0]].r;
+                var depth = nodes[outputs[0]].d;
+                for (var i=1;i<outputs.length;i++) {
+                    // console.log(outputs[i]);
+                    var n = nodes[outputs[i]];
+                    if (n.d !== depth && n.r === rank) {
+                        // need to move n down one.
+                        var r = n.r;
+                        ns.forEach(function(_n) {
+                            var nn = nodes[_n.id];
+                            if (nn.d >= n.d && nn.d < depth && nn.r >= r) {
+                                pushed = true;
+                                nn.r++;
+                            }
+                        })
+                    }
+                    depth = n.d;
+                    rank = n.r;
+                }
+            }
+            node.o.forEach(function(n) {
+                pushed = pushed || shuffleRanks(nodes[n])
+            })
+            return pushed;
+        }
+        var shuffle = function() {
+            if (shuffleRanks(nodes[inputs[0]])) {
+                shuffle();
+            }
+        }
+        shuffle();
+
+
+        var x = nodes[inputs[0]].n.x;
+        var y = nodes[inputs[0]].n.y;
+        var changedNodes = [];
+        ns.forEach(function(n) {
+            var d = nodes[n.id].d;
+            var r = nodes[n.id].r;
+
+            changedNodes.push({
+                n:n,
+                ox: n.x,
+                oy: n.y,
+                moved: n.moved
+            });
+
+            n.x = x + d*200;
+            n.y = y + r*50;
+            n.dirty = true;
+            // n.dirtyStatus = true;
+            // n.status = {
+            //     text:"d"+d+" : r"+r+" : ds"+nodes[n.id].downstream
+            // }
+        });
+
+        if (changedNodes.length > 0) {
+            RED.history.push({t:"move",nodes:changedNodes,dirty:RED.nodes.dirty()});
+            RED.nodes.dirty(true);
+            RED.view.redraw(true);
+        }
+
+    }
+
+
     return {
         init: function() {
             RED.actions.add("core:align-selection-to-grid", alignToGrid);
@@ -121,6 +283,8 @@ RED.view.tools = (function() {
             RED.actions.add("core:step-selection-right", function() { moveSelection(RED.view.gridSize(),0);});
             RED.actions.add("core:step-selection-down", function() { moveSelection(0,RED.view.gridSize());});
             RED.actions.add("core:step-selection-left", function() { moveSelection(-RED.view.gridSize(),0);});
+
+            RED.actions.add("core:layout-flow", function() { layoutFlow() })
         },
         /**
          * Aligns all selected nodes to the current grid

From 17d3a5840d47831bfc4a475867943c38275ab72e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 13 Aug 2019 20:41:13 +0100
Subject: [PATCH 064/305] Revert "Add initial core:layout-flow action"

This reverts commit be49e1d3838f040b6adf87c0cda42686376c7061.
---
 .../editor-client/src/js/ui/view-tools.js     | 164 ------------------
 1 file changed, 164 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
index 66af9c083..0814892be 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@@ -108,168 +108,6 @@ RED.view.tools = (function() {
         }
     }
 
-    function layoutFlow() {
-
-        var selection = RED.view.selection();
-        if (!selection.nodes || selection.nodes.length !== 1) {
-            RED.notify("Select exactly one node");
-            return;
-        }
-        var ns = RED.nodes.getAllFlowNodes(selection.nodes[0]);
-
-        // Find Input node
-
-        var nodes = {};
-        var minRank = 0;
-        var stack = [];
-        var candidateInputs = {};
-        var candidateOutputs = {};
-        ns.forEach(function(n) {
-            candidateInputs[n.id] = n;
-            candidateOutputs[n.id] = n;
-            nodes[n.id] = {
-                n:n,
-                i:[],
-                o:[],
-                d:-1, // depth from start
-                r:-1, // rank order at that depth
-                downstream: 0
-            }
-        });
-        RED.nodes.eachLink(function(link) {
-            if (nodes[link.source.id] || nodes[link.target.id]) {
-                nodes[link.source.id].o.push(link.target.id);
-                nodes[link.target.id].i.push(link.source.id);
-                delete candidateInputs[link.target.id]
-                delete candidateOutputs[link.source.id]
-            }
-        })
-
-        var inputs = Object.keys(candidateInputs);
-        var outputs = Object.keys(candidateOutputs);
-
-        if (inputs.length > 1) {
-            RED.notify("Multiple start points - bailing")
-            return;
-        }
-
-       if (outputs.length === 0) {
-           RED.notify("No outputs - is this a big loop? Bailing");
-           return;
-       }
-
-        function applyDepth(id,d) {
-            if (nodes[id].d < d) {
-                nodes[id].d = d;
-                nodes[id].o.forEach(function(nid) {
-                    applyDepth(nid,d+1);
-                })
-            }
-        }
-        applyDepth(inputs[0],0)
-
-        function calculateDownstream(id,downstream) {
-            nodes[id].downstream += downstream;
-            nodes[id].i.forEach(function(nid) {
-                calculateDownstream(nid, nodes[id].downstream+1);
-            })
-        }
-        outputs.forEach(function(id) {
-            calculateDownstream(id, 0)
-        })
-
-        var ranks = {};
-        function rankNodes(node) {
-            if (node.r === -1) {
-                ranks[node.d] = ranks[node.d] || [];
-                node.r = ranks[node.d].length;
-                ranks[node.d].push(node);
-                node.o.sort(function(a,b) {
-                    return nodes[b].downstream - nodes[a].downstream
-                })
-                node.o.forEach(function(nid) {
-                    rankNodes(nodes[nid])
-                })
-            }
-        }
-        rankNodes(nodes[inputs[0]]);
-        function shuffleRanks(node) {
-            var pushed = false;
-            if (node.o.length > 1) {
-                var outputs = node.o.slice(0);
-                outputs.sort(function(a,b) {
-                    if (nodes[a].d === nodes[b].d) {
-                        return nodes[a].r - nodes[b].r;
-                    } else {
-                        return nodes[b].d - nodes[a].d;
-                    }
-                })
-                // outputs.forEach(function(o,i) { console.log(" ",i," + "+nodes[o].n.type," d:",nodes[o].d," r:",nodes[o].r)});
-                var rank = nodes[outputs[0]].r;
-                var depth = nodes[outputs[0]].d;
-                for (var i=1;i<outputs.length;i++) {
-                    // console.log(outputs[i]);
-                    var n = nodes[outputs[i]];
-                    if (n.d !== depth && n.r === rank) {
-                        // need to move n down one.
-                        var r = n.r;
-                        ns.forEach(function(_n) {
-                            var nn = nodes[_n.id];
-                            if (nn.d >= n.d && nn.d < depth && nn.r >= r) {
-                                pushed = true;
-                                nn.r++;
-                            }
-                        })
-                    }
-                    depth = n.d;
-                    rank = n.r;
-                }
-            }
-            node.o.forEach(function(n) {
-                pushed = pushed || shuffleRanks(nodes[n])
-            })
-            return pushed;
-        }
-        var shuffle = function() {
-            if (shuffleRanks(nodes[inputs[0]])) {
-                shuffle();
-            }
-        }
-        shuffle();
-
-
-        var x = nodes[inputs[0]].n.x;
-        var y = nodes[inputs[0]].n.y;
-        var changedNodes = [];
-        ns.forEach(function(n) {
-            var d = nodes[n.id].d;
-            var r = nodes[n.id].r;
-
-            changedNodes.push({
-                n:n,
-                ox: n.x,
-                oy: n.y,
-                moved: n.moved
-            });
-
-            n.x = x + d*200;
-            n.y = y + r*50;
-            n.dirty = true;
-            // n.dirtyStatus = true;
-            // n.status = {
-            //     text:"d"+d+" : r"+r+" : ds"+nodes[n.id].downstream
-            // }
-        });
-
-        if (changedNodes.length > 0) {
-            RED.history.push({t:"move",nodes:changedNodes,dirty:RED.nodes.dirty()});
-            RED.nodes.dirty(true);
-            RED.view.redraw(true);
-        }
-
-    }
-
-
     return {
         init: function() {
             RED.actions.add("core:align-selection-to-grid", alignToGrid);
@@ -283,8 +121,6 @@ RED.view.tools = (function() {
             RED.actions.add("core:step-selection-right", function() { moveSelection(RED.view.gridSize(),0);});
             RED.actions.add("core:step-selection-down", function() { moveSelection(0,RED.view.gridSize());});
             RED.actions.add("core:step-selection-left", function() { moveSelection(-RED.view.gridSize(),0);});
-
-            RED.actions.add("core:layout-flow", function() { layoutFlow() })
         },
         /**
          * Aligns all selected nodes to the current grid

From 426fd499ce629d67833df5650215f45408de2286 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 09:50:34 +0100
Subject: [PATCH 065/305] Fix ctrl-click on wire whilst already in quick-join

---
 .../@node-red/editor-client/src/js/ui/view.js | 167 +++++++++---------
 1 file changed, 83 insertions(+), 84 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 7de739491..693538f2c 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -841,110 +841,109 @@ RED.view = (function() {
                 if (showLabel !== undefined && !/^link (in|out)$/.test(nn._def.type) && !nn._def.defaults.hasOwnProperty("l")) {
                     nn.l = showLabel;
                 }
-                if (!spliceLink) {
-                    if (quickAddLink) {
-                        var drag_line = quickAddLink;
-                        var src = null,dst,src_port;
-                        if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
-                            src = drag_line.node;
-                            src_port = drag_line.port;
-                            dst = nn;
-                        } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
-                            src = nn;
-                            dst = drag_line.node;
-                            src_port = 0;
-                        }
+                if (quickAddLink) {
+                    var drag_line = quickAddLink;
+                    var src = null,dst,src_port;
+                    if (drag_line.portType === PORT_TYPE_OUTPUT && (nn.inputs > 0 || drag_line.virtualLink) ) {
+                        src = drag_line.node;
+                        src_port = drag_line.port;
+                        dst = nn;
+                    } else if (drag_line.portType === PORT_TYPE_INPUT && (nn.outputs > 0 || drag_line.virtualLink)) {
+                        src = nn;
+                        dst = drag_line.node;
+                        src_port = 0;
+                    }
 
-                        if (src !== null) {
-                            // Joining link nodes via virual wires. Need to update
-                            // the src and dst links property
-                            if (drag_line.virtualLink) {
-                                historyEvent = {
-                                    t:'multi',
-                                    events: [historyEvent]
-                                }
-                                var oldSrcLinks = $.extend(true,{},{v:src.links}).v
-                                var oldDstLinks = $.extend(true,{},{v:dst.links}).v
-                                src.links.push(dst.id);
-                                dst.links.push(src.id);
-                                src.dirty = true;
-                                dst.dirty = true;
+                    if (src !== null) {
+                        // Joining link nodes via virual wires. Need to update
+                        // the src and dst links property
+                        if (drag_line.virtualLink) {
+                            historyEvent = {
+                                t:'multi',
+                                events: [historyEvent]
+                            }
+                            var oldSrcLinks = $.extend(true,{},{v:src.links}).v
+                            var oldDstLinks = $.extend(true,{},{v:dst.links}).v
+                            src.links.push(dst.id);
+                            dst.links.push(src.id);
+                            src.dirty = true;
+                            dst.dirty = true;
 
-                                historyEvent.events.push({
-                                    t:'edit',
-                                    node: src,
-                                    dirty: RED.nodes.dirty(),
-                                    changed: src.changed,
-                                    changes: {
-                                        links:oldSrcLinks
-                                    }
-                                });
-                                historyEvent.events.push({
-                                    t:'edit',
-                                    node: dst,
-                                    dirty: RED.nodes.dirty(),
-                                    changed: dst.changed,
-                                    changes: {
-                                        links:oldDstLinks
-                                    }
-                                });
-                                src.changed = true;
-                                dst.changed = true;
-                            } else {
-                                var link = {source: src, sourcePort:src_port, target: dst};
-                                RED.nodes.addLink(link);
-                                historyEvent.links = [link];
-                            }
-                            if (!keepAdding) {
-                                quickAddLink.el.remove();
-                                quickAddLink = null;
-                                if (mouse_mode === RED.state.QUICK_JOINING) {
-                                    if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                    } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
-                                        showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
-                                    } else {
-                                        resetMouseVars();
-                                    }
+                            historyEvent.events.push({
+                                t:'edit',
+                                node: src,
+                                dirty: RED.nodes.dirty(),
+                                changed: src.changed,
+                                changes: {
+                                    links:oldSrcLinks
                                 }
-                            } else {
-                                quickAddLink.node = nn;
-                                quickAddLink.port = 0;
-                            }
+                            });
+                            historyEvent.events.push({
+                                t:'edit',
+                                node: dst,
+                                dirty: RED.nodes.dirty(),
+                                changed: dst.changed,
+                                changes: {
+                                    links:oldDstLinks
+                                }
+                            });
+                            src.changed = true;
+                            dst.changed = true;
                         } else {
-                            hideDragLines();
-                            resetMouseVars();
+                            var link = {source: src, sourcePort:src_port, target: dst};
+                            RED.nodes.addLink(link);
+                            historyEvent.links = [link];
                         }
-                    } else {
                         if (!keepAdding) {
+                            quickAddLink.el.remove();
+                            quickAddLink = null;
                             if (mouse_mode === RED.state.QUICK_JOINING) {
-                                if (nn.outputs > 0) {
+                                if (drag_line.portType === PORT_TYPE_OUTPUT && nn.outputs > 0) {
                                     showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
-                                } else if (nn.inputs > 0) {
+                                } else if (!quickAddLink && drag_line.portType === PORT_TYPE_INPUT && nn.inputs > 0) {
                                     showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
                                 } else {
                                     resetMouseVars();
                                 }
                             }
                         } else {
+                            quickAddLink.node = nn;
+                            quickAddLink.port = 0;
+                        }
+                    } else {
+                        hideDragLines();
+                        resetMouseVars();
+                    }
+                } else {
+                    if (!keepAdding) {
+                        if (mouse_mode === RED.state.QUICK_JOINING) {
                             if (nn.outputs > 0) {
-                                quickAddLink = {
-                                    node: nn,
-                                    port: 0,
-                                    portType: PORT_TYPE_OUTPUT
-                                }
+                                showDragLines([{node:nn,port:0,portType:PORT_TYPE_OUTPUT}]);
                             } else if (nn.inputs > 0) {
-                                quickAddLink = {
-                                    node: nn,
-                                    port: 0,
-                                    portType: PORT_TYPE_INPUT
-                                }
+                                showDragLines([{node:nn,port:0,portType:PORT_TYPE_INPUT}]);
                             } else {
                                 resetMouseVars();
                             }
                         }
+                    } else {
+                        if (nn.outputs > 0) {
+                            quickAddLink = {
+                                node: nn,
+                                port: 0,
+                                portType: PORT_TYPE_OUTPUT
+                            }
+                        } else if (nn.inputs > 0) {
+                            quickAddLink = {
+                                node: nn,
+                                port: 0,
+                                portType: PORT_TYPE_INPUT
+                            }
+                        } else {
+                            resetMouseVars();
+                        }
                     }
-                } else {
+                }
+                if (spliceLink) {
                     resetMouseVars();
                     // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
                     RED.nodes.removeLink(spliceLink);
@@ -960,7 +959,7 @@ RED.view = (function() {
                     };
                     RED.nodes.addLink(link1);
                     RED.nodes.addLink(link2);
-                    historyEvent.links = [link1,link2];
+                    historyEvent.links = (historyEvent.links || []).concat([link1,link2]);
                     historyEvent.removedLinks = [spliceLink];
                 }
                 RED.history.push(historyEvent);

From fe084a4478b4fde77319010cae417e65c6c99273 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 11:37:26 +0100
Subject: [PATCH 066/305] Allow search results to show more than 25 results

---
 .../editor-client/src/js/ui/search.js         | 57 +++++++++++++++++--
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
index 6799385fd..9bb4cefb0 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -125,6 +125,14 @@ RED.search = (function() {
                 for (i=0;i<Math.min(results.length,25);i++) {
                     searchResults.editableList('addItem',results[i])
                 }
+                if (results.length > 25) {
+                    searchResults.editableList('addItem', {
+                        more: {
+                            results: results,
+                            start: 25
+                        }
+                    })
+                }
             } else {
                 searchResults.editableList('addItem',{});
             }
@@ -186,8 +194,27 @@ RED.search = (function() {
                     evt.preventDefault();
                 } else if (evt.keyCode === 13) {
                     // Enter
-                    if (results.length > 0) {
-                        reveal(results[Math.max(0,selected)].node);
+                    children = searchResults.children();
+                    if ($(children[selected]).hasClass("red-ui-search-more")) {
+                        var object = $(children[selected]).find(".red-ui-editableList-item-content").data('data');
+                        if (object) {
+                            searchResults.editableList('removeItem',object);
+                            for (i=object.more.start;i<Math.min(results.length,object.more.start+25);i++) {
+                                searchResults.editableList('addItem',results[i])
+                            }
+                            if (results.length > object.more.start+25) {
+                                searchResults.editableList('addItem', {
+                                    more: {
+                                        results: results,
+                                        start: object.more.start+25
+                                    }
+                                })
+                            }
+                        }
+                    } else {
+                        if (results.length > 0) {
+                            reveal(results[Math.max(0,selected)].node);
+                        }
                     }
                 }
             }
@@ -199,12 +226,32 @@ RED.search = (function() {
             addButton: false,
             addItem: function(container,i,object) {
                 var node = object.node;
-                if (node === undefined) {
-                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+                var div;
+                if (object.more) {
+                    container.parent().addClass("red-ui-search-more")
+                    div = $('<a>',{href:'#',class:"red-ui-search-result red-ui-search-empty"}).appendTo(container);
+                    div.text(RED._("palette.editor.more",{count:object.more.results.length-object.more.start}));
+                    div.on("click", function(evt) {
+                        evt.preventDefault();
+                        searchResults.editableList('removeItem',object);
+                        for (i=object.more.start;i<Math.min(results.length,object.more.start+25);i++) {
+                            searchResults.editableList('addItem',results[i])
+                        }
+                        if (results.length > object.more.start+25) {
+                            searchResults.editableList('addItem', {
+                                more: {
+                                    results: results,
+                                    start: object.more.start+25
+                                }
+                            })
+                        }
+                    });
 
+                } else if (node === undefined) {
+                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
                 } else {
                     var def = node._def;
-                    var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+                    div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
 
                     var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
                     var colour = RED.utils.getNodeColor(node.type,def);

From 2daedf8fd55987b8e1d0fa5b34bf9c37e398402b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 11:43:04 +0100
Subject: [PATCH 067/305] Sanitize subflow env var names properly when building
 ui form

---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 8e2bdf453..ed7cf134c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1668,7 +1668,7 @@ RED.subflow = (function() {
     }
 
     function getSubflowEnvPropertyName(name) {
-        return 'node-input-subflow-env-'+name.replace(/\s/g,"_");
+        return 'node-input-subflow-env-'+name.replace(/[^a-z0-9-_]/ig,"_");
     }
 
     /**

From 84232f25f0efc49fc52182d35b6ee4d8cc97a0b7 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 15:54:06 +0100
Subject: [PATCH 068/305] Add node done to mqtt, http req and ws output nodes

---
 .../@node-red/nodes/core/io/10-mqtt.js          | 17 ++++++++++++-----
 .../@node-red/nodes/core/io/21-httprequest.js   | 12 +++++++++---
 .../@node-red/nodes/core/io/22-websocket.js     |  3 ++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.js
index f6702e902..379cf8a96 100644
--- a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.js
@@ -334,7 +334,7 @@ module.exports = function(RED) {
             }
         };
 
-        this.publish = function (msg) {
+        this.publish = function (msg,done) {
             if (node.connected) {
                 if (msg.payload === null || msg.payload === undefined) {
                     msg.payload = "";
@@ -350,7 +350,10 @@ module.exports = function(RED) {
                     qos: msg.qos || 0,
                     retain: msg.retain || false
                 };
-                node.client.publish(msg.topic, msg.payload, options, function(err) {return});
+                node.client.publish(msg.topic, msg.payload, options, function(err) {
+                    done && done();
+                    return
+                });
             }
         };
 
@@ -453,7 +456,7 @@ module.exports = function(RED) {
 
         if (this.brokerConn) {
             this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
-            this.on("input",function(msg) {
+            this.on("input",function(msg,send,done) {
                 if (msg.qos) {
                     msg.qos = parseInt(msg.qos);
                     if ((msg.qos !== 0) && (msg.qos !== 1) && (msg.qos !== 2)) {
@@ -468,9 +471,13 @@ module.exports = function(RED) {
                 }
                 if ( msg.hasOwnProperty("payload")) {
                     if (msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "")) { // topic must exist
-                        this.brokerConn.publish(msg);  // send the message
+                        this.brokerConn.publish(msg, done);  // send the message
+                    } else {
+                        node.warn(RED._("mqtt.errors.invalid-topic"));
+                        done();
                     }
-                    else { node.warn(RED._("mqtt.errors.invalid-topic")); }
+                } else {
+                    done();
                 }
             });
             if (this.brokerConn.connected) {
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
index ec5290835..d290ae244 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
@@ -50,7 +50,7 @@ module.exports = function(RED) {
             noprox = proxyConfig.noproxy;
         }
 
-        this.on("input",function(msg) {
+        this.on("input",function(msg,nodeSend,nodeDone) {
             var preRequestTimestamp = process.hrtime();
             node.status({fill:"blue",shape:"dot",text:"httpin.status.requesting"});
             var url = nodeUrl || msg.url;
@@ -62,12 +62,14 @@ module.exports = function(RED) {
             }
             if (!url) {
                 node.error(RED._("httpin.errors.no-url"),msg);
+                nodeDone();
                 return;
             }
             // url must start http:// or https:// so assume http:// if not set
             if (url.indexOf("://") !== -1 && url.indexOf("http") !== 0) {
                 node.warn(RED._("httpin.errors.invalid-transport"));
                 node.status({fill:"red",shape:"ring",text:"httpin.errors.invalid-transport"});
+                nodeDone();
                 return;
             }
             if (!((url.indexOf("http://") === 0) || (url.indexOf("https://") === 0))) {
@@ -261,10 +263,12 @@ module.exports = function(RED) {
                         }
                     } catch(err) {
                         node.error(RED._("httpin.errors.invalid-payload"),msg);
+                        nodeDone();
                         return;
                     }
                 } else {
                     node.error(RED._("httpin.errors.invalid-payload"),msg);
+                    nodeDone();
                     return;
                 }
             }
@@ -320,7 +324,8 @@ module.exports = function(RED) {
                     }
                     msg.payload = err.toString() + " : " + url;
                     msg.statusCode = err.code;
-                    node.send(msg);
+                    nodeSend(msg);
+                    nodeDone();
                 }else{
                     msg.statusCode = res.statusCode;
                     msg.headers = res.headers;
@@ -354,7 +359,8 @@ module.exports = function(RED) {
                         }
                     }
                     node.status({});
-                    node.send(msg);
+                    nodeSend(msg);
+                    nodeDone();
                 }
             });
         });
diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.js b/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
index 5240b544a..957b7d8ed 100644
--- a/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
+++ b/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
@@ -309,7 +309,7 @@ module.exports = function(RED) {
                 node.status(status);
             });
         }
-        this.on("input", function(msg) {
+        this.on("input", function(msg, nodeSend, nodeDone) {
             var payload;
             if (this.serverConfig.wholemsg) {
                 var sess;
@@ -337,6 +337,7 @@ module.exports = function(RED) {
                     });
                 }
             }
+            nodeDone();
         });
         this.on('close', function() {
             node.status({});

From 4ce0e3976046338d10b00657ca9f10ec1db517d8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 22:28:10 +0100
Subject: [PATCH 069/305] Add nodeDone to File nodes

---
 .../@node-red/nodes/core/storage/50-file.js   | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.js b/packages/node_modules/@node-red/nodes/core/storage/50-file.js
index 547ef3132..c27c3ed5f 100644
--- a/packages/node_modules/@node-red/nodes/core/storage/50-file.js
+++ b/packages/node_modules/@node-red/nodes/core/storage/50-file.js
@@ -34,8 +34,9 @@ module.exports = function(RED) {
         }
         return data.toString();
     }
-    
+
     function FileNode(n) {
+        // Write/delete a file
         RED.nodes.createNode(this,n);
         this.filename = n.filename;
         this.appendNewline = n.appendNewline;
@@ -48,7 +49,7 @@ module.exports = function(RED) {
         node.closing = false;
         node.closeCallback = null;
 
-        function processMsg(msg, done) {
+        function processMsg(msg,nodeSend, done) {
             var filename = node.filename || msg.filename || "";
             if ((!node.filename) && (!node.tout)) {
                 node.tout = setTimeout(function() {
@@ -68,7 +69,7 @@ module.exports = function(RED) {
                         if (RED.settings.verbose) {
                             node.log(RED._("file.status.deletedfile",{file:filename}));
                         }
-                        node.send(msg);
+                        nodeSend(msg);
                     }
                     done();
                 });
@@ -101,7 +102,7 @@ module.exports = function(RED) {
                     });
                     wstream.on("open", function() {
                         wstream.end(buf, function() {
-                            node.send(msg);
+                            nodeSend(msg);
                             done();
                         });
                     })
@@ -150,13 +151,13 @@ module.exports = function(RED) {
                     if (node.filename) {
                         // Static filename - write and reuse the stream next time
                         node.wstream.write(buf, function() {
-                            node.send(msg);
+                            nodeSend(msg);
                             done();
                         });
                     } else {
                         // Dynamic filename - write and close the stream
                         node.wstream.end(buf, function() {
-                            node.send(msg);
+                            nodeSend(msg);
                             delete node.wstream;
                             delete node.wstreamIno;
                             done();
@@ -169,12 +170,13 @@ module.exports = function(RED) {
             }
         }
 
-        function processQ(queue) {
-            var msg = queue[0];
-            processMsg(msg, function() {
+        function processQueue(queue) {
+            var event = queue[0];
+            processMsg(event.msg, event.send, function() {
+                event.done();
                 queue.shift();
                 if (queue.length > 0) {
-                    processQ(queue);
+                    processQueue(queue);
                 }
                 else if (node.closing) {
                     closeNode();
@@ -182,14 +184,19 @@ module.exports = function(RED) {
             });
         }
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg,nodeSend,nodeDone) {
             var msgQueue = node.msgQueue;
-            if (msgQueue.push(msg) > 1) {
+            msgQueue.push({
+                msg: msg,
+                send: nodeSend,
+                done: nodeDone
+            })
+            if (msgQueue.length > 1) {
                 // pending write exists
                 return;
             }
             try {
-                processQ(msgQueue);
+                processQueue(msgQueue);
             }
             catch (e) {
                 node.msgQueue = [];
@@ -234,6 +241,7 @@ module.exports = function(RED) {
 
 
     function FileInNode(n) {
+        // Read a file
         RED.nodes.createNode(this,n);
         this.filename = n.filename;
         this.format = n.format;
@@ -248,13 +256,14 @@ module.exports = function(RED) {
         if (this.format === "stream") { this.chunk = true; }
         var node = this;
 
-        this.on("input",function(msg) {
+        this.on("input",function(msg, nodeSend, nodeDone) {
             var filename = (node.filename || msg.filename || "").replace(/\t|\r|\n/g,'');
             if (!node.filename) {
                 node.status({fill:"grey",shape:"dot",text:filename});
             }
             if (filename === "") {
                 node.warn(RED._("file.errors.nofilename"));
+                nodeDone();
             }
             else {
                 msg.filename = filename;
@@ -288,7 +297,7 @@ module.exports = function(RED) {
                                             parts:{index:count, ch:ch, type:type, id:msg._msgid}
                                         }
                                         count += 1;
-                                        node.send(m);
+                                        nodeSend(m);
                                     }
                                     spare = bits[i];
                                 }
@@ -304,7 +313,7 @@ module.exports = function(RED) {
                                         getout = false;
                                         m.parts.count = count;
                                     }
-                                    node.send(m);
+                                    nodeSend(m);
                                 }
                             }
                             else {
@@ -318,8 +327,9 @@ module.exports = function(RED) {
                             var sendMessage = RED.util.cloneMessage(msg);
                             delete sendMessage.payload;
                             sendMessage.error = err;
-                            node.send(sendMessage);
+                            nodeSend(sendMessage);
                         }
+                        nodeDone();
                     })
                     .on('end', function() {
                         if (node.chunk === false) {
@@ -327,7 +337,7 @@ module.exports = function(RED) {
                                 msg.payload = decode(lines, node.encoding);
                             }
                             else { msg.payload = lines; }
-                            node.send(msg);
+                            nodeSend(msg);
                         }
                         else if (node.format === "lines") {
                             var m = { payload: spare,
@@ -339,12 +349,13 @@ module.exports = function(RED) {
                                           id: msg._msgid
                                       }
                                     };
-                            node.send(m);
+                            nodeSend(m);
                         }
                         else if (getout) { // last chunk same size as high water mark - have to send empty extra packet.
                             var m = { parts:{index:count, count:count, ch:ch, type:type, id:msg._msgid} };
-                            node.send(m);
+                            nodeSend(m);
                         }
+                        nodeDone();
                     });
             }
         });

From 83932e172528bc3dd2cddcdefdabd51bc12864e6 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Aug 2019 22:55:46 +0100
Subject: [PATCH 070/305] Fix Flow test for updated node.done api

---
 test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
index c1f7b0f3e..e1315dc50 100644
--- a/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/flows/Flow_spec.js
@@ -148,10 +148,10 @@ describe('Flow', function() {
         this.stopped = false;
         this.closeDelay = n.closeDelay || 50;
         currentNodes[node.id] = node;
-        this.on('input',function(msg, done) {
+        this.on('input',function(msg, send, done) {
             node.handled++;
             node.messages.push(msg);
-            node.send(msg);
+            send(msg);
             done();
         });
         this.on('close',function(done) {

From 0d680a58f3cfb0a447f8ae3a66106b1e4f2296a7 Mon Sep 17 00:00:00 2001
From: Nam Giang <kyng@ece.ubc.ca>
Date: Wed, 14 Aug 2019 15:11:03 -0700
Subject: [PATCH 071/305] removed expensive try/catch

---
 .../@node-red/nodes/core/logic/10-switch.html | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index cef869741..a5b5ab075 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -262,21 +262,21 @@
                         resizeRule(container);
                         var type = selectField.val();
                         
-                        try {
+                        if (valueField){
                             valueField.typedInput('hide');
-                        } catch(e){}
-                        try {
+                        }
+                        if (expValueField){
                             expValueField.typedInput('hide');
-                        } catch(e){}
-                        try {
+                        }
+                        if (numValueField){
                             numValueField.typedInput('hide');
-                        } catch(e){}
-                        try {
+                        }
+                        if (typeValueField){
                             typeValueField.typedInput('hide');
-                        } catch(e){}
-                        try {
+                        }
+                        if (btwnValue2Field){
                             btwnValue2Field.typedInput('hide');
-                        } catch(e){}
+                        }
                         
                         if ((type === "btwn") || (type === "index")) {
                             if (!btwnValueField){

From cd529d53ae0dbadfecc218d993d77793bf172657 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 15 Aug 2019 10:19:03 +0100
Subject: [PATCH 072/305] Update TCP nodes to node.done

---
 .../@node-red/nodes/core/io/31-tcpin.js       | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
index aa72f0fe9..eb365a54c 100644
--- a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
+++ b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
@@ -132,7 +132,7 @@ module.exports = function(RED) {
                             reconnectTimeout = setTimeout(setupTcpClient, reconnectTime);
                         }
                     } else {
-                        if (node.done) { node.done(); }
+                        if (node.doneClose) { node.doneClose(); }
                     }
                 });
                 client.on('error', function(err) {
@@ -142,7 +142,7 @@ module.exports = function(RED) {
             setupTcpClient();
 
             this.on('close', function(done) {
-                node.done = done;
+                node.doneClose = done;
                 this.closing = true;
                 if (client) { client.destroy(); }
                 clearTimeout(reconnectTimeout);
@@ -305,13 +305,13 @@ module.exports = function(RED) {
                             reconnectTimeout = setTimeout(setupTcpClient,reconnectTime);
                         }
                     } else {
-                        if (node.done) { node.done(); }
+                        if (node.doneClose) { node.doneClose(); }
                     }
                 });
             }
             setupTcpClient();
 
-            node.on("input", function(msg) {
+            node.on("input", function(msg,nodeSend,nodeDone) {
                 if (node.connected && msg.payload != null) {
                     if (Buffer.isBuffer(msg.payload)) {
                         client.write(msg.payload);
@@ -325,10 +325,11 @@ module.exports = function(RED) {
                         if (client) { node.status({}); client.destroy(); }
                     }
                 }
+                nodeDone();
             });
 
             node.on("close", function(done) {
-                node.done = done;
+                node.doneClose = done;
                 this.closing = true;
                 if (client) { client.destroy(); }
                 clearTimeout(reconnectTimeout);
@@ -337,7 +338,7 @@ module.exports = function(RED) {
 
         }
         else if (node.beserver == "reply") {
-            node.on("input",function(msg) {
+            node.on("input",function(msg, nodeSend, nodeDone) {
                 if (msg._session && msg._session.type == "tcp") {
                     var client = connectionPool[msg._session.id];
                     if (client) {
@@ -361,6 +362,7 @@ module.exports = function(RED) {
                         }
                     }
                 }
+                nodeDone();
             });
         }
         else {
@@ -389,7 +391,7 @@ module.exports = function(RED) {
                 });
             });
 
-            node.on("input", function(msg) {
+            node.on("input", function(msg, nodeSend, nodeDone) {
                 if (msg.payload != null) {
                     var buffer;
                     if (Buffer.isBuffer(msg.payload)) {
@@ -404,6 +406,7 @@ module.exports = function(RED) {
                         else { connectedSockets[i].write(buffer); }
                     }
                 }
+                nodeDone();
             });
 
             server.on('error', function(err) {
@@ -461,7 +464,7 @@ module.exports = function(RED) {
 
         var clients = {};
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, nodeSend, nodeDone) {
             var i = 0;
             if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
                 msg.payload = msg.payload.toString();
@@ -483,7 +486,7 @@ module.exports = function(RED) {
                 connected: false,
                 connecting: false
             };
-            enqueue(clients[connection_id].msgQueue, msg);
+            enqueue(clients[connection_id].msgQueue, {msg:msg,nodeSend:nodeSend, nodeDone: nodeDone});
             clients[connection_id].lastMsg = msg;
 
             if (!clients[connection_id].connecting && !clients[connection_id].connected) {
@@ -505,9 +508,10 @@ module.exports = function(RED) {
                         if (clients[connection_id] && clients[connection_id].client) {
                             clients[connection_id].connected = true;
                             clients[connection_id].connecting = false;
-                            let msg;
-                            while (msg = dequeue(clients[connection_id].msgQueue)) {
-                                clients[connection_id].client.write(msg.payload);
+                            let event;
+                            while (event = dequeue(clients[connection_id].msgQueue)) {
+                                clients[connection_id].client.write(event.msg.payload);
+                                event.nodeDone();
                             }
                             if (node.out === "time" && node.splitc < 0) {
                                 clients[connection_id].connected = clients[connection_id].connecting = false;
@@ -527,7 +531,7 @@ module.exports = function(RED) {
                         if (clients[connection_id]) {
                             const msg = clients[connection_id].lastMsg || {};
                             msg.payload = data;
-                            node.send(RED.util.cloneMessage(msg));
+                            nodeSend(RED.util.cloneMessage(msg));
                         }
                     }
                     // else if (node.splitc === 0) {
@@ -550,7 +554,7 @@ module.exports = function(RED) {
                                                 const msg = clients[connection_id].lastMsg || {};
                                                 msg.payload = Buffer.alloc(i+1);
                                                 buf.copy(msg.payload,0,0,i+1);
-                                                node.send(msg);
+                                                nodeSend(msg);
                                                 if (clients[connection_id].client) {
                                                     node.status({});
                                                     clients[connection_id].client.destroy();
@@ -572,7 +576,7 @@ module.exports = function(RED) {
                                         const msg = clients[connection_id].lastMsg || {};
                                         msg.payload = Buffer.alloc(i);
                                         buf.copy(msg.payload,0,0,i);
-                                        node.send(msg);
+                                        nodeSend(msg);
                                         if (clients[connection_id].client) {
                                             node.status({});
                                             clients[connection_id].client.destroy();
@@ -591,7 +595,7 @@ module.exports = function(RED) {
                                         const msg = clients[connection_id].lastMsg || {};
                                         msg.payload = Buffer.alloc(i);
                                         buf.copy(msg.payload,0,0,i);
-                                        node.send(msg);
+                                        nodeSend(msg);
                                         if (clients[connection_id].client) {
                                             node.status({});
                                             clients[connection_id].client.destroy();
@@ -628,9 +632,9 @@ module.exports = function(RED) {
                             break;
                         }
                     }
-                    if (node.done && !anyConnected) {
+                    if (node.doneClose && !anyConnected) {
                         clients = {};
-                        node.done();
+                        node.doneClose();
                     }
                 });
 
@@ -663,13 +667,15 @@ module.exports = function(RED) {
             }
             else if (!clients[connection_id].connecting && clients[connection_id].connected) {
                 if (clients[connection_id] && clients[connection_id].client) {
-                    clients[connection_id].client.write(dequeue(clients[connection_id].msgQueue).payload);
+                    let event = dequeue(clients[connection_id].msgQueue)
+                    clients[connection_id].client.write(event.msg.payload);
+                    event.nodeDone();
                 }
             }
         });
 
         this.on("close", function(done) {
-            node.done = done;
+            node.doneClose = done;
             for (var cl in clients) {
                 if (clients[cl].hasOwnProperty("client")) {
                     clients[cl].client.destroy();

From 944b81b71cfa75c4bbc5f54ea275be3a7228a5b8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 15 Aug 2019 10:20:54 +0100
Subject: [PATCH 073/305] Update UDP nodes for node.done

---
 packages/node_modules/@node-red/nodes/core/io/32-udp.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/32-udp.js b/packages/node_modules/@node-red/nodes/core/io/32-udp.js
index cf4751760..60e9bec08 100644
--- a/packages/node_modules/@node-red/nodes/core/io/32-udp.js
+++ b/packages/node_modules/@node-red/nodes/core/io/32-udp.js
@@ -223,16 +223,19 @@ module.exports = function(RED) {
                 udpInputPortsInUse[p] = sock;
             }
 
-            node.on("input", function(msg) {
+            node.on("input", function(msg, nodeSend, nodeDone) {
                 if (msg.hasOwnProperty("payload")) {
                     var add = node.addr || msg.ip || "";
                     var por = node.port || msg.port || 0;
                     if (add === "") {
                         node.warn(RED._("udp.errors.ip-notset"));
+                        nodeDone();
                     } else if (por === 0) {
                         node.warn(RED._("udp.errors.port-notset"));
+                        nodeDone();
                     } else if (isNaN(por) || (por < 1) || (por > 65535)) {
                         node.warn(RED._("udp.errors.port-invalid"));
+                        nodeDone();
                     } else {
                         var message;
                         if (node.base64) {
@@ -247,6 +250,7 @@ module.exports = function(RED) {
                                 node.error("udp : "+err,msg);
                             }
                             message = null;
+                            nodeDone();
                         });
                     }
                 }

From 7bed9677551dc972be21feed7375bfe7c453ca33 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 15 Aug 2019 10:40:40 +0100
Subject: [PATCH 074/305] Add node.done to exec node

---
 .../@node-red/nodes/core/core/75-exec.js            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.js b/packages/node_modules/@node-red/nodes/core/core/75-exec.js
index 09e54decc..a5132230e 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/core/75-exec.js
@@ -38,7 +38,7 @@ module.exports = function(RED) {
             //node.error("Exec node timeout");
         }
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, nodeSend, nodeDone) {
             if (msg.hasOwnProperty("kill")) {
                 if (typeof msg.kill !== "string" || msg.kill.length === 0 || !msg.kill.toUpperCase().startsWith("SIG") ) { msg.kill = "SIGTERM"; }
                 if (msg.hasOwnProperty("pid")) {
@@ -53,6 +53,7 @@ module.exports = function(RED) {
                         node.status({fill:"red",shape:"dot",text:"killed"});
                     }
                 }
+                nodeDone();
             }
             else {
                 var child;
@@ -85,14 +86,14 @@ module.exports = function(RED) {
                             // console.log('[exec] stdout: ' + data,child.pid);
                             if (isUtf8(data)) { msg.payload = data.toString(); }
                             else { msg.payload = data; }
-                            node.send([RED.util.cloneMessage(msg),null,null]);
+                            nodeSend([RED.util.cloneMessage(msg),null,null]);
                         }
                     });
                     child.stderr.on('data', function (data) {
                         if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
                             if (isUtf8(data)) { msg.payload = data.toString(); }
                             else { msg.payload = Buffer.from(data); }
-                            node.send([null,RED.util.cloneMessage(msg),null]);
+                            nodeSend([null,RED.util.cloneMessage(msg),null]);
                         }
                     });
                     child.on('close', function (code,signal) {
@@ -108,8 +109,9 @@ module.exports = function(RED) {
                             if (code === null) { node.status({fill:"red",shape:"dot",text:"killed"}); }
                             else if (code < 0) { node.status({fill:"red",shape:"dot",text:"rc:"+code}); }
                             else { node.status({fill:"yellow",shape:"dot",text:"rc:"+code}); }
-                            node.send([null,null,RED.util.cloneMessage(msg)]);
+                            nodeSend([null,null,RED.util.cloneMessage(msg)]);
                         }
+                        nodeDone();
                     });
                     child.on('error', function (code) {
                         if (child.tout) { clearTimeout(child.tout); }
@@ -154,9 +156,10 @@ module.exports = function(RED) {
                             msg.rc = msg3.payload;
                             if (msg2) { msg2.rc = msg3.payload; }
                         }
-                        node.send([msg,msg2,msg3]);
+                        nodeSend([msg,msg2,msg3]);
                         if (child.tout) { clearTimeout(child.tout); }
                         delete node.activeProcesses[child.pid];
+                        nodeDone();
                     });
                     node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
                     child.on('error',function() {});

From b274bafe8e646c03f75b5f8bf67e9556e27861c1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 15 Aug 2019 13:29:08 +0100
Subject: [PATCH 075/305] Allow a node to change if it has an input port Closes
 #2268

---
 .../editor-client/src/js/ui/editor.js         | 20 +++++++++++++++----
 .../@node-red/editor-client/src/js/ui/view.js |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 006fd6ec4..2caf1cc16 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -230,8 +230,12 @@ RED.editor = (function() {
                 }
             }
         }
+        node.inputs = Math.min(1,Math.max(0,parseInt(node.inputs)));
+        if (isNaN(node.inputs)) {
+            node.inputs = 0;
+        }
         if (node.inputs === 0) {
-            removedLinks.concat(RED.nodes.filterLinks({target:node}));
+            removedLinks = removedLinks.concat(RED.nodes.filterLinks({target:node}));
         }
         for (var l=0;l<removedLinks.length;l++) {
             RED.nodes.removeLink(removedLinks[l]);
@@ -594,10 +598,18 @@ RED.editor = (function() {
         var outputsDiv = $("#red-ui-editor-node-label-form-outputs");
 
         var inputCount;
-        if (node.type === 'subflow') {
-            inputCount = node.in.length;
+        var formInputs = $("#node-input-inputs").val();
+        if (formInputs === undefined) {
+            if (node.type === 'subflow') {
+                inputCount = node.in.length;
+            } else {
+                inputCount = node.inputs || node._def.inputs || 0;
+            }
         } else {
-            inputCount = node.inputs || node._def.inputs || 0;
+            inputCount = Math.min(1,Math.max(0,parseInt(formInputs)));
+            if (isNaN(inputCount)) {
+                inputCount = 0;
+            }
         }
 
         var children = inputsDiv.children();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 693538f2c..3a8273ef5 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2991,7 +2991,7 @@ RED.view = (function() {
                             //thisNode.selectAll(".red-ui-flow-node-icon-shade-border-right").attr("d",function(d){return "M "+(d.w-30)+" 1 l 0 "+(d.h-2)});
 
                             var inputPorts = thisNode.selectAll(".red-ui-flow-port-input");
-                            if (isLink && showAllLinkPorts === -1 && !activeLinkNodes[d.id] && d.inputs === 0 && !inputPorts.empty()) {
+                            if ((!isLink || (showAllLinkPorts === -1 && !activeLinkNodes[d.id])) && d.inputs === 0 && !inputPorts.empty()) {
                                 inputPorts.remove();
                             } else if (((isLink && (showAllLinkPorts===PORT_TYPE_INPUT||activeLinkNodes[d.id]))|| d.inputs === 1) && inputPorts.empty()) {
                                 var inputGroup = thisNode.append("g").attr("class","red-ui-flow-port-input");

From e72faef839f7b23b5049ed0d5c359bbfa9cd47cd Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 16 Aug 2019 14:59:15 +0100
Subject: [PATCH 076/305] Check both node props and defn props when deciding to
 splice

---
 .../node_modules/@node-red/editor-client/src/js/ui/view.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 3a8273ef5..88b3e7a45 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1158,8 +1158,8 @@ RED.view = (function() {
                 if (moving_set.length === 1) {
                     node = moving_set[0];
                     spliceActive = node.n.hasOwnProperty("_def") &&
-                                   node.n._def.inputs > 0 &&
-                                   node.n._def.outputs > 0 &&
+                                   ((node.n.hasOwnProperty("inputs") && node.n.inputs > 0) || (!node.n.hasOwnProperty("inputs") && node.n._def.inputs > 0)) &&
+                                   ((node.n.hasOwnProperty("outputs") && node.n.outputs > 0) || (!node.n.hasOwnProperty("outputs") && node.n._def.outputs > 0)) &&
                                    RED.nodes.filterLinks({ source: node.n }).length === 0 &&
                                    RED.nodes.filterLinks({ target: node.n }).length === 0;
                 }

From bf14af6a1fead34cabb003c70b61e8d7df157d0c Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 19 Aug 2019 10:42:14 +0100
Subject: [PATCH 077/305] Function node - handle things thrown that aren't
 proper Error types

and add tests
to close #2269
---
 .../@node-red/nodes/core/core/80-function.js  | 52 ++++++++-------
 test/nodes/core/core/80-function_spec.js      | 66 +++++++++++++++++++
 2 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/core/80-function.js
index 8347433a5..a5d47ebc8 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.js
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.js
@@ -237,35 +237,43 @@ module.exports = function(RED) {
                         this.status({fill:"yellow",shape:"dot",text:""+converted});
                     }
                 } catch(err) {
-                    //remove unwanted part
-                    var index = err.stack.search(/\n\s*at ContextifyScript.Script.runInContext/);
-                    err.stack = err.stack.slice(0, index).split('\n').slice(0,-1).join('\n');
-                    var stack = err.stack.split(/\r?\n/);
+                    if ((typeof err === "object") && err.hasOwnProperty("stack")) {
+                        //remove unwanted part
+                        var index = err.stack.search(/\n\s*at ContextifyScript.Script.runInContext/);
+                        err.stack = err.stack.slice(0, index).split('\n').slice(0,-1).join('\n');
+                        var stack = err.stack.split(/\r?\n/);
 
-                    //store the error in msg to be used in flows
-                    msg.error = err;
+                        //store the error in msg to be used in flows
+                        msg.error = err;
 
-                    var line = 0;
-                    var errorMessage;
-                    if (stack.length > 0) {
-                        while (line < stack.length && stack[line].indexOf("ReferenceError") !== 0) {
-                            line++;
-                        }
+                        var line = 0;
+                        var errorMessage;
+                        if (stack.length > 0) {
+                            while (line < stack.length && stack[line].indexOf("ReferenceError") !== 0) {
+                                line++;
+                            }
 
-                        if (line < stack.length) {
-                            errorMessage = stack[line];
-                            var m = /:(\d+):(\d+)$/.exec(stack[line+1]);
-                            if (m) {
-                                var lineno = Number(m[1])-1;
-                                var cha = m[2];
-                                errorMessage += " (line "+lineno+", col "+cha+")";
+                            if (line < stack.length) {
+                                errorMessage = stack[line];
+                                var m = /:(\d+):(\d+)$/.exec(stack[line+1]);
+                                if (m) {
+                                    var lineno = Number(m[1])-1;
+                                    var cha = m[2];
+                                    errorMessage += " (line "+lineno+", col "+cha+")";
+                                }
                             }
                         }
+                        if (!errorMessage) {
+                            errorMessage = err.toString();
+                        }
+                        this.error(errorMessage, msg);
                     }
-                    if (!errorMessage) {
-                        errorMessage = err.toString();
+                    else if (typeof err === "string") {
+                        this.error(err, msg);
+                    }
+                    else {
+                        this.error(JSON.stringify(err), msg);
                     }
-                    this.error(errorMessage, msg);
                 }
             });
             this.on("close", function() {
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index 01e40c464..6f884f0ce 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -1390,6 +1390,72 @@ describe('function node', function() {
                 }
             });
         });
+        it('should catch thrown string', function (done) {
+            var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "throw \"small mistake\";"}];
+            helper.load(functionNode, flow, function () {
+                var n1 = helper.getNode("n1");
+                n1.receive({payload: "foo", topic: "bar"});
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function (evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    msg.should.have.property('msg', 'small mistake');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+        it('should catch thrown number', function (done) {
+            var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "throw 99;"}];
+            helper.load(functionNode, flow, function () {
+                var n1 = helper.getNode("n1");
+                n1.receive({payload: "foo", topic: "bar"});
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function (evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    msg.should.have.property('msg', '99');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+        it('should catch thrown object (bad practise)', function (done) {
+            var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "throw {a:1};"}];
+            helper.load(functionNode, flow, function () {
+                var n1 = helper.getNode("n1");
+                n1.receive({payload: "foo", topic: "bar"});
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function (evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    msg.should.have.property('msg', '{"a":1}');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
     });
 
 });

From afaf077aca517b1de15a2e3e95277853a0b64549 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 11:12:15 +0100
Subject: [PATCH 078/305] Pass httpServer to runtime even when httpAdmin
 disabled Fixes #2272

---
 packages/node_modules/node-red/lib/red.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
index 4d7269518..9a4d77862 100644
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -76,7 +76,7 @@ module.exports = {
             apiEnabled = true;
             server = httpServer;
         } else {
-            runtime.init(userSettings);
+            runtime.init(userSettings, httpServer);
             apiEnabled = false;
             if (httpServer) {
                 server = httpServer;

From a17325f028f71215fe0be97b5fd5849d14daddc6 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 11:39:34 +0100
Subject: [PATCH 079/305] Update Function catch tests to handle async receive

---
 .../@node-red/nodes/core/core/80-function.js  |  6 +-
 test/nodes/core/core/80-function_spec.js      | 98 ++++++++++---------
 2 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/core/80-function.js
index e6732e594..f636b6b16 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.js
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.js
@@ -282,13 +282,13 @@ module.exports = function(RED) {
                         if (!errorMessage) {
                             errorMessage = err.toString();
                         }
-                        this.error(errorMessage, msg);
+                        done(errorMessage);
                     }
                     else if (typeof err === "string") {
-                        this.error(err, msg);
+                        done(err);
                     }
                     else {
-                        this.error(JSON.stringify(err), msg);
+                        done(JSON.stringify(err));
                     }
                 }
             });
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index 01ec551cf..86d616ede 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -1412,21 +1412,23 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().ERROR);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'small mistake');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().ERROR);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', 'small mistake');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
         it('should catch thrown number', function (done) {
@@ -1434,43 +1436,47 @@ describe('function node', function() {
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().ERROR);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', '99');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().ERROR);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', '99');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
-        it('should catch thrown object (bad practise)', function (done) {
+        it('should catch thrown object (bad practice)', function (done) {
             var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "throw {a:1};"}];
             helper.load(functionNode, flow, function () {
                 var n1 = helper.getNode("n1");
                 n1.receive({payload: "foo", topic: "bar"});
-                try {
-                    helper.log().called.should.be.true();
-                    var logEvents = helper.log().args.filter(function (evt) {
-                        return evt[0].type == "function";
-                    });
-                    logEvents.should.have.length(1);
-                    var msg = logEvents[0][0];
-                    msg.should.have.property('level', helper.log().ERROR);
-                    msg.should.have.property('id', 'n1');
-                    msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', '{"a":1}');
-                    done();
-                } catch (err) {
-                    done(err);
-                }
+                setTimeout(function() {
+                    try {
+                        helper.log().called.should.be.true();
+                        var logEvents = helper.log().args.filter(function (evt) {
+                            return evt[0].type == "function";
+                        });
+                        logEvents.should.have.length(1);
+                        var msg = logEvents[0][0];
+                        msg.should.have.property('level', helper.log().ERROR);
+                        msg.should.have.property('id', 'n1');
+                        msg.should.have.property('type', 'function');
+                        msg.should.have.property('msg', '{"a":1}');
+                        done();
+                    } catch (err) {
+                        done(err);
+                    }
+                },50);
             });
         });
     });

From c686f7eefc23d012b8144dab9452ee0f5851b8f7 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 11:45:21 +0100
Subject: [PATCH 080/305] Set default http request persist option to false

---
 .../node_modules/@node-red/nodes/core/io/21-httprequest.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index fc5e05ffc..9275560cd 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -67,7 +67,7 @@
             </div>
         </div>
     </div>
-    
+
     <div class="form-row">
         <input type="checkbox" id="node-input-persist" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-input-persist" style="width: auto" data-i18n="httpin.persist"></label>
@@ -107,7 +107,7 @@
             paytoqs: {value: false},
             url:{value:"",validate:function(v) { return (v.trim().length === 0) || (v.indexOf("://") === -1) || (v.trim().indexOf("http") === 0)} },
             tls: {type:"tls-config",required: false},
-            "persist":{value:true},
+            persist: {value:false},
             proxy: {type:"http proxy",required: false},
             authType: {value: ""}
         },

From 8307f2609914b8d3fe67c4a0ccaa8e0a724aca77 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 12:39:51 +0100
Subject: [PATCH 081/305] Fix up dynamic generation of switch ui

---
 .../@node-red/nodes/core/logic/10-switch.html | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
index a5b5ab075..3a487bc1b 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/10-switch.html
@@ -251,17 +251,16 @@
                     var numValueField = null;
                     var expValueField = null;
                     var btwnAndLabel = null;
+                    var btwnValueField = null;
                     var btwnValue2Field = null;
                     var typeValueField = null;
-                        
+
                     var finalspan = $('<span/>',{style:"float: right;margin-top: 6px;"}).appendTo(row);
                     finalspan.append(' &#8594; <span class="node-input-rule-index">'+(i+1)+'</span> ');
                     var caseSensitive = $('<input/>',{id:"node-input-rule-case-"+i,class:"node-input-rule-case",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
                     $('<label/>',{for:"node-input-rule-case-"+i,style:"margin-left: 3px;"}).text(caseLabel).appendTo(row2);
                     selectField.change(function() {
-                        resizeRule(container);
                         var type = selectField.val();
-                        
                         if (valueField){
                             valueField.typedInput('hide');
                         }
@@ -274,10 +273,13 @@
                         if (typeValueField){
                             typeValueField.typedInput('hide');
                         }
+                        if (btwnValueField){
+                            btwnValueField.typedInput('hide');
+                        }
                         if (btwnValue2Field){
                             btwnValue2Field.typedInput('hide');
                         }
-                        
+
                         if ((type === "btwn") || (type === "index")) {
                             if (!btwnValueField){
                                 btwnValueField = createBtwnValueField();
@@ -293,19 +295,16 @@
                                 expValueField = createExpValueField();
                             }
                             expValueField.typedInput('show');
-                        } else {
-                            if (type === "istype") {
-                                if (!typeValueField){
-                                    typeValueField = createTypeValueField();
-                                }
-                                typeValueField.typedInput('show');
+                        } else if (type === "istype") {
+                            if (!typeValueField){
+                                typeValueField = createTypeValueField();
                             }
-                            else {
+                            typeValueField.typedInput('show');
+                        } else if (! (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "empty" || type === "nempty" || type === "else" )) {
                                 if (!valueField){
                                     valueField = createValueField();
                                 }
                                 valueField.typedInput('show');
-                            }
                         }
                         if (type === "regex") {
                             row2.show();
@@ -321,6 +320,8 @@
                             row2.hide();
                             row3.hide();
                         }
+                        resizeRule(container);
+
                     });
                     selectField.val(rule.t);
                     if ((rule.t == "btwn") || (rule.t == "index")) {

From 00a3e2571421a825042f54a2b933ab3207f74824 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 19 Jun 2019 14:31:03 +0100
Subject: [PATCH 082/305] Change core node categories

---
 .../@node-red/editor-client/src/js/ui/palette.js   | 14 +++++++++++++-
 .../@node-red/nodes/core/core/20-inject.html       |  2 +-
 .../core/core/{58-debug.html => 21-debug.html}     |  2 +-
 .../nodes/core/core/{58-debug.js => 21-debug.js}   |  0
 .../@node-red/nodes/core/core/25-catch.html        |  2 +-
 .../@node-red/nodes/core/core/25-status.html       |  2 +-
 .../@node-red/nodes/core/core/60-link.html         |  4 ++--
 .../@node-red/nodes/core/core/90-comment.html      |  2 +-
 .../@node-red/nodes/core/parsers/70-CSV.html       |  2 +-
 .../@node-red/nodes/core/parsers/70-HTML.html      |  2 +-
 .../@node-red/nodes/core/parsers/70-JSON.html      |  2 +-
 .../@node-red/nodes/core/parsers/70-XML.html       |  2 +-
 .../@node-red/nodes/core/parsers/70-YAML.html      |  2 +-
 .../de/core/{58-debug.html => 21-debug.html}       |  0
 .../en-US/core/{58-debug.html => 21-debug.html}    |  0
 .../ja/core/{58-debug.html => 21-debug.html}       |  0
 .../ko/core/{58-debug.html => 21-debug.html}       |  0
 packages/node_modules/node-red/settings.js         |  2 +-
 18 files changed, 26 insertions(+), 14 deletions(-)
 rename packages/node_modules/@node-red/nodes/core/core/{58-debug.html => 21-debug.html} (99%)
 rename packages/node_modules/@node-red/nodes/core/core/{58-debug.js => 21-debug.js} (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/core/{58-debug.html => 21-debug.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/core/{58-debug.html => 21-debug.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/core/{58-debug.html => 21-debug.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/core/{58-debug.html => 21-debug.html} (100%)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 01503a58d..65cc2d850 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -17,7 +17,19 @@
 RED.palette = (function() {
 
     var exclusion = ['config','unknown','deprecated'];
-    var coreCategories = ['subflows', 'input', 'output', 'function', 'social', 'mobile', 'storage', 'analysis', 'advanced'];
+    var coreCategories = [
+        'subflows',
+        'flow',
+        'input',
+        'output',
+        'function',
+        'parser',
+        'social',
+        'mobile',
+        'storage',
+        'analysis',
+        'advanced'
+    ];
 
     var categoryContainers = {};
     var sidebarControls;
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
index 69fd9c8d1..f0f8d2393 100644
--- a/packages/node_modules/@node-red/nodes/core/core/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
@@ -156,7 +156,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('inject',{
-        category: 'input',
+        category: 'flow',
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.html b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/core/core/21-debug.html
index 23962620b..f051d6f2a 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
@@ -37,7 +37,7 @@
 (function() {
     var subWindow = null;
     RED.nodes.registerType('debug',{
-        category: 'output',
+        category: 'flow',
         defaults: {
             name: {value:""},
             active: {value:true},
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/21-debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/58-debug.js
rename to packages/node_modules/@node-red/nodes/core/core/21-debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
index 97bd627d5..983bae39f 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
@@ -25,7 +25,7 @@
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('catch',{
-        category: 'input',
+        category: 'flow',
         color:"#e49191",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/core/25-status.html
index 68eb127a7..fff3de618 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-status.html
@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('status',{
-        category: 'input',
+        category: 'flow',
         color:"#d9f4fd",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/core/60-link.html
index 9efec0a04..31412ab1a 100644
--- a/packages/node_modules/@node-red/nodes/core/core/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/core/60-link.html
@@ -162,7 +162,7 @@
     }
 
     RED.nodes.registerType('link in',{
-        category: 'input',
+        category: 'flow',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
@@ -191,7 +191,7 @@
     });
 
     RED.nodes.registerType('link out',{
-        category: 'output',
+        category: 'flow',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
index 0ec6dfdb5..6d0e69439 100644
--- a/packages/node_modules/@node-red/nodes/core/core/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('comment',{
-        category: 'function',
+        category: 'flow',
         color:"#ffffff",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
index caf6fe753..d42e702ba 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
@@ -62,7 +62,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('csv',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
index 2ce298d4b..043d60e2b 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
@@ -37,7 +37,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('html',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
index 15bf9cf6c..67323b228 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
@@ -27,7 +27,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('json',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
index 4b8e83674..52db99ff2 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
@@ -22,7 +22,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('xml',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
index 86ae10a98..6a9e4fd2e 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('yaml',{
-        category: 'function',
+        category: 'parser',
         color:"#DEBD5C",
         defaults: {
             property: {value:"payload",required:true},
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/58-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index 679d24065..960cb6d17 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -243,7 +243,7 @@ module.exports = {
     // palette. If a node's category is not in the list, the category will get
     // added to the end of the palette.
     // If not set, the following default order is used:
-    //paletteCategories: ['subflows', 'input', 'output', 'function', 'social', 'mobile', 'storage', 'analysis', 'advanced'],
+    //paletteCategories: ['subflows','flow','input','output','function','parser','social','mobile','storage','analysis','advanced'],
 
     // Configure the logging output
     logging: {

From 2b66723d4260431bb96a479747c893c7fd7f1840 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 9 Jul 2019 20:26:26 +0100
Subject: [PATCH 083/305] Another pass of categorisation

---
 .../editor-client/src/js/ui/palette.js        | 21 ++++++++++++-------
 .../@node-red/nodes/core/core/20-inject.html  |  2 +-
 .../@node-red/nodes/core/core/21-debug.html   |  2 +-
 .../@node-red/nodes/core/core/25-catch.html   |  2 +-
 .../@node-red/nodes/core/core/25-status.html  |  2 +-
 .../@node-red/nodes/core/core/60-link.html    |  4 ++--
 .../@node-red/nodes/core/core/75-exec.html    |  2 +-
 .../@node-red/nodes/core/core/90-comment.html |  2 +-
 .../@node-red/nodes/core/io/10-mqtt.html      |  4 ++--
 .../@node-red/nodes/core/io/21-httpin.html    |  4 ++--
 .../nodes/core/io/21-httprequest.html         |  2 +-
 .../@node-red/nodes/core/io/22-websocket.html |  4 ++--
 .../@node-red/nodes/core/io/23-watch.html     |  2 +-
 .../@node-red/nodes/core/io/31-tcpin.html     |  6 +++---
 .../@node-red/nodes/core/io/32-udp.html       |  4 ++--
 .../@node-red/nodes/core/logic/17-split.html  |  4 ++--
 .../@node-red/nodes/core/logic/18-sort.html   |  2 +-
 .../@node-red/nodes/core/logic/19-batch.html  |  2 +-
 .../@node-red/nodes/core/storage/50-file.html |  4 ++--
 19 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 65cc2d850..22ee08558 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -19,15 +19,15 @@ RED.palette = (function() {
     var exclusion = ['config','unknown','deprecated'];
     var coreCategories = [
         'subflows',
-        'flow',
-        'input',
-        'output',
+        'common',
         'function',
+        'input/output',
+        'sequence',
         'parser',
-        'social',
-        'mobile',
         'storage',
         'analysis',
+        'social',
+        'mobile',
         'advanced'
     ];
 
@@ -35,6 +35,7 @@ RED.palette = (function() {
     var sidebarControls;
 
     function createCategory(originalCategory,rootCategory,category,ns) {
+        console.log("createCategory",originalCategory,rootCategory,category,ns);
         if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
             createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
         }
@@ -44,6 +45,7 @@ RED.palette = (function() {
         }
     }
     function createCategoryContainer(originalCategory,category, labelId) {
+        console.log("createCategoryContainer",originalCategory,category,labelId);
         var label = RED._(labelId, {defaultValue:category});
         label = (label || category).replace(/_/g, " ");
         var catDiv = $('<div id="red-ui-palette-container-'+category+'" class="red-ui-palette-category hide">'+
@@ -165,6 +167,9 @@ RED.palette = (function() {
         return $(".red-ui-palette-node[data-palette-type='"+type+"']");
     }
 
+    function escapeCategory(category) {
+        return category.replace(/[ /.]/g,"_");
+    }
     function addNodeType(nt,def) {
         if (getPaletteNode(nt).length) {
             return;
@@ -172,7 +177,7 @@ RED.palette = (function() {
         if (exclusion.indexOf(def.category)===-1) {
 
             var originalCategory = def.category;
-            var category = def.category.replace(/ /g,"_");
+            var category = escapeCategory(def.category);
             var rootCategory = category.split("-")[0];
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
@@ -423,7 +428,7 @@ RED.palette = (function() {
             var currentCategory = paletteNode.data('category');
             var newCategory = (sf.category||"subflows");
             if (currentCategory !== newCategory) {
-                var category = newCategory.replace(/ /g,"_");
+                var category = escapeCategory(newCategory);
                 createCategory(newCategory,category,category,"node-red");
 
                 var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
@@ -556,7 +561,7 @@ RED.palette = (function() {
             categoryList = coreCategories
         }
         categoryList.forEach(function(category){
-            createCategoryContainer(category, category, "palette.label."+category);
+            createCategoryContainer(category, escapeCategory(category), "palette.label."+escapeCategory(category));
         });
 
 
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
index f0f8d2393..4953505eb 100644
--- a/packages/node_modules/@node-red/nodes/core/core/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
@@ -156,7 +156,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('inject',{
-        category: 'flow',
+        category: 'common',
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.html b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
index f051d6f2a..ebfb8532b 100644
--- a/packages/node_modules/@node-red/nodes/core/core/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
@@ -37,7 +37,7 @@
 (function() {
     var subWindow = null;
     RED.nodes.registerType('debug',{
-        category: 'flow',
+        category: 'common',
         defaults: {
             name: {value:""},
             active: {value:true},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
index 983bae39f..7cc170b89 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
@@ -25,7 +25,7 @@
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('catch',{
-        category: 'flow',
+        category: 'common',
         color:"#e49191",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/core/25-status.html
index fff3de618..f3aa7bd98 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-status.html
@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('status',{
-        category: 'flow',
+        category: 'common',
         color:"#d9f4fd",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/core/60-link.html
index 31412ab1a..9c70b4eda 100644
--- a/packages/node_modules/@node-red/nodes/core/core/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/core/60-link.html
@@ -162,7 +162,7 @@
     }
 
     RED.nodes.registerType('link in',{
-        category: 'flow',
+        category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
@@ -191,7 +191,7 @@
     });
 
     RED.nodes.registerType('link out',{
-        category: 'flow',
+        category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.html b/packages/node_modules/@node-red/nodes/core/core/75-exec.html
index 5225044be..264b60ba8 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/core/75-exec.html
@@ -53,7 +53,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('exec',{
-        category: 'advanced-function',
+        category: 'function',
         color:"darksalmon",
         defaults: {
             command: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
index 6d0e69439..1631c6314 100644
--- a/packages/node_modules/@node-red/nodes/core/core/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('comment',{
-        category: 'flow',
+        category: 'common',
         color:"#ffffff",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
index ed6964101..fa9f89e29 100644
--- a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
@@ -46,7 +46,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt in',{
-        category: 'input',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
@@ -107,7 +107,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt out',{
-        category: 'output',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             topic: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html b/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
index 6786e0ea4..b4c237589 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
@@ -66,7 +66,7 @@
 <script type="text/javascript">
 (function() {
     RED.nodes.registerType('http in',{
-        category: 'input',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
@@ -142,7 +142,7 @@
     ];
 
     RED.nodes.registerType('http response',{
-        category: 'output',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index 9275560cd..1ed183d12 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -98,7 +98,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('http request',{
-        category: 'function',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html b/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
index 403c1e5c8..576fafc67 100644
--- a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
@@ -97,7 +97,7 @@
     }
 
     RED.nodes.registerType('websocket in',{
-        category: 'input',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
@@ -116,7 +116,7 @@
     });
 
     RED.nodes.registerType('websocket out',{
-        category: 'output',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.html b/packages/node_modules/@node-red/nodes/core/io/23-watch.html
index e53842e2e..587eee756 100644
--- a/packages/node_modules/@node-red/nodes/core/io/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/core/io/23-watch.html
@@ -33,7 +33,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('watch',{
-        category: 'advanced-input',
+        category: 'storage',
         defaults: {
             name: {value:""},
             files: {value:"",required:true},
diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
index 27629f569..3955105e7 100644
--- a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp in',{
-        category: 'input',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -143,7 +143,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp out',{
-        category: 'output',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             host: {value:"",validate:function(v) { return (this.beserver != "client")||v.length > 0;} },
@@ -215,7 +215,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp request',{
-        category: 'function',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             server: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/32-udp.html b/packages/node_modules/@node-red/nodes/core/io/32-udp.html
index 89e9ded70..6784e8d15 100644
--- a/packages/node_modules/@node-red/nodes/core/io/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/core/io/32-udp.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp in',{
-        category: 'input',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -159,7 +159,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp out',{
-        category: 'output',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.html b/packages/node_modules/@node-red/nodes/core/logic/17-split.html
index fbdb7f8b6..7751a1c55 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/17-split.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/17-split.html
@@ -48,7 +48,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('split',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: {value:""},
@@ -196,7 +196,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('join',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html b/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
index 0093ee65d..8ca2e5be2 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
@@ -60,7 +60,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('sort',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: { value:"" },
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html b/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
index 52bb84132..5781ffbe5 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
@@ -68,7 +68,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("batch",{
-        category: "function",
+        category: "sequence",
         color:"#E2D96E",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.html b/packages/node_modules/@node-red/nodes/core/storage/50-file.html
index e48039269..3561d491a 100755
--- a/packages/node_modules/@node-red/nodes/core/storage/50-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/50-file.html
@@ -193,7 +193,7 @@
     ];
 
     RED.nodes.registerType('file',{
-        category: 'storage-output',
+        category: 'storage',
         defaults: {
             name: {value:""},
             filename: {value:""},
@@ -258,7 +258,7 @@
     });
 
     RED.nodes.registerType('file in',{
-        category: 'storage-input',
+        category: 'storage',
         defaults: {
             name: {value:""},
             filename: {value:""},

From da6db24f9e584702c973c0845aa53bb0ef1e57b2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 9 Jul 2019 23:32:22 +0100
Subject: [PATCH 084/305] Reorganise nodes into new categories

---
 .../editor-client/src/js/ui/palette.js        |   3 +--
 .../core/{core => common}/20-inject.html      |   0
 .../nodes/core/{core => common}/20-inject.js  |   0
 .../nodes/core/{core => common}/21-debug.html |   0
 .../nodes/core/{core => common}/21-debug.js   |   0
 .../nodes/core/{core => common}/25-catch.html |   0
 .../nodes/core/{core => common}/25-catch.js   |   0
 .../core/{core => common}/25-status.html      |   4 ++--
 .../nodes/core/{core => common}/25-status.js  |   0
 .../nodes/core/{core => common}/60-link.html  |   0
 .../nodes/core/{core => common}/60-link.js    |   0
 .../core/{core => common}/90-comment.html     |   0
 .../nodes/core/{core => common}/90-comment.js |   0
 .../core/{core => common}/98-unknown.html     |   0
 .../nodes/core/{core => common}/98-unknown.js |   0
 .../{core => common}/lib/debug/debug-utils.js |   0
 .../core/{core => common}/lib/debug/debug.js  |   0
 .../core/{core => common}/lib/debug/view.html |   0
 .../10-function.html}                         |   0
 .../10-function.js}                           |   0
 .../core/{logic => function}/10-switch.html   |   0
 .../core/{logic => function}/10-switch.js     |   0
 .../core/{logic => function}/15-change.html   |   0
 .../core/{logic => function}/15-change.js     |   0
 .../core/{logic => function}/16-range.html    |   0
 .../core/{logic => function}/16-range.js      |   0
 .../core/{core => function}/80-template.html  |   0
 .../core/{core => function}/80-template.js    |   0
 .../core/{core => function}/89-delay.html     |   0
 .../nodes/core/{core => function}/89-delay.js |   0
 .../core/{core => function}/89-trigger.html   |   0
 .../core/{core => function}/89-trigger.js     |   0
 .../75-exec.html => function/90-exec.html}    |   3 +--
 .../{core/75-exec.js => function/90-exec.js}  |   0
 .../@node-red/nodes/core/logic/.DS_Store      | Bin 6148 -> 0 bytes
 .../core/{logic => sequence}/17-split.html    |   0
 .../core/{logic => sequence}/17-split.js      |   0
 .../core/{logic => sequence}/18-sort.html     |   0
 .../nodes/core/{logic => sequence}/18-sort.js |   0
 .../core/{logic => sequence}/19-batch.html    |   0
 .../core/{logic => sequence}/19-batch.js      |   0
 .../storage/{50-file.html => 10-file.html}    |   0
 .../core/storage/{50-file.js => 10-file.js}   |   0
 .../nodes/core/{io => storage}/23-watch.html  |   0
 .../nodes/core/{io => storage}/23-watch.js    |   0
 .../@node-red/nodes/icons/comment.svg         |   2 +-
 .../@node-red/nodes/icons/status.svg          |   1 +
 .../de/{core => common}/20-inject.html        |   0
 .../locales/de/{core => common}/21-debug.html |   0
 .../locales/de/{core => common}/25-catch.html |   0
 .../de/{core => common}/25-status.html        |   0
 .../locales/de/{core => common}/60-link.html  |   0
 .../de/{core => common}/90-comment.html       |   0
 .../de/{core => common}/98-unknown.html       |   0
 .../10-function.html}                         |   0
 .../de/{logic => function}/10-switch.html     |   0
 .../de/{logic => function}/15-change.html     |   0
 .../de/{logic => function}/16-range.html      |   0
 .../de/{core => function}/80-template.html    |   0
 .../de/{core => function}/89-delay.html       |   0
 .../de/{core => function}/89-trigger.html     |   0
 .../75-exec.html => function/90-exec.html}    |   0
 .../de/{logic => sequence}/17-split.html      |   0
 .../de/{logic => sequence}/18-sort.html       |   0
 .../de/{logic => sequence}/19-batch.html      |   0
 .../de/storage/{50-file.html => 10-file.html} |   0
 .../locales/de/{io => storage}/23-watch.html  |   0
 .../en-US/{core => common}/20-inject.html     |   0
 .../en-US/{core => common}/21-debug.html      |   0
 .../en-US/{core => common}/25-catch.html      |   0
 .../en-US/{core => common}/25-status.html     |   0
 .../en-US/{core => common}/60-link.html       |   0
 .../en-US/{core => common}/90-comment.html    |   0
 .../en-US/{core => common}/98-unknown.html    |   0
 .../10-function.html}                         |   0
 .../en-US/{logic => function}/10-switch.html  |   0
 .../en-US/{logic => function}/15-change.html  |   0
 .../en-US/{logic => function}/16-range.html   |   0
 .../en-US/{core => function}/80-template.html |   0
 .../en-US/{core => function}/89-delay.html    |   0
 .../en-US/{core => function}/89-trigger.html  |   0
 .../75-exec.html => function/90-exec.html}    |   0
 .../en-US/{logic => sequence}/17-split.html   |   0
 .../en-US/{logic => sequence}/18-sort.html    |   0
 .../en-US/{logic => sequence}/19-batch.html   |   0
 .../storage/{50-file.html => 10-file.html}    |   0
 .../en-US/{io => storage}/23-watch.html       |   0
 .../ja/{core => common}/20-inject.html        |   0
 .../locales/ja/{core => common}/21-debug.html |   0
 .../locales/ja/{core => common}/25-catch.html |   0
 .../ja/{core => common}/25-status.html        |   0
 .../locales/ja/{core => common}/60-link.html  |   0
 .../ja/{core => common}/90-comment.html       |   0
 .../ja/{core => common}/98-unknown.html       |   0
 .../10-function.html}                         |   0
 .../ja/{logic => function}/10-switch.html     |   0
 .../ja/{logic => function}/15-change.html     |   0
 .../ja/{logic => function}/16-range.html      |   0
 .../ja/{core => function}/80-template.html    |   0
 .../ja/{core => function}/89-delay.html       |   0
 .../ja/{core => function}/89-trigger.html     |   0
 .../75-exec.html => function/90-exec.html}    |   0
 .../ja/{logic => sequence}/17-split.html      |   0
 .../ja/{logic => sequence}/18-sort.html       |   0
 .../ja/{logic => sequence}/19-batch.html      |   0
 .../ja/storage/{50-file.html => 10-file.html} |   0
 .../locales/ja/{io => storage}/23-watch.html  |   0
 .../ko/{core => common}/20-inject.html        |   0
 .../locales/ko/{core => common}/21-debug.html |   0
 .../locales/ko/{core => common}/25-catch.html |   0
 .../ko/{core => common}/25-status.html        |   0
 .../locales/ko/{core => common}/60-link.html  |   0
 .../ko/{core => common}/90-comment.html       |   0
 .../ko/{core => common}/98-unknown.html       |   0
 .../10-function.html}                         |   0
 .../ko/{logic => function}/10-switch.html     |   0
 .../ko/{logic => function}/15-change.html     |   0
 .../ko/{logic => function}/16-range.html      |   0
 .../ko/{core => function}/80-template.html    |   0
 .../ko/{core => function}/89-delay.html       |   0
 .../ko/{core => function}/89-trigger.html     |   0
 .../75-exec.html => function/90-exec.html}    |   0
 .../ko/{logic => sequence}/17-split.html      |   0
 .../ko/{logic => sequence}/18-sort.html       |   0
 .../ko/{logic => sequence}/19-batch.html      |   0
 .../ko/storage/{50-file.html => 10-file.html} |   0
 .../locales/ko/{io => storage}/23-watch.html  |   0
 .../core/{core => common}/20-inject_spec.js   |   2 +-
 .../21-debug_spec.js}                         |   2 +-
 .../core/{core => common}/25-catch_spec.js    |   2 +-
 .../core/{core => common}/25-status_spec.js   |   2 +-
 .../core/{core => common}/60-link_spec.js     |   2 +-
 .../core/{core => common}/90-comment_spec.js  |   2 +-
 .../core/{core => common}/98-unknown_spec.js  |   2 +-
 .../10-function_spec.js}                      |   2 +-
 .../{logic => function}/10-switch_spec.js     |   2 +-
 .../{logic => function}/15-change_spec.js     |   2 +-
 .../core/{logic => function}/16-range_spec.js |   2 +-
 .../{core => function}/80-template_spec.js    |   2 +-
 .../core/{core => function}/89-delay_spec.js  |   2 +-
 .../{core => function}/89-trigger_spec.js     |   2 +-
 .../90-exec_spec.js}                          |   2 +-
 .../core/{logic => sequence}/17-split_spec.js |   4 ++--
 .../core/{logic => sequence}/18-sort_spec.js  |   2 +-
 .../core/{logic => sequence}/19-batch_spec.js |   2 +-
 .../{50-file_spec.js => 10-file_spec.js}      |  18 +++++++++---------
 .../core/{io => storage}/23-watch_spec.js     |   2 +-
 test/nodes/subflow/subflow_spec.js            |   2 +-
 148 files changed, 36 insertions(+), 37 deletions(-)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/20-inject.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/20-inject.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/21-debug.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/21-debug.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/25-catch.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/25-catch.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/25-status.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/25-status.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/60-link.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/60-link.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/90-comment.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/90-comment.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/98-unknown.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/98-unknown.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/lib/debug/debug-utils.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/lib/debug/debug.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => common}/lib/debug/view.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core/80-function.html => function/10-function.html} (100%)
 rename packages/node_modules/@node-red/nodes/core/{core/80-function.js => function/10-function.js} (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/10-switch.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/10-switch.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/15-change.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/15-change.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/16-range.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => function}/16-range.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/80-template.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/80-template.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/89-delay.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/89-delay.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/89-trigger.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{core => function}/89-trigger.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{core/75-exec.html => function/90-exec.html} (98%)
 rename packages/node_modules/@node-red/nodes/core/{core/75-exec.js => function/90-exec.js} (100%)
 delete mode 100644 packages/node_modules/@node-red/nodes/core/logic/.DS_Store
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/17-split.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/17-split.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/18-sort.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/18-sort.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/19-batch.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{logic => sequence}/19-batch.js (100%)
 rename packages/node_modules/@node-red/nodes/core/storage/{50-file.html => 10-file.html} (100%)
 rename packages/node_modules/@node-red/nodes/core/storage/{50-file.js => 10-file.js} (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => storage}/23-watch.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => storage}/23-watch.js (100%)
 create mode 100644 packages/node_modules/@node-red/nodes/icons/status.svg
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/20-inject.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/21-debug.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/25-catch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/25-status.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/60-link.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/90-comment.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => common}/98-unknown.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core/80-function.html => function/10-function.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => function}/10-switch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => function}/15-change.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => function}/16-range.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => function}/80-template.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => function}/89-delay.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core => function}/89-trigger.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{core/75-exec.html => function/90-exec.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => sequence}/17-split.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => sequence}/18-sort.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{logic => sequence}/19-batch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/storage/{50-file.html => 10-file.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => storage}/23-watch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/20-inject.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/21-debug.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/25-catch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/25-status.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/60-link.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/90-comment.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => common}/98-unknown.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core/80-function.html => function/10-function.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => function}/10-switch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => function}/15-change.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => function}/16-range.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => function}/80-template.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => function}/89-delay.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core => function}/89-trigger.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core/75-exec.html => function/90-exec.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => sequence}/17-split.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => sequence}/18-sort.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{logic => sequence}/19-batch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/storage/{50-file.html => 10-file.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => storage}/23-watch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/20-inject.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/21-debug.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/25-catch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/25-status.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/60-link.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/90-comment.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => common}/98-unknown.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core/80-function.html => function/10-function.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => function}/10-switch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => function}/15-change.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => function}/16-range.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => function}/80-template.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => function}/89-delay.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core => function}/89-trigger.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{core/75-exec.html => function/90-exec.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => sequence}/17-split.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => sequence}/18-sort.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{logic => sequence}/19-batch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/storage/{50-file.html => 10-file.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => storage}/23-watch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/20-inject.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/21-debug.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/25-catch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/25-status.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/60-link.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/90-comment.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => common}/98-unknown.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core/80-function.html => function/10-function.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => function}/10-switch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => function}/15-change.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => function}/16-range.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => function}/80-template.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => function}/89-delay.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core => function}/89-trigger.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{core/75-exec.html => function/90-exec.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => sequence}/17-split.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => sequence}/18-sort.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{logic => sequence}/19-batch.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/storage/{50-file.html => 10-file.html} (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => storage}/23-watch.html (100%)
 rename test/nodes/core/{core => common}/20-inject_spec.js (99%)
 rename test/nodes/core/{core/58-debug_spec.js => common/21-debug_spec.js} (99%)
 rename test/nodes/core/{core => common}/25-catch_spec.js (98%)
 rename test/nodes/core/{core => common}/25-status_spec.js (98%)
 rename test/nodes/core/{core => common}/60-link_spec.js (99%)
 rename test/nodes/core/{core => common}/90-comment_spec.js (97%)
 rename test/nodes/core/{core => common}/98-unknown_spec.js (97%)
 rename test/nodes/core/{core/80-function_spec.js => function/10-function_spec.js} (99%)
 rename test/nodes/core/{logic => function}/10-switch_spec.js (99%)
 rename test/nodes/core/{logic => function}/15-change_spec.js (99%)
 rename test/nodes/core/{logic => function}/16-range_spec.js (99%)
 rename test/nodes/core/{core => function}/80-template_spec.js (99%)
 rename test/nodes/core/{core => function}/89-delay_spec.js (99%)
 rename test/nodes/core/{core => function}/89-trigger_spec.js (99%)
 rename test/nodes/core/{core/75-exec_spec.js => function/90-exec_spec.js} (99%)
 rename test/nodes/core/{logic => sequence}/17-split_spec.js (99%)
 rename test/nodes/core/{logic => sequence}/18-sort_spec.js (99%)
 rename test/nodes/core/{logic => sequence}/19-batch_spec.js (99%)
 rename test/nodes/core/storage/{50-file_spec.js => 10-file_spec.js} (99%)
 rename test/nodes/core/{io => storage}/23-watch_spec.js (99%)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 22ee08558..a36c642b5 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -35,7 +35,6 @@ RED.palette = (function() {
     var sidebarControls;
 
     function createCategory(originalCategory,rootCategory,category,ns) {
-        console.log("createCategory",originalCategory,rootCategory,category,ns);
         if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
             createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
         }
@@ -182,7 +181,7 @@ RED.palette = (function() {
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
 
-            var label = /^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
+            var label = nt;///^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
             if (typeof def.paletteLabel !== "undefined") {
                 try {
                     label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/core/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.js b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/20-inject.js
rename to packages/node_modules/@node-red/nodes/core/common/20-inject.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/core/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/21-debug.js
rename to packages/node_modules/@node-red/nodes/core/common/21-debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/core/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.js b/packages/node_modules/@node-red/nodes/core/common/25-catch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-catch.js
rename to packages/node_modules/@node-red/nodes/core/common/25-catch.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/core/25-status.html
rename to packages/node_modules/@node-red/nodes/core/common/25-status.html
index f3aa7bd98..283d505a7 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -22,14 +22,14 @@
 <script type="text/javascript">
     RED.nodes.registerType('status',{
         category: 'common',
-        color:"#d9f4fd",
+        color:"#94c1d0",
         defaults: {
             name: {value:""},
             scope: {value:null}
         },
         inputs:0,
         outputs:1,
-        icon: "alert.svg",
+        icon: "status.svg",
         label: function() {
             return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
         },
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-status.js
rename to packages/node_modules/@node-red/nodes/core/common/25-status.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/60-link.html
rename to packages/node_modules/@node-red/nodes/core/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.js b/packages/node_modules/@node-red/nodes/core/common/60-link.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/60-link.js
rename to packages/node_modules/@node-red/nodes/core/common/60-link.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/core/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.js b/packages/node_modules/@node-red/nodes/core/common/90-comment.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/90-comment.js
rename to packages/node_modules/@node-red/nodes/core/common/90-comment.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/98-unknown.html b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/core/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/98-unknown.js b/packages/node_modules/@node-red/nodes/core/common/98-unknown.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/98-unknown.js
rename to packages/node_modules/@node-red/nodes/core/common/98-unknown.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/debug.js
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/view.html b/packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/lib/debug/view.html
rename to packages/node_modules/@node-red/nodes/core/common/lib/debug/view.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-function.html
rename to packages/node_modules/@node-red/nodes/core/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-function.js
rename to packages/node_modules/@node-red/nodes/core/function/10-function.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/core/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/10-switch.js
rename to packages/node_modules/@node-red/nodes/core/function/10-switch.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.html b/packages/node_modules/@node-red/nodes/core/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/core/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/15-change.js b/packages/node_modules/@node-red/nodes/core/function/15-change.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/15-change.js
rename to packages/node_modules/@node-red/nodes/core/function/15-change.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/16-range.html b/packages/node_modules/@node-red/nodes/core/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/core/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/16-range.js b/packages/node_modules/@node-red/nodes/core/function/16-range.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/16-range.js
rename to packages/node_modules/@node-red/nodes/core/function/16-range.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-template.html b/packages/node_modules/@node-red/nodes/core/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-template.html
rename to packages/node_modules/@node-red/nodes/core/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-template.js b/packages/node_modules/@node-red/nodes/core/function/80-template.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/80-template.js
rename to packages/node_modules/@node-red/nodes/core/function/80-template.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-delay.html b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/core/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-delay.js
rename to packages/node_modules/@node-red/nodes/core/function/89-delay.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/core/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/core/core/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/89-trigger.js
rename to packages/node_modules/@node-red/nodes/core/function/89-trigger.js
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
similarity index 98%
rename from packages/node_modules/@node-red/nodes/core/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/core/function/90-exec.html
index 264b60ba8..e3cb2cf45 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -73,8 +73,7 @@
                 this._("exec.label.retcode")
             ][i];
         },
-        icon: "arrow-in.svg",
-        align: "right",
+        icon: "cog.svg",
         label: function() {
             return this.name||this.command||(this.useSpawn=="true"?this._("exec.spawn"):this._("exec.exec"));
         },
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/75-exec.js
rename to packages/node_modules/@node-red/nodes/core/function/90-exec.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/.DS_Store b/packages/node_modules/@node-red/nodes/core/logic/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.html b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/core/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.js b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/17-split.js
rename to packages/node_modules/@node-red/nodes/core/sequence/17-split.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.js b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/18-sort.js
rename to packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.js b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/logic/19-batch.js
rename to packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/core/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.js b/packages/node_modules/@node-red/nodes/core/storage/10-file.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/storage/50-file.js
rename to packages/node_modules/@node-red/nodes/core/storage/10-file.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.html b/packages/node_modules/@node-red/nodes/core/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/core/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.js b/packages/node_modules/@node-red/nodes/core/storage/23-watch.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/23-watch.js
rename to packages/node_modules/@node-red/nodes/core/storage/23-watch.js
diff --git a/packages/node_modules/@node-red/nodes/icons/comment.svg b/packages/node_modules/@node-red/nodes/icons/comment.svg
index 43042723a..832dbf895 100644
--- a/packages/node_modules/@node-red/nodes/icons/comment.svg
+++ b/packages/node_modules/@node-red/nodes/icons/comment.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#868686" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#bababa" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/status.svg b/packages/node_modules/@node-red/nodes/icons/status.svg
new file mode 100644
index 000000000..514e451aa
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/icons/status.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M0 30h9l3.5-10 5 25 5.125-30L27.5 40 31 30h9" fill="none" stroke="#fff" stroke-miterlimit="6.5" stroke-width="4"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/20-inject.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/21-debug.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/25-catch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/25-status.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/25-status.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/60-link.html b/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/60-link.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/90-comment.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/98-unknown.html
rename to packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/80-function.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/80-function.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/10-switch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/15-change.html b/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/15-change.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/16-range.html b/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/16-range.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/80-template.html b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/80-template.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/89-delay.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/89-trigger.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/core/75-exec.html b/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/core/75-exec.html
rename to packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/17-split.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/17-split.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/18-sort.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/logic/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/logic/19-batch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/storage/50-file.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/storage/50-file.html
rename to packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/23-watch.html
rename to packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
diff --git a/test/nodes/core/core/20-inject_spec.js b/test/nodes/core/common/20-inject_spec.js
similarity index 99%
rename from test/nodes/core/core/20-inject_spec.js
rename to test/nodes/core/common/20-inject_spec.js
index 8eeec3620..ea78d0f53 100644
--- a/test/nodes/core/core/20-inject_spec.js
+++ b/test/nodes/core/common/20-inject_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var injectNode = require("nr-test-utils").require("@node-red/nodes/core/core/20-inject.js");
+var injectNode = require("nr-test-utils").require("@node-red/nodes/core/common/20-inject.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/common/21-debug_spec.js
similarity index 99%
rename from test/nodes/core/core/58-debug_spec.js
rename to test/nodes/core/common/21-debug_spec.js
index 1ae55062f..c3a5d4d2a 100644
--- a/test/nodes/core/core/58-debug_spec.js
+++ b/test/nodes/core/common/21-debug_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var debugNode = require("nr-test-utils").require("@node-red/nodes/core/core/58-debug.js");
+var debugNode = require("nr-test-utils").require("@node-red/nodes/core/common/21-debug.js");
 var helper = require("node-red-node-test-helper");
 var WebSocket = require('ws');
 
diff --git a/test/nodes/core/core/25-catch_spec.js b/test/nodes/core/common/25-catch_spec.js
similarity index 98%
rename from test/nodes/core/core/25-catch_spec.js
rename to test/nodes/core/common/25-catch_spec.js
index 5ab913cb3..466d912d7 100644
--- a/test/nodes/core/core/25-catch_spec.js
+++ b/test/nodes/core/common/25-catch_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-catch.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
 var helper = require("node-red-node-test-helper");
 
 describe('catch Node', function() {
diff --git a/test/nodes/core/core/25-status_spec.js b/test/nodes/core/common/25-status_spec.js
similarity index 98%
rename from test/nodes/core/core/25-status_spec.js
rename to test/nodes/core/common/25-status_spec.js
index 33689248d..41b0a79c8 100644
--- a/test/nodes/core/core/25-status_spec.js
+++ b/test/nodes/core/common/25-status_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-status.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-status.js");
 var helper = require("node-red-node-test-helper");
 
 describe('status Node', function() {
diff --git a/test/nodes/core/core/60-link_spec.js b/test/nodes/core/common/60-link_spec.js
similarity index 99%
rename from test/nodes/core/core/60-link_spec.js
rename to test/nodes/core/common/60-link_spec.js
index b52dee470..50072d761 100644
--- a/test/nodes/core/core/60-link_spec.js
+++ b/test/nodes/core/common/60-link_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var linkNode = require("nr-test-utils").require("@node-red/nodes/core/core/60-link.js");
+var linkNode = require("nr-test-utils").require("@node-red/nodes/core/common/60-link.js");
 var helper = require("node-red-node-test-helper");
 
 describe('link Node', function() {
diff --git a/test/nodes/core/core/90-comment_spec.js b/test/nodes/core/common/90-comment_spec.js
similarity index 97%
rename from test/nodes/core/core/90-comment_spec.js
rename to test/nodes/core/common/90-comment_spec.js
index d8740970c..a6f6a8284 100644
--- a/test/nodes/core/core/90-comment_spec.js
+++ b/test/nodes/core/common/90-comment_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var commentNode = require("nr-test-utils").require("@node-red/nodes/core/core/90-comment.js");
+var commentNode = require("nr-test-utils").require("@node-red/nodes/core/common/90-comment.js");
 var helper = require("node-red-node-test-helper");
 
 describe('comment Node', function() {
diff --git a/test/nodes/core/core/98-unknown_spec.js b/test/nodes/core/common/98-unknown_spec.js
similarity index 97%
rename from test/nodes/core/core/98-unknown_spec.js
rename to test/nodes/core/common/98-unknown_spec.js
index 04ca621f3..1b16a5c3b 100644
--- a/test/nodes/core/core/98-unknown_spec.js
+++ b/test/nodes/core/common/98-unknown_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var unknown = require("nr-test-utils").require("@node-red/nodes/core/core/98-unknown.js");
+var unknown = require("nr-test-utils").require("@node-red/nodes/core/common/98-unknown.js");
 var helper = require("node-red-node-test-helper");
 
 describe('unknown Node', function() {
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/function/10-function_spec.js
similarity index 99%
rename from test/nodes/core/core/80-function_spec.js
rename to test/nodes/core/function/10-function_spec.js
index 86d616ede..df44a66ee 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
similarity index 99%
rename from test/nodes/core/logic/10-switch_spec.js
rename to test/nodes/core/function/10-switch_spec.js
index 034198ccf..3865bdb99 100644
--- a/test/nodes/core/logic/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var switchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/10-switch.js");
+var switchNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-switch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context/");
diff --git a/test/nodes/core/logic/15-change_spec.js b/test/nodes/core/function/15-change_spec.js
similarity index 99%
rename from test/nodes/core/logic/15-change_spec.js
rename to test/nodes/core/function/15-change_spec.js
index a838ca4a6..1809d91d9 100644
--- a/test/nodes/core/logic/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 
-var changeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/15-change.js");
+var changeNode = require("nr-test-utils").require("@node-red/nodes/core/function/15-change.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/logic/16-range_spec.js b/test/nodes/core/function/16-range_spec.js
similarity index 99%
rename from test/nodes/core/logic/16-range_spec.js
rename to test/nodes/core/function/16-range_spec.js
index ddf34be8f..a0dcd0078 100644
--- a/test/nodes/core/logic/16-range_spec.js
+++ b/test/nodes/core/function/16-range_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/16-range.js");
+var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/function/16-range.js");
 var helper = require("node-red-node-test-helper");
 
 describe('range Node', function() {
diff --git a/test/nodes/core/core/80-template_spec.js b/test/nodes/core/function/80-template_spec.js
similarity index 99%
rename from test/nodes/core/core/80-template_spec.js
rename to test/nodes/core/function/80-template_spec.js
index 5c89d73a8..e944824b3 100644
--- a/test/nodes/core/core/80-template_spec.js
+++ b/test/nodes/core/function/80-template_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var templateNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-template.js");
+var templateNode = require("nr-test-utils").require("@node-red/nodes/core/function/80-template.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 
diff --git a/test/nodes/core/core/89-delay_spec.js b/test/nodes/core/function/89-delay_spec.js
similarity index 99%
rename from test/nodes/core/core/89-delay_spec.js
rename to test/nodes/core/function/89-delay_spec.js
index c516adb43..f16a13636 100644
--- a/test/nodes/core/core/89-delay_spec.js
+++ b/test/nodes/core/function/89-delay_spec.js
@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var delayNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-delay.js");
+var delayNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-delay.js");
 var helper = require("node-red-node-test-helper");
 
 var GRACE_PERCENTAGE=10;
diff --git a/test/nodes/core/core/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
similarity index 99%
rename from test/nodes/core/core/89-trigger_spec.js
rename to test/nodes/core/function/89-trigger_spec.js
index 8f2f71b8c..5f7bfc2d1 100644
--- a/test/nodes/core/core/89-trigger_spec.js
+++ b/test/nodes/core/function/89-trigger_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-trigger.js");
+var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-trigger.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 
diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/function/90-exec_spec.js
similarity index 99%
rename from test/nodes/core/core/75-exec_spec.js
rename to test/nodes/core/function/90-exec_spec.js
index 5b20dc658..6dbe8137d 100644
--- a/test/nodes/core/core/75-exec_spec.js
+++ b/test/nodes/core/function/90-exec_spec.js
@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var execNode = require("nr-test-utils").require("@node-red/nodes/core/core/75-exec.js");
+var execNode = require("nr-test-utils").require("@node-red/nodes/core/function/90-exec.js");
 var osType = require("os").type();
 
 var child_process = require('child_process');
diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/sequence/17-split_spec.js
similarity index 99%
rename from test/nodes/core/logic/17-split_spec.js
rename to test/nodes/core/sequence/17-split_spec.js
index e55682965..3d38a9ac8 100644
--- a/test/nodes/core/logic/17-split_spec.js
+++ b/test/nodes/core/sequence/17-split_spec.js
@@ -15,8 +15,8 @@
  **/
 
 var should = require("should");
-var splitNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
-var joinNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
+var splitNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
+var joinNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
diff --git a/test/nodes/core/logic/18-sort_spec.js b/test/nodes/core/sequence/18-sort_spec.js
similarity index 99%
rename from test/nodes/core/logic/18-sort_spec.js
rename to test/nodes/core/sequence/18-sort_spec.js
index 960a6d666..ac220216c 100644
--- a/test/nodes/core/logic/18-sort_spec.js
+++ b/test/nodes/core/sequence/18-sort_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var sortNode = require("nr-test-utils").require("@node-red/nodes/core/logic/18-sort.js");
+var sortNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/18-sort.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
diff --git a/test/nodes/core/logic/19-batch_spec.js b/test/nodes/core/sequence/19-batch_spec.js
similarity index 99%
rename from test/nodes/core/logic/19-batch_spec.js
rename to test/nodes/core/sequence/19-batch_spec.js
index e62f3bf6f..3a40ebfb5 100644
--- a/test/nodes/core/logic/19-batch_spec.js
+++ b/test/nodes/core/sequence/19-batch_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var batchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/19-batch.js");
+var batchNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/19-batch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/10-file_spec.js
similarity index 99%
rename from test/nodes/core/storage/50-file_spec.js
rename to test/nodes/core/storage/10-file_spec.js
index 19b7e804d..cb3dc5d07 100644
--- a/test/nodes/core/storage/50-file_spec.js
+++ b/test/nodes/core/storage/10-file_spec.js
@@ -20,7 +20,7 @@ var fs = require('fs-extra');
 var os = require('os');
 var sinon = require("sinon");
 var iconv = require("iconv-lite");
-var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/50-file.js");
+var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/10-file.js");
 var helper = require("node-red-node-test-helper");
 
 describe('file Nodes', function() {
@@ -31,7 +31,7 @@ describe('file Nodes', function() {
         }
         return iconv.encode(s, enc);
     }
-    
+
     function decode(data, enc) {
         if (enc === "none") {
             return data.toString();
@@ -780,7 +780,7 @@ describe('file Nodes', function() {
             it('should write to a file with "Big5" encoding', function(done) {
                 checkWriteWithEncoding("Big5", "test", done);
             });
-            
+
             it('should write to a file with "Big5-HKSCS" encoding', function(done) {
                 checkWriteWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1280,10 +1280,10 @@ describe('file Nodes', function() {
                     n1.receive({payload:""});
                 });
             }
-            
+
             // default
             it('should read in a file with "none" encoding', function(done) {
-                checkReadWithEncoding("none", "試験", done);                
+                checkReadWithEncoding("none", "試験", done);
             });
 
             // Native
@@ -1332,7 +1332,7 @@ describe('file Nodes', function() {
             it('should read in a file with "EUC-JP" encoding', function(done) {
                 checkReadWithEncoding("EUC-JP", "試験", done);
             });
-            
+
             // following encoding tests should be more specific
             // Chinese
             it('should read in a file with "GB2312" encoding', function(done) {
@@ -1372,7 +1372,7 @@ describe('file Nodes', function() {
             it('should read in a file with "Big5" encoding', function(done) {
                 checkReadWithEncoding("Big5", "test", done);
             });
-            
+
             it('should read in a file with "Big5-HKSCS" encoding', function(done) {
                 checkReadWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1621,8 +1621,8 @@ describe('file Nodes', function() {
             it('should read in a file with "tis620" encoding', function(done) {
                 checkReadWithEncoding("tis620", "test", done);
             });
-            
+
         });
-        
+
     });
 });
diff --git a/test/nodes/core/io/23-watch_spec.js b/test/nodes/core/storage/23-watch_spec.js
similarity index 99%
rename from test/nodes/core/io/23-watch_spec.js
rename to test/nodes/core/storage/23-watch_spec.js
index 87d68f0b8..a9942d5b1 100644
--- a/test/nodes/core/io/23-watch_spec.js
+++ b/test/nodes/core/storage/23-watch_spec.js
@@ -18,7 +18,7 @@ var fs = require("fs-extra");
 var path = require("path");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var watchNode = require("nr-test-utils").require("@node-red/nodes/core/io/23-watch.js");
+var watchNode = require("nr-test-utils").require("@node-red/nodes/core/storage/23-watch.js");
 
 
 describe('watch Node', function() {
diff --git a/test/nodes/subflow/subflow_spec.js b/test/nodes/subflow/subflow_spec.js
index 84fba68dd..39f5f6b8a 100644
--- a/test/nodes/subflow/subflow_spec.js
+++ b/test/nodes/subflow/subflow_spec.js
@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var helper = require("node-red-node-test-helper");
 
 // Notice:

From 69b781419fa06c986ad8fa2a6f398f1222a9f595 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 14:21:19 +0100
Subject: [PATCH 085/305] Move io to network

---
 .../@node-red/editor-client/src/js/ui/palette.js | 16 ++++++++++------
 .../nodes/core/{io => network}/05-tls.html       |  0
 .../nodes/core/{io => network}/05-tls.js         |  0
 .../nodes/core/{io => network}/06-httpproxy.html |  0
 .../nodes/core/{io => network}/06-httpproxy.js   |  0
 .../nodes/core/{io => network}/10-mqtt.html      |  4 ++--
 .../nodes/core/{io => network}/10-mqtt.js        |  0
 .../nodes/core/{io => network}/21-httpin.html    |  4 ++--
 .../nodes/core/{io => network}/21-httpin.js      |  0
 .../core/{io => network}/21-httprequest.html     |  2 +-
 .../nodes/core/{io => network}/21-httprequest.js |  0
 .../nodes/core/{io => network}/22-websocket.html |  4 ++--
 .../nodes/core/{io => network}/22-websocket.js   |  0
 .../nodes/core/{io => network}/31-tcpin.html     |  6 +++---
 .../nodes/core/{io => network}/31-tcpin.js       |  0
 .../nodes/core/{io => network}/32-udp.html       |  4 ++--
 .../nodes/core/{io => network}/32-udp.js         |  0
 .../nodes/core/{io => network}/lib/mqtt.js       |  0
 .../nodes/locales/de/{io => network}/05-tls.html |  0
 .../locales/de/{io => network}/06-httpproxy.html |  0
 .../locales/de/{io => network}/10-mqtt.html      |  0
 .../locales/de/{io => network}/21-httpin.html    |  0
 .../de/{io => network}/21-httprequest.html       |  0
 .../locales/de/{io => network}/22-websocket.html |  0
 .../locales/de/{io => network}/31-tcpin.html     |  0
 .../nodes/locales/de/{io => network}/32-udp.html |  0
 .../locales/en-US/{io => network}/05-tls.html    |  0
 .../en-US/{io => network}/06-httpproxy.html      |  0
 .../locales/en-US/{io => network}/10-mqtt.html   |  0
 .../locales/en-US/{io => network}/21-httpin.html |  0
 .../en-US/{io => network}/21-httprequest.html    |  0
 .../en-US/{io => network}/22-websocket.html      |  0
 .../locales/en-US/{io => network}/31-tcpin.html  |  0
 .../locales/en-US/{io => network}/32-udp.html    |  0
 .../nodes/locales/ja/{io => network}/05-tls.html |  0
 .../locales/ja/{io => network}/06-httpproxy.html |  0
 .../locales/ja/{io => network}/10-mqtt.html      |  0
 .../locales/ja/{io => network}/21-httpin.html    |  0
 .../ja/{io => network}/21-httprequest.html       |  0
 .../locales/ja/{io => network}/22-websocket.html |  0
 .../locales/ja/{io => network}/31-tcpin.html     |  0
 .../nodes/locales/ja/{io => network}/32-udp.html |  0
 .../nodes/locales/ko/{io => network}/05-tls.html |  0
 .../locales/ko/{io => network}/06-httpproxy.html |  0
 .../locales/ko/{io => network}/10-mqtt.html      |  0
 .../locales/ko/{io => network}/21-httpin.html    |  0
 .../ko/{io => network}/21-httprequest.html       |  0
 .../locales/ko/{io => network}/22-websocket.html |  0
 .../locales/ko/{io => network}/31-tcpin.html     |  0
 .../nodes/locales/ko/{io => network}/32-udp.html |  0
 .../core/{io => network}/21-httprequest_spec.js  |  6 +++---
 .../core/{io => network}/22-websocket_spec.js    |  2 +-
 test/nodes/core/{io => network}/31-tcpin_spec.js |  2 +-
 .../core/{io => network}/31-tcprequest_spec.js   |  2 +-
 test/nodes/core/{io => network}/32-udpin_spec.js |  2 +-
 .../nodes/core/{io => network}/32-udpout_spec.js |  2 +-
 56 files changed, 30 insertions(+), 26 deletions(-)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/05-tls.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/05-tls.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/06-httpproxy.html (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/06-httpproxy.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/10-mqtt.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/10-mqtt.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/21-httpin.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/21-httpin.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/21-httprequest.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/21-httprequest.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/22-websocket.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/22-websocket.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/31-tcpin.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/31-tcpin.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/32-udp.html (99%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/32-udp.js (100%)
 rename packages/node_modules/@node-red/nodes/core/{io => network}/lib/mqtt.js (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/05-tls.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/06-httpproxy.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/10-mqtt.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/21-httpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/21-httprequest.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/22-websocket.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/31-tcpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/de/{io => network}/32-udp.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/05-tls.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/06-httpproxy.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/10-mqtt.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/21-httpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/21-httprequest.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/22-websocket.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/31-tcpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{io => network}/32-udp.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/05-tls.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/06-httpproxy.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/10-mqtt.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/21-httpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/21-httprequest.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/22-websocket.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/31-tcpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ja/{io => network}/32-udp.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/05-tls.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/06-httpproxy.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/10-mqtt.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/21-httpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/21-httprequest.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/22-websocket.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/31-tcpin.html (100%)
 rename packages/node_modules/@node-red/nodes/locales/ko/{io => network}/32-udp.html (100%)
 rename test/nodes/core/{io => network}/21-httprequest_spec.js (99%)
 rename test/nodes/core/{io => network}/22-websocket_spec.js (99%)
 rename test/nodes/core/{io => network}/31-tcpin_spec.js (99%)
 rename test/nodes/core/{io => network}/31-tcprequest_spec.js (99%)
 rename test/nodes/core/{io => network}/32-udpin_spec.js (99%)
 rename test/nodes/core/{io => network}/32-udpout_spec.js (99%)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index a36c642b5..a494066ea 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -21,7 +21,9 @@ RED.palette = (function() {
         'subflows',
         'common',
         'function',
-        'input/output',
+        'network',
+        'input',
+        'output',
         'sequence',
         'parser',
         'storage',
@@ -44,12 +46,12 @@ RED.palette = (function() {
         }
     }
     function createCategoryContainer(originalCategory,category, labelId) {
-        console.log("createCategoryContainer",originalCategory,category,labelId);
         var label = RED._(labelId, {defaultValue:category});
         label = (label || category).replace(/_/g, " ");
         var catDiv = $('<div id="red-ui-palette-container-'+category+'" class="red-ui-palette-category hide">'+
             '<div id="red-ui-palette-header-'+category+'" class="red-ui-palette-header"><i class="expanded fa fa-angle-down"></i><span>'+label+'</span></div>'+
             '<div class="red-ui-palette-content" id="red-ui-palette-base-category-'+category+'">'+
+            '<div id="red-ui-palette-'+category+'"></div>'+
             '<div id="red-ui-palette-'+category+'-input"></div>'+
             '<div id="red-ui-palette-'+category+'-output"></div>'+
             '<div id="red-ui-palette-'+category+'-function"></div>'+
@@ -173,10 +175,12 @@ RED.palette = (function() {
         if (getPaletteNode(nt).length) {
             return;
         }
-        if (exclusion.indexOf(def.category)===-1) {
+        var nodeCategory = def.category;
 
-            var originalCategory = def.category;
-            var category = escapeCategory(def.category);
+        if (exclusion.indexOf(nodeCategory)===-1) {
+
+            var originalCategory = nodeCategory;
+            var category = escapeCategory(nodeCategory);
             var rootCategory = category.split("-")[0];
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
@@ -219,7 +223,7 @@ RED.palette = (function() {
                 d.append(portIn);
             }
 
-            createCategory(def.category,rootCategory,category,(coreCategories.indexOf(rootCategory) !== -1)?"node-red":def.set.id);
+            createCategory(nodeCategory,rootCategory,category,(coreCategories.indexOf(rootCategory) !== -1)?"node-red":def.set.id);
 
             $("#red-ui-palette-"+category).append(d);
 
diff --git a/packages/node_modules/@node-red/nodes/core/io/05-tls.html b/packages/node_modules/@node-red/nodes/core/network/05-tls.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/05-tls.html
rename to packages/node_modules/@node-red/nodes/core/network/05-tls.html
diff --git a/packages/node_modules/@node-red/nodes/core/io/05-tls.js b/packages/node_modules/@node-red/nodes/core/network/05-tls.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/05-tls.js
rename to packages/node_modules/@node-red/nodes/core/network/05-tls.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/06-httpproxy.html
rename to packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
diff --git a/packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/06-httpproxy.js
rename to packages/node_modules/@node-red/nodes/core/network/06-httpproxy.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
rename to packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index fa9f89e29..86c3c0b9d 100644
--- a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -46,7 +46,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt in',{
-        category: 'input/output',
+        category: 'network',
         defaults: {
             name: {value:""},
             topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
@@ -107,7 +107,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt out',{
-        category: 'input/output',
+        category: 'network',
         defaults: {
             name: {value:""},
             topic: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/10-mqtt.js
rename to packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/21-httpin.html
rename to packages/node_modules/@node-red/nodes/core/network/21-httpin.html
index b4c237589..d3ab7fe6b 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
@@ -66,7 +66,7 @@
 <script type="text/javascript">
 (function() {
     RED.nodes.registerType('http in',{
-        category: 'input/output',
+        category: 'network',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
@@ -142,7 +142,7 @@
     ];
 
     RED.nodes.registerType('http response',{
-        category: 'input/output',
+        category: 'network',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httpin.js b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/21-httpin.js
rename to packages/node_modules/@node-red/nodes/core/network/21-httpin.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
rename to packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index 1ed183d12..01f8e33cb 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -98,7 +98,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('http request',{
-        category: 'input/output',
+        category: 'network',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
rename to packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html b/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/22-websocket.html
rename to packages/node_modules/@node-red/nodes/core/network/22-websocket.html
index 576fafc67..4e62cb95e 100644
--- a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
@@ -97,7 +97,7 @@
     }
 
     RED.nodes.registerType('websocket in',{
-        category: 'input/output',
+        category: 'network',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
@@ -116,7 +116,7 @@
     });
 
     RED.nodes.registerType('websocket out',{
-        category: 'input/output',
+        category: 'network',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.js b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/22-websocket.js
rename to packages/node_modules/@node-red/nodes/core/network/22-websocket.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
rename to packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
index 3955105e7..6029d61ce 100644
--- a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp in',{
-        category: 'input/output',
+        category: 'network',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -143,7 +143,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp out',{
-        category: 'input/output',
+        category: 'network',
         color:"Silver",
         defaults: {
             host: {value:"",validate:function(v) { return (this.beserver != "client")||v.length > 0;} },
@@ -215,7 +215,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp request',{
-        category: 'input/output',
+        category: 'network',
         color:"Silver",
         defaults: {
             server: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
rename to packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/32-udp.html b/packages/node_modules/@node-red/nodes/core/network/32-udp.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/io/32-udp.html
rename to packages/node_modules/@node-red/nodes/core/network/32-udp.html
index 6784e8d15..ed867ae05 100644
--- a/packages/node_modules/@node-red/nodes/core/io/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/core/network/32-udp.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp in',{
-        category: 'input/output',
+        category: 'network',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -159,7 +159,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp out',{
-        category: 'input/output',
+        category: 'network',
         color:"Silver",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/32-udp.js b/packages/node_modules/@node-red/nodes/core/network/32-udp.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/32-udp.js
rename to packages/node_modules/@node-red/nodes/core/network/32-udp.js
diff --git a/packages/node_modules/@node-red/nodes/core/io/lib/mqtt.js b/packages/node_modules/@node-red/nodes/core/network/lib/mqtt.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/io/lib/mqtt.js
rename to packages/node_modules/@node-red/nodes/core/network/lib/mqtt.js
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/05-tls.html b/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/05-tls.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/06-httpproxy.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/10-mqtt.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/21-httpin.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/21-httprequest.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/22-websocket.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/31-tcpin.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/de/io/32-udp.html b/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/de/io/32-udp.html
rename to packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/05-tls.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/05-tls.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/06-httpproxy.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/10-mqtt.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/21-httpin.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/22-websocket.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/31-tcpin.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/32-udp.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/io/32-udp.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/05-tls.html b/packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/05-tls.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/06-httpproxy.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/10-mqtt.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/21-httpin.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/21-httprequest.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/22-websocket.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/31-tcpin.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/io/32-udp.html b/packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ja/io/32-udp.html
rename to packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/05-tls.html b/packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/05-tls.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/06-httpproxy.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/10-mqtt.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/21-httpin.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/21-httprequest.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/22-websocket.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/31-tcpin.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/io/32-udp.html b/packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/ko/io/32-udp.html
rename to packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html
diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/network/21-httprequest_spec.js
similarity index 99%
rename from test/nodes/core/io/21-httprequest_spec.js
rename to test/nodes/core/network/21-httprequest_spec.js
index 00caa9867..39667f1f2 100644
--- a/test/nodes/core/io/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -22,9 +22,9 @@ var express = require("express");
 var bodyParser = require('body-parser');
 var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
-var httpRequestNode = require("nr-test-utils").require("@node-red/nodes/core/io/21-httprequest.js");
-var tlsNode = require("nr-test-utils").require("@node-red/nodes/core/io/05-tls.js");
-var httpProxyNode = require("nr-test-utils").require("@node-red/nodes/core/io/06-httpproxy.js");
+var httpRequestNode = require("nr-test-utils").require("@node-red/nodes/core/network/21-httprequest.js");
+var tlsNode = require("nr-test-utils").require("@node-red/nodes/core/network/05-tls.js");
+var httpProxyNode = require("nr-test-utils").require("@node-red/nodes/core/network/06-httpproxy.js");
 var hashSum = require("hash-sum");
 var httpProxy = require('http-proxy');
 var cookieParser = require('cookie-parser');
diff --git a/test/nodes/core/io/22-websocket_spec.js b/test/nodes/core/network/22-websocket_spec.js
similarity index 99%
rename from test/nodes/core/io/22-websocket_spec.js
rename to test/nodes/core/network/22-websocket_spec.js
index d2af1de28..e13b513c8 100644
--- a/test/nodes/core/io/22-websocket_spec.js
+++ b/test/nodes/core/network/22-websocket_spec.js
@@ -18,7 +18,7 @@ var ws = require("ws");
 var when = require("when");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var websocketNode = require("nr-test-utils").require("@node-red/nodes/core/io/22-websocket.js");
+var websocketNode = require("nr-test-utils").require("@node-red/nodes/core/network/22-websocket.js");
 
 var sockets = [];
 
diff --git a/test/nodes/core/io/31-tcpin_spec.js b/test/nodes/core/network/31-tcpin_spec.js
similarity index 99%
rename from test/nodes/core/io/31-tcpin_spec.js
rename to test/nodes/core/network/31-tcpin_spec.js
index a8683f260..cbe7ced2a 100644
--- a/test/nodes/core/io/31-tcpin_spec.js
+++ b/test/nodes/core/network/31-tcpin_spec.js
@@ -19,7 +19,7 @@ var should = require("should");
 var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
 
-var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/io/31-tcpin.js");
+var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/network/31-tcpin.js");
 
 
 describe('TCP in Node', function() {
diff --git a/test/nodes/core/io/31-tcprequest_spec.js b/test/nodes/core/network/31-tcprequest_spec.js
similarity index 99%
rename from test/nodes/core/io/31-tcprequest_spec.js
rename to test/nodes/core/network/31-tcprequest_spec.js
index fe1811134..69ae9ad36 100644
--- a/test/nodes/core/io/31-tcprequest_spec.js
+++ b/test/nodes/core/network/31-tcprequest_spec.js
@@ -18,7 +18,7 @@ var net = require("net");
 var should = require("should");
 var stoppable = require('stoppable');
 var helper = require("node-red-node-test-helper");
-var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/io/31-tcpin.js");
+var tcpinNode = require("nr-test-utils").require("@node-red/nodes/core/network/31-tcpin.js");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 
 
diff --git a/test/nodes/core/io/32-udpin_spec.js b/test/nodes/core/network/32-udpin_spec.js
similarity index 99%
rename from test/nodes/core/io/32-udpin_spec.js
rename to test/nodes/core/network/32-udpin_spec.js
index 72b43992e..107c313bf 100644
--- a/test/nodes/core/io/32-udpin_spec.js
+++ b/test/nodes/core/network/32-udpin_spec.js
@@ -17,7 +17,7 @@
 var dgram = require("dgram");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var udpNode = require("nr-test-utils").require("@node-red/nodes/core/io/32-udp.js");
+var udpNode = require("nr-test-utils").require("@node-red/nodes/core/network/32-udp.js");
 
 
 describe('UDP in Node', function() {
diff --git a/test/nodes/core/io/32-udpout_spec.js b/test/nodes/core/network/32-udpout_spec.js
similarity index 99%
rename from test/nodes/core/io/32-udpout_spec.js
rename to test/nodes/core/network/32-udpout_spec.js
index d3696dc59..ff01c2f10 100644
--- a/test/nodes/core/io/32-udpout_spec.js
+++ b/test/nodes/core/network/32-udpout_spec.js
@@ -17,7 +17,7 @@
 var dgram = require("dgram");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var udpNode = require("nr-test-utils").require("@node-red/nodes/core/io/32-udp.js");
+var udpNode = require("nr-test-utils").require("@node-red/nodes/core/network/32-udp.js");
 
 
 describe('UDP out Node', function() {

From b6055479a1e165255f91d5d8143d6039548377d8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 14:41:51 +0100
Subject: [PATCH 086/305] Move Complete node to the new common category

---
 .../core/{core/25-complete.html => common/24-complete.html}     | 2 +-
 .../nodes/core/{core/25-complete.js => common/24-complete.js}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/node_modules/@node-red/nodes/core/{core/25-complete.html => common/24-complete.html} (99%)
 rename packages/node_modules/@node-red/nodes/core/{core/25-complete.js => common/24-complete.js} (100%)

diff --git a/packages/node_modules/@node-red/nodes/core/core/25-complete.html b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
similarity index 99%
rename from packages/node_modules/@node-red/nodes/core/core/25-complete.html
rename to packages/node_modules/@node-red/nodes/core/common/24-complete.html
index f82ed02f8..c801ca706 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-complete.html
+++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
@@ -13,7 +13,7 @@
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('complete',{
-        category: 'input',
+        category: 'common',
         color:"#c0edc0",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js
similarity index 100%
rename from packages/node_modules/@node-red/nodes/core/core/25-complete.js
rename to packages/node_modules/@node-red/nodes/core/common/24-complete.js

From 10077ae7500431816176840be1549cb5a9c8a2a5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 16:54:26 +0100
Subject: [PATCH 087/305] Use a more atomic process for writing context files
 Fixes #2271

---
 .../runtime/lib/nodes/context/localfilesystem.js   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
index 10b4349b8..0f83573e8 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
@@ -137,6 +137,16 @@ function stringify(value) {
     return { json: result, circular: hasCircular };
 }
 
+
+function writeFileAtomic(storagePath, content) {
+    // To protect against file corruption, write to a tmp file first and then
+    // rename to the destination file
+    let finalFile = storagePath + ".json";
+    let tmpFile = finalFile + "."+Date.now()+".tmp";
+    return fs.outputFile(tmpFile, content, "utf8").then(function() {
+        return fs.rename(tmpFile,finalFile);
+    })
+}
 function LocalFileSystem(config){
     this.config = config;
     this.storageBaseDir = getBasePath(this.config);
@@ -202,7 +212,7 @@ LocalFileSystem.prototype.open = function(){
                         delete self.knownCircularRefs[scope];
                     }
                     log.debug("Flushing localfilesystem context scope "+scope);
-                    promises.push(fs.outputFile(storagePath + ".json", stringifiedContext.json, "utf8"));
+                    promises.push(writeFileAtomic(storagePath, stringifiedContext.json))
                 });
                 delete self._pendingWriteTimeout;
                 return Promise.all(promises);
@@ -319,7 +329,7 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) {
             } else {
                 delete self.knownCircularRefs[scope];
             }
-            return fs.outputFile(storagePath + ".json", stringifiedContext.json, "utf8");
+            return writeFileAtomic(storagePath, stringifiedContext.json);
         }).then(function(){
             if(typeof callback === "function"){
                 callback(null);

From 03aa6c7d3a12bf893cb62d9497789567c935b7e3 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 17:27:06 +0100
Subject: [PATCH 088/305] Apply user specified palette cateogies and remaining
 core ones

---
 .../editor-client/src/js/ui/palette.js        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index a494066ea..e78191d65 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -553,20 +553,26 @@ RED.palette = (function() {
             sidebarControls.stop(false,true);
             sidebarControls.hide();
         })
-
-        var categoryList = coreCategories;
+        var userCategories = [];
         if (RED.settings.paletteCategories) {
-            categoryList = RED.settings.paletteCategories;
+            userCategories = RED.settings.paletteCategories;
         } else if (RED.settings.theme('palette.categories')) {
-            categoryList = RED.settings.theme('palette.categories');
+            userCategories = RED.settings.theme('palette.categories');
         }
-        if (!Array.isArray(categoryList)) {
-            categoryList = coreCategories
+        if (!Array.isArray(userCategories)) {
+            userCategories = [];
         }
-        categoryList.forEach(function(category){
+
+        var addedCategories = {};
+        userCategories.forEach(function(category){
+            addedCategories[category] = true;
             createCategoryContainer(category, escapeCategory(category), "palette.label."+escapeCategory(category));
         });
-
+        coreCategories.forEach(function(category){
+            if (!addedCategories[category]) {
+                createCategoryContainer(category, escapeCategory(category), "palette.label."+escapeCategory(category));
+            }
+        });
 
         var paletteFooterButtons = $('<span class="button-group"></span>').appendTo("#red-ui-palette .red-ui-component-footer");
         var paletteCollapseAll = $('<button type="button" class="red-ui-footer-button"><i class="fa fa-angle-double-up"></i></button>').appendTo(paletteFooterButtons);

From c7427a5f7cc3992373b213c3c0e77b99386e1254 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 21 Aug 2019 17:30:02 +0100
Subject: [PATCH 089/305] Add nls messages for new palette categories

---
 .../@node-red/editor-client/locales/en-US/editor.json         | 4 ++++
 .../node_modules/@node-red/editor-client/src/js/ui/palette.js | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 67dfa8a73..8d461c714 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -414,9 +414,13 @@
         "addCategory": "Add new...",
         "label": {
             "subflows": "subflows",
+            "network": "network",
+            "common": "common",
             "input": "input",
             "output": "output",
             "function": "function",
+            "sequence": "sequence",
+            "parser": "parser",
             "social": "social",
             "storage": "storage",
             "analysis": "analysis",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index e78191d65..52af66055 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -29,7 +29,6 @@ RED.palette = (function() {
         'storage',
         'analysis',
         'social',
-        'mobile',
         'advanced'
     ];
 

From 18aeeab041fa1e0f052ae727aade6ee1f54aeda2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 22 Aug 2019 10:40:33 +0100
Subject: [PATCH 090/305] Bump dependencies

---
 package.json                                  | 26 +++++++++----------
 .../@node-red/editor-api/package.json         |  2 +-
 .../node_modules/@node-red/nodes/package.json |  8 +++---
 .../@node-red/registry/package.json           |  2 +-
 packages/node_modules/node-red/package.json   |  8 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index e0997ce16..ac88d09c6 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
         }
     ],
     "dependencies": {
-        "ajv": "6.10.0",
+        "ajv": "6.10.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
@@ -41,7 +41,7 @@
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.1",
+        "https-proxy-agent": "2.2.2",
         "i18next": "15.1.2",
         "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
@@ -52,11 +52,11 @@
         "memorystore": "1.6.1",
         "mime": "2.4.4",
         "mqtt": "2.18.8",
-        "multer": "1.4.1",
-        "mustache": "3.0.1",
-        "node-red-node-rbe": "^0.2.4",
-        "node-red-node-sentiment": "^0.1.3",
-        "node-red-node-tail": "^0.0.2",
+        "multer": "1.4.2",
+        "mustache": "3.0.2",
+        "node-red-node-rbe": "^0.2.5",
+        "node-red-node-sentiment": "^0.1.4",
+        "node-red-node-tail": "^0.0.3",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
@@ -65,7 +65,7 @@
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.4.1",
         "request": "2.88.0",
-        "semver": "6.2.0",
+        "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8",
         "ws": "6.2.1",
@@ -79,16 +79,16 @@
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
         "grunt-concurrent": "~2.3.1",
-        "grunt-contrib-clean": "~1.1.0",
-        "grunt-contrib-compress": "~1.4.0",
+        "grunt-contrib-clean": "~2.0.0",
+        "grunt-contrib-compress": "~1.5.0",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
-        "grunt-contrib-jshint": "~1.1.0",
-        "grunt-contrib-uglify": "~3.4.0",
+        "grunt-contrib-jshint": "~2.1.0",
+        "grunt-contrib-uglify": "~4.0.1",
         "grunt-contrib-watch": "~1.1.0",
         "grunt-jsdoc": "^2.2.1",
         "grunt-jsdoc-to-markdown": "^4.0.0",
-        "grunt-jsonlint": "~1.1.0",
+        "grunt-jsonlint": "~2.0.0",
         "grunt-mkdir": "~1.0.0",
         "grunt-mocha-istanbul": "5.0.2",
         "grunt-nodemon": "~0.4.2",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index e4b3b1f69..13b665806 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -26,7 +26,7 @@
         "express": "4.17.1",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
-        "mustache": "3.0.1",
+        "mustache": "3.0.2",
         "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 55de27d7c..225142f58 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -15,7 +15,7 @@
         }
     ],
     "dependencies": {
-        "ajv": "6.10.0",
+        "ajv": "6.10.2",
         "body-parser": "1.19.0",
         "cheerio": "0.22.0",
         "content-type": "1.0.4",
@@ -27,13 +27,13 @@
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.1",
+        "https-proxy-agent": "2.2.2",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "media-typer": "1.1.0",
         "mqtt": "2.18.8",
-        "multer": "1.4.1",
-        "mustache": "3.0.1",
+        "multer": "1.4.2",
+        "mustache": "3.0.2",
         "on-headers": "1.0.2",
         "raw-body": "2.4.1",
         "request": "2.88.0",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 04d7de24e..8ad8cd718 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -17,7 +17,7 @@
     ],
     "dependencies": {
         "@node-red/util": "1.0.0-beta.2",
-        "semver": "6.2.0",
+        "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
     }
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 6cfc0fa36..d6d6bbdf4 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -39,11 +39,11 @@
         "bcryptjs": "2.4.3",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
-        "node-red-node-rbe": "^0.2.4",
-        "node-red-node-sentiment": "^0.1.3",
-        "node-red-node-tail": "^0.0.2",
+        "node-red-node-rbe": "^0.2.5",
+        "node-red-node-sentiment": "^0.1.4",
+        "node-red-node-tail": "^0.0.3",
         "nopt": "4.0.1",
-        "semver": "6.2.0"
+        "semver": "6.3.0"
     },
     "optionalDependencies": {
         "bcrypt": "3.0.6"

From 28bda9fa41df52d737d251e31ca798e18b4dab40 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 22 Aug 2019 11:09:55 +0100
Subject: [PATCH 091/305] Bump for 1.0.0-beta.3

---
 CHANGELOG.md                                  | 89 +++++++++++++++++++
 package.json                                  |  2 +-
 .../@node-red/editor-api/package.json         |  6 +-
 .../@node-red/editor-client/package.json      |  2 +-
 .../node_modules/@node-red/nodes/package.json |  2 +-
 .../@node-red/registry/package.json           |  4 +-
 .../@node-red/runtime/package.json            |  6 +-
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   | 10 +--
 9 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 793b5c565..6334fac66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,92 @@
+#### 1.0.0-beta.3: Beta Release
+
+Runtime
+ - [FEATURE] Add Node Done API - make message passing async
+ - Ensure the subflow stop promise is waiting for before restarting
+ - Limit the regex for the /nodes/ api end points
+ - Add error event handler to ssh-keygen child_process Fixes #2255
+ - Fix default value handling on context array access Fixes #2252
+ - Remove all ui test dependencies from package.json
+ - Add req back to audit log events and extend to Projects api
+ - Ensure 2nd arg to node.error is an object Fixes #2228
+ - Use a more atomic process for writing context files Fixes #2271
+
+
+Editor
+ - [FEATURE] Change core node categories
+ - [FEATURE] Subflow Instance property UI (#2236)
+ - [FEATURE] Add visual JSON editor
+ - [FEATURE] Add Action List dialog
+ - [FEATURE] Add new shortcut to clear debug message list - ctrl-alt-l
+ - [FEATURE] Add show-library dialog actions
+ - [FEATURE] Add shift-cursor handling for moving quick-add dialog
+ - [FEATURE] Add enable/disable-flow actions
+ - [FEATURE] Add actions to change deploy type
+ - [FEATURE] Allow config nodes to be disabled, tidy css and add actions
+ - [FEATURE] Add default shortcut (ctrl-d) for deploy
+ - [FEATURE] Initial implementation of redo (un-undo) - ctrl-y
+ - [FEATURE] add support for specifying subflow template color
+ - [FEATURE] Use ctrl-click on wire to splice node in place
+ - [FEATURE] Allow search results to show more than 25 results
+ - [FEATURE] Allow a node to change if it has an input port Closes #2268
+ - Revealing node position needs to account for zoom level Fixes #2172
+ - Fix typedInput option selection Fixes #2174
+ - Fix palette node id handling so search works Fixes #2173
+ - Add popover tooltips to debug sidebar,function and template
+ - Add popovers to context sidebar mini buttons
+ - Ensure node status icon is shown when value set
+ - Revert treeList children function signature change
+ - Restore tray component css for compatibility. Mark as deprecated
+ - fix function name & string compare function
+ - Handle empty list of example flows Fixes #2171
+ - Ensure library list has an item selected when opened
+ - Ensure tooltip popover doesn't replace normal popover
+ - Fix clipboard export download button
+ - Ensure input box has focus on repeated quick add
+ - Fix width calculation of typedInput
+ - Remove some hardcoded css colors
+ - Fix display of node help when clicking in palette Fixes #2194
+ - Ensure node help is loaded in the right language Fixes #2195
+ - Do not allow tab focus on clipboard hidden element
+ - Fix undefined error on typedInput due to valueLabel used before being added
+ - Fix undo of flow disable state change
+ - Fix select-all action in main view
+ - Fix delete-all action on config node sidebar
+ - Update UI tests for new editor css
+ - Add insertItemAt doc to editableList
+ - Ensure focus returns to the right element after dialogs shown
+ - Set autocomplete to disabled in form input elements
+ - Update all node icons to SVG
+ - Handle png/svg fallback for def.icon values. Remove old pngs
+ - Ignore empty examples directories (don't add to import menu)
+ - better handle example file at any depth - #2222
+ - Properly escape node types in palette
+ - Ensure session expiry timeout doesn't exceed limit
+ - Use node/tab map to make filterNodes more efficient
+ - Rearrange contents of subflow template settings tab
+ - Handle undefined node.\_def in edit stack title.
+ - fix converting selection to subflow
+ - Fix inserting new subflow node to existing wire between nodes
+ - Support displaying falsey node status values Fixes #2246
+ - Remove tab menu from node property UI for subflow and config nodes
+ - Mark workspace dirty when shift-click-drag detaches wires Fixes #2260
+ - Fix subflow category change on palette
+
+
+Nodes
+ - Remove pi gpi, twitter, email and feedparser nodes from core
+ - Fix error handling in Websocket broadcast function Fixes #2182
+ - Handle websocket item being parseable but not an object better
+ - stop join tripping up if last message of buffer is blank.
+ - Add support for env var propety in switch node
+ - Improve handling of file upload in request node
+ - Add "has key" rule to  switch node + tests
+ - Optimise generation of switch node edit dialog
+ - Add keep-alive option to HTTP Request - #2261
+
+
+
+
 #### 1.0.0-beta.2: Beta Release
 
 Runtime
diff --git a/package.json b/package.json
index ac88d09c6..b5bb47a22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 13b665806..7825e7e3f 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.2",
-        "@node-red/editor-client": "1.0.0-beta.2",
+        "@node-red/util": "1.0.0-beta.3",
+        "@node-red/editor-client": "1.0.0-beta.3",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 162b73c75..7f138c4e2 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 225142f58..0e9cc127d 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 8ad8cd718..f96f75115 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.2",
+        "@node-red/util": "1.0.0-beta.3",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index a100b45bf..aeaa152d9 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.0-beta.2",
-        "@node-red/util": "1.0.0-beta.2",
+        "@node-red/registry": "1.0.0-beta.3",
+        "@node-red/util": "1.0.0-beta.3",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index d0d6275a8..ff49381e6 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index d6d6bbdf4..ab2310247 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.3",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.0-beta.2",
-        "@node-red/runtime": "1.0.0-beta.2",
-        "@node-red/util": "1.0.0-beta.2",
-        "@node-red/nodes": "1.0.0-beta.2",
+        "@node-red/editor-api": "1.0.0-beta.3",
+        "@node-red/runtime": "1.0.0-beta.3",
+        "@node-red/util": "1.0.0-beta.3",
+        "@node-red/nodes": "1.0.0-beta.3",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From bc789c7f9f3967fa622ea4af9074adcd4fb855b2 Mon Sep 17 00:00:00 2001
From: 3Anology <kent1026+3a@gmail.com>
Date: Thu, 22 Aug 2019 23:50:44 +0800
Subject: [PATCH 092/305] Update infotips.json

---
 .../@node-red/editor-client/locales/zh-TW/infotips.json         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
index 9e67a71cf..f783f2e8b 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json
@@ -9,7 +9,7 @@
         "tip6": "您可以用[left] [up] [down] [right]鍵來移動被選中的節點。按住[shift]可以更快地移動節點。",
         "tip7": "把節點拖到連接上可以向連接中插入節點。",
         "tip8": "您可以用 {{core:show-export-dialog}} 來匯出被選中的節點或標籤頁中的流程。",
-        "tip9": "您可以將流程的json檔拖入編輯方塊或 {{core:show-import-dialog}} 來導入流程。",
+        "tip9": "您可以將流程的json文字檔拖入編輯方塊或 {{core:show-import-dialog}} 來導入流程。",
         "tip10": "按住[shift]後按一下並拖動節點可以將該節點的多個連接一併移動到其他節點的埠。",
         "tip11": "{{core:show-info-tab}} 可以顯示「資訊」標籤頁。 {{core:show-debug-tab}} 可以顯示「調試」標籤頁。",
         "tip12": "按住[ctrl]的同時點擊工作介面可以在節點的對話欄中快速添加節點。",

From bca9b5d8c06b049016a909bb6433490ee5648096 Mon Sep 17 00:00:00 2001
From: 3Anology <kent1026+3a@gmail.com>
Date: Fri, 23 Aug 2019 00:12:41 +0800
Subject: [PATCH 093/305] =?UTF-8?q?=E5=9F=BA=E6=9C=ACNode=E7=B9=81?=
 =?UTF-8?q?=E9=AB=94=E4=B8=AD=E6=96=87=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodes/locales/zh-TW/messages.json         | 910 ++++++++++++++++++
 1 file changed, 910 insertions(+)
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json

diff --git a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
new file mode 100644
index 000000000..153a88300
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
@@ -0,0 +1,910 @@
+{
+    "common": {
+        "label": {
+            "payload": "內容",
+            "topic": "主題",
+            "name": "名稱",
+            "username": "使用者名稱",
+            "password": "密碼",
+            "property": "屬性"
+        },
+        "status": {
+            "connected": "已連接",
+            "not-connected": "未連接",
+            "disconnected": "已斷開",
+            "connecting": "連接中",
+            "error": "錯誤",
+            "ok": "確定"
+        },
+        "notification": {
+            "error": "<strong>錯誤</strong>: __message__",
+            "errors": {
+                "not-deployed": "節點未部署",
+                "no-response": "伺服器無反應",
+                "unexpected": "發生意外錯誤 (__status__) __message__"
+            }
+        },
+        "errors": {
+            "nooverride": "警告: 資訊的屬性已經不可以改寫節點的屬性. 詳情參考 bit.ly/nr-override-msg-props"
+        }
+    },
+    "inject": {
+        "inject": "注入",
+        "repeat": "重複 = __repeat__",
+        "crontab": "crontab = __crontab__",
+        "stopped": "停止",
+        "failed": "注入失敗: __error__",
+        "label": {
+            "repeat": "重複"
+        },
+        "timestamp": "時間戳記",
+        "none": "無",
+        "interval": "週期性執行",
+        "interval-time": "指定時間段並週期性執行",
+        "time": "指定時間",
+        "seconds": "秒",
+        "minutes": "分鐘",
+        "hours": "小時",
+        "between": "介於",
+        "previous": "之前數值",
+        "at": "在",
+        "and": "至",
+        "every": "每隔",
+        "days": [
+            "星期一",
+            "星期二",
+            "星期三",
+            "星期四",
+            "星期五",
+            "星期六",
+            "星期天"
+        ],
+        "on": "在",
+        "onstart": "立刻執行於",
+        "onceDelay": "秒後, 此後",
+        "tip": "<b>注意:</b> \"指定時間段並週期性執行\" 和 \"指定時間\" 會使用cron系統.<br/> 詳情查看信息頁.",
+        "success": "成功注入: __label__",
+        "errors": {
+            "failed": "注入失敗, 請查看日誌",
+            "toolong": "週期過長"
+        }
+    },
+    "catch": {
+        "catch": "監測所有節點",
+        "catchNodes": "監測__number__個節點",
+        "label": {
+            "source": "監測範圍",
+            "node": "節點",
+            "type": "類型",
+            "selectAll": "全選",
+            "sortByLabel": "按名稱排序",
+            "sortByType": "按類型排序"
+        },
+        "scope": {
+            "all": "所有節點",
+            "selected": "指定節點"
+        }
+    },
+    "status": {
+        "status": "報告所有節點狀態",
+        "statusNodes": "報告__number__個節點狀態",
+        "label": {
+            "source": "報告狀態範圍",
+            "node": "節點",
+            "type": "類型",
+            "selectAll": "全選",
+            "sortByLabel": "按名稱排序",
+            "sortByType": "按類型排序"
+        },
+        "scope": {
+            "all": "所有節點",
+            "selected": "指定節點"
+        }
+    },
+    "debug": {
+        "output": "輸出",
+        "msgprop": "資訊屬性",
+        "msgobj": "完整資訊",
+        "to": "目標",
+        "debtab": "除錯窗口",
+        "tabcon": "除錯窗口及Console",
+        "toSidebar": "除錯窗口",
+        "toConsole": "Console",
+        "toStatus": "節點狀態 (32位元字元)",
+        "severity": "級別",
+        "notification": {
+            "activated": "成功啟動: __label__",
+            "deactivated": "成功取消: __label__"
+        },
+        "sidebar": {
+            "label": "除錯窗口",
+            "name": "名稱",
+            "filterAll": "所有節點",
+            "filterSelected": "已選節點",
+            "filterCurrent": "當前流程",
+            "debugNodes": "除錯節點",
+            "clearLog": "清空日誌",
+            "openWindow": "在新視窗打開"
+        },
+        "messageMenu": {
+            "collapseAll": "折疊所有路徑",
+            "clearPinned": "清空已固定路徑",
+            "filterNode": "過濾此節點",
+            "clearFilter": "清空過濾條件"
+        }
+    },
+    "link": {
+        "linkIn": "輸入",
+        "linkOut": "輸出"
+    },
+    "tls": {
+        "tls": "TLS設置",
+        "label": {
+            "use-local-files": "使用本地密鑰及證書檔",
+            "upload": "上傳",
+            "cert": "證書",
+            "key": "私密金鑰",
+            "passphrase": "密碼",
+            "ca": "CA證書",
+            "verify-server-cert":"驗證伺服器憑證"
+        },
+        "placeholder": {
+            "cert":"憑證路徑 (PEM 格式)",
+            "key":"私密金鑰路徑 (PEM 格式)",
+            "ca":"CA憑證路徑 (PEM 格式)",
+            "passphrase":"私密金鑰密碼 (可選)"
+        },
+        "error": {
+            "missing-file": "未提供證書/金鑰檔案"
+        }
+    },
+    "exec": {
+        "label": {
+            "command": "命令",
+            "append": "追加",
+            "timeout": "超時",
+            "timeoutplace": "可選填",
+            "return": "輸出",
+            "seconds": "秒"
+        },
+        "placeholder": {
+            "extraparams": "額外的輸入參數"
+        },
+        "opt": {
+            "exec": "當命令完成時 - exec模式",
+            "spawn": "當命令進行時 - spawn模式"
+        },
+        "oldrc": "使用舊式輸出 (相容模式)"
+    },
+    "function": {
+        "label": {
+            "function": "函數",
+            "outputs": "輸出"
+        },
+        "error": {
+            "inputListener":"無法在函數中監聽對'注入'事件",
+            "non-message-returned":"函數節點嘗試返回類型為 __type__ 的資訊"
+        }
+    },
+    "template": {
+        "label": {
+            "template": "模版",
+            "property": "屬性",
+            "format": "語法高亮",
+            "syntax": "格式",
+            "output": "輸出為",
+            "mustache": "Mustache 模版",
+            "plain": "純文字",
+            "json": "JSON",
+            "yaml": "YAML",
+            "none": "無"
+        },
+        "templatevalue": "This is the payload: {{payload}} !"
+    },
+    "delay": {
+        "action": "行為設置",
+        "for": "時長",
+        "delaymsg": "延遲每一條資訊",
+        "delayfixed": "固定延遲時間",
+        "delayvarmsg": "允許msg.delay複寫延遲時長",
+        "randomdelay": "隨機延遲",
+        "limitrate": "限制資訊頻率",
+        "limitall": "所有資訊",
+        "limittopic": "每一個msg.topic",
+        "fairqueue": "依次發送每一個topic",
+        "timedqueue": "發所有topic",
+        "milisecs": "毫秒",
+        "secs": "秒",
+        "sec": "秒",
+        "mins": "分",
+        "min": "分",
+        "hours": "小時",
+        "hour": "小時",
+        "days": "天",
+        "day": "天",
+        "between": "介於",
+        "and": "至",
+        "rate": "速度",
+        "msgper": "信息 每",
+        "dropmsg": "不傳輸中間資訊",
+        "label": {
+            "delay": "延遲",
+            "variable": "變數",
+            "limit": "限制",
+            "limitTopic": "限制主題",
+            "random": "隨機",
+            "units" : {
+                "second": {
+                    "plural" : "秒",
+                    "singular": "秒"
+                },
+                "minute": {
+                    "plural" : "分鐘",
+                    "singular": "分鐘"
+                },
+                "hour": {
+                    "plural" : "小時",
+                    "singular": "小時"
+                },
+                "day": {
+                    "plural" : "天",
+                    "singular": "天"
+                }
+            }
+        },
+        "error": {
+            "buffer": "緩衝了超過 1000 條資訊",
+            "buffer1": "緩衝了超過 10000 條資訊"
+        }
+    },
+    "trigger": {
+        "send": "發送",
+        "then": "然後",
+        "then-send": "然後發送",
+        "output": {
+            "string": "字串",
+            "number": "數字",
+            "existing": "現有資訊物件",
+            "original": "原本資訊物件",
+            "latest": "最新資訊物件",
+            "nothing": "無"
+        },
+        "wait-reset": "等待被重置",
+        "wait-for": "等待",
+        "wait-loop": "週期性重發",
+        "duration": {
+            "ms": "毫秒",
+            "s": "秒",
+            "m": "分鐘",
+            "h": "小時"
+        },
+        "extend": " 如有新資訊，延長延遲",
+        "label": {
+            "trigger": "觸發",
+            "trigger-block": "觸發並阻止",
+            "trigger-loop": "週期性重發",
+            "reset": "重置觸發節點條件 如果:",
+            "resetMessage":"msg.reset已設置",
+            "resetPayload":"msg.payload等於",
+            "resetprompt": "可選填"
+        }
+    },
+    "comment": {
+    },
+    "unknown": {
+        "label": {
+            "unknown": "未知"
+        },
+        "tip": "<p>此節點是您安裝，但Node-RED所不知道的類型。</p><p><i>如果在此狀態下部署節點，那麼它的配置將被保留，但是流程將不會啟動，直到安裝缺少的節點。</i></p><p>有關更多説明，請參閱資訊側欄</p>"
+    },
+    "mqtt": {
+        "label": {
+            "broker": "服務端",
+            "example": "e.g. localhost",
+            "output": "輸出",
+            "qos": "QoS",
+            "clientid": "使用者端ID",
+            "port": "埠",
+            "keepalive": "Keepalive計時(秒)",
+            "cleansession": "使用新的會話",
+            "use-tls": "使用安全連接 (SSL/TLS)",
+            "tls-config":"TLS 設置",
+            "verify-server-cert":"驗證伺服器憑證",
+            "compatmode": "使用舊式MQTT 3.1支援"
+        },
+        "tabs-label": {
+            "connection": "連接",
+            "security": "安全",
+            "will": "Will信息",
+            "birth": "Birth信息"
+        },
+        "placeholder": {
+            "clientid": "留白則自動隨機生成",
+            "clientid-nonclean":"如非新會話，必須設置使用者端ID",
+            "will-topic": "留白將禁止Will資訊",
+            "birth-topic": "留白將禁止Birth資訊"
+        },
+        "state": {
+            "connected": "已連接到服務端: __broker__",
+            "disconnected": "已斷開與服務端 __broker__ 的連結",
+            "connect-failed": "與服務端 __broker__ 的連接失敗"
+        },
+        "retain": "保留",
+        "output": {
+            "buffer": "Buffer",
+            "string": "字串",
+            "base64": "Base64編碼字串"
+        },
+        "true": "是",
+        "false": "否",
+        "tip": "提示: 若希望通過msg屬性對topic(資訊), qos及retain(保留)進行設置, 則將上述項留白",
+        "errors": {
+            "not-defined": "主題未設置",
+            "missing-config": "未設置服務端",
+            "invalid-topic": "主題無效",
+            "nonclean-missingclientid": "使用者端ID未設定，使用新會話"
+        }
+    },
+    "httpin": {
+        "label": {
+            "method": "請求方式",
+            "url": "URL",
+            "doc": "文字檔",
+            "return": "返回",
+            "upload": "接受檔案上傳?",
+            "status": "狀態碼",
+            "headers": "Header",
+            "other": "其他"
+        },
+        "setby": "- 用 msg.method 設定 -",
+        "basicauth": "基本認證",
+        "use-tls": "使用安全連接 (SSL/TLS) ",
+        "tls-config":"TLS 設置",
+        "utf8": "UTF-8 字串",
+        "binary": "二進位資料",
+        "json": "JSON對象",
+        "tip": {
+            "in": "相對URL",
+            "res": "發送到此節點的消息<b>必須</b>來自<i>http input</i>節點",
+            "req": "提示：如果JSON解析失敗，則獲取的字串將按原樣返回."
+        },
+        "httpreq": "http 請求",
+        "errors": {
+            "not-created": "當httpNodeRoot為否時，無法創建http-in節點",
+            "missing-path": "無路徑",
+            "no-response": "無響應物件",
+            "json-error": "JSON 解析錯誤",
+            "no-url": "未設定 URL",
+            "deprecated-call":"__method__方法已棄用",
+            "invalid-transport":"非HTTP傳輸請求"
+        },
+        "status": {
+            "requesting": "請求中"
+        }
+    },
+    "websocket": {
+        "label": {
+            "type": "類型",
+            "path": "路徑",
+            "url": "URL"
+        },
+        "listenon": "監聽",
+        "connectto": "連接",
+        "sendrec": "發送/接受",
+        "payload": "有效載荷",
+        "message": "完整資訊",
+        "tip": {
+            "path1": "預設情況下，<code>payload</code>將包含要發送或從Websocket接收的資料。偵聽器可以配置為以JSON格式的字串發送或接收整個消息物件.",
+            "path2": "這條路徑將相對於 ",
+            "url1": "URL 應該使用ws:&#47;&#47;或者wss:&#47;&#47;方案並指向現有的websocket監聽器.",
+            "url2": "預設情況下，<code>payload</code> 將包含要發送或從Websocket接收的資料。可以將使用者端配置為以JSON格式的字串發送或接收整個消息物件."
+        },
+        "errors": {
+            "connect-error": "ws連接發生了錯誤: ",
+            "send-error": "發送時發生了錯誤: ",
+            "missing-conf": "未設置伺服器"
+        }
+    },
+    "watch": {
+        "label": {
+            "files": "文件",
+            "recursive": "遞迴所有子資料夾"
+        },
+        "placeholder": {
+            "files": "逗號分開文件或資料夾"
+        },
+        "tip": "在Windows上，請務必使用雙斜杠 \\\\ 來隔開資料夾名字"
+    },
+    "tcpin": {
+        "label": {
+            "type": "類型",
+            "output": "輸出",
+            "port": "埠",
+            "host": "主機位址",
+            "payload": "的有效載荷",
+            "delimited": "分隔符號號",
+            "close-connection": "是否在成功發送每條資訊後斷開連接?",
+            "decode-base64": "用 Base64 解碼信息?",
+            "server": "伺服器",
+            "return": "返回",
+            "ms": "毫秒",
+            "chars": "字元"
+        },
+        "type": {
+            "listen": "監聽",
+            "connect": "連接",
+            "reply": "回應 TCP"
+        },
+        "output": {
+            "stream": "字串流",
+            "single": "單一",
+            "buffer": "Buffer",
+            "string": "字串",
+            "base64": "Base64 字串"
+        },
+        "return": {
+            "timeout": "指定時間後",
+            "character": "當收到某個字元為",
+            "number": "指定字元數",
+            "never": "永不 - 保持連接",
+            "immed": "馬上 - 不需要等待回復"
+        },
+        "status": {
+            "connecting": "正在連接到 __host__:__port__",
+            "connected": "已經連接到 __host__:__port__",
+            "listening-port": "監聽埠 __port__",
+            "stopped-listening": "已停止監聽埠",
+            "connection-from": "連接來自 __host__:__port__",
+            "connection-closed": "連接已關閉 __host__:__port__",
+            "connections": "__count__ 個連接",
+            "connections_plural": "__count__ 個連接"
+
+        },
+        "errors": {
+            "connection-lost": "連接中斷 __host__:__port__",
+            "timeout": "超時關閉通訊端連接，埠 __port__",
+            "cannot-listen": "無法監聽埠 __port__, 錯誤: __error__",
+            "error": "錯誤: __error__",
+
+            "socket-error": "通訊端連接錯誤來自 __host__:__port__",
+            "no-host": "主機位址或埠未設定",
+            "connect-timeout": "連接逾時",
+            "connect-fail": "連接失敗"
+        }
+    },
+    "udp": {
+        "label": {
+            "listen": "監聽",
+            "onport": "埠",
+            "using": "使用",
+            "output": "輸出",
+            "group": "組",
+            "interface": "本地IP",
+            "interfaceprompt": "（可選）本地 IP 綁定到",
+            "send": "發送一個",
+            "toport": "到埠",
+            "address": "地址",
+            "decode-base64": "是否解碼Base64編碼的資訊?"
+        },
+        "placeholder": {
+            "interface": "（可選）eth0的IP地址",
+            "address": "目標IP位址"
+        },
+        "udpmsgs": "udp信息",
+        "mcmsgs": "群播信息",
+        "udpmsg": "udp信息",
+        "bcmsg": "廣播資訊",
+        "mcmsg": "群播信息",
+        "output": {
+            "buffer": "Buffer",
+            "string": "字串",
+            "base64": "Base64編碼字串"
+        },
+        "bind": {
+            "random": "綁定到任意本地埠",
+            "local": "綁定到本地埠",
+            "target": "綁定到目標埠"
+        },
+        "tip": {
+            "in": "提示：確保您的防火牆將允許資料進入",
+            "out": "提示：如果要使用<code>msg.ip</code>和<code>msg.port</code>設置，請將位址和埠留空",
+            "port": "正在使用埠: "
+        },
+        "status": {
+            "listener-at": "udp 監聽器正在監聽 __host__:__port__",
+            "mc-group": "udp 群播到 __group__",
+            "listener-stopped": "udp 監聽器已停止",
+            "output-stopped": "udp 輸出已停止",
+            "mc-ready": "udp 群播已準備好: __outport__ -> __host__:__port__",
+            "bc-ready": "udp 廣播已準備好: __outport__ -> __host__:__port__",
+            "ready": "udp 已準備好: __outport__ -> __host__:__port__",
+            "ready-nolocal": "udp 已準備好: __host__:__port__",
+            "re-use": "udp 重用通訊端: __outport__ -> __host__:__port__"
+        },
+        "errors": {
+            "access-error": "UDP 訪問錯誤, 你可能需要root許可權才能接入1024以下的埠",
+            "error": "錯誤: __error__",
+            "bad-mcaddress": "無效的群播地址",
+            "interface": "必須是指定介面的IP位址",
+            "ip-notset": "udp: IP地址未設定",
+            "port-notset": "udp: 埠未設定",
+            "port-invalid": "udp: 無效埠號碼",
+            "alreadyused": "udp: 埠已被佔用"
+        }
+    },
+    "switch": {
+        "label": {
+            "property": "屬性",
+            "rule": "規則",
+            "repair" : "重建資訊佇列"
+        },
+        "and": "與",
+        "checkall": "全選所有規則",
+        "stopfirst": "接受第一條匹配資訊後停止",
+        "ignorecase": "忽略大小寫",
+        "rules": {
+            "btwn":"在之間",
+            "cont":"包含",
+            "regex":"匹配規則運算式",
+            "true":"為真",
+            "false":"為假",
+            "null":"為空",
+            "nnull":"非空",
+            "head":"head",
+            "tail":"tail",
+            "index":"index between",
+            "exp":"JSONata運算式",
+            "else":"除此以外"
+        },
+        "errors": {
+            "invalid-expr": "無效的JSONata運算式: __error__",
+            "too-many" : "Switch節點中有太多待定信息"
+        }
+    },
+    "change": {
+        "label": {
+            "rules": "規則",
+            "rule": "規則",
+            "set": "設定 __property__",
+            "change": "修改 __property__",
+            "delete": "刪除 __property__",
+            "move": "移動 __property__",
+            "changeCount": "修改: __count__條規矩",
+            "regex": "使用規則運算式"
+        },
+        "action": {
+            "set": "設定",
+            "change": "修改",
+            "delete": "刪除",
+            "move": "轉移",
+            "to": "到",
+            "search": "搜索",
+            "replace": "替代為"
+        },
+        "errors": {
+            "invalid-from": "無效的'from'屬性: __error__",
+            "invalid-json": "無效的'to'JSON 屬性",
+            "invalid-expr": "無效的JSONata運算式: __error__"
+        }
+    },
+    "range": {
+        "label": {
+            "action": "操作",
+            "inputrange": "映射輸入資料",
+            "resultrange": "至目標範圍",
+            "from": "從",
+            "to": "到",
+            "roundresult": "取最接近整數？"
+        },
+        "placeholder": {
+            "min": "e.g. 0",
+            "maxin": "e.g. 99",
+            "maxout": "e.g. 255"
+        },
+        "scale": {
+            "payload": "按比例msg.payload",
+            "limit": "按比例並設定界限至目標範圍",
+            "wrap": "按比例並包含在目標範圍內"
+        },
+        "tip": "提示: 此節點僅對數字有效",
+        "errors": {
+            "notnumber": "不是一個數字"
+        }
+    },
+    "csv": {
+        "label": {
+            "columns": "列",
+            "separator": "分隔符號",
+            "c2o": "CSV至對象",
+            "o2c": "對象至CSV",
+            "input": "輸入",
+            "skip-s": "忽略前",
+            "skip-e": "行",
+            "firstrow": "第一行包含列名",
+            "output": "輸出",
+            "includerow": "包含列名行",
+            "newline": "分行符號"
+        },
+        "placeholder": {
+            "columns": "用逗號分割列名"
+        },
+        "separator": {
+            "comma": "逗號",
+            "tab": "Tab",
+            "space": "空格",
+            "semicolon": "分號",
+            "colon": "冒號",
+            "hashtag": "井號",
+            "other": "其他..."
+        },
+        "output": {
+            "row": "每行一條信息",
+            "array": "僅一條資訊 [陣列]"
+        },
+        "newline": {
+            "linux": "Linux (\\n)",
+            "mac": "Mac (\\r)",
+            "windows": "Windows (\\r\\n)"
+        },
+        "errors": {
+            "csv_js": "此節點僅處理CSV字串或JS物件",
+            "obj_csv": "對象->CSV轉換未設定列模版"
+        }
+    },
+    "html": {
+        "label": {
+            "select": "選取項",
+            "output": "輸出"
+        },
+        "output": {
+            "html": "選定元素的html內容",
+            "text": "選定元素的純文字內容",
+            "attr": "包含選定元素的所有屬性的物件"
+        },
+        "format": {
+            "single": "一條資訊 [陣列]",
+            "multi": "多條資訊，每條一個元素"
+        }
+    },
+    "json": {
+        "errors": {
+            "dropped-object": "忽略非物件格式的有效負載",
+            "dropped": "忽略不支援格式的有效負載類型",
+            "dropped-error": "轉換有效負載失敗"
+        },
+        "label": {
+            "o2j": "對象至JSON",
+            "pretty": "格式化JSON字串",
+            "action": "操作",
+            "property": "屬性",
+            "actions": {
+                "toggle": "JSON字串與物件互轉",
+                "str":"總是轉為JSON字串",
+                "obj":"總是轉為JS對象"
+            }
+        }
+    },
+    "yaml": {
+        "errors": {
+            "dropped-object": "忽略非物件格式的有效負載",
+            "dropped": "忽略不支援格式的有效負載類型",
+            "dropped-error": "轉換有效負載失敗"
+        }
+    },
+    "xml": {
+        "label": {
+            "represent": "XML標籤屬性的屬性名稱",
+            "prefix": "標籤文本內容的屬性名稱",
+            "advanced": "高級選項",
+            "x2o": "XML到物件選項"
+        },
+        "errors": {
+            "xml_js": "此節點僅處理XML字串或JS物件."
+        }
+    },
+    "rpi-gpio": {
+        "label": {
+            "gpiopin": "GPIO",
+            "selectpin": "選擇引腳",
+            "resistor": "電阻?",
+            "readinitial": "在部署/重啟時讀取引腳的初始狀態?",
+            "type": "類型",
+            "initpin": "初始化引腳狀態?",
+            "debounce": "去抖動",
+            "freq": "頻率",
+            "button": "按鈕",
+            "pimouse": "Pi滑鼠",
+            "pikeyboard": "Pi鍵盤",
+            "left": "左",
+            "right": "右",
+            "middle": "中"
+        },
+        "resistor": {
+            "none": "無",
+            "pullup": "上拉電阻",
+            "pulldown": "下拉電阻"
+        },
+        "digout": "數位輸出",
+        "pwmout": "PWM輸出",
+        "servo": "伺服輸出",
+        "initpin0": "初始引腳電平 - 低(0)",
+        "initpin1": "初始引腳電平 - 高(1)",
+        "left": "左",
+        "right": "右",
+        "middle": "中",
+        "any": "任何",
+        "pinname": "引腳",
+        "alreadyuse": "已被使用",
+        "alreadyset": "已被設為",
+        "tip": {
+            "pin": "<b>正在使用引腳</b>: ",
+            "in": "提示: 僅接受數位輸入 - 輸出必須為0或1.",
+            "dig": "提示: 如用數位輸出 - 輸入必須為0或1.",
+            "pwm": "提示: 如用PWM輸出 - 輸入必須為0至100之間; 如用高頻率可能會比預期佔用更多CPU資源.",
+            "ser": "<b>提示</b>: 如用伺服輸出 - 輸入必須為0至100之間. 50為中間值."
+        },
+        "types": {
+            "digout": "數位輸出",
+            "input": "輸入",
+            "pullup": "含有上拉電阻的輸入",
+            "pulldown": "含有下拉電阻的輸入",
+            "pwmout": "PWM輸出",
+            "servo": "伺服輸出"
+        },
+        "status": {
+            "stopped": "已停止",
+            "closed": "已關閉",
+            "not-running": "不運行"
+        },
+        "errors": {
+            "ignorenode": "忽略樹莓派的特定節點",
+            "version": "版本命令失敗",
+            "sawpitype": "查看Pi類型",
+            "libnotfound": "找不到樹莓派RPi.GPIO的python庫",
+            "alreadyset": "GPIO引腳 __pin__ 已經被設定為類型: __type__",
+            "invalidpin": "無效GPIO引腳",
+            "invalidinput": "無效輸入",
+            "needtobeexecutable": "__command__須為可運行命令",
+            "mustbeexecutable": "nrgpio須為可運行",
+            "commandnotfound": "nrgpio命令不存在",
+            "commandnotexecutable": "nrgpio命令不可運行",
+            "error": "錯誤: __error__",
+            "pythoncommandnotfound": "nrpgio python命令未處於運行狀態"
+        }
+    },
+    "file": {
+        "label": {
+            "filename": "檔案名",
+            "action": "行為",
+            "addnewline": "向每個有效載荷添加分行符號（\\n）?",
+            "createdir": "創建目錄（如果不存在）?",
+            "outputas": "輸出",
+            "breakchunks": "分拆成塊",
+            "breaklines": "分拆成行",
+            "filelabel": "文件",
+            "sendError": "發生錯誤時發送消息（傳統模式）",
+            "deletelabel": "刪除 __file__"
+        },
+        "action": {
+            "append": "追加至文件",
+            "overwrite": "複寫文件",
+            "delete": "刪除檔"
+        },
+        "output": {
+            "utf8": "一個utf8字串",
+            "buffer": "一個Buffer物件",
+            "lines": "每行一條信息",
+            "stream": "一個Buffer流"
+        },
+        "status": {
+            "wrotefile": "寫入至文件: __file__",
+            "deletedfile": "刪除檔: __file__",
+            "appendedfile": "追加至文件: __file__"
+        },
+        "errors": {
+            "nofilename": "未指定檔案名",
+            "invaliddelete": "警告：無效刪除。請在配置對話方塊中使用特定的刪除選項",
+            "deletefail": "無法刪除檔: __error__",
+            "writefail": "無法寫入文件: __error__",
+            "appendfail": "無法追加到文件: __error__",
+            "createfail": "檔創建失敗: __error__"
+        },
+        "tip": "提示: 檔案名應該是絕對路徑，否則它將相對於Node-RED進程的工作目錄。"
+    },
+    "split": {
+        "intro":"基於以下類型拆分<code>msg.payload</code>:",
+        "object":"<b>對象</b>",
+        "objectSend":"每個鍵值對作為單個消息發送",
+        "strBuff":"<b>字串</b> / <b>Buffer</b>",
+        "array":"<b>陣列</b>",
+        "splitUsing":"拆分使用",
+        "splitLength":"固定長度",
+        "stream":"作為消息流處理",
+        "addname":" 複製鍵到 "
+    },
+    "join":{
+        "mode":{
+            "mode":"模式",
+            "auto":"自動",
+            "merge":"合併序列",
+            "reduce":"縮減序列",
+            "custom":"手動"
+        },
+        "combine":"合併每個",
+        "create":"輸出為",
+        "type":{
+            "string":"字串",
+            "array":"陣列",
+            "buffer":"Buffer",
+            "object":"鍵值對對象",
+            "merged":"合併對象"
+        },
+        "using":"使用此值",
+        "key":"作為鍵",
+        "joinedUsing":"合併符號",
+        "send":"發送資訊:",
+        "afterCount":"達到一定數量的資訊時",
+        "count":"數量",
+        "subsequent":"和每個後續的消息",
+        "afterTimeout":"第一條消息的若干時間後",
+        "seconds":"秒",
+        "complete":"在收到存在<code>msg.complete</code>的消息後",
+        "tip":"此模式假定此節點與<i>split</i>相連, 或者接收到的消息有正確配置的<code>msg.parts</code>屬性.",
+        "too-many" : "join節點中有太多待定信息",
+        "merge": {
+            "topics-label":"合併主題",
+            "topics":"主題",
+            "topic" : "主題",
+            "on-change":"當收到一個新主題時發送已合併資訊"
+        },
+        "reduce": {
+            "exp": "Reduce運算式",
+            "exp-value": "exp",
+            "init": "初始值",
+            "right": "反向求值(從後往前)",
+            "fixup": "Fix-up exp"
+        },
+        "errors": {
+            "invalid-expr": "無效的JSONata運算式: __error__"
+        }
+    },
+    "sort" : {
+        "target" : "排序屬性",
+        "seq" : "資訊佇列",
+        "key" : "鍵值",
+        "elem" : "元素值",
+        "order" : "順序",
+        "ascending" : "昇冪",
+        "descending" : "降冪",
+        "as-number" : "作為數值",
+        "invalid-exp" : "sort節點中存在無效的JSONata運算式",
+        "too-many" : "sort節點中有太多待定信息",
+        "clear" : "清空sort節點中的待定資訊"
+    },
+    "batch" : {
+        "mode": {
+            "label" : "模式",
+            "num-msgs" : "按指定數量分組",
+            "interval" : "按時間間隔分組",
+            "concat" : "按主題分組"
+        },
+        "count": {
+            "label" : "分組數量",
+            "overlap" : "隊末隊首重疊數量",
+            "count" : "數量",
+            "invalid" : "無效的分組數量或重疊數量"
+        },
+        "interval": {
+            "label" : "時間間隔",
+            "seconds" : "秒",
+            "empty" : "無數據到達時發送空資訊"
+        },
+        "concat": {
+            "topics-label": "主題",
+            "topic" : "主題"
+        },
+        "too-many" : "batch節點中有太多待定信息",
+        "unexpected" : "未知模式",
+        "no-parts" : "資訊中沒有parts屬性"
+    }
+}

From a2b5c0247b8ff10f98d2d80ec43914f076bd70fb Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 26 Aug 2019 23:08:25 +0900
Subject: [PATCH 094/305] update JP message catalogue

---
 .../@node-red/editor-client/locales/ja/editor.json            | 4 ++++
 .../node_modules/@node-red/nodes/locales/ja/messages.json     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index b95119530..0e42c404d 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -416,9 +416,13 @@
         "addCategory": "新規追加...",
         "label": {
             "subflows": "サブフロー",
+            "network": "ネットワーク",
+            "common": "共通",
             "input": "入力",
             "output": "出力",
             "function": "機能",
+            "sequence": "シーケンス",
+            "parser": "パーサ",
             "social": "ソーシャル",
             "storage": "ストレージ",
             "analysis": "分析",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index 1f244d824..8e241dc5f 100755
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -112,6 +112,9 @@
             "selected": "選択したノード"
         }
     },
+    "complete": {
+        "completeNodes": "complete: __number__"
+    },
     "debug": {
         "output": "対象",
         "none": "無し",
@@ -410,6 +413,7 @@
         "digest": "Digest認証",
         "bearer": "Bearer認証",
         "use-proxy": "プロキシを使用",
+        "persist": "コネクションkeep-aliveを有効化",
         "proxy-config": "プロキシ設定",
         "use-proxyauth": "プロキシ認証を使用",
         "noproxy-hosts": "例外ホスト",

From f98d1c95ccabb95b19991783ba330db3b0ce4de5 Mon Sep 17 00:00:00 2001
From: Sebastian Raff <hobbyquaker@gmail.com>
Date: Tue, 27 Aug 2019 19:32:59 +0200
Subject: [PATCH 095/305] Add css class to login submit button (#2275)

---
 packages/node_modules/@node-red/editor-client/src/js/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js
index f2b53c31a..70e9c46a7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@@ -74,7 +74,7 @@ RED.user = (function() {
                     }
                     $('<div class="form-row" style="text-align: right; margin-top: 10px;"><span id="node-dialog-login-failed" style="line-height: 2em;float:left;" class="hide">'+RED._("user.loginFailed")+'</span><img src="red/images/spin.svg" style="height: 30px; margin-right: 10px; " class="login-spinner hide"/>'+
                         (opts.cancelable?'<a href="#" id="node-dialog-login-cancel" style="margin-right: 20px;" tabIndex="'+(i+1)+'">'+RED._("common.label.cancel")+'</a>':'')+
-                        '<input type="submit" id="node-dialog-login-submit" style="width: auto;" tabIndex="'+(i+2)+'" value="'+RED._("user.login")+'"></div>').appendTo("#node-dialog-login-fields");
+                        '<input type="submit" id="node-dialog-login-submit" class="red-ui-button" style="width: auto;" tabIndex="'+(i+2)+'" value="'+RED._("user.login")+'"></div>').appendTo("#node-dialog-login-fields");
 
 
                     $("#node-dialog-login-submit").button();

From 4f049fd94b7f02fab45b1e2a0e97e8b628fcb2bc Mon Sep 17 00:00:00 2001
From: Sebastian Raff <hobbyquaker@gmail.com>
Date: Wed, 28 Aug 2019 17:55:59 +0200
Subject: [PATCH 096/305] add class red-ui-button to cancel button

---
 packages/node_modules/@node-red/editor-client/src/js/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js
index 70e9c46a7..72d5d9ed3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@@ -73,7 +73,7 @@ RED.user = (function() {
                         row.appendTo("#node-dialog-login-fields");
                     }
                     $('<div class="form-row" style="text-align: right; margin-top: 10px;"><span id="node-dialog-login-failed" style="line-height: 2em;float:left;" class="hide">'+RED._("user.loginFailed")+'</span><img src="red/images/spin.svg" style="height: 30px; margin-right: 10px; " class="login-spinner hide"/>'+
-                        (opts.cancelable?'<a href="#" id="node-dialog-login-cancel" style="margin-right: 20px;" tabIndex="'+(i+1)+'">'+RED._("common.label.cancel")+'</a>':'')+
+                        (opts.cancelable?'<a href="#" id="node-dialog-login-cancel" class="red-ui-button" style="margin-right: 20px;" tabIndex="'+(i+1)+'">'+RED._("common.label.cancel")+'</a>':'')+
                         '<input type="submit" id="node-dialog-login-submit" class="red-ui-button" style="width: auto;" tabIndex="'+(i+2)+'" value="'+RED._("user.login")+'"></div>').appendTo("#node-dialog-login-fields");
 
 

From 30c3004f27e86377613c06649f939e7f32746ca5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 6 Sep 2019 10:25:30 +0100
Subject: [PATCH 097/305] Sanitize tab name in edit dialog

---
 .../@node-red/editor-client/src/js/ui/workspaces.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index 32196a4c4..1e1597e7a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -63,7 +63,7 @@ RED.workspaces = (function() {
         RED.view.state(RED.state.EDITING);
         var tabflowEditor;
         var trayOptions = {
-            title: RED._("workspace.editFlow",{name:workspace.label}),
+            title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}),
             buttons: [
                 {
                     id: "node-dialog-delete",

From f7e9c109f627a1fd2de76b9e5b070bab274cdac1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 6 Sep 2019 10:28:52 +0100
Subject: [PATCH 098/305] Bump for 0.20.8

---
 CHANGELOG.md                                           |  5 +++++
 package.json                                           |  2 +-
 .../node_modules/@node-red/editor-api/package.json     |  6 +++---
 .../node_modules/@node-red/editor-client/package.json  |  2 +-
 packages/node_modules/@node-red/nodes/package.json     |  2 +-
 packages/node_modules/@node-red/registry/package.json  |  4 ++--
 packages/node_modules/@node-red/runtime/package.json   |  6 +++---
 packages/node_modules/@node-red/util/package.json      |  2 +-
 packages/node_modules/node-red/package.json            | 10 +++++-----
 9 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1bdc154c..3948938d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+#### 0.20.8: Maintenance Release
+
+ - Sanitize tab name in edit dialog
+ - Pass httpServer to runtime even when httpAdmin disabled Fixes #2272
+
 #### 0.20.7: Maintenance Release
 
  - Update jsonata to 1.6.5 which should fix #2183
diff --git a/package.json b/package.json
index 9f2770acb..431b70125 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 60322caeb..ebb831234 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "0.20.7",
-        "@node-red/editor-client": "0.20.7",
+        "@node-red/util": "0.20.8",
+        "@node-red/editor-client": "0.20.8",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 5c04db292..dbff58e8c 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 7750cb826..09c697501 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 5ce8b5b5b..99c3b4a8b 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "0.20.7",
+        "@node-red/util": "0.20.8",
         "semver": "6.2.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 9ba954154..6696a2f62 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "0.20.7",
-        "@node-red/util": "0.20.7",
+        "@node-red/registry": "0.20.8",
+        "@node-red/util": "0.20.8",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 03386f063..a65ffe28d 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index e7dcdceb4..2c62c8982 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.20.7",
+    "version": "0.20.8",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "0.20.7",
-        "@node-red/runtime": "0.20.7",
-        "@node-red/util": "0.20.7",
-        "@node-red/nodes": "0.20.7",
+        "@node-red/editor-api": "0.20.8",
+        "@node-red/runtime": "0.20.8",
+        "@node-red/util": "0.20.8",
+        "@node-red/nodes": "0.20.8",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From 8582cda12458b5a1fd34fd58e94d57a7842a2516 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 9 Sep 2019 21:44:23 +0900
Subject: [PATCH 099/305] update info text of complete node & add JP text

---
 .../24-complete.html}                         |  0
 .../nodes/locales/ja/common/24-complete.html  | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 rename packages/node_modules/@node-red/nodes/locales/en-US/{core/25-complete.html => common/24-complete.html} (100%)
 create mode 100644 packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html
similarity index 100%
rename from packages/node_modules/@node-red/nodes/locales/en-US/core/25-complete.html
rename to packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
new file mode 100644
index 000000000..2c721cae5
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
@@ -0,0 +1,24 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="complete">
+    <p>他のノードにおけるメッセージ処理の完了 を受けてフローを開始します。</p>
+    <h3>詳細</h3>
+    <p>ノードからランタイムに対してメッセージ処理の完了が通知されると、本ノードによって次のフローを開始できます。</p>
+    <p>本ノードは出力ポートを持たないノードと共に用いるo場合などに有用です。例えば、Emal送信ノードで送信後にフローを起動する場合がこれに当たります。</p>
+    <p>このノードはフロー内で選択したノードに対するイベントを処理するように設定します。Catchノードとは異なり、「全てのノード」モードを指定して、フロー中の全てのノードを対象とすることはできません。</p>
+    <p>全てのノードで本ノードのイベント処理を開始するわけではありません。Node-RED 1.0で導入した本機能を対象ノードがサポートしている必要があります。</p>
+</script>

From a25e98d0cbe08faed431b3e1945e99d613e2a120 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 09:44:08 +0100
Subject: [PATCH 100/305] Fix padding of subflow locale select Closes #2276

---
 .../node_modules/@node-red/editor-client/src/sass/editor.scss  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 1125e3639..b13941f22 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -908,8 +908,9 @@ span.red-ui-editor-subflow-env-lang-icon {
     top: -20px;
     float: right;
     select {
+        padding: 2px;
         width: 160px;
-        height: 20px;
+        height: auto;
         min-width: 20px;
         line-height: 18px;
         font-size: 10px;

From a12aa81d73cfd1fd255e81e330e5433e96b0b14e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 09:54:15 +0100
Subject: [PATCH 101/305] Add red-ui-button class to strategy login button

---
 packages/node_modules/@node-red/editor-client/src/js/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js
index 72d5d9ed3..485670e4f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@@ -119,7 +119,7 @@ RED.user = (function() {
                         var field = data.prompts[i];
                         var row = $("<div/>",{class:"form-row",style:"text-align: center"}).appendTo("#node-dialog-login-fields");
 
-                        var loginButton = $('<a href="#"></a>',{style: "padding: 10px"}).appendTo(row).on("click", function() {
+                        var loginButton = $('<a href="#" class="red-ui-button"></a>',{style: "padding: 10px"}).appendTo(row).on("click", function() {
                             document.location = field.url;
                         });
                         if (field.image) {

From c138e2ffb4415c2901586ae47a568f126aaa791e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 11:12:07 +0100
Subject: [PATCH 102/305] Mark workspace dirty when deleting link node link
 Fixes #2274

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index da7d4d06b..8ef8d07a8 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1748,7 +1748,7 @@ RED.view = (function() {
                     ],
                     dirty:RED.nodes.dirty()
                 }
-
+                RED.nodes.dirty(true);
                 selected_link.source.changed = true;
                 selected_link.target.changed = true;
                 selected_link.target.links.splice(sourceIdIndex,1);

From db9fb8480afc964b274602c0d8f997346f37a4e0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 11:38:35 +0100
Subject: [PATCH 103/305] Filter quickadd properly when splicing a wire

---
 .../node_modules/@node-red/editor-client/src/js/ui/view.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 8ef8d07a8..9293e0689 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -771,9 +771,11 @@ RED.view = (function() {
                 quickAddLink.virtualLink = true;
             }
             hideDragLines();
-        } else if (spliceLink) {
+        }
+        if (spliceLink) {
             filter = {input:true, output:true}
         }
+
         var rebuildQuickAddLink = function() {
             if (!quickAddLink) {
                 return;

From a0b1831cdb1f9cc1ca940a0838919351d433d287 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 11:39:07 +0100
Subject: [PATCH 104/305] Fix node hover effect to prevent jumping position

---
 .../editor-client/src/sass/palette.scss       | 23 +++++++------------
 .../editor-client/src/sass/tab-config.scss    | 11 ++-------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
index f9a234dc5..ea4b06c52 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
@@ -119,10 +119,10 @@
 }
 
 .red-ui-palette-node {
-    display: inline-block;
+    // display: inline-block;
     cursor: move;
     background: $secondary-background;
-    margin: 5px auto;
+    margin: 10px auto;
     height: 25px;
     border-radius: 5px;
     border: 1px solid $node-border;
@@ -131,23 +131,16 @@
     width: 120px;
     background-size: contain;
     position: relative;
-    &:first-child {
-        margin-top: 10px;
+    &:not(.red-ui-palette-node-config):first-child {
+        margin-top: 15px;
     }
-    &:last-child {
-        margin-bottom: 10px;
+    &:not(.red-ui-palette-node-config):last-child {
+        margin-bottom: 15px;
     }
 }
 .red-ui-palette-node:hover {
-    margin: 4px auto;
-    border-color: $node-selected-color;
-    border-width: 2px;
-    &:first-child {
-        margin-top: 9px;
-    }
-    &:last-child {
-        margin-bottom: 9px;
-    }
+    border-color: transparent;
+    box-shadow: 0 0 0 2px $node-selected-color;
 }
 .red-ui-palette-port {
     position: absolute;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
index 467ce8511..f88cbfd73 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@@ -35,15 +35,8 @@ ul.red-ui-sidebar-node-config-list {
         overflow: hidden;
 
         &.selected {
-            margin: 4px auto;
-            border-color: $node-selected-color;
-            border-width: 2px;
-            &:first-child {
-                margin-top: 9px;
-            }
-            &:last-child {
-                margin-bottom: 9px;
-            }
+            border-color: transparent;
+            box-shadow: 0 0 0 2px $node-selected-color;
         }
     }
     .red-ui-palette-label {

From 6c487358542b467887fb3e1d5e6b9eb72e8380a0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 11:49:59 +0100
Subject: [PATCH 105/305] Move flow-status button to footer for consistency

---
 .../editor-client/src/js/ui/workspaces.js     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index c3943b0d5..bb64f848a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -157,17 +157,27 @@ RED.workspaces = (function() {
                 tabflowEditor.resize();
             },
             open: function(tray) {
+                var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayBody = tray.find('.red-ui-tray-body');
+                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
+
                 var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
                 $('<div class="form-row">'+
                     '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
                     '<input type="text" id="node-input-name">'+
                 '</div>').appendTo(dialogForm);
 
-                $('<div class="form-row">'+
-                    '<label for="node-input-disabled" data-i18n="editor:workspace.status"></label>'+
-                    '<input type="checkbox" id="node-input-disabled"/>'+
-                '</div>').appendTo(dialogForm);
+
+                if (!workspace.hasOwnProperty("disabled")) {
+                    workspace.disabled = false;
+                }
+
+                $('<input id="node-input-disabled" type="checkbox">').prop("checked",workspace.disabled).appendTo(trayFooterLeft).toggleButton({
+                    enabledIcon: "fa-circle-thin",
+                    disabledIcon: "fa-ban",
+                    invertState: true
+                })
+
 
                 var row = $('<div class="form-row node-text-editor-row">'+
                     '<label for="node-input-info" data-i18n="editor:workspace.info" style="width:300px;"></label>'+
@@ -196,16 +206,7 @@ RED.workspaces = (function() {
                     })
                 });
 
-                if (workspace.hasOwnProperty("disabled")) {
-                    $("#node-input-disabled").prop("checked",workspace.disabled);
-                } else {
-                    workspace.disabled = false;
-                }
-                $("#node-input-disabled").toggleButton({
-                    enabledIcon: "fa-circle-thin",
-                    disabledIcon: "fa-ban",
-                    invertState: true
-                })
+
 
                 $('<input type="text" style="display: none;" />').prependTo(dialogForm);
                 dialogForm.on("submit", function(e) { e.preventDefault();});

From 7def676a171ec3efc35e2ddc742f47f452191128 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 12:56:32 +0100
Subject: [PATCH 106/305] Create SECURITY.md

---
 SECURITY.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..a52064d59
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.0.0   | :white_check_mark: |
+| 0.20.x  | :white_check_mark: |
+
+
+## Reporting a Vulnerability
+
+Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.

From 00306f82c5d0fdc040370151eea63b6289dc812b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 14:31:08 +0100
Subject: [PATCH 107/305] Remove sentiment from core nodes

---
 packages/node_modules/node-red/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index ab2310247..b907422b5 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -40,7 +40,6 @@
         "express": "4.17.1",
         "fs-extra": "8.1.0",
         "node-red-node-rbe": "^0.2.5",
-        "node-red-node-sentiment": "^0.1.4",
         "node-red-node-tail": "^0.0.3",
         "nopt": "4.0.1",
         "semver": "6.3.0"

From 3129d44ff1a637507d4906f6dfa09445b9270774 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 14:31:17 +0100
Subject: [PATCH 108/305] Realign subflow output port labels

---
 .../node_modules/@node-red/editor-client/src/js/ui/view.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 9293e0689..e60bfabe2 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2569,8 +2569,8 @@ RED.view = (function() {
                     .on("mouseover",function(d){portMouseOver(d3.select(this),d,PORT_TYPE_INPUT,0);})
                     .on("mouseout",function(d){portMouseOut(d3.select(this),d,PORT_TYPE_INPUT,0);});
 
-                outGroup.append("svg:text").attr("class","red-ui-flow-port-label").attr("x",20).attr("y",8).style("font-size","10px").text("output");
-                outGroup.append("svg:text").attr("class","red-ui-flow-port-label red-ui-flow-port-index").attr("x",20).attr("y",24).text(function(d,i){ return i+1});
+                outGroup.append("svg:text").attr("class","red-ui-flow-port-label").attr("x",20).attr("y",12).style("font-size","10px").text("output");
+                outGroup.append("svg:text").attr("class","red-ui-flow-port-label red-ui-flow-port-index").attr("x",20).attr("y",28).text(function(d,i){ return i+1});
 
                 var subflowInputs = nodeLayer.selectAll(".red-ui-flow-subflow-port-input").data(activeSubflow.in,function(d,i){ return d.id;});
                 subflowInputs.exit().remove();

From 3c657a6645e3ec73f1661da3f7fe58febe2201ce Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 14:31:34 +0100
Subject: [PATCH 109/305] Fix Switch node display of jsonata_exp type

---
 .../node_modules/@node-red/nodes/core/function/10-switch.html    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 41fcd5ab0..5312d2ba6 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -354,7 +354,6 @@
                         if (!expValueField){
                             expValueField = createExpValueField();
                         }
-                    } else if (rule.t === "jsonata_exp") {
                         expValueField.typedInput('value',rule.v);
                         expValueField.typedInput('type',rule.vt||'jsonata');
                     } else if (typeof rule.v != "undefined") {

From 5a094b44c409f2550970361b4d2335f55b089930 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 17:04:53 +0100
Subject: [PATCH 110/305] Remove 'uglify' from Grunt watch task

The grunt watch task is used by the grunt dev task that watches for
changes and auto rebuilds the editor js.

When running in dev mode, the editor will load the unminified version
of red.js. This means there is no point in running the uglify task to
generate the minified version. The uglify task tasks a few seconds and
if you do a couple rapid saves, the second will often not get built as
the previous uglify task was still running.

Removing it from the dev task shouldn't have any side effects. It still
forms part of the `grunt build` and `grunt release` tasks where it is
needed.
---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 66ebf4f38..caa043e76 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -276,7 +276,7 @@ module.exports = function(grunt) {
                 files: [
                     'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
                 ],
-                tasks: ['copy:build','concat','uglify','attachCopyright:js']
+                tasks: ['copy:build','concat',/*'uglify',*/ 'attachCopyright:js']
             },
             sass: {
                 files: [

From ec01f8f54b0080ea6ebfba4e40eeb836c88b906f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Sep 2019 17:10:22 +0100
Subject: [PATCH 111/305] Move context sidebar auto-refresh option to
 individual sections

---
 .../editor-client/locales/en-US/editor.json   |   2 +-
 .../src/js/ui/common/toggleButton.js          |   4 +-
 .../editor-client/src/js/ui/tab-context.js    | 108 ++++++------------
 .../editor-client/src/sass/tab-context.scss   |   2 +-
 4 files changed, 39 insertions(+), 77 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 8d461c714..b89949ddf 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -571,7 +571,7 @@
             "flow": "Flow",
             "global": "Global",
             "deleteConfirm": "Are you sure you want to delete this item?",
-            "autoRefresh": "Auto-refresh",
+            "autoRefresh": "Refresh on selection change",
             "refrsh": "Refresh",
             "delete": "Delete"
         },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js
index 999606912..398d35c85 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js
@@ -39,8 +39,8 @@
             var baseClass = this.options.baseClass || "red-ui-button";
             var enabledIcon = this.options.enabledIcon || "fa-check-square-o";
             var disabledIcon = this.options.disabledIcon || "fa-square-o";
-            var enabledLabel = this.options.enabledLabel || RED._("editor:workspace.enabled");
-            var disabledLabel = this.options.disabledLabel || RED._("editor:workspace.disabled");
+            var enabledLabel = this.options.hasOwnProperty('enabledLabel') ? this.options.enabledLabel : RED._("editor:workspace.enabled");
+            var disabledLabel = this.options.hasOwnProperty('disabledLabel') ? this.options.disabledLabel : RED._("editor:workspace.disabled");
 
             this.element.css("display","none");
             this.element.on("focus", function() {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
index d4554e1f1..3bc41b982 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
@@ -21,6 +21,7 @@ RED.sidebar.context = (function() {
     var localCache = {};
 
     var flowAutoRefresh;
+    var nodeAutoRefresh;
     var nodeSection;
     // var subflowSection;
     var flowSection;
@@ -34,18 +35,6 @@ RED.sidebar.context = (function() {
         content = $("<div>").css({"position":"relative","height":"100%"});
         content.className = "red-ui-sidebar-context"
 
-        var header = $('<div class="red-ui-sidebar-header"></div>').appendTo(content);
-
-        var autoUpdate = RED.settings.get("editor.context.refresh",false);
-        flowAutoRefresh = $('<input type="checkbox">').prop("checked",autoUpdate).appendTo(header).toggleButton({
-            baseClass: "red-ui-sidebar-header-button",
-            enabledLabel: RED._("sidebar.context.autoRefresh"),
-            disabledLabel: RED._("sidebar.context.autoRefresh")
-        }).on("change", function() {
-            var value = $(this).prop("checked");
-            RED.settings.set("editor.context.refresh",value);
-        });
-
         var footerToolbar = $('<div></div>');
 
         var stackContainer = $("<div>",{class:"red-ui-sidebar-context-stack"}).appendTo(content);
@@ -55,10 +44,7 @@ RED.sidebar.context = (function() {
 
         nodeSection = sections.add({
             title: RED._("sidebar.context.node"),
-            collapsible: true,
-            // onexpand: function() {
-            //     updateNode(currentNode,true);
-            // }
+            collapsible: true
         });
         nodeSection.expand();
         nodeSection.content.css({height:"100%"});
@@ -66,30 +52,27 @@ RED.sidebar.context = (function() {
         var table = $('<table class="red-ui-info-table"></table>').appendTo(nodeSection.content);
         nodeSection.table = $('<tbody>').appendTo(table);
         var bg = $('<div style="float: right"></div>').appendTo(nodeSection.header);
-        $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>')
+
+        var nodeAutoRefreshSetting = RED.settings.get("editor.context.nodeRefresh",false);
+        nodeAutoRefresh = $('<input type="checkbox">').prop("checked",nodeAutoRefreshSetting).appendTo(bg).toggleButton({
+            baseClass: "red-ui-sidebar-header-button red-ui-button-small",
+            enabledLabel: "",
+            disabledLabel: ""
+        }).on("change", function() {
+            var value = $(this).prop("checked");
+            RED.settings.set("editor.context.flowRefresh",value);
+        });
+        RED.popover.tooltip(nodeAutoRefresh.next(),RED._("sidebar.context.autoRefresh"));
+
+
+        var manualRefreshNode = $('<button class="red-ui-button red-ui-button-small" style="margin-left: 5px"><i class="fa fa-refresh"></i></button>')
             .appendTo(bg)
             .on("click", function(evt) {
                 evt.stopPropagation();
                 evt.preventDefault();
                 updateNode(currentNode, true);
             })
-        RED.popover.tooltip(bg,RED._("sidebar.context.refrsh"));
-
-        // subflowSection  = sections.add({
-        //     title: "Subflow",
-        //     collapsible: true
-        // });
-        // subflowSection.expand();
-        // subflowSection.content.css({height:"100%"});
-        // bg = $('<div style="float: right"></div>').appendTo(subflowSection.header);
-        // $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>')
-        //     .appendTo(bg)
-        //     .on("click", function(evt) {
-        //         evt.stopPropagation();
-        //         evt.preventDefault();
-        //     })
-        // RED.popover.tooltip(bg,RED._("sidebar.context.refrsh"));
-        // subflowSection.container.hide();
+        RED.popover.tooltip(manualRefreshNode,RED._("sidebar.context.refrsh"));
 
         flowSection = sections.add({
             title: RED._("sidebar.context.flow"),
@@ -101,14 +84,26 @@ RED.sidebar.context = (function() {
         var table = $('<table class="red-ui-info-table"></table>').appendTo(flowSection.content);
         flowSection.table = $('<tbody>').appendTo(table);
         bg = $('<div style="float: right"></div>').appendTo(flowSection.header);
-        $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-refresh"></i></button>')
+
+        var flowAutoRefreshSetting = RED.settings.get("editor.context.flowRefresh",false);
+        flowAutoRefresh = $('<input type="checkbox">').prop("checked",flowAutoRefreshSetting).appendTo(bg).toggleButton({
+            baseClass: "red-ui-sidebar-header-button red-ui-button-small",
+            enabledLabel: "",
+            disabledLabel: ""
+        }).on("change", function() {
+            var value = $(this).prop("checked");
+            RED.settings.set("editor.context.flowRefresh",value);
+        });
+        RED.popover.tooltip(flowAutoRefresh.next(),RED._("sidebar.context.autoRefresh"));
+
+        var manualRefreshFlow = $('<button class="red-ui-button red-ui-button-small" style="margin-left: 5px"><i class="fa fa-refresh"></i></button>')
             .appendTo(bg)
             .on("click", function(evt) {
                 evt.stopPropagation();
                 evt.preventDefault();
                 updateFlow(currentFlow, true);
             })
-        RED.popover.tooltip(bg,RED._("sidebar.context.refrsh"));
+        RED.popover.tooltip(manualRefreshFlow,RED._("sidebar.context.refrsh"));
 
         globalSection = sections.add({
             title: RED._("sidebar.context.global"),
@@ -144,28 +139,6 @@ RED.sidebar.context = (function() {
             action: "core:show-context-tab"
         });
 
-        // var toggleLiveButton = $("#sidebar-context-toggle-live");
-        // toggleLiveButton.on("click", function(evt) {
-        //     evt.preventDefault();
-        //     if ($(this).hasClass("selected")) {
-        //         $(this).removeClass("selected");
-        //         $(this).find("i").removeClass("fa-pause");
-        //         $(this).find("i").addClass("fa-play");
-        //     } else {
-        //         $(this).addClass("selected");
-        //         $(this).find("i").removeClass("fa-play");
-        //         $(this).find("i").addClass("fa-pause");
-        //     }
-        // });
-        // RED.popover.tooltip(toggleLiveButton, function() {
-        //     if (toggleLiveButton.hasClass("selected")) {
-        //         return "Pause live updates"
-        //     } else {
-        //         return "Start live updates"
-        //     }
-        // });
-
-
         RED.events.on("view:selection-changed", function(event) {
             var selectedNode = event.nodes && event.nodes.length === 1 && event.nodes[0];
             updateNode(selectedNode);
@@ -174,29 +147,18 @@ RED.sidebar.context = (function() {
         RED.events.on("workspace:change", function(event) {
             updateFlow(RED.nodes.workspace(event.workspace));
         })
-        if (autoUpdate) {
-            updateEntry(globalSection,"context/global","global");
-        } else {
-            $(globalSection.table).empty();
-            $('<tr class="red-ui-help-info-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.refresh"></td></tr>').appendTo(globalSection.table).i18n();
-            globalSection.timestamp.html("&nbsp;");
-        }
 
+        $(globalSection.table).empty();
+        $('<tr class="red-ui-help-info-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.refresh"></td></tr>').appendTo(globalSection.table).i18n();
+        globalSection.timestamp.html("&nbsp;");
     }
 
     function updateNode(node,force) {
         currentNode = node;
-        if (force) {
+        if (force || nodeAutoRefresh.prop("checked")) {
             if (node) {
                 updateEntry(nodeSection,"context/node/"+node.id,node.id);
-                // if (/^subflow:/.test(node.type)) {
-                //     subflowSection.container.show();
-                //     updateEntry(subflowSection,"context/flow/"+node.id,node.id);
-                // } else {
-                //     subflowSection.container.hide();
-                // }
             } else {
-                // subflowSection.container.hide();
                 updateEntry(nodeSection)
             }
         } else {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
index b335ab601..46b09de43 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
@@ -16,7 +16,7 @@
 
 .red-ui-sidebar-context-stack {
     position: absolute;
-    top: 42px;
+    top: 0;
     bottom: 0;
     left: 0;
     right: 0;

From 7c7be378bc55ab0701db5e3dcff3853622faa5f2 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 10 Sep 2019 17:17:21 +0100
Subject: [PATCH 112/305] Add python and SQL to template language options

as we already include in the ACE modes
---
 .../node_modules/@node-red/nodes/core/function/80-template.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/core/function/80-template.html b/packages/node_modules/@node-red/nodes/core/function/80-template.html
index 0e95e7796..e781b9572 100644
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -21,6 +21,8 @@
                 <option value="javascript">Javascript</option>
                 <option value="css">CSS</option>
                 <option value="markdown">Markdown</option>
+                <option value="python">Python</option>
+                <option value="sql">SQL</option>
                 <option value="yaml">YAML</option>
                 <option value="text" data-i18n="template.label.none"></option>
             </select>

From 922ab1d17bdc06fd3a9056e20bc95c398a12e5e8 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 11 Sep 2019 22:46:01 +0900
Subject: [PATCH 113/305] update Japanese message catalogue

---
 .../@node-red/editor-client/locales/ja/editor.json            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 0e42c404d..e8044cd5a 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -325,8 +325,6 @@
         "locale": "UI言語の選択",
         "icon": "記号",
         "inputType": "入力形式",
-        "previewUI": "UI確認",
-        "previewOK": "確認OK",
         "inputs" : {
             "input": "入力",
             "select": "メニュー",
@@ -573,7 +571,7 @@
             "flow": "フロー",
             "global": "グローバル",
             "deleteConfirm": "データを削除しても良いですか?",
-            "autoRefresh": "自動更新",
+            "autoRefresh": "選択対象が変化した場合更新",
             "refrsh": "更新",
             "delete": "削除"
         },

From 89d0d6ec931954bd86005a0641b88db9c783c0a3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 12 Sep 2019 17:01:11 +0100
Subject: [PATCH 114/305] remove old rc option from exec node for 1.0

(not removing functionality so old flows will keep working - just removing option to select it)
---
 .../node_modules/@node-red/nodes/core/function/90-exec.html  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
index e3cb2cf45..c6102d397 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -35,11 +35,6 @@
             <option value="true" data-i18n="exec.opt.spawn"></option>
         </select>
     </div>
-    <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-oldrc" style="display:inline-block; width:auto; vertical-align:top;">
-        <label for="node-input-oldrc" style="width:70%;"><span data-i18n="exec.oldrc"></span></label>
-    </div>
     <div class="form-row">
         <label for="node-input-timer"><i class="fa fa-clock-o"></i> <span data-i18n="exec.label.timeout"></span></label>
         <input type="text" id="node-input-timer" style="width:65px;" data-i18n="[placeholder]exec.label.timeoutplace">

From f0839571d00df8bdf337278ce2cb9170bcb630f8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 12 Sep 2019 22:08:52 +0100
Subject: [PATCH 115/305] Clone the first message passed to node.send in
 Function

Also introduces an optional second arg to node.send in the Function
node that can disable that cloning
---
 .../nodes/core/function/10-function.js        | 14 ++++--
 test/nodes/core/function/10-function_spec.js  | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js
index f636b6b16..65a1b4a61 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@@ -19,7 +19,7 @@ module.exports = function(RED) {
     var util = require("util");
     var vm = require("vm");
 
-    function sendResults(node,send,_msgid,msgs) {
+    function sendResults(node,send,_msgid,msgs,cloneFirstMessage) {
         if (msgs == null) {
             return;
         } else if (!util.isArray(msgs)) {
@@ -35,6 +35,10 @@ module.exports = function(RED) {
                     var msg = msgs[m][n];
                     if (msg !== null && msg !== undefined) {
                         if (typeof msg === 'object' && !Buffer.isBuffer(msg) && !util.isArray(msg)) {
+                            if (msgCount === 0 && cloneFirstMessage !== false) {
+                                msgs[m][n] = RED.util.cloneMessage(msgs[m][n]);
+                                msg = msgs[m][n];
+                            }
                             msg._msgid = _msgid;
                             msgCount++;
                         } else {
@@ -80,7 +84,7 @@ module.exports = function(RED) {
                                  "trace:__node__.trace,"+
                                  "on:__node__.on,"+
                                  "status:__node__.status,"+
-                                 "send:function(msgs){ __node__.send(__send__,__msgid__,msgs);},"+
+                                 "send:function(msgs,cloneMsg){ __node__.send(__send__,__msgid__,msgs,cloneMsg);},"+
                                  "done:__done__"+
                               "};\n"+
                               this.func+"\n"+
@@ -114,8 +118,8 @@ module.exports = function(RED) {
                 trace: function() {
                     node.trace.apply(node, arguments);
                 },
-                send: function(send, id, msgs) {
-                    sendResults(node, send, id, msgs);
+                send: function(send, id, msgs, cloneMsg) {
+                    sendResults(node, send, id, msgs, cloneMsg);
                 },
                 on: function() {
                     if (arguments[0] === "input") {
@@ -241,7 +245,7 @@ module.exports = function(RED) {
                     context.done = done;
 
                     this.script.runInContext(context);
-                    sendResults(this,send,msg._msgid,context.results);
+                    sendResults(this,send,msg._msgid,context.results,false);
                     if (handleNodeDoneCall) {
                         done();
                     }
diff --git a/test/nodes/core/function/10-function_spec.js b/test/nodes/core/function/10-function_spec.js
index df44a66ee..c13dd1972 100644
--- a/test/nodes/core/function/10-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -93,6 +93,56 @@ describe('function node', function() {
         });
     });
 
+    function testSendCloning(args,done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"],["n2"]],func:"node.send("+args+"); msg.payload = 'changed';"},
+        {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.should.have.property('topic', 'bar');
+                    msg.should.have.property('payload', 'foo');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+            var origMessage = {payload:"foo",topic: "bar"};
+            n1.receive(origMessage);
+        });
+    }
+    it('should clone single message sent using send()', function(done) {
+        testSendCloning("msg",done);
+    });
+    it('should not clone single message sent using send(,false)', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"node.send(msg,false); msg.payload = 'changed';"},
+        {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                msg.should.have.property('topic', 'bar');
+                msg.should.have.property('payload', 'changed');
+                done();
+            });
+            var origMessage = {payload:"foo",topic: "bar"};
+            n1.receive(origMessage);
+        });
+    });
+    it('should clone first message sent using send() - array 1', function(done) {
+        testSendCloning("[msg]",done);
+    });
+    it('should clone first message sent using send() - array 2', function(done) {
+        testSendCloning("[[msg],[null]]",done);
+    });
+    it('should clone first message sent using send() - array 3', function(done) {
+        testSendCloning("[null,msg]",done);
+    });
+    it('should clone first message sent using send() - array 3', function(done) {
+        testSendCloning("[null,[msg]]",done);
+    });
+
     it('should pass through _topic', function(done) {
         var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"return msg;"},
         {id:"n2", type:"helper"}];

From 901e2527d830ac76f3fcc0f73f63f1be9286565f Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 13 Sep 2019 14:41:10 +0900
Subject: [PATCH 116/305] Maximize the size of markdown editor

---
 .../@node-red/editor-client/src/js/ui/editors/markdown.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 9a09ff3f5..1363ba717 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -38,7 +38,7 @@
     var template = '<script type="text/x-red" data-template-name="_markdown">'+
         '<div id="red-ui-editor-type-markdown-panels">'+
         '<div id="red-ui-editor-type-markdown-panel-editor" class="red-ui-panel">'+
-            '<div style="height: 100%; margin: auto; max-width: 1000px;">'+
+            '<div style="height: 100%; margin: auto;">'+
                 '<div id="red-ui-editor-type-markdown-toolbar"></div>'+
                 '<div class="node-text-editor" style="height: 100%" id="red-ui-editor-type-markdown"></div>'+
             '</div>'+

From a4d48077badf7779c1c0fb9cf1e3240860c97098 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 13 Sep 2019 14:42:45 +0900
Subject: [PATCH 117/305] Remove print margin from ace editor

---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 2fcbacf0e..69b743011 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2425,6 +2425,7 @@ RED.editor = (function() {
         el = $("<div>").appendTo(el).addClass("red-ui-editor-text-container")[0];
         var editor = ace.edit(el);
         editor.setTheme("ace/theme/tomorrow");
+        editor.setShowPrintMargin(false);
         var session = editor.getSession();
         session.on("changeAnnotation", function () {
             var annotations = session.getAnnotations() || [];

From 1b2e442513d7dcc9a0e5ced1828b40285920c0e2 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 13 Sep 2019 14:43:13 +0900
Subject: [PATCH 118/305] Remove print margin from library editor

---
 .../node_modules/@node-red/editor-client/src/js/ui/library.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index e25223f94..552fc8ff9 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -243,6 +243,7 @@ RED.library = (function() {
                         useWorker: false
                     });
                     libraryEditor.setTheme("ace/theme/tomorrow");
+                    libraryEditor.setShowPrintMargin(false);
                     if (options.mode) {
                         libraryEditor.getSession().setMode(options.mode);
                     }

From b42fff105509df34d3be1f3c46a1125b7e1c6437 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 13 Sep 2019 22:49:48 +0900
Subject: [PATCH 119/305] Allow SUBFLOW UI label row without variable name

---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index ed7cf134c..50a4e2020 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1493,7 +1493,8 @@ RED.subflow = (function() {
                 var entry = $(this);
                 var item = entry.data('data');
                 var name = (item.parent?item.name:item.nameField.val()).trim();
-                if (name !== "") {
+                if ((name !== "") ||
+                    (item.ui && (item.ui.type === "none"))) {
                     var valueInput = item.valueField;
                     var value = valueInput.typedInput("value");
                     var type = valueInput.typedInput("type");

From 11bce8c17cf41fc4c6d7d50f71cb0a645887a0bd Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 13 Sep 2019 23:11:23 +0900
Subject: [PATCH 120/305] remove padding before label text for SUBFLOW UI row

---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index ed7cf134c..f7fa598fe 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1381,7 +1381,8 @@ RED.subflow = (function() {
             }
         }
         if (ui.type !== "checkbox") {
-            $('<span>').css({"padding-left":"5px"}).text(labelText).appendTo(label);
+            var css = ui.icon ? {"padding-left":"5px"} : {};
+            $('<span>').css(css).text(labelText).appendTo(label);
             if (ui.type === 'none') {
                 label.width('100%');
             }

From 1c44b0bc98328579e98621ea56d33a8bfae4abdf Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 15 Sep 2019 23:44:01 +0900
Subject: [PATCH 121/305] Fix subflow UI for select

---
 .../@node-red/editor-client/src/js/ui/subflow.js      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index ed7cf134c..05ef03e81 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1360,14 +1360,19 @@ RED.subflow = (function() {
     }
 
     function buildEnvUIRow(row, tenv, ui) {
-
         ui.label = ui.label||{};
-        ui.opts = ui.opts||{};
         if (!ui.type) {
             ui.type = "input";
             ui.opts = {types:['str','num','bool','json','bin','env']}
         } else {
-            ui.opts = ui.opts || {};
+            var typeOptions = {
+                'input': {types:['str','num','bool','json','bin','env']},
+                'select': {opts:[]},
+                'spinner': {}
+            };
+            if (!ui.opts) {
+                ui.opts = (ui.type === "select") ? {opts:[]} : {};
+            }
         }
 
         var labels = ui.label || {};

From 6ef49152f3780a2c83e3588f67028c31047f9ba5 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 15 Sep 2019 23:55:27 +0900
Subject: [PATCH 122/305] remove useless variable definition

---
 .../@node-red/editor-client/src/js/ui/subflow.js             | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 05ef03e81..b888f0112 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1365,11 +1365,6 @@ RED.subflow = (function() {
             ui.type = "input";
             ui.opts = {types:['str','num','bool','json','bin','env']}
         } else {
-            var typeOptions = {
-                'input': {types:['str','num','bool','json','bin','env']},
-                'select': {opts:[]},
-                'spinner': {}
-            };
             if (!ui.opts) {
                 ui.opts = (ui.type === "select") ? {opts:[]} : {};
             }

From 34cdbfc8525cf20653e59168881ae9b19a2056f1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 16 Sep 2019 15:27:06 +0100
Subject: [PATCH 123/305] Bump for 1.0.0-beta.4

---
 package.json                                           |  2 +-
 .../node_modules/@node-red/editor-api/package.json     |  6 +++---
 .../node_modules/@node-red/editor-client/package.json  |  2 +-
 packages/node_modules/@node-red/nodes/package.json     |  2 +-
 packages/node_modules/@node-red/registry/package.json  |  4 ++--
 packages/node_modules/@node-red/runtime/package.json   |  6 +++---
 packages/node_modules/@node-red/util/package.json      |  2 +-
 packages/node_modules/node-red/package.json            | 10 +++++-----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index b5bb47a22..9010526f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 7825e7e3f..61104b075 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.3",
-        "@node-red/editor-client": "1.0.0-beta.3",
+        "@node-red/util": "1.0.0-beta.4",
+        "@node-red/editor-client": "1.0.0-beta.4",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 7f138c4e2..1c7b26cae 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 0e9cc127d..91506f34f 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index f96f75115..8ac9a39ed 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.3",
+        "@node-red/util": "1.0.0-beta.4",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index aeaa152d9..07680d32b 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.0-beta.3",
-        "@node-red/util": "1.0.0-beta.3",
+        "@node-red/registry": "1.0.0-beta.4",
+        "@node-red/util": "1.0.0-beta.4",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index ff49381e6..03f0254f4 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index b907422b5..79f5e076c 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0-beta.4",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.0-beta.3",
-        "@node-red/runtime": "1.0.0-beta.3",
-        "@node-red/util": "1.0.0-beta.3",
-        "@node-red/nodes": "1.0.0-beta.3",
+        "@node-red/editor-api": "1.0.0-beta.4",
+        "@node-red/runtime": "1.0.0-beta.4",
+        "@node-red/util": "1.0.0-beta.4",
+        "@node-red/nodes": "1.0.0-beta.4",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From 8d2ca25fd61a30ca1773d823b6a43fda3de27ff0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 16 Sep 2019 15:33:05 +0100
Subject: [PATCH 124/305] Update changelog

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c48057e0e..8fea4aeac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+#### 1.0.0-beta.4: Beta Release
+
+Runtime
+ - Clone the first message passed to node.send in Function node
+
+Editor
+ - Move flow-status button to footer for consistency
+ - Fix node hover effect to prevent jumping position
+ - Filter quick-add properly when splicing a wire
+ - Mark workspace dirty when deleting link node link Fixes #2274
+ - Add red-ui-button class to strategy login button
+ - Fix padding of subflow locale select Closes #2276
+ - Update info text of complete node & add JP text
+ - Add class red-ui-button to cancel button
+ - Add css class to login submit button (#2275)
+ - Realign subflow output port labels
+ - Move context sidebar auto-refresh option to individual sections
+ - Update Japanese message catalogue
+ - Fix subflow UI for select
+ - remove padding before label text for SUBFLOW UI row
+ - Allow SUBFLOW UI label row without variable name
+
+Nodes
+ - Remove old rc option from exec node for 1.0
+ - Add python and SQL to template language options
+ - Fix Switch node display of jsonata_exp type
+ - Remove sentiment from core nodes
+
 #### 1.0.0-beta.3: Beta Release
 
 Runtime

From 42c6487ff3e8f88837323be396317a8fca9bba86 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 17 Sep 2019 14:47:00 +0900
Subject: [PATCH 125/305] Show print margin on ace editor

---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js     | 1 -
 .../node_modules/@node-red/editor-client/src/js/ui/library.js    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 69b743011..2fcbacf0e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2425,7 +2425,6 @@ RED.editor = (function() {
         el = $("<div>").appendTo(el).addClass("red-ui-editor-text-container")[0];
         var editor = ace.edit(el);
         editor.setTheme("ace/theme/tomorrow");
-        editor.setShowPrintMargin(false);
         var session = editor.getSession();
         session.on("changeAnnotation", function () {
             var annotations = session.getAnnotations() || [];
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index 552fc8ff9..e25223f94 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -243,7 +243,6 @@ RED.library = (function() {
                         useWorker: false
                     });
                     libraryEditor.setTheme("ace/theme/tomorrow");
-                    libraryEditor.setShowPrintMargin(false);
                     if (options.mode) {
                         libraryEditor.getSession().setMode(options.mode);
                     }

From 73132475dc9ff73d2af17df2f405b90fcaee3c18 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 17 Sep 2019 18:10:47 +0900
Subject: [PATCH 126/305] Fix typo in complete node

---
 .../@node-red/nodes/locales/ja/common/24-complete.html        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
index 2c721cae5..2cb3004d0 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
@@ -15,10 +15,10 @@
 -->
 
 <script type="text/x-red" data-help-name="complete">
-    <p>他のノードにおけるメッセージ処理の完了 を受けてフローを開始します。</p>
+    <p>他のノードにおけるメッセージ処理の完了を受けてフローを開始します。</p>
     <h3>詳細</h3>
     <p>ノードからランタイムに対してメッセージ処理の完了が通知されると、本ノードによって次のフローを開始できます。</p>
-    <p>本ノードは出力ポートを持たないノードと共に用いるo場合などに有用です。例えば、Emal送信ノードで送信後にフローを起動する場合がこれに当たります。</p>
+    <p>本ノードは出力ポートを持たないノードと共に用いる場合などに有用です。例えば、Email送信ノードで送信後にフローを起動する場合がこれに当たります。</p>
     <p>このノードはフロー内で選択したノードに対するイベントを処理するように設定します。Catchノードとは異なり、「全てのノード」モードを指定して、フロー中の全てのノードを対象とすることはできません。</p>
     <p>全てのノードで本ノードのイベント処理を開始するわけではありません。Node-RED 1.0で導入した本機能を対象ノードがサポートしている必要があります。</p>
 </script>

From 8eb28555bc0928c4d4f00740243d1c183cc3fe41 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 17 Sep 2019 20:26:59 +0900
Subject: [PATCH 127/305] Enable wrap mode in Markdown editor

---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 2fcbacf0e..ec75f5ee4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2503,6 +2503,7 @@ RED.editor = (function() {
                 content: RED._("markdownEditor.format"),
                 autoClose: 50
             });
+            session.setUseWrapMode(true);
         }
         return editor;
     }

From 247052df5f953dca36948ff4926eb601788727bf Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 19 Sep 2019 22:50:35 +0900
Subject: [PATCH 128/305] allow word breaking of node name with long word

---
 .../editor-client/src/js/ui/palette.js        | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 52af66055..6b0f441e0 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -98,18 +98,36 @@ RED.palette = (function() {
 
         var displayLines = [];
 
-        var currentLine = words[0];
-        var currentLineWidth = RED.view.calculateTextWidth(currentLine, "red-ui-palette-label", 0);
-
-        for (var i=1;i<words.length;i++) {
-            var newWidth = RED.view.calculateTextWidth(currentLine+" "+words[i], "red-ui-palette-label", 0);
+        var currentLine = "";
+        for (var i=0;i<words.length;i++) {
+            var word = words[i];
+            var sep = (i == 0) ? "" : " ";
+            var newWidth = RED.view.calculateTextWidth(currentLine+sep+word, "red-ui-palette-label", 0);
             if (newWidth < nodeWidth) {
-                currentLine += " "+words[i];
-                currentLineWidth = newWidth;
+                currentLine += sep +word;
             } else {
-                displayLines.push(currentLine);
-                currentLine = words[i];
-                currentLineWidth = RED.view.calculateTextWidth(currentLine, "red-ui-palette-label", 0);
+                if (i > 0) {
+                    displayLines.push(currentLine);
+                }
+                while (true) {
+                    var wordWidth = RED.view.calculateTextWidth(word, "red-ui-palette-label", 0);
+                    if (wordWidth >= nodeWidth) {
+                        // break word if too wide
+                        for(var j = word.length; j > 0; j--) {
+                            var s = word.substring(0, j);
+                            var width = RED.view.calculateTextWidth(s, "red-ui-palette-label", 0);
+                            if (width < nodeWidth) {
+                                displayLines.push(s);
+                                word = word.substring(j);
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        currentLine = word;
+                        break;
+                    }
+                }
             }
         }
         displayLines.push(currentLine);

From 6b61fa9f6f190d954b0b84321d68a1932aabb518 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 20 Sep 2019 11:18:19 +0100
Subject: [PATCH 129/305] remove legacy error option from file in mode

(for 1.0)
---
 .../@node-red/nodes/core/storage/10-file.html             | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/storage/10-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
index 3561d491a..8b2dee0e6 100755
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
@@ -48,11 +48,6 @@
             <option value="stream" data-i18n="file.output.stream"></option>
         </select>
     </div>
-    <div class="form-row">
-        <label></label>
-        <input type="checkbox" id="node-input-sendError" style="width:auto">
-        <label style="width:auto; margin-bottom:0; vertical-align: middle;" for="node-input-sendError" data-i18n="file.label.sendError"></label>
-    </div>
     <div class="form-row" id="encoding-spec">
         <label for="node-input-encoding"><i class="fa fa-flag"></i> <span data-i18n="file.label.encoding"></span></label>
         <select type="text" id="node-input-encoding" style="width: 250px;">
@@ -309,9 +304,6 @@
                 }
             });
             encSel.val(node.encoding);
-            if (this.sendError === undefined) {
-                $("#node-input-sendError").prop("checked",true);
-            }
             $("#node-input-format").on("change",function() {
                 var format = $("#node-input-format").val();
                 if ((format === "utf8") || (format === "lines")) {

From d2a882380834dccd3c0c24884c4c08c67af8248f Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 20 Sep 2019 11:20:40 +0100
Subject: [PATCH 130/305] add extra comment re mustache escapes to tempalte
 info

---
 .../@node-red/nodes/locales/en-US/function/80-template.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
index e69f6d96c..8be8234b5 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -46,6 +46,6 @@
     <p>It is possible to use a property from the flow context or global context. Just use <code>{{flow.name}}</code> or
     <code>{{global.name}}</code>, or for persistable store <code>store</code> use <code>{{flow[store].name}}</code> or
     <code>{{global[store].name}}</code>.
-    <p><b>Note: </b>By default, <i>mustache</i> will escape any HTML entities in the values it substitutes.
+    <p><b>Note: </b>By default, <i>mustache</i> will escape any non-alphanumeric or HTML entities in the values it substitutes.
        To prevent this, use <code>{{{triple}}}</code> braces.
 </script>

From 2601cc898cdc7524eec3a83fc98cdba9a9b2a3ef Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 20 Sep 2019 12:57:02 +0100
Subject: [PATCH 131/305] Fix undefined reference loading on mobile

---
 .../@node-red/editor-client/src/js/ui/common/menu.js        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
index 3e16ef9d3..131dc1f13 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -224,9 +224,9 @@ RED.menu = (function() {
             if (!alreadySet && opt.onselect) {
                 triggerAction(opt.id,state);
             }
-        }
-        if (!opt.local && !alreadySet) {
-            RED.settings.set(opt.setting||("menu-"+opt.id), state);
+            if (!opt.local && !alreadySet) {
+                RED.settings.set(opt.setting||("menu-"+opt.id), state);
+            }
         }
     }
 

From 30c402eb8301981298367a233a0e4dada3cf3d89 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 20 Sep 2019 12:57:24 +0100
Subject: [PATCH 132/305] Update radialMenu to use standard theme colours

---
 .../src/js/ui/touch/radialMenu.js             | 40 +++-----------
 .../editor-client/src/sass/radialMenu.scss    | 54 +++++++++++++++++++
 .../editor-client/src/sass/style.scss         |  2 +
 3 files changed, 64 insertions(+), 32 deletions(-)
 create mode 100644 packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
index 29daa6510..a7c9704d9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
@@ -27,15 +27,7 @@ RED.touch.radialMenu = (function() {
     function createRadial(obj,pos,options) {
         isActive = true;
         try {
-            touchMenu = d3.select("body").append("div")
-                .style({
-                        position:"absolute",
-                        top: 0,
-                        left:0,
-                        bottom:0,
-                        right:0,
-                        "z-index": 1000
-                })
+            touchMenu = d3.select("body").append("div").classed("red-ui-editor-radial-menu",true)
                 .on('touchstart',function() {
                     hide();
                     d3.event.preventDefault();
@@ -43,43 +35,27 @@ RED.touch.radialMenu = (function() {
 
             var menu = touchMenu.append("div")
                 .style({
-                        position: "absolute",
-                        top: (pos[1]-80)+"px",
-                        left:(pos[0]-80)+"px",
-                        "border-radius": "80px",
-                        width: "160px",
-                        height: "160px",
-                        background: "rgba(255,255,255,0.6)",
-                        border: "1px solid #666"
+                    top: (pos[1]-80)+"px",
+                    left:(pos[0]-80)+"px",
                 });
 
             var menuOpts = [];
             var createMenuOpt = function(x,y,opt) {
-                opt.el = menu.append("div")
+                opt.el = menu.append("div").classed("red-ui-editor-radial-menu-opt",true)
                     .style({
-                        position: "absolute",
                         top: (y+80-25)+"px",
-                        left:(x+80-25)+"px",
-                        "border-radius": "20px",
-                        width: "50px",
-                        height: "50px",
-                        background: "#fff",
-                        border: "2px solid #666",
-                        "text-align": "center",
-                        "line-height":"50px"
-                    });
+                        left:(x+80-25)+"px"
+                    })
+                    .classed("red-ui-editor-radial-menu-opt-disabled",!!opt.disabled)
 
                 opt.el.html(opt.name);
 
-                if (opt.disabled) {
-                    opt.el.style({"border-color":"#ccc",color:"#ccc"});
-                }
                 opt.x = x;
                 opt.y = y;
                 menuOpts.push(opt);
 
                 opt.el.on('touchstart',function() {
-                    opt.el.style("background","#999");
+                    opt.el.classed("red-ui-editor-radial-menu-opt-active",true)
                     d3.event.preventDefault();
                     d3.event.stopPropagation();
                 });
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss b/packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss
new file mode 100644
index 000000000..114919460
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss
@@ -0,0 +1,54 @@
+/**
+* Copyright JS Foundation and other contributors, http://js.foundation
+*
+* Licensed under the Apache License, Version 2.0 (the License);
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+.red-ui-editor-radial-menu {
+    font-size: $primary-font-size;
+    font-family: $primary-font;
+    position: absolute;
+    top: 0;
+    left:0;
+    bottom:0;
+    right:0;
+    z-index: 1000;
+
+    & > div {
+        position: absolute;
+        border-radius: 80px;
+        width: 160px;
+        height: 160px;
+        background: $shadow;
+        border: 1px solid $primary-border-color;
+    }
+}
+
+.red-ui-editor-radial-menu-opt {
+    position: absolute;
+    border-radius: 20px;
+    width: 50px;
+    height: 50px;
+    background: $secondary-background;
+    border: 2px solid $primary-border-color;
+    text-align: center;
+    line-height:50px
+}
+
+.red-ui-editor-radial-menu-opt-disabled {
+    border-color: $tertiary-border-color;
+    color: $tertiary-border-color;
+}
+.red-ui-editor-radial-menu-opt-active {
+    background: $secondary-background-hover;
+}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/style.scss b/packages/node_modules/@node-red/editor-client/src/sass/style.scss
index 69504fa3b..088e5c1b8 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/style.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/style.scss
@@ -65,3 +65,5 @@
 @import "keyboard";
 
 @import "debug";
+
+@import "radialMenu";

From 7178c63e1098c273360861a461e09289e56da9b4 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 20 Sep 2019 12:58:03 +0100
Subject: [PATCH 133/305] Fix tab access on touch screens

---
 .../editor-client/src/js/ui/common/tabs.js    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 288334c06..0d371e56f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -19,6 +19,9 @@
 RED.tabs = (function() {
 
     var defaultTabIcon = "fa fa-lemon-o";
+    var dragActive = false;
+    var dblClickTime;
+    var dblClickArmed = false;
 
     function createTabs(options) {
         var tabs = {};
@@ -201,7 +204,16 @@ RED.tabs = (function() {
         }
 
         function onTabClick(evt) {
-            evt.preventDefault();
+            if (dragActive) {
+                return
+            }
+            if (dblClickTime && Date.now()-dblClickTime < 400) {
+                dblClickTime = 0;
+                dblClickArmed = true;
+                return onTabDblClick.call(this,evt);
+            }
+            dblClickTime = Date.now();
+
             var currentTab = ul.find("li.red-ui-tab.active");
             var thisTab = $(this).parent();
             var fireSelectionChanged = false;
@@ -267,7 +279,6 @@ RED.tabs = (function() {
             if (fireSelectionChanged) {
                 selectionChanged();
             }
-            return false;
         }
 
         function updateScroll() {
@@ -289,7 +300,6 @@ RED.tabs = (function() {
         }
         function onTabDblClick(evt) {
             evt.preventDefault();
-            evt.stopPropagation();
             if (evt.metaKey || evt.shiftKey) {
                 return;
             }
@@ -418,7 +428,11 @@ RED.tabs = (function() {
 
         }
 
-        ul.find("li.red-ui-tab a").on("click",onTabClick).on("dblclick",onTabDblClick);
+        ul.find("li.red-ui-tab a")
+            .on("mouseup",onTabClick)
+            .on("click", function(evt) {evt.preventDefault(); })
+            .on("dblclick", function(evt) {evt.stopPropagation(); evt.preventDefault(); })
+
         setTimeout(function() {
             updateTabWidths();
         },0);
@@ -524,8 +538,9 @@ RED.tabs = (function() {
                     RED.popover.tooltip($(pinnedLink), tab.name, tab.action);
 
                 }
-                link.on("click",onTabClick);
-                link.on("dblclick",onTabDblClick);
+                link.on("mouseup",onTabClick);
+                link.on("click", function(evt) { evt.preventDefault(); })
+                link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })
 
 
                 if (tab.closeable) {
@@ -560,6 +575,8 @@ RED.tabs = (function() {
                         axis:"x",
                         distance: 20,
                         start: function(event,ui) {
+                            if (dblClickArmed) { dblClickArmed = false; return false }
+                            dragActive = true;
                             originalTabOrder = [];
                             tabElements = [];
                             ul.children().each(function(i) {
@@ -615,6 +632,7 @@ RED.tabs = (function() {
                             }
                         },
                         stop: function(event,ui) {
+                            dragActive = false;
                             ul.children().css({position:"relative",left:"",transition:""});
                             if (!li.hasClass('active')) {
                                 li.css({zIndex:""});

From 9955bcc33983c8edae3b3029ffb08d3e1ad12156 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 20 Sep 2019 13:08:05 +0100
Subject: [PATCH 134/305] Hide header text of very small screens to deploy is
 visible

---
 .../@node-red/editor-client/src/sass/header.scss            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
index ff7233cde..01552ec25 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -272,3 +272,9 @@
         vertical-align: middle;
     }
 }
+
+@media only screen and (max-width: 450px) {
+    span.red-ui-header-logo > span {
+        display: none;
+    }
+}

From 460c5a1ae3a72989cdc34ee100db690dfe2f837e Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 20 Sep 2019 21:57:19 +0100
Subject: [PATCH 135/305] fix file-in port labels for all 4 options

---
 .../node_modules/@node-red/nodes/core/storage/10-file.html   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/storage/10-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
index 8b2dee0e6..d20ad75c5 100755
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
@@ -41,7 +41,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-format"><i class="fa fa-sign-out"></i> <span data-i18n="file.label.outputas"></span></label>
-        <select id="node-input-format">
+        <select id="node-input-format" style="width: 250px;">
             <option value="utf8" data-i18n="file.output.utf8"></option>
             <option value="lines" data-i18n="file.output.lines"></option>
             <option value="" data-i18n="file.output.buffer"></option>
@@ -266,7 +266,8 @@
         inputs:1,
         outputs:1,
         outputLabels: function(i) {
-            return (this._((this.format === "utf8") ? "file.label.utf8String" : "file.label.binaryBuffer"));
+            var l = this._(((this.format === "utf8")||(this.format === "lines")) ? "file.label.utf8String" : "file.label.binaryBuffer");
+            return ( l + (((this.format === "lines")||(this.format === "stream")) ? "s" : "") );
         },
         icon: "file-in.svg",
         label: function() {

From 6fb6b13037d159cf7d47d4e2ce39fe137ce61d3a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 23 Sep 2019 10:19:41 +0100
Subject: [PATCH 136/305] Normalise default subflow color references

---
 .../node_modules/@node-red/editor-client/src/js/nodes.js  | 2 +-
 .../@node-red/editor-client/src/js/ui/diff.js             | 8 ++++----
 .../@node-red/editor-client/src/js/ui/editor.js           | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index ef9a88074..cd2ec87fc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -392,7 +392,7 @@ RED.nodes = (function() {
             category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: sf.color || "#da9",
+            color: sf.color || "#DDAA99",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 4ebdcdce9..7c5b22f26 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -401,7 +401,7 @@ RED.diff = (function() {
                                 defaults:{},
                                 icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:currentConfig.subflows[subflowId]
                         }
@@ -424,7 +424,7 @@ RED.diff = (function() {
                                 defaults:{},
                                 icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:newConfig.subflows[subflowId],
                             newTab:newConfig.subflows[subflowId]
@@ -445,7 +445,7 @@ RED.diff = (function() {
                                     defaults:{},
                                     icon:"subflow.svg",
                                     category: "subflows",
-                                    color: "#da9"
+                                    color: "#DDAA99"
                                 },
                                 tab:remoteDiff.newConfig.subflows[subflowId],
                                 remoteTab: remoteDiff.newConfig.subflows[subflowId]
@@ -551,7 +551,7 @@ RED.diff = (function() {
                 def = {
                     icon:"subflow.svg",
                     category: "subflows",
-                    color: "#da9",
+                    color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
             } else {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index ec75f5ee4..27100c070 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -842,6 +842,7 @@ RED.editor = (function() {
         selector.trigger("change");
         colorButton.on("click", function (e) {
             var recommendedColors = [
+                "#DDAA99",
                 "#3FADB5", "#87A980", "#A6BBCF",
                 "#AAAA66", "#C0C0C0", "#C0DEED",
                 "#C7E9C0", "#D7D7A0", "#D8BFD8",
@@ -989,7 +990,7 @@ RED.editor = (function() {
 
         if (node.type === "subflow") {
             // subflow template can select its color
-            var color = node.color ? node.color : "#da9";
+            var color = node.color ? node.color : "#DDAA99";
             var colorRow = $("<div/>", {
                 class: "form-row"
             }).appendTo(dialogForm);

From d047b75cb7a4309cadda3a2207b6a478a1e43893 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 23 Sep 2019 10:24:23 +0100
Subject: [PATCH 137/305] Show clear debug shortcut in tooltip

---
 .../@node-red/nodes/core/common/lib/debug/debug-utils.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
index a1b44ae97..b2d96893c 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
@@ -222,7 +222,7 @@ RED.debug = (function() {
             e.preventDefault();
             clearMessageList(false);
         });
-        RED.popover.tooltip(toolbar.find("#red-ui-sidebar-debug-clear"),RED._('node-red:debug.sidebar.clearLog'));
+        RED.popover.tooltip(toolbar.find("#red-ui-sidebar-debug-clear"),RED._('node-red:debug.sidebar.clearLog'),"core:clear-debug-messages");
 
 
 

From 7e4a06044ae0e7631912e3fca4556bca22100cd3 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 24 Sep 2019 17:22:36 +0900
Subject: [PATCH 138/305] Fix menu hiding function for flow editor

---
 .../@node-red/editor-client/src/js/red.js            | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index 715da7784..78f82e507 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -455,8 +455,12 @@ var RED = (function() {
             null
         ]});
         menuOptions.push(null);
-        menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),onselect:"core:show-import-dialog"});
-        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),onselect:"core:show-export-dialog"});
+        if (RED.settings.theme("menu.menu-item-import-library", true)) {
+            menuOptions.push({id: "menu-item-import", label: RED._("menu.label.import"), onselect: "core:show-import-dialog"});
+        }
+        if (RED.settings.theme("menu.menu-item-export-library", true)) {
+            menuOptions.push({id: "menu-item-export", label: RED._("menu.label.export"), onselect: "core:show-export-dialog"});
+        }
         menuOptions.push(null);
         menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:"core:search"});
         menuOptions.push(null);
@@ -479,7 +483,9 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-user-settings",label:RED._("menu.label.settings"),onselect:"core:show-user-settings"});
         menuOptions.push(null);
 
-        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:"core:show-help"});
+        if (RED.settings.theme("menu.menu-item-keyboard-shortcuts", true)) {
+            menuOptions.push({id: "menu-item-keyboard-shortcuts", label: RED._("menu.label.keyboardShortcuts"), onselect: "core:show-help"});
+        }
         menuOptions.push({id:"menu-item-help",
             label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
             href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")

From 199ff071e8eb730049698c47abbeb6cd3eb8293a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 24 Sep 2019 19:46:51 +0900
Subject: [PATCH 139/305] Update i18n for project feature

---
 .../@node-red/editor-client/locales/en-US/editor.json        | 1 +
 .../@node-red/editor-client/locales/ja/editor.json           | 5 +++--
 .../editor-client/src/js/ui/projects/projectSettings.js      | 4 ++--
 .../@node-red/editor-client/src/js/ui/tab-info.js            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index b89949ddf..7bae69c57 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -588,6 +588,7 @@
             "noSummaryAvailable": "No summary available",
             "editDescription": "Edit project description",
             "editDependencies": "Edit project dependencies",
+            "noDescriptionAvailable": "No description available",
             "editReadme": "Edit README.md",
             "showProjectSettings": "Show project settings",
             "projectSettings": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index e8044cd5a..c57062be1 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -325,7 +325,7 @@
         "locale": "UI言語の選択",
         "icon": "記号",
         "inputType": "入力形式",
-        "inputs" : {
+        "inputs": {
             "input": "入力",
             "select": "メニュー",
             "checkbox": "チェックボックス",
@@ -585,9 +585,10 @@
             "description": "詳細",
             "dependencies": "依存関係",
             "settings": "設定",
-            "noSummaryAvailable": "サマリが存在しません",
+            "noSummaryAvailable": "要約が存在しません",
             "editDescription": "プロジェクトの詳細を編集",
             "editDependencies": "プロジェクトの依存関係を編集",
+            "noDescriptionAvailable": "詳細が存在しません",
             "editReadme": "README.mdを編集",
             "showProjectSettings": "プロジェクト設定を表示",
             "projectSettings": {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
index 9c3784410..2d377ba54 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
@@ -160,7 +160,7 @@ RED.projects.settings = (function() {
         if (activeProject.description) {
             desc = marked(activeProject.description);
         } else {
-            desc = '<span class="red-ui-help-info-none">'+'No description available'+'</span>';
+            desc = '<span class="red-ui-help-info-none">' + RED._("sidebar.project.noDescriptionAvailable") + '</span>';
         }
         var description = addTargetToExternalLinks($('<span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(desc)+'">'+desc+'</span>')).appendTo(container);
         description.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
@@ -222,7 +222,7 @@ RED.projects.settings = (function() {
         if (summary) {
             container.text(summary).removeClass('node-info-node');
         } else {
-            container.text(RED._("sidebar.project.projectSettings.noSummaryAvailable")).addClass('red-ui-help-info-none');
+            container.text(RED._("sidebar.project.noSummaryAvailable")).addClass('red-ui-help-info-none');
         }
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
index 87a845466..b8e3b150b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -140,7 +140,7 @@ RED.sidebar.info = (function() {
 
         var activeProject = RED.projects.getActiveProject();
         if (activeProject) {
-            propRow = $('<tr class="red-ui-help-info-row"><td>Project</td><td></td></tr>').appendTo(tableBody);
+            propRow = $('<tr class="red-ui-help-info-row"><td>'+ RED._("sidebar.project.name") + '</td><td></td></tr>').appendTo(tableBody);
             $(propRow.children()[1]).text(activeProject.name||"");
             $('<tr class="red-ui-help-property-expand blank"><td colspan="2"></td></tr>').appendTo(tableBody);
             var editProjectButton = $('<button class="red-ui-button red-ui-button-small" style="position:absolute;right:2px;"><i class="fa fa-ellipsis-h"></i></button>')

From 6fc9c03d707710446752763bd1e9d45b1c0f56e9 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 24 Sep 2019 21:04:33 +0100
Subject: [PATCH 140/305] Ensure complete node scope property is remapped on
 import

---
 .../node_modules/@node-red/editor-client/src/js/nodes.js     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index cd2ec87fc..17ba67ce7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -311,7 +311,7 @@ RED.nodes = (function() {
         nodeTabMap[z][node.id] = node;
         node.z = z;
     }
-    
+
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -1194,6 +1194,7 @@ RED.nodes = (function() {
         var nodeTypeArrayReferences = {
             "catch":"scope",
             "status":"scope",
+            "complete": "scope",
             "link in":"links",
             "link out":"links"
         }
@@ -1479,7 +1480,7 @@ RED.nodes = (function() {
         clear: clear,
 
         moveNodeToTab: moveNodeToTab,
-        
+
         addLink: addLink,
         removeLink: removeLink,
 

From dddfb1ec08fdfb0eaeb6b24b9309bbfd490b28d9 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 26 Sep 2019 11:43:24 +0900
Subject: [PATCH 141/305] Fix node draggable handling

---
 .../node_modules/@node-red/editor-client/src/js/ui/palette.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 6b0f441e0..d2ef971b3 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -298,7 +298,8 @@ RED.palette = (function() {
                 },
                 stop: function() { d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false); if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null;}},
                 drag: function(e,ui) {
-                    ui.originalPosition.left = $('#' + e.target.id).offset().left;
+                    var paletteNode = getPaletteNode(nt);
+                    ui.originalPosition.left = paletteNode.offset().left;
 
                     if (def.inputs > 0 && def.outputs > 0) {
                         mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();

From bb70e796a1829efc03249eed1209e51519380156 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 27 Sep 2019 14:22:37 +0100
Subject: [PATCH 142/305] Change MQtt node default 3.1 compatibility mode to
 false

---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.html  | 6 +++---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.js    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 86c3c0b9d..cdafab9ce 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -278,7 +278,7 @@
             }},
             usetls: {value: false},
             verifyservercert: { value: false},
-            compatmode: { value: true},
+            compatmode: { value: false},
             keepalive: {value:60,validate:RED.validators.number()},
             cleansession: {value: true},
             birthTopic: {value:""},
@@ -371,8 +371,8 @@
                 $("#node-config-input-usetls").prop("checked",false);
             }
             if (typeof this.compatmode === 'undefined') {
-                this.compatmode = true;
-                $("#node-config-input-compatmode").prop('checked', true);
+                this.compatmode = false;
+                $("#node-config-input-compatmode").prop('checked', false);
             }
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 379cf8a96..4945c5c8b 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -98,7 +98,7 @@ module.exports = function(RED) {
             this.usews = false;
         }
         if (typeof this.compatmode === 'undefined') {
-            this.compatmode = true;
+            this.compatmode = false;
         }
         if (typeof this.verifyservercert === 'undefined') {
             this.verifyservercert = false;

From 52373e5bef6c7c58d2dcde42380847fac1b33f64 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 29 Sep 2019 16:47:18 +0100
Subject: [PATCH 143/305] Add click-on-tooltip to close

For the rare occasions a tooltip gets orphaned on the page
---
 .../@node-red/editor-client/src/js/ui/common/popover.js      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
index 554ea8afe..fca2f26f1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -131,6 +131,11 @@ RED.popover = (function() {
                     existingPopover.close(true);
                 }
                 target.data("red-ui-popover",res)
+                if (options.tooltip) {
+                    div.on("mousedown", function(evt) {
+                        closePopup(true);
+                    });
+                }
                 if (instant) {
                     div.show();
                 } else {

From a27e8777aa6cd380cb892d08d1f4609e3a81ddd7 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 30 Sep 2019 09:54:05 +0100
Subject: [PATCH 144/305] Let function node spinner go to 0

---
 .../node_modules/@node-red/nodes/core/function/10-function.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index 49d53f548..9202d96ba 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -41,7 +41,7 @@
         oneditprepare: function() {
             var that = this;
             $( "#node-input-outputs" ).spinner({
-                min:1,
+                min:0,
                 change: function(event, ui) {
                     var value = this.value;
                     if (!value.match(/^\d+$/)) { value = 1;  }

From 9775d3a33de8b45f64dd045e9c077808f03498b3 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 09:56:51 +0100
Subject: [PATCH 145/305] Ensure status is refreshed when switching tabs

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index e60bfabe2..339b6e017 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -291,6 +291,7 @@ RED.view = (function() {
             }
             RED.nodes.eachNode(function(n) {
                 n.dirty = true;
+                n.dirtyStatus = true;
             });
             updateSelection();
             updateActiveNodes();

From e5738d608c8bb59902bfbdc10ee2cc3a24cecc60 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 10:58:03 +0100
Subject: [PATCH 146/305] Add fallback for Object.values call in IE11

---
 .../@node-red/editor-client/src/js/nodes.js          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 17ba67ce7..d956684ce 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1296,8 +1296,13 @@ RED.nodes = (function() {
     function filterNodes(filter) {
         var result = [];
         var searchSet = nodes;
-        if (filter.hasOwnProperty("z") && Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
-            searchSet = Object.values(nodeTabMap[filter.z]);
+        var doZFilter = false;
+        if (filter.hasOwnProperty("z")) {
+            if (Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
+                searchSet = Object.values(nodeTabMap[filter.z]);
+            } else {
+                doZFilter = true;
+            }
         }
 
         for (var n=0;n<searchSet.length;n++) {
@@ -1305,6 +1310,9 @@ RED.nodes = (function() {
             if (filter.hasOwnProperty("type") && node.type !== filter.type) {
                 continue;
             }
+            if (doZFilter && node.z !== filter.z) {
+                continue;
+            }
             result.push(node);
         }
         return result;

From 29d1894f9a8ff4e0ddf4b586dd6f81e9da3354f4 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 10:59:04 +0100
Subject: [PATCH 147/305] Fix wrap of header logo in IE11

---
 .../node_modules/@node-red/editor-client/src/sass/header.scss    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/header.scss b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
index 01552ec25..4093e9bca 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -36,6 +36,7 @@
         font-size: 30px;
         line-height: 30px;
         text-decoration: none;
+        white-space: nowrap;
 
         span {
             vertical-align: middle;

From aa69d663ed27737f839a8b7ba9810ffcd4573d81 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 10:59:20 +0100
Subject: [PATCH 148/305] Put <meta> inside <head> to keep IE11 happy

---
 .../node_modules/@node-red/editor-client/templates/index.mst    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/templates/index.mst b/packages/node_modules/@node-red/editor-client/templates/index.mst
index f13564577..0cacd1906 100644
--- a/packages/node_modules/@node-red/editor-client/templates/index.mst
+++ b/packages/node_modules/@node-red/editor-client/templates/index.mst
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+<head>
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
@@ -20,7 +21,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<head>
 <title>{{ page.title }}</title>
 <link rel="icon" type="image/png" href="{{ page.favicon }}">
 <link rel="mask-icon" href="{{ page.tabicon }}" color="#8f0000">

From 4d5f771f9fb303cd7bf9df66255367d657caa82c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 09:57:23 +0100
Subject: [PATCH 149/305] Bump for 1.0

---
 CHANGELOG.md                                  | 29 +++++++++++++++++--
 package.json                                  |  4 +--
 .../@node-red/editor-api/package.json         |  6 ++--
 .../@node-red/editor-client/package.json      |  2 +-
 .../node_modules/@node-red/nodes/package.json |  2 +-
 .../@node-red/registry/package.json           |  4 +--
 .../@node-red/runtime/package.json            |  6 ++--
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   | 12 ++++----
 9 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fea4aeac..0842ef66d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+#### 1.0.0: Milestone Release
+
+Editor
+ - Add click-on-tooltip to close
+ - Fix node draggable handling
+ - Ensure complete node scope property is remapped on import
+ - Update i18n for project feature
+ - Fix menu hiding function for flow editor
+ - Normalise default subflow color references
+ - Hide header text of very small screens to deploy is visible
+ - Fix tab access on touch screens
+ - Update radialMenu to use standard theme colours
+ - Fix undefined reference loading on mobile
+ - Allow word breaking of node name with long word
+ - Enable wrap mode in Markdown editor
+ - Maximize the size of markdown editor
+
+Nodes
+ - remove legacy error option from file in mode
+ - Change MQTT node default 3.1 compatibility mode to false
+ - Show clear debug shortcut in tooltip
+ - Fix file-in port labels for all 4 options
+ - Add extra comment re Mustache escapes to Template info
+ - Fix typo in complete node
+ - Allow Function node output input to go to 0
+
 #### 1.0.0-beta.4: Beta Release
 
 Runtime
@@ -112,9 +138,6 @@ Nodes
  - Optimise generation of switch node edit dialog
  - Add keep-alive option to HTTP Request - #2261
 
-
-
-
 #### 1.0.0-beta.2: Beta Release
 
 Runtime
diff --git a/package.json b/package.json
index 9010526f1..f72dd9c4a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.4",
-    "description": "A visual tool for wiring the Internet of Things",
+    "version": "1.0.0",
+    "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
     "repository": {
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 61104b075..001ec5cf3 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.4",
-        "@node-red/editor-client": "1.0.0-beta.4",
+        "@node-red/util": "1.0.0",
+        "@node-red/editor-client": "1.0.0",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 1c7b26cae..ea34f5f60 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 91506f34f..ae2f74aa7 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 8ac9a39ed..a97a5af2c 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.4",
+        "@node-red/util": "1.0.0",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 07680d32b..bffa5813a 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.0-beta.4",
-        "@node-red/util": "1.0.0-beta.4",
+        "@node-red/registry": "1.0.0",
+        "@node-red/util": "1.0.0",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 03f0254f4..028bae0d3 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 79f5e076c..38fc52fe6 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,7 +1,7 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.4",
-    "description": "A visual tool for wiring the Internet of Things",
+    "version": "1.0.0",
+    "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
     "repository": {
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.0-beta.4",
-        "@node-red/runtime": "1.0.0-beta.4",
-        "@node-red/util": "1.0.0-beta.4",
-        "@node-red/nodes": "1.0.0-beta.4",
+        "@node-red/editor-api": "1.0.0",
+        "@node-red/runtime": "1.0.0",
+        "@node-red/util": "1.0.0",
+        "@node-red/nodes": "1.0.0",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From 3327adb1aee7cce9ca907c40e9c27df48aa10238 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 30 Sep 2019 13:38:46 +0100
Subject: [PATCH 150/305] Update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3d0acb0e3..3baa69377 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@ http://nodered.org
 [![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
 [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
 
-A visual tool for wiring the Internet of Things.
+Low-code programming for event-driven applications.
 
-![Node-RED: A visual tool for wiring the Internet of Things](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
 
 ## Quick Start
 
@@ -56,7 +56,7 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [JS Foundation](http://js.foundation).
+Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
 
 It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
 
@@ -67,4 +67,4 @@ It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-t
 
 ## Copyright and license
 
-Copyright JS Foundation and other contributors, http://js.foundation under [the Apache 2.0 license](LICENSE).
+Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).

From 1ed148aaf505712293b1dac7210106a4de9533cc Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 1 Oct 2019 20:02:34 +0900
Subject: [PATCH 151/305] Fix large icons in typed input for IE

---
 .../@node-red/editor-client/src/images/typedInput/09.svg        | 2 +-
 .../@node-red/editor-client/src/images/typedInput/az.svg        | 2 +-
 .../@node-red/editor-client/src/images/typedInput/bin.svg       | 2 +-
 .../@node-red/editor-client/src/images/typedInput/bool.svg      | 2 +-
 .../@node-red/editor-client/src/images/typedInput/env.svg       | 2 +-
 .../@node-red/editor-client/src/images/typedInput/expr.svg      | 2 +-
 .../@node-red/editor-client/src/images/typedInput/json.svg      | 2 +-
 .../@node-red/editor-client/src/images/typedInput/re.svg        | 2 +-
 .../@node-red/editor-client/src/images/typedInput/target.svg    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/09.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/09.svg
index 29c54b860..8e91ec38e 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/09.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/09.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M14.16 27.38l1.555-.144c.132.731.383 1.261.755 1.591.371.33.848.494 1.429.494.497 0 .931-.114 1.303-.341.377-.228.686-.53.926-.908.24-.383.44-.899.602-1.546a8.122 8.122 0 0 0 .233-2.3 3.732 3.732 0 0 1-1.33 1.258 3.605 3.605 0 0 1-1.815.476c-1.09 0-2.013-.395-2.768-1.186s-1.133-1.834-1.133-3.128c0-1.336.393-2.411 1.178-3.226.79-.815 1.78-1.223 2.966-1.223.856 0 1.638.231 2.345.692.713.462 1.253 1.12 1.618 1.978.372.85.557 2.085.557 3.702 0 1.684-.182 3.026-.548 4.027-.365.994-.91 1.752-1.636 2.274-.719.52-1.563.781-2.534.781-1.03 0-1.872-.284-2.525-.853-.654-.576-1.046-1.381-1.178-2.418zm6.624-5.815c0-.928-.249-1.666-.746-2.21-.492-.546-1.085-.819-1.78-.819-.719 0-1.345.294-1.878.881s-.8 1.348-.8 2.283c0 .839.252 1.522.755 2.05.51.52 1.135.781 1.878.781.75 0 1.363-.26 1.843-.782.485-.527.728-1.255.728-2.184zM4.858 10.466c0-1.558.158-2.81.476-3.757.324-.952.8-1.686 1.429-2.201.635-.516 1.432-.773 2.39-.773.708 0 1.328.143 1.861.431.533.282.974.692 1.321 1.231.348.534.62 1.187.818 1.96.198.767.297 1.803.297 3.11 0 1.545-.16 2.794-.477 3.747-.317.947-.794 1.68-1.429 2.202-.629.515-1.426.773-2.39.773-1.27 0-2.268-.456-2.993-1.366-.869-1.097-1.303-2.882-1.303-5.357zm1.662 0c0 2.163.252 3.604.755 4.323.51.713 1.136 1.07 1.879 1.07.743 0 1.366-.36 1.87-1.079.508-.719.763-2.157.763-4.314 0-2.169-.255-3.61-.764-4.323-.503-.713-1.132-1.07-1.887-1.07-.743 0-1.336.315-1.78.944-.557.803-.836 2.286-.836 4.45z" fill="#444"/></svg>
\ No newline at end of file
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M14.16 27.38l1.555-.144c.132.731.383 1.261.755 1.591.371.33.848.494 1.429.494.497 0 .931-.114 1.303-.341.377-.228.686-.53.926-.908.24-.383.44-.899.602-1.546a8.122 8.122 0 0 0 .233-2.3 3.732 3.732 0 0 1-1.33 1.258 3.605 3.605 0 0 1-1.815.476c-1.09 0-2.013-.395-2.768-1.186s-1.133-1.834-1.133-3.128c0-1.336.393-2.411 1.178-3.226.79-.815 1.78-1.223 2.966-1.223.856 0 1.638.231 2.345.692.713.462 1.253 1.12 1.618 1.978.372.85.557 2.085.557 3.702 0 1.684-.182 3.026-.548 4.027-.365.994-.91 1.752-1.636 2.274-.719.52-1.563.781-2.534.781-1.03 0-1.872-.284-2.525-.853-.654-.576-1.046-1.381-1.178-2.418zm6.624-5.815c0-.928-.249-1.666-.746-2.21-.492-.546-1.085-.819-1.78-.819-.719 0-1.345.294-1.878.881s-.8 1.348-.8 2.283c0 .839.252 1.522.755 2.05.51.52 1.135.781 1.878.781.75 0 1.363-.26 1.843-.782.485-.527.728-1.255.728-2.184zM4.858 10.466c0-1.558.158-2.81.476-3.757.324-.952.8-1.686 1.429-2.201.635-.516 1.432-.773 2.39-.773.708 0 1.328.143 1.861.431.533.282.974.692 1.321 1.231.348.534.62 1.187.818 1.96.198.767.297 1.803.297 3.11 0 1.545-.16 2.794-.477 3.747-.317.947-.794 1.68-1.429 2.202-.629.515-1.426.773-2.39.773-1.27 0-2.268-.456-2.993-1.366-.869-1.097-1.303-2.882-1.303-5.357zm1.662 0c0 2.163.252 3.604.755 4.323.51.713 1.136 1.07 1.879 1.07.743 0 1.366-.36 1.87-1.079.508-.719.763-2.157.763-4.314 0-2.169-.255-3.61-.764-4.323-.503-.713-1.132-1.07-1.887-1.07-.743 0-1.336.315-1.78.944-.557.803-.836 2.286-.836 4.45z" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/az.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/az.svg
index e0abbdc4a..90105811f 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/az.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/az.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M13.27 29.15l6.733-8.143h-6.235V19.3h8.8v1.559l-6.69 8.09h6.892v1.707h-9.5zm4.909-10.125zM6.577 12.58q0 .827.604 1.304.605.478 1.432.478 1.007 0 1.95-.467 1.59-.774 1.59-2.534V9.824q-.349.222-.9.37-.552.15-1.082.213l-1.155.148q-1.04.138-1.56.435-.88.498-.88 1.59zM11.2 8.721q.657-.085.88-.551.127-.255.127-.732 0-.975-.7-1.41-.689-.445-1.983-.445-1.495 0-2.12.805-.35.446-.456 1.326H5.167q.053-2.1 1.357-2.916 1.315-.827 3.043-.827 2.004 0 3.255.763 1.24.764 1.24 2.375v6.542q0 .297.117.477.127.18.52.18.127 0 .286-.01.159-.021.34-.053v1.41q-.446.127-.68.16-.233.031-.636.031-.986 0-1.43-.7-.234-.37-.33-1.05-.583.764-1.675 1.326t-2.407.562q-1.58 0-2.587-.954-.996-.965-.996-2.407 0-1.58.986-2.45.986-.869 2.587-1.07zm-1.58-4.75z" fill="#444"/></svg>
\ No newline at end of file
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M13.27 29.15l6.733-8.143h-6.235V19.3h8.8v1.559l-6.69 8.09h6.892v1.707h-9.5zm4.909-10.125zM6.577 12.58q0 .827.604 1.304.605.478 1.432.478 1.007 0 1.95-.467 1.59-.774 1.59-2.534V9.824q-.349.222-.9.37-.552.15-1.082.213l-1.155.148q-1.04.138-1.56.435-.88.498-.88 1.59zM11.2 8.721q.657-.085.88-.551.127-.255.127-.732 0-.975-.7-1.41-.689-.445-1.983-.445-1.495 0-2.12.805-.35.446-.456 1.326H5.167q.053-2.1 1.357-2.916 1.315-.827 3.043-.827 2.004 0 3.255.763 1.24.764 1.24 2.375v6.542q0 .297.117.477.127.18.52.18.127 0 .286-.01.159-.021.34-.053v1.41q-.446.127-.68.16-.233.031-.636.031-.986 0-1.43-.7-.234-.37-.33-1.05-.583.764-1.675 1.326t-2.407.562q-1.58 0-2.587-.954-.996-.965-.996-2.407 0-1.58.986-2.45.986-.869 2.587-1.07zm-1.58-4.75z" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.svg
index 0ef91aed8..efc427ac9 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bin.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M18.8 33.9c3.328 0 4.776-2.603 4.776-7.066s-1.448-7.066-4.776-7.066-4.776 2.603-4.776 7.066S15.473 33.9 18.8 33.9zm0-1.429c-2.192 0-3.073-1.781-3.073-4.522v-2.23c0-2.741.88-4.523 3.073-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.88 4.522-3.073 4.522zm-6.306 1.194v-1.429H8.892V20.002H6.328l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02H3.333v1.429zm11.2-17.7v-1.429h-3.602V2.302h-2.564l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02h-3.915v1.429zM7.5 16.2c3.327 0 4.776-2.603 4.776-7.066S10.828 2.068 7.5 2.068 2.725 4.67 2.725 9.134 4.173 16.2 7.5 16.2zm0-1.429c-2.193 0-3.074-1.781-3.074-4.522V8.02c0-2.741.881-4.523 3.074-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.881 4.522-3.073 4.522z" fill="#444"/></svg>
\ No newline at end of file
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M18.8 33.9c3.328 0 4.776-2.603 4.776-7.066s-1.448-7.066-4.776-7.066-4.776 2.603-4.776 7.066S15.473 33.9 18.8 33.9zm0-1.429c-2.192 0-3.073-1.781-3.073-4.522v-2.23c0-2.741.88-4.523 3.073-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.88 4.522-3.073 4.522zm-6.306 1.194v-1.429H8.892V20.002H6.328l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02H3.333v1.429zm11.2-17.7v-1.429h-3.602V2.302h-2.564l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02h-3.915v1.429zM7.5 16.2c3.327 0 4.776-2.603 4.776-7.066S10.828 2.068 7.5 2.068 2.725 4.67 2.725 9.134 4.173 16.2 7.5 16.2zm0-1.429c-2.193 0-3.074-1.781-3.074-4.522V8.02c0-2.741.881-4.523 3.074-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.881 4.522-3.073 4.522z" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.svg
index e2e4297c7..8eee38409 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/bool.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M9.96 21.98a5 5 0 1 1 6.11-7.917zm3.035-13.973c-5.512 0-10 4.488-10 10s4.488 9.998 10 9.998 10-4.486 10-9.998-4.488-10-10-10zm0 1.816c4.53 0 8.182 3.655 8.182 8.184s-3.652 8.182-8.182 8.182-8.181-3.653-8.181-8.182 3.652-8.184 8.181-8.184z" color="#000" fill="#444"/></svg>
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M9.96 21.98a5 5 0 1 1 6.11-7.917zm3.035-13.973c-5.512 0-10 4.488-10 10s4.488 9.998 10 9.998 10-4.486 10-9.998-4.488-10-10-10zm0 1.816c4.53 0 8.182 3.655 8.182 8.184s-3.652 8.182-8.182 8.182-8.181-3.653-8.181-8.182 3.652-8.184 8.181-8.184z" color="#000" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/env.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/env.svg
index bddd1c082..a24515f30 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/env.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/env.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M14.33 27.19q2.916-.136 4.024-2.131.58-1.024.58-2.37 0-2.132-1.569-3.24-.904-.648-3.035-1.228zM8.55 10.736q0 1.688 1.108 2.643 1.125.955 3.018 1.33V6.695q-2.234.085-3.189 1.364-.937 1.279-.937 2.677zm-3.07.205q0-2.592 1.893-4.672 1.91-2.08 5.337-2.115V1.887h1.62V4.12q3.393.239 5.2 2.012 1.825 1.757 1.91 4.655h-2.984q-.119-1.296-.699-2.233-1.074-1.723-3.427-1.808v8.287q3.956 1.108 5.371 2.08 2.302 1.603 2.302 4.74 0 4.536-2.95 6.446-1.637 1.057-4.723 1.398v3.308h-1.62v-3.308q-4.962-.324-6.735-3.513-.972-1.722-.972-4.655h3.018q.136 2.336.733 3.41 1.057 1.927 3.922 2.166v-9.293q-3.683-.699-5.44-2.336Q5.48 13.84 5.48 10.941z" fill="#444"/></svg>
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M14.33 27.19q2.916-.136 4.024-2.131.58-1.024.58-2.37 0-2.132-1.569-3.24-.904-.648-3.035-1.228zM8.55 10.736q0 1.688 1.108 2.643 1.125.955 3.018 1.33V6.695q-2.234.085-3.189 1.364-.937 1.279-.937 2.677zm-3.07.205q0-2.592 1.893-4.672 1.91-2.08 5.337-2.115V1.887h1.62V4.12q3.393.239 5.2 2.012 1.825 1.757 1.91 4.655h-2.984q-.119-1.296-.699-2.233-1.074-1.723-3.427-1.808v8.287q3.956 1.108 5.371 2.08 2.302 1.603 2.302 4.74 0 4.536-2.95 6.446-1.637 1.057-4.723 1.398v3.308h-1.62v-3.308q-4.962-.324-6.735-3.513-.972-1.722-.972-4.655h3.018q.136 2.336.733 3.41 1.057 1.927 3.922 2.166v-9.293q-3.683-.699-5.44-2.336Q5.48 13.84 5.48 10.941z" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.svg
index c6357af50..500ca3926 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/expr.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-337.103 -913.25) scale(1.2585)" fill="#444" stroke-width=".795"><circle cx="284.36" cy="733.68" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><circle cx="284.33" cy="740.74" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><path d="M276.18 727.78l4.396-1.565v18.515c-.711 2.606-2.922 4.394-5.812 5.812l-4.135 1.974-.559-1.192 3.353-1.639c1.459-.724 2.689-1.87 2.869-4.955z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-337.103 -913.25) scale(1.2585)" fill="#444" stroke-width=".795"><circle cx="284.36" cy="733.68" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><circle cx="284.33" cy="740.74" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><path d="M276.18 727.78l4.396-1.565v18.515c-.711 2.606-2.922 4.394-5.812 5.812l-4.135 1.974-.559-1.192 3.353-1.639c1.459-.724 2.689-1.87 2.869-4.955z" fill-rule="evenodd"/></g></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/json.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/json.svg
index 713fe7944..978c89149 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/json.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/json.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M15 5.225v-1.92h2.24q.608 0 1.216.288.608.256 1.12.8.48.512.8 1.312.32.768.32 1.792v5.824q0 .832.224 1.536t.608 1.216q.352.48.832.768.48.256.992.256v2.176q-.512 0-.992.256t-.832.736q-.384.48-.608 1.184t-.224 1.568v5.792q0 1.024-.32 1.792-.32.8-.8 1.312-.512.544-1.12.8-.608.288-1.216.288H15v-1.92h1.6q.48 0 .768-.256.288-.224.48-.64.16-.384.224-.896.064-.48.064-.96v-5.824q0-1.216.352-2.016.32-.8.768-1.28.448-.512.928-.736.448-.224.736-.256v-.096q-.288-.064-.736-.32-.48-.256-.928-.768t-.768-1.28q-.352-.8-.352-1.92V7.977q0-.512-.064-.992-.064-.512-.224-.896-.192-.384-.48-.608-.288-.256-.768-.256zm-3.648 0v-1.92h-2.24q-.608 0-1.216.288-.608.256-1.12.8-.48.512-.8 1.312-.32.768-.32 1.792v5.824q0 .832-.224 1.536t-.608 1.216q-.352.48-.832.768-.48.256-.992.256v2.176q.512 0 .992.256t.832.736q.384.48.608 1.184t.224 1.568v5.792q0 1.024.32 1.792.32.8.8 1.312.512.544 1.12.8.608.288 1.216.288h2.24v-1.92h-1.6q-.48 0-.768-.256-.288-.224-.48-.64-.16-.384-.224-.896-.064-.48-.064-.96v-5.824q0-1.216-.352-2.016-.32-.8-.768-1.28-.448-.512-.928-.736-.448-.224-.736-.256v-.096q.288-.064.736-.32.48-.256.928-.768t.768-1.28q.352-.8.352-1.92V7.977q0-.512.064-.992.064-.512.224-.896.192-.384.48-.608.288-.256.768-.256z" fill="#444"/></svg>
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M15 5.225v-1.92h2.24q.608 0 1.216.288.608.256 1.12.8.48.512.8 1.312.32.768.32 1.792v5.824q0 .832.224 1.536t.608 1.216q.352.48.832.768.48.256.992.256v2.176q-.512 0-.992.256t-.832.736q-.384.48-.608 1.184t-.224 1.568v5.792q0 1.024-.32 1.792-.32.8-.8 1.312-.512.544-1.12.8-.608.288-1.216.288H15v-1.92h1.6q.48 0 .768-.256.288-.224.48-.64.16-.384.224-.896.064-.48.064-.96v-5.824q0-1.216.352-2.016.32-.8.768-1.28.448-.512.928-.736.448-.224.736-.256v-.096q-.288-.064-.736-.32-.48-.256-.928-.768t-.768-1.28q-.352-.8-.352-1.92V7.977q0-.512-.064-.992-.064-.512-.224-.896-.192-.384-.48-.608-.288-.256-.768-.256zm-3.648 0v-1.92h-2.24q-.608 0-1.216.288-.608.256-1.12.8-.48.512-.8 1.312-.32.768-.32 1.792v5.824q0 .832-.224 1.536t-.608 1.216q-.352.48-.832.768-.48.256-.992.256v2.176q.512 0 .992.256t.832.736q.384.48.608 1.184t.224 1.568v5.792q0 1.024.32 1.792.32.8.8 1.312.512.544 1.12.8.608.288 1.216.288h2.24v-1.92h-1.6q-.48 0-.768-.256-.288-.224-.48-.64-.16-.384-.224-.896-.064-.48-.064-.96v-5.824q0-1.216-.352-2.016-.32-.8-.768-1.28-.448-.512-.928-.736-.448-.224-.736-.256v-.096q.288-.064.736-.32.48-.256.928-.768t.768-1.28q.352-.8.352-1.92V7.977q0-.512.064-.992.064-.512.224-.896.192-.384.48-.608.288-.256.768-.256z" fill="#444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/re.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/re.svg
index c30cbff55..b44c5921c 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/re.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/re.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M2 19h5v5H2zm16.099-3.304v-5.659h-2.654v5.66l-5.309-2.004-.901 2.404L14.543 18l-3.255 4.557 2.254 1.553 3.255-4.808 3.455 4.808 2.054-1.553L19 18l5.46-1.903-1.002-2.404z" color="#000" fill="#444444"/></svg>
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M2 19h5v5H2zm16.099-3.304v-5.659h-2.654v5.66l-5.309-2.004-.901 2.404L14.543 18l-3.255 4.557 2.254 1.553 3.255-4.808 3.455 4.808 2.054-1.553L19 18l5.46-1.903-1.002-2.404z" color="#000" fill="#444444"/></svg>
diff --git a/packages/node_modules/@node-red/editor-client/src/images/typedInput/target.svg b/packages/node_modules/@node-red/editor-client/src/images/typedInput/target.svg
index b98996701..41ed2e3a6 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/typedInput/target.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/typedInput/target.svg
@@ -1 +1 @@
-<svg width="26" height="36" xmlns="http://www.w3.org/2000/svg"><path d="M11 5v5.77a7.542 7.542 0 0 0-5.234 5.25L1 16c-1.432 1.397-1.232 2.722 0 4l4.75-.078a7.542 7.542 0 0 0 5.22 5.297L11 31c1.316 1.303 2.649 1.363 4 0l.009-5.775A7.542 7.542 0 0 0 20.228 20H25c1.261-1.294 1.404-2.623 0-4l-4.774-.01a7.542 7.542 0 0 0-5.23-5.22L15 5c-1.3-1.273-2.63-1.393-4 0zm2 7.499c3.05 0 5.5 2.45 5.5 5.5s-2.45 5.5-5.5 5.5-5.5-2.45-5.5-5.5 2.45-5.5 5.5-5.5z" color="#000" fill="#444"/></svg>
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M11 5v5.77a7.542 7.542 0 0 0-5.234 5.25L1 16c-1.432 1.397-1.232 2.722 0 4l4.75-.078a7.542 7.542 0 0 0 5.22 5.297L11 31c1.316 1.303 2.649 1.363 4 0l.009-5.775A7.542 7.542 0 0 0 20.228 20H25c1.261-1.294 1.404-2.623 0-4l-4.774-.01a7.542 7.542 0 0 0-5.23-5.22L15 5c-1.3-1.273-2.63-1.393-4 0zm2 7.499c3.05 0 5.5 2.45 5.5 5.5s-2.45 5.5-5.5 5.5-5.5-2.45-5.5-5.5 2.45-5.5 5.5-5.5z" color="#000" fill="#444"/></svg>

From ee3dc8c4cd2970df161c892cdcb768fa6f615cac Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 1 Oct 2019 12:41:20 +0100
Subject: [PATCH 152/305] Join node must clone group message before sending

---
 packages/node_modules/@node-red/nodes/core/sequence/17-split.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
index 869fbaa3d..5d93c8faf 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
+++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
@@ -479,7 +479,7 @@ module.exports = function(RED) {
                 delete group.msg.parts;
             }
             delete group.msg.complete;
-            node.send(group.msg);
+            node.send(RED.util.cloneMessage(group.msg));
         }
 
         var pendingMessages = [];

From af742ea536593409ea8bad3d6afa2d74a8d231ad Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 1 Oct 2019 20:57:20 +0100
Subject: [PATCH 153/305] Add example to range node info and make use of target
 consistent

---
 .../nodes/locales/en-US/function/16-range.html      | 13 ++++++++++---
 .../@node-red/nodes/locales/en-US/messages.json     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
index 740f1fec3..16ea0d784 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
@@ -29,9 +29,16 @@
     </dl>
     <h3>Details</h3>
     <p>This node will linearly scale the received value. By default, the result
-       is not constrained to the range defined in the node.</p>
+    is not constrained to the range defined in the node.</p>
     <p><i>Scale and limit to target range</i> means that the result will never be outside
-    the range specified within the result range.</p>
+    the range specified within the target range.</p>
     <p><i>Scale and wrap within the target range</i> means that the result will
-    be wrapped within the result range.</p>
+    be wrapped within the target range.</p>
+    <p>For example an input 0 - 10 mapped to 0 - 100.</p>
+    <table style="outline-width:#888 solid thin">
+        <tr><th width="80px">mode</th><th width="80px">input</th><th width="80px">output</th></tr>
+        <tr><td><center>scale</center></td><td><center>12</center></td><td><center>120</center></td></tr>
+        <tr><td><center>limit</center></td><td><center>12</center></td><td><center>100</center></td></tr>
+        <tr><td><center>wrap</center></td><td><center>12</center></td><td><center>20</center></td></tr>
+    </table>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index f5fbe9e91..4999cb8a7 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -664,7 +664,7 @@
         "label": {
             "action": "Action",
             "inputrange": "Map the input range",
-            "resultrange": "to the result range",
+            "resultrange": "to the target range",
             "from": "from",
             "to": "to",
             "roundresult": "Round result to the nearest integer?"

From dbca2178c0faa61cadd3de69dfba848dbb0b9ece Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Tue, 1 Oct 2019 22:46:01 -0700
Subject: [PATCH 154/305] Fix issue where subflow color did not update when not
 on a flow

---
 .../@node-red/editor-client/src/js/ui/editor.js             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 27100c070..60ce66e61 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2238,6 +2238,12 @@ RED.editor = (function() {
                             changes.color = newColor;
                             changed = true;
                             RED.utils.clearNodeColorCache();
+                            if (editing_node.type === "subflow") {
+                                var nodeDefinition = RED.nodes.getType(
+                                    "subflow:" + editing_node.id
+                                );
+                                nodeDefinition["color"] = newColor;
+                            }
                         }
 
                         var old_env = editing_node.env;

From ddd0d1bef32c0e53a938197dfa6e9f6f15dbdf1e Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 2 Oct 2019 17:39:38 +0900
Subject: [PATCH 155/305] Fix invisible icons in IE

---
 .../@node-red/editor-client/src/js/ui/view.js | 20 ++++++++++---------
 .../@node-red/nodes/icons/alert.svg           |  2 +-
 .../@node-red/nodes/icons/arrow-in.svg        |  2 +-
 .../@node-red/nodes/icons/batch.svg           |  2 +-
 .../@node-red/nodes/icons/bridge-dash.svg     |  2 +-
 .../@node-red/nodes/icons/bridge.svg          |  2 +-
 .../@node-red/nodes/icons/cog.svg             |  2 +-
 .../@node-red/nodes/icons/comment.svg         |  2 +-
 .../node_modules/@node-red/nodes/icons/db.svg |  2 +-
 .../@node-red/nodes/icons/debug.svg           |  2 +-
 .../@node-red/nodes/icons/envelope.svg        |  2 +-
 .../@node-red/nodes/icons/feed.svg            |  2 +-
 .../@node-red/nodes/icons/file-in.svg         |  2 +-
 .../@node-red/nodes/icons/file-out.svg        |  2 +-
 .../@node-red/nodes/icons/file.svg            |  2 +-
 .../@node-red/nodes/icons/function.svg        |  2 +-
 .../@node-red/nodes/icons/hash.svg            |  2 +-
 .../@node-red/nodes/icons/inject.svg          |  2 +-
 .../@node-red/nodes/icons/join.svg            |  2 +-
 .../@node-red/nodes/icons/light.svg           |  2 +-
 .../@node-red/nodes/icons/link-out.svg        |  2 +-
 .../@node-red/nodes/icons/parser-csv.svg      |  2 +-
 .../@node-red/nodes/icons/parser-html.svg     |  2 +-
 .../@node-red/nodes/icons/parser-json.svg     |  2 +-
 .../@node-red/nodes/icons/parser-xml.svg      |  2 +-
 .../@node-red/nodes/icons/parser-yaml.svg     |  2 +-
 .../@node-red/nodes/icons/range.svg           |  2 +-
 .../@node-red/nodes/icons/rpi.svg             |  2 +-
 .../@node-red/nodes/icons/serial.svg          |  2 +-
 .../@node-red/nodes/icons/sort.svg            |  2 +-
 .../@node-red/nodes/icons/split.svg           |  2 +-
 .../@node-red/nodes/icons/status.svg          |  2 +-
 .../@node-red/nodes/icons/subflow.svg         |  2 +-
 .../@node-red/nodes/icons/swap.svg            |  2 +-
 .../@node-red/nodes/icons/switch.svg          |  2 +-
 .../@node-red/nodes/icons/template.svg        |  2 +-
 .../@node-red/nodes/icons/timer.svg           |  2 +-
 .../@node-red/nodes/icons/trigger.svg         |  2 +-
 .../@node-red/nodes/icons/watch.svg           |  2 +-
 .../@node-red/nodes/icons/white-globe.svg     |  2 +-
 40 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 339b6e017..0967c630e 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2499,16 +2499,18 @@ RED.view = (function() {
             var img = new Image();
             img.src = iconUrl;
             img.onload = function() {
-                var largestEdge = Math.max(img.width,img.height);
-                var scaleFactor = 1;
-                if (largestEdge > 30) {
-                    scaleFactor = 30/largestEdge;
+                if (!iconUrl.match(/\.svg$/)) {
+                    var largestEdge = Math.max(img.width,img.height);
+                    var scaleFactor = 1;
+                    if (largestEdge > 30) {
+                        scaleFactor = 30/largestEdge;
+                    }
+                    var width = img.width * scaleFactor;
+                    var height = img.height * scaleFactor;
+                    icon.attr("width",width);
+                    icon.attr("height",height);
+                    icon.attr("x",15-width/2);
                 }
-                var width = img.width * scaleFactor;
-                var height = img.height * scaleFactor;
-                icon.attr("width",width);
-                icon.attr("height",height);
-                icon.attr("x",15-width/2);
                 icon.attr("xlink:href",iconUrl);
                 icon.style("display",null);
                 //if ("right" == d._def.align) {
diff --git a/packages/node_modules/@node-red/nodes/icons/alert.svg b/packages/node_modules/@node-red/nodes/icons/alert.svg
index 06f6c15f3..4337fb496 100644
--- a/packages/node_modules/@node-red/nodes/icons/alert.svg
+++ b/packages/node_modules/@node-red/nodes/icons/alert.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-216.74 -415.04) scale(.62143)" fill="#fff"><path d="M371.3 683.97l1.61-1.61H389l1.61 1.61-3.219 40.23-3.218 3.218h-6.437l-3.219-3.218z"/><rect x="372.91" y="735.47" width="16.092" height="16.092" ry="3.017" color="#000"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-216.74 -415.04) scale(.62143)" fill="#fff"><path d="M371.3 683.97l1.61-1.61H389l1.61 1.61-3.219 40.23-3.218 3.218h-6.437l-3.219-3.218z"/><rect x="372.91" y="735.47" width="16.092" height="16.092" ry="3.017" color="#000"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/arrow-in.svg b/packages/node_modules/@node-red/nodes/icons/arrow-in.svg
index a5fcb49af..de75fbe4e 100644
--- a/packages/node_modules/@node-red/nodes/icons/arrow-in.svg
+++ b/packages/node_modules/@node-red/nodes/icons/arrow-in.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/batch.svg b/packages/node_modules/@node-red/nodes/icons/batch.svg
index eb513de93..5b3328097 100644
--- a/packages/node_modules/@node-red/nodes/icons/batch.svg
+++ b/packages/node_modules/@node-red/nodes/icons/batch.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".612"><path d="M34.001 27.987l-4 .004v3.997l4-.01M40.001 27.987l-4 .004v3.997l4-.01M26.001 29.987l-7-7.986v15.986M34.001 13.987l-4 .004v3.997l4-.01M40.001 13.987l-4 .004v3.997l4-.01M34.001 41.988l-4 .003v3.997l4-.01M40.001 41.988l-4 .003v3.997l4-.01M8.001 27.987l-4 .004v3.997l4-.01M14.001 27.987l-4 .004v3.997l4-.01M8.001 19.987l-4 .004v3.997l4-.01M14.001 19.987l-4 .004v3.997l4-.01M8.001 35.987l-4 .004v3.997l4-.01M14.001 35.987l-4 .004v3.997l4-.01"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".612"><path d="M34.001 27.987l-4 .004v3.997l4-.01M40.001 27.987l-4 .004v3.997l4-.01M26.001 29.987l-7-7.986v15.986M34.001 13.987l-4 .004v3.997l4-.01M40.001 13.987l-4 .004v3.997l4-.01M34.001 41.988l-4 .003v3.997l4-.01M40.001 41.988l-4 .003v3.997l4-.01M8.001 27.987l-4 .004v3.997l4-.01M14.001 27.987l-4 .004v3.997l4-.01M8.001 19.987l-4 .004v3.997l4-.01M14.001 19.987l-4 .004v3.997l4-.01M8.001 35.987l-4 .004v3.997l4-.01M14.001 35.987l-4 .004v3.997l4-.01"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/bridge-dash.svg b/packages/node_modules/@node-red/nodes/icons/bridge-dash.svg
index 45f556a11..7c09d9776 100644
--- a/packages/node_modules/@node-red/nodes/icons/bridge-dash.svg
+++ b/packages/node_modules/@node-red/nodes/icons/bridge-dash.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M19.924 6.61c4.372 5.433 7.182 13.893 7.182 23.397 0 9.493-2.804 17.946-7.167 23.379m-4.294-38.39c5.645 9.417 7.172 20.944.024 29.993m-4.36-21.661c1.338 1.459 2.215 3.906 2.215 6.68 0 2.571-.755 4.863-1.931 6.346" fill="none" stroke="#fff" stroke-dasharray="14.096, 3.524" stroke-width="3.524"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M19.924 6.61c4.372 5.433 7.182 13.893 7.182 23.397 0 9.493-2.804 17.946-7.167 23.379m-4.294-38.39c5.645 9.417 7.172 20.944.024 29.993m-4.36-21.661c1.338 1.459 2.215 3.906 2.215 6.68 0 2.571-.755 4.863-1.931 6.346" fill="none" stroke="#fff" stroke-dasharray="14.096, 3.524" stroke-width="3.524"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/bridge.svg b/packages/node_modules/@node-red/nodes/icons/bridge.svg
index 093071ca8..1112a4625 100644
--- a/packages/node_modules/@node-red/nodes/icons/bridge.svg
+++ b/packages/node_modules/@node-red/nodes/icons/bridge.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M19.924 6.61c4.372 5.433 7.182 13.893 7.182 23.397 0 9.493-2.804 17.946-7.167 23.379m-4.294-38.39c5.645 9.417 7.172 20.944.024 29.993m-4.36-21.661c1.338 1.459 2.215 3.906 2.215 6.68 0 2.571-.755 4.863-1.931 6.346" fill="none" stroke="#fff" stroke-width="3.224"/></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M19.924 6.61c4.372 5.433 7.182 13.893 7.182 23.397 0 9.493-2.804 17.946-7.167 23.379m-4.294-38.39c5.645 9.417 7.172 20.944.024 29.993m-4.36-21.661c1.338 1.459 2.215 3.906 2.215 6.68 0 2.571-.755 4.863-1.931 6.346" fill="none" stroke="#fff" stroke-width="3.224"/></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/cog.svg b/packages/node_modules/@node-red/nodes/icons/cog.svg
index ae236ff43..8cd81c57b 100644
--- a/packages/node_modules/@node-red/nodes/icons/cog.svg
+++ b/packages/node_modules/@node-red/nodes/icons/cog.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M20 12a18 18 0 0 0-3.494.36l-1.428 5.715-5.06-3.036a18 18 0 0 0-4.946 4.917l3.045 5.078-5.765 1.442A18 18 0 0 0 2 30a18 18 0 0 0 .345 3.434l5.775 1.444-3.072 5.12a18 18 0 0 0 4.893 4.924l5.137-3.083 1.455 5.82A18 18 0 0 0 20 48a18 18 0 0 0 3.47-.353l1.452-5.807 5.128 3.076a18 18 0 0 0 4.905-4.913l-3.074-5.124 5.783-1.446A18 18 0 0 0 38 30a18 18 0 0 0-.367-3.529l-5.75-1.437 3.041-5.069a18 18 0 0 0-4.937-4.928l-5.065 3.038-1.433-5.728A18 18 0 0 0 20 12zm0 9a9 9 0 0 1 9 9 9 9 0 0 1-9 9 9 9 0 0 1-9-9 9 9 0 0 1 9-9z" color="#000" fill="#fff" opacity=".98" style="isolation:auto;mix-blend-mode:normal"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M20 12a18 18 0 0 0-3.494.36l-1.428 5.715-5.06-3.036a18 18 0 0 0-4.946 4.917l3.045 5.078-5.765 1.442A18 18 0 0 0 2 30a18 18 0 0 0 .345 3.434l5.775 1.444-3.072 5.12a18 18 0 0 0 4.893 4.924l5.137-3.083 1.455 5.82A18 18 0 0 0 20 48a18 18 0 0 0 3.47-.353l1.452-5.807 5.128 3.076a18 18 0 0 0 4.905-4.913l-3.074-5.124 5.783-1.446A18 18 0 0 0 38 30a18 18 0 0 0-.367-3.529l-5.75-1.437 3.041-5.069a18 18 0 0 0-4.937-4.928l-5.065 3.038-1.433-5.728A18 18 0 0 0 20 12zm0 9a9 9 0 0 1 9 9 9 9 0 0 1-9 9 9 9 0 0 1-9-9 9 9 0 0 1 9-9z" color="#000" fill="#fff" opacity=".98" style="isolation:auto;mix-blend-mode:normal"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/comment.svg b/packages/node_modules/@node-red/nodes/icons/comment.svg
index 832dbf895..73ccaec5c 100644
--- a/packages/node_modules/@node-red/nodes/icons/comment.svg
+++ b/packages/node_modules/@node-red/nodes/icons/comment.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#bababa" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M36.19 28.6c0 6.088-7.289 11.024-16.28 11.024a23.98 23.98 0 0 1-2.982-.185c-1.272-.159-7.933 7.526-13.113 6.53.18-2.004 8.18-6.004 5.87-8.79C5.993 35.16 3.63 32.066 3.63 28.6c0-6.088 7.289-11.024 16.28-11.024 8.991 0 16.28 4.936 16.28 11.024z" fill="#fff" stroke="#bababa" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="isolation:auto;mix-blend-mode:normal"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/db.svg b/packages/node_modules/@node-red/nodes/icons/db.svg
index 5b455b606..ae602290d 100644
--- a/packages/node_modules/@node-red/nodes/icons/db.svg
+++ b/packages/node_modules/@node-red/nodes/icons/db.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-355 -704.36)"><ellipse transform="matrix(1.2868 0 0 1.9263 -64.444 -607.56)" cx="341.25" cy="688.61" rx="9.84" ry="3.25" color="#000" fill="#fff"/><path d="M387.32 750.48c0 1.949-5.669 5.879-12.662 5.879s-12.662-3.93-12.662-5.879v-27.043c0 1.949 5.669 6.242 12.662 6.242s12.662-4.293 12.662-6.242v27.043" color="#000" fill="#fff"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-355 -704.36)"><ellipse transform="matrix(1.2868 0 0 1.9263 -64.444 -607.56)" cx="341.25" cy="688.61" rx="9.84" ry="3.25" color="#000" fill="#fff"/><path d="M387.32 750.48c0 1.949-5.669 5.879-12.662 5.879s-12.662-3.93-12.662-5.879v-27.043c0 1.949 5.669 6.242 12.662 6.242s12.662-4.293 12.662-6.242v27.043" color="#000" fill="#fff"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/debug.svg b/packages/node_modules/@node-red/nodes/icons/debug.svg
index f102ddb7d..927680ee3 100644
--- a/packages/node_modules/@node-red/nodes/icons/debug.svg
+++ b/packages/node_modules/@node-red/nodes/icons/debug.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M10.004 14.499h20M10.004 46.503h20M10.004 22.5h20M10.004 30.501h20M10.004 38.502h20" stroke="#fff" stroke-width="2.9997000000000003"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M10.004 14.499h20M10.004 46.503h20M10.004 22.5h20M10.004 30.501h20M10.004 38.502h20" stroke="#fff" stroke-width="2.9997000000000003"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/envelope.svg b/packages/node_modules/@node-red/nodes/icons/envelope.svg
index dacfd673b..13764301c 100644
--- a/packages/node_modules/@node-red/nodes/icons/envelope.svg
+++ b/packages/node_modules/@node-red/nodes/icons/envelope.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M20 32.96l-18-18h36z"/><path d="M2 20.36l18 18 18-18v26.1H2z"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M20 32.96l-18-18h36z"/><path d="M2 20.36l18 18 18-18v26.1H2z"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/feed.svg b/packages/node_modules/@node-red/nodes/icons/feed.svg
index dc22a626a..8df69736c 100644
--- a/packages/node_modules/@node-red/nodes/icons/feed.svg
+++ b/packages/node_modules/@node-red/nodes/icons/feed.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#b85c5c" stroke="#000"><path color="#000" d="M-.01-.004h39.998v60H-.01z" fill="none" stroke="none"/><g transform="translate(-450.266 -585.37)"><rect x="464.27" y="625.37" width="12" height="12" ry="2.4" color="#000" fill="#fff" stroke="none"/><g fill="none" stroke="#fff" stroke-width="4"><path d="M461.27 618.87l5.5-2.5h7l5.5 2.5M459.27 608.87l5.5-2.5h11l5.5 2.5M457.27 598.87l5.5-2.5h15l5.5 2.5"/></g></g></g></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#b85c5c" stroke="#000"><path color="#000" d="M-.01-.004h39.998v60H-.01z" fill="none" stroke="none"/><g transform="translate(-450.266 -585.37)"><rect x="464.27" y="625.37" width="12" height="12" ry="2.4" color="#000" fill="#fff" stroke="none"/><g fill="none" stroke="#fff" stroke-width="4"><path d="M461.27 618.87l5.5-2.5h7l5.5 2.5M459.27 608.87l5.5-2.5h11l5.5 2.5M457.27 598.87l5.5-2.5h15l5.5 2.5"/></g></g></g></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/file-in.svg b/packages/node_modules/@node-red/nodes/icons/file-in.svg
index 15950f96f..4004d8cf9 100644
--- a/packages/node_modules/@node-red/nodes/icons/file-in.svg
+++ b/packages/node_modules/@node-red/nodes/icons/file-in.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="none" d="M0-.04h40v60H0z"/><g fill="#fff"><path d="M5 9.96h14v16h9v7H18v10h10v7H5z"/><path d="M22 9.96l13 13H22z"/><path d="M28 25.96h7v6l5 6-4.987 6-.013 6h-7l10-12z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="none" d="M0-.04h40v60H0z"/><g fill="#fff"><path d="M5 9.96h14v16h9v7H18v10h10v7H5z"/><path d="M22 9.96l13 13H22z"/><path d="M28 25.96h7v6l5 6-4.987 6-.013 6h-7l10-12z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/file-out.svg b/packages/node_modules/@node-red/nodes/icons/file-out.svg
index 214e307ee..ed2420a64 100644
--- a/packages/node_modules/@node-red/nodes/icons/file-out.svg
+++ b/packages/node_modules/@node-red/nodes/icons/file-out.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="none" d="M0-.04h40v60H0z"/><g fill="#fff"><path d="M5 9.96h14v16h16v24H5v-7h5v7l10-12-10-12v7H5z"/><path d="M22 9.96l13 13H22z"/></g><path d="M5 30.96H0v14h5v-2H2v-10h3z" fill="#fff" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="none" d="M0-.04h40v60H0z"/><g fill="#fff"><path d="M5 9.96h14v16h16v24H5v-7h5v7l10-12-10-12v7H5z"/><path d="M22 9.96l13 13H22z"/></g><path d="M5 30.96H0v14h5v-2H2v-10h3z" fill="#fff" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/file.svg b/packages/node_modules/@node-red/nodes/icons/file.svg
index 2934c0c15..8edc658c2 100644
--- a/packages/node_modules/@node-red/nodes/icons/file.svg
+++ b/packages/node_modules/@node-red/nodes/icons/file.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M5 10h14v16h16v24H5z"/><path d="M22 10l13 13H22z"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M5 10h14v16h16v24H5z"/><path d="M22 10l13 13H22z"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/function.svg b/packages/node_modules/@node-red/nodes/icons/function.svg
index b831a21fa..04bebc370 100644
--- a/packages/node_modules/@node-red/nodes/icons/function.svg
+++ b/packages/node_modules/@node-red/nodes/icons/function.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M30.999 31.005v-3h-6.762s.812-12.397 1.162-14 .597-3.35 2.628-3.103 1.971 3.103 1.971 3.103l4.862-.016s-.783-3.984-2.783-5.984-7.946-1.7-9.633.03c-1.687 1.73-2.302 5.065-2.597 6.422-.588 4.5-.854 9.027-1.248 13.547h-8.6v3H18.1s-.812 12.398-1.162 14-.597 3.35-2.628 3.103-1.972-3.102-1.972-3.102l-4.862.015s.783 3.985 2.783 5.985c2 2 7.946 1.699 9.634-.031 1.687-1.73 2.302-5.065 2.597-6.422.587-4.5.854-9.027 1.248-13.547z" fill="#fff"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M30.999 31.005v-3h-6.762s.812-12.397 1.162-14 .597-3.35 2.628-3.103 1.971 3.103 1.971 3.103l4.862-.016s-.783-3.984-2.783-5.984-7.946-1.7-9.633.03c-1.687 1.73-2.302 5.065-2.597 6.422-.588 4.5-.854 9.027-1.248 13.547h-8.6v3H18.1s-.812 12.398-1.162 14-.597 3.35-2.628 3.103-1.972-3.102-1.972-3.102l-4.862.015s.783 3.985 2.783 5.985c2 2 7.946 1.699 9.634-.031 1.687-1.73 2.302-5.065 2.597-6.422.587-4.5.854-9.027 1.248-13.547z" fill="#fff"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/hash.svg b/packages/node_modules/@node-red/nodes/icons/hash.svg
index 4c8e4370e..a8ac048af 100644
--- a/packages/node_modules/@node-red/nodes/icons/hash.svg
+++ b/packages/node_modules/@node-red/nodes/icons/hash.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".857"><path d="M17.997 8.998l-5.972.072-4.028 43.928 5.914.072z"/><path d="M6 16.999l-1 6 31 1 1-6z"/><path d="M31.996 8.998l-5.971.072-4.029 43.928 5.914.072z"/><path d="M3.998 37.004l-1 6 31 1 1-6z"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".857"><path d="M17.997 8.998l-5.972.072-4.028 43.928 5.914.072z"/><path d="M6 16.999l-1 6 31 1 1-6z"/><path d="M31.996 8.998l-5.971.072-4.029 43.928 5.914.072z"/><path d="M3.998 37.004l-1 6 31 1 1-6z"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/inject.svg b/packages/node_modules/@node-red/nodes/icons/inject.svg
index 8038a313f..841c6c2ca 100644
--- a/packages/node_modules/@node-red/nodes/icons/inject.svg
+++ b/packages/node_modules/@node-red/nodes/icons/inject.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v9h15v-7l6 11-6 12v-8H7v9h11v12l14-25z" fill="#fff"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v9h15v-7l6 11-6 12v-8H7v9h11v12l14-25z" fill="#fff"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/join.svg b/packages/node_modules/@node-red/nodes/icons/join.svg
index 491a22b08..0f7fd92af 100644
--- a/packages/node_modules/@node-red/nodes/icons/join.svg
+++ b/packages/node_modules/@node-red/nodes/icons/join.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M40.001 39.99l-.032-19.955-11.967.017v19.983l12-.046M8.001 28.027l-4 .004v3.997l4-.01M14.001 28.027l-4 .004v3.997l4-.01M25.001 30.027l-7-7.986v15.986M8.001 20.027l-4 .004v3.996l4-.01M14.001 20.027l-4 .004v3.996l4-.01M8.001 36.027l-4 .004v3.997l4-.01M14.001 36.027l-4 .004v3.997l4-.01" fill="#fff" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M40.001 39.99l-.032-19.955-11.967.017v19.983l12-.046M8.001 28.027l-4 .004v3.997l4-.01M14.001 28.027l-4 .004v3.997l4-.01M25.001 30.027l-7-7.986v15.986M8.001 20.027l-4 .004v3.996l4-.01M14.001 20.027l-4 .004v3.996l4-.01M8.001 36.027l-4 .004v3.997l4-.01M14.001 36.027l-4 .004v3.997l4-.01" fill="#fff" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/light.svg b/packages/node_modules/@node-red/nodes/icons/light.svg
index ba1c973d4..09d1ac91c 100644
--- a/packages/node_modules/@node-red/nodes/icons/light.svg
+++ b/packages/node_modules/@node-red/nodes/icons/light.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.78737 0 0 .78793 -271.294 -529.99)" stroke="#fff" fill="none"><ellipse transform="matrix(1.4924 0 0 1.4616 -59.491 -343.46)" cx="287.75" cy="715.86" rx="10.75" ry="12" color="#000" stroke-width="4.071"/><path d="M362.5 717.86v15.5c6.371 2.128 8.712 2.003 15 0v-15.5" stroke-linejoin="round" stroke-width="5.01"/><path d="M366.5 717.86l1-12h5l1 12" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.006"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.78737 0 0 .78793 -271.294 -529.99)" stroke="#fff" fill="none"><ellipse transform="matrix(1.4924 0 0 1.4616 -59.491 -343.46)" cx="287.75" cy="715.86" rx="10.75" ry="12" color="#000" stroke-width="4.071"/><path d="M362.5 717.86v15.5c6.371 2.128 8.712 2.003 15 0v-15.5" stroke-linejoin="round" stroke-width="5.01"/><path d="M366.5 717.86l1-12h5l1 12" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.006"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/link-out.svg b/packages/node_modules/@node-red/nodes/icons/link-out.svg
index efbcd85cc..250348861 100644
--- a/packages/node_modules/@node-red/nodes/icons/link-out.svg
+++ b/packages/node_modules/@node-red/nodes/icons/link-out.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M7 38.98v3.983h11v12l13-23H19l-.463.017c-1.28 4.048-5.066 6.983-9.537 6.983zm12-11.017h12l-13-23v12H7V20.9l2 .064c4.467 0 8.25 2.93 9.534 6.972zM6.95 24.22a6 6 0 1 1-.083 11.456" fill="#fff" style="isolation:auto;mix-blend-mode:normal"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M7 38.98v3.983h11v12l13-23H19l-.463.017c-1.28 4.048-5.066 6.983-9.537 6.983zm12-11.017h12l-13-23v12H7V20.9l2 .064c4.467 0 8.25 2.93 9.534 6.972zM6.95 24.22a6 6 0 1 1-.083 11.456" fill="#fff" style="isolation:auto;mix-blend-mode:normal"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-csv.svg b/packages/node_modules/@node-red/nodes/icons/parser-csv.svg
index 62698efc4..fff9b5022 100644
--- a/packages/node_modules/@node-red/nodes/icons/parser-csv.svg
+++ b/packages/node_modules/@node-red/nodes/icons/parser-csv.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-14.838 14h2.838v15.001h-3V25.738c-1.027.96-2.606 1.114-4 1.574V24.76c.734-.24 1.53-.706 2.39-1.373.861-.673 1.452-1.457 1.772-2.351zm15.948 0c1.448 0 2.824.392 3.65 1.173.828.78 1.24 1.751 1.24 2.912 0 .66-.12 1.29-.36 1.89a7.143 7.143 0 0 1-1.05 1.872c-.34.433-.952 1.057-1.84 1.87-.886.815-1.687 1.355-1.927 1.622-.233.267-.423.408-.57.662h5.748v3H21.98c.107-.987.427-2.192.96-3.072.534-.887 1.825-2.06 3.4-3.522 1.267-1.18 1.972-1.982 2.259-2.402.387-.58.402-1.154.402-1.721 0-.627.008-1.108-.332-1.441-.333-.34-1.035-.51-1.629-.51-.587 0-1.053.178-1.4.531-.347.354-.546 1.316-.6 2.137h-3.039c.167-1.548.928-3.315 1.809-3.989.88-.673 1.98-1.011 3.3-1.011zM17.002 33.036h3v1.928c0 .814-.073 1.455-.213 1.922-.14.473-.407.898-.8 1.271-.387.374-.88.666-1.481.88l-.549-1.161c.567-.187.969-.443 1.21-.77.24-.327.367-.503.38-1.07h-1.547z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-14.838 14h2.838v15.001h-3V25.738c-1.027.96-2.606 1.114-4 1.574V24.76c.734-.24 1.53-.706 2.39-1.373.861-.673 1.452-1.457 1.772-2.351zm15.948 0c1.448 0 2.824.392 3.65 1.173.828.78 1.24 1.751 1.24 2.912 0 .66-.12 1.29-.36 1.89a7.143 7.143 0 0 1-1.05 1.872c-.34.433-.952 1.057-1.84 1.87-.886.815-1.687 1.355-1.927 1.622-.233.267-.423.408-.57.662h5.748v3H21.98c.107-.987.427-2.192.96-3.072.534-.887 1.825-2.06 3.4-3.522 1.267-1.18 1.972-1.982 2.259-2.402.387-.58.402-1.154.402-1.721 0-.627.008-1.108-.332-1.441-.333-.34-1.035-.51-1.629-.51-.587 0-1.053.178-1.4.531-.347.354-.546 1.316-.6 2.137h-3.039c.167-1.548.928-3.315 1.809-3.989.88-.673 1.98-1.011 3.3-1.011zM17.002 33.036h3v1.928c0 .814-.073 1.455-.213 1.922-.14.473-.407.898-.8 1.271-.387.374-.88.666-1.481.88l-.549-1.161c.567-.187.969-.443 1.21-.77.24-.327.367-.503.38-1.07h-1.547z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-html.svg b/packages/node_modules/@node-red/nodes/icons/parser-html.svg
index 05c8c8628..66c7436b7 100644
--- a/packages/node_modules/@node-red/nodes/icons/parser-html.svg
+++ b/packages/node_modules/@node-red/nodes/icons/parser-html.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-13 13l3 2-6 8 6 8.001-3 2-7-10zm13 0l7 10-7 10.001-3-2 6-8-6-8z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-13 13l3 2-6 8 6 8.001-3 2-7-10zm13 0l7 10-7 10.001-3-2 6-8-6-8z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-json.svg b/packages/node_modules/@node-red/nodes/icons/parser-json.svg
index 6ce3d45f5..e93ab5d33 100644
--- a/packages/node_modules/@node-red/nodes/icons/parser-json.svg
+++ b/packages/node_modules/@node-red/nodes/icons/parser-json.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-9.17 10.002h1.197v3.11c-.974 0-2.1.057-2.381.17a1.146 1.146 0 0 0-.606.493c-.131.217-.197.593-.197 1.131 0 .546-.04 1.583-.119 3.11-.044.858-.158 1.556-.342 2.093-.184.53-.421.968-.71 1.315-.281.347-.716.705-1.303 1.078.517.295.939.642 1.263 1.04.334.391.588.869.764 1.433.175.563.29 1.318.342 2.263a86.9 86.9 0 0 1 .092 2.756c0 .573.07.972.21 1.198.14.225.35.395.631.507.29.122 1.408.182 2.356.182v3.121H16.83c-1.185 0-2.093-.095-2.725-.285a3.69 3.69 0 0 1-1.604-.924 3.3 3.3 0 0 1-.869-1.613c-.149-.633-.224-1.634-.224-3.004 0-1.596-.07-2.633-.21-3.11-.192-.693-.487-1.187-.882-1.482-.386-.303-2.509-.539-3.316-.582v-3c.64-.035 2.649-.19 2.974-.346.324-.156.605-.417.842-.781.237-.373.398-.836.486-1.39.07-.417.106-1.143.106-2.175 0-1.682.08-2.852.238-3.511.158-.668.443-1.201.855-1.6.413-.408 1.012-.729 1.801-.963.535-.156 3.677-.234 2.527-.234zm5.157 0h1.197c1.15 0 1.993.078 2.528.234.79.234 1.388.555 1.8.963.413.399.698.932.856 1.6.158.659.238 1.83.238 3.511 0 1.032.036 1.758.106 2.174.087.555.25 1.018.486 1.39.237.365.517.626.842.782.324.156 2.333.311 2.973.346v3c-.807.043-2.93.278-3.315.582-.395.295-.69.789-.883 1.482-.14.477-.209 1.514-.209 3.11 0 1.37-.075 2.37-.224 3.004-.15.641-.44 1.18-.87 1.613a3.69 3.69 0 0 1-1.603.924c-.632.19-3.909.285-2.725.285h-1.197v-3.121c.947 0 2.066-.06 2.356-.182.28-.112.49-.282.63-.508.14-.225.211-.625.211-1.197 0-.399.03-1.316.092-2.756.053-.945.166-1.7.342-2.264.175-.563.43-1.041.764-1.431a4.434 4.434 0 0 1 1.263-1.041c-.587-.373-1.022-.731-1.302-1.078-.29-.347-.527-.786-.711-1.315-.185-.537-.298-1.235-.342-2.094-.08-1.526-.12-2.563-.12-3.109 0-.538-.065-.914-.197-1.13a1.146 1.146 0 0 0-.605-.495c-.28-.113-1.407-.17-2.38-.17z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-9.17 10.002h1.197v3.11c-.974 0-2.1.057-2.381.17a1.146 1.146 0 0 0-.606.493c-.131.217-.197.593-.197 1.131 0 .546-.04 1.583-.119 3.11-.044.858-.158 1.556-.342 2.093-.184.53-.421.968-.71 1.315-.281.347-.716.705-1.303 1.078.517.295.939.642 1.263 1.04.334.391.588.869.764 1.433.175.563.29 1.318.342 2.263a86.9 86.9 0 0 1 .092 2.756c0 .573.07.972.21 1.198.14.225.35.395.631.507.29.122 1.408.182 2.356.182v3.121H16.83c-1.185 0-2.093-.095-2.725-.285a3.69 3.69 0 0 1-1.604-.924 3.3 3.3 0 0 1-.869-1.613c-.149-.633-.224-1.634-.224-3.004 0-1.596-.07-2.633-.21-3.11-.192-.693-.487-1.187-.882-1.482-.386-.303-2.509-.539-3.316-.582v-3c.64-.035 2.649-.19 2.974-.346.324-.156.605-.417.842-.781.237-.373.398-.836.486-1.39.07-.417.106-1.143.106-2.175 0-1.682.08-2.852.238-3.511.158-.668.443-1.201.855-1.6.413-.408 1.012-.729 1.801-.963.535-.156 3.677-.234 2.527-.234zm5.157 0h1.197c1.15 0 1.993.078 2.528.234.79.234 1.388.555 1.8.963.413.399.698.932.856 1.6.158.659.238 1.83.238 3.511 0 1.032.036 1.758.106 2.174.087.555.25 1.018.486 1.39.237.365.517.626.842.782.324.156 2.333.311 2.973.346v3c-.807.043-2.93.278-3.315.582-.395.295-.69.789-.883 1.482-.14.477-.209 1.514-.209 3.11 0 1.37-.075 2.37-.224 3.004-.15.641-.44 1.18-.87 1.613a3.69 3.69 0 0 1-1.603.924c-.632.19-3.909.285-2.725.285h-1.197v-3.121c.947 0 2.066-.06 2.356-.182.28-.112.49-.282.63-.508.14-.225.211-.625.211-1.197 0-.399.03-1.316.092-2.756.053-.945.166-1.7.342-2.264.175-.563.43-1.041.764-1.431a4.434 4.434 0 0 1 1.263-1.041c-.587-.373-1.022-.731-1.302-1.078-.29-.347-.527-.786-.711-1.315-.185-.537-.298-1.235-.342-2.094-.08-1.526-.12-2.563-.12-3.109 0-.538-.065-.914-.197-1.13a1.146 1.146 0 0 0-.605-.495c-.28-.113-1.407-.17-2.38-.17z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-xml.svg b/packages/node_modules/@node-red/nodes/icons/parser-xml.svg
index 05c8c8628..66c7436b7 100644
--- a/packages/node_modules/@node-red/nodes/icons/parser-xml.svg
+++ b/packages/node_modules/@node-red/nodes/icons/parser-xml.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-13 13l3 2-6 8 6 8.001-3 2-7-10zm13 0l7 10-7 10.001-3-2 6-8-6-8z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 7.034l-22 .043v45.958h32v-36zm-13 13l3 2-6 8 6 8.001-3 2-7-10zm13 0l7 10-7 10.001-3-2 6-8-6-8z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/parser-yaml.svg b/packages/node_modules/@node-red/nodes/icons/parser-yaml.svg
index d3a2cb9e0..f0a23ce9a 100644
--- a/packages/node_modules/@node-red/nodes/icons/parser-yaml.svg
+++ b/packages/node_modules/@node-red/nodes/icons/parser-yaml.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 6.987l-22 .043v45.958h32V16.987zM10.567 19.362h5.352c.768 0 1.282.104 1.543.313.273.208.41.573.41 1.093 0 .521-.163.886-.488 1.094-.313.209-.892.313-1.739.313h-.644l4.726 8.477 4.903-8.477h-.801c-.703 0-1.191-.104-1.465-.313-.273-.208-.41-.573-.41-1.094 0-.546.117-.918.352-1.113.234-.195.826-.293 1.777-.293h3.594c.99 0 1.62.104 1.894.313.287.195.43.56.43 1.093 0 .521-.143.886-.43 1.094-.273.209-.8.313-1.582.313h-.312l-6.64 11.387v6.211h2.85c1.003 0 1.641.098 1.915.293.286.182.43.534.43 1.055 0 .534-.144.905-.43 1.113-.274.195-.834.293-1.68.293h-9.277c-.847 0-1.406-.098-1.68-.293-.273-.208-.41-.58-.41-1.113 0-.521.15-.873.45-1.055.312-.195.95-.293 1.913-.293h2.832V33.29l-6.504-11.114h-.332c-.781 0-1.315-.104-1.601-.312-.287-.209-.43-.573-.43-1.094 0-.482.117-.833.351-1.055.248-.234.626-.351 1.133-.351z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M26.001 6.987l-22 .043v45.958h32V16.987zM10.567 19.362h5.352c.768 0 1.282.104 1.543.313.273.208.41.573.41 1.093 0 .521-.163.886-.488 1.094-.313.209-.892.313-1.739.313h-.644l4.726 8.477 4.903-8.477h-.801c-.703 0-1.191-.104-1.465-.313-.273-.208-.41-.573-.41-1.094 0-.546.117-.918.352-1.113.234-.195.826-.293 1.777-.293h3.594c.99 0 1.62.104 1.894.313.287.195.43.56.43 1.093 0 .521-.143.886-.43 1.094-.273.209-.8.313-1.582.313h-.312l-6.64 11.387v6.211h2.85c1.003 0 1.641.098 1.915.293.286.182.43.534.43 1.055 0 .534-.144.905-.43 1.113-.274.195-.834.293-1.68.293h-9.277c-.847 0-1.406-.098-1.68-.293-.273-.208-.41-.58-.41-1.113 0-.521.15-.873.45-1.055.312-.195.95-.293 1.913-.293h2.832V33.29l-6.504-11.114h-.332c-.781 0-1.315-.104-1.601-.312-.287-.209-.43-.573-.43-1.094 0-.482.117-.833.351-1.055.248-.234.626-.351 1.133-.351z" fill="#fff" stroke="none" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/range.svg b/packages/node_modules/@node-red/nodes/icons/range.svg
index 6253f01df..51be7a4e7 100644
--- a/packages/node_modules/@node-red/nodes/icons/range.svg
+++ b/packages/node_modules/@node-red/nodes/icons/range.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M8.003 42.007h5v-18h-5zM8.003 20.006h5v-5h-5zM25 52.007h8v-29h-8zM25 15.01h8v-8h-8z" fill="#fff" stroke="none"/><path d="M15.819 15.639l6.293-2.517M15.19 42.385l7.236 3.775" fill="none" stroke="#fff" stroke-width="1.25862"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M8.003 42.007h5v-18h-5zM8.003 20.006h5v-5h-5zM25 52.007h8v-29h-8zM25 15.01h8v-8h-8z" fill="#fff" stroke="none"/><path d="M15.819 15.639l6.293-2.517M15.19 42.385l7.236 3.775" fill="none" stroke="#fff" stroke-width="1.25862"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/rpi.svg b/packages/node_modules/@node-red/nodes/icons/rpi.svg
index 99185f9b0..33aa12efb 100644
--- a/packages/node_modules/@node-red/nodes/icons/rpi.svg
+++ b/packages/node_modules/@node-red/nodes/icons/rpi.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".138"><path d="M20.21 20.98c2.096-.023 4.694 1.562 4.683 3.058-.01 1.32-1.824 2.39-4.667 2.37-2.784-.034-4.656-1.344-4.65-2.623.005-1.053 2.271-2.866 4.634-2.805zM13.07 21.87c.469-.009.954.028 1.449.111 1.458.245-6.99 7.623-7.12 5.977-.116-3.756 2.39-6.027 5.671-6.088zM26.91 21.99c3.28.061 5.787 2.33 5.67 6.086-.13 1.645-8.577-5.73-7.119-5.975a7.83 7.83 0 0 1 1.449-.111zM25.76 26.59c1.56.143 3.143 1.08 4.175 2.643 1.652 2.5 1.27 5.656-.855 7.048-2.125 1.392-5.185.492-6.837-2.008-1.652-2.5-1.269-5.656.855-7.048.797-.522 1.725-.72 2.662-.635zM14.7 26.84c.937-.086 1.865.113 2.661.635 2.125 1.392 2.508 4.548.856 7.048-1.652 2.5-4.712 3.397-6.837 2.005-2.124-1.392-2.507-4.545-.855-7.045 1.032-1.563 2.614-2.5 4.175-2.643zM33.05 29.6a.728.728 0 0 1 .204.026c3.806 2.173 3.145 7.01 1.092 8.66-1.808.804-3.29-8.653-1.296-8.686zM6.95 29.73c1.994.033.512 9.49-1.296 8.687-2.053-1.651-2.714-6.486 1.092-8.66a.738.738 0 0 1 .204-.027zM20.3 36.23c2.832-.014 5.141 2.093 5.156 4.704v.049c.015 2.61-2.269 4.738-5.1 4.752-2.832.014-5.141-2.09-5.156-4.701a2.996 2.996 0 0 1 0-.051c-.015-2.611 2.268-4.74 5.1-4.753zM31.66 38.02c.4-.011.777.102 1.115.364.91.907 1.443 4.32-.15 6.366-2.195 3.045-5.165 3.164-6.272 2.316-1.157-1.092-.274-4.482 1.313-6.34 1.361-1.538 2.793-2.675 3.994-2.706zM8.65 38.74c1.29.055 2.836 1.076 4.099 2.54 1.466 1.768 2.135 4.872.91 5.788-1.157.698-3.968.409-5.967-2.463-1.347-2.409-1.175-4.86-.229-5.58a2.07 2.07 0 0 1 1.187-.285zM20.35 47.21c2.06-.09 4.824.663 4.83 1.662.033.97-2.508 3.163-4.967 3.12-2.547.11-5.045-2.085-5.012-2.846-.038-1.116 3.102-1.987 5.149-1.936zM35.13 11.03c-.569 7.356-7.409 14.128-11.629 6.971 1.363-1.52 3.853-3.306 8.133-5.513-3.33 1.132-6.335 2.64-8.85 4.716-5.838-4.296 4.734-9.675 12.346-6.174z"/><path d="M5.42 11.03c.569 7.356 7.409 14.128 11.629 6.971-1.363-1.52-3.853-3.306-8.133-5.513 3.33 1.132 6.335 2.64 8.85 4.716 5.838-4.296-4.734-9.675-12.346-6.174z"/></g></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-width=".138"><path d="M20.21 20.98c2.096-.023 4.694 1.562 4.683 3.058-.01 1.32-1.824 2.39-4.667 2.37-2.784-.034-4.656-1.344-4.65-2.623.005-1.053 2.271-2.866 4.634-2.805zM13.07 21.87c.469-.009.954.028 1.449.111 1.458.245-6.99 7.623-7.12 5.977-.116-3.756 2.39-6.027 5.671-6.088zM26.91 21.99c3.28.061 5.787 2.33 5.67 6.086-.13 1.645-8.577-5.73-7.119-5.975a7.83 7.83 0 0 1 1.449-.111zM25.76 26.59c1.56.143 3.143 1.08 4.175 2.643 1.652 2.5 1.27 5.656-.855 7.048-2.125 1.392-5.185.492-6.837-2.008-1.652-2.5-1.269-5.656.855-7.048.797-.522 1.725-.72 2.662-.635zM14.7 26.84c.937-.086 1.865.113 2.661.635 2.125 1.392 2.508 4.548.856 7.048-1.652 2.5-4.712 3.397-6.837 2.005-2.124-1.392-2.507-4.545-.855-7.045 1.032-1.563 2.614-2.5 4.175-2.643zM33.05 29.6a.728.728 0 0 1 .204.026c3.806 2.173 3.145 7.01 1.092 8.66-1.808.804-3.29-8.653-1.296-8.686zM6.95 29.73c1.994.033.512 9.49-1.296 8.687-2.053-1.651-2.714-6.486 1.092-8.66a.738.738 0 0 1 .204-.027zM20.3 36.23c2.832-.014 5.141 2.093 5.156 4.704v.049c.015 2.61-2.269 4.738-5.1 4.752-2.832.014-5.141-2.09-5.156-4.701a2.996 2.996 0 0 1 0-.051c-.015-2.611 2.268-4.74 5.1-4.753zM31.66 38.02c.4-.011.777.102 1.115.364.91.907 1.443 4.32-.15 6.366-2.195 3.045-5.165 3.164-6.272 2.316-1.157-1.092-.274-4.482 1.313-6.34 1.361-1.538 2.793-2.675 3.994-2.706zM8.65 38.74c1.29.055 2.836 1.076 4.099 2.54 1.466 1.768 2.135 4.872.91 5.788-1.157.698-3.968.409-5.967-2.463-1.347-2.409-1.175-4.86-.229-5.58a2.07 2.07 0 0 1 1.187-.285zM20.35 47.21c2.06-.09 4.824.663 4.83 1.662.033.97-2.508 3.163-4.967 3.12-2.547.11-5.045-2.085-5.012-2.846-.038-1.116 3.102-1.987 5.149-1.936zM35.13 11.03c-.569 7.356-7.409 14.128-11.629 6.971 1.363-1.52 3.853-3.306 8.133-5.513-3.33 1.132-6.335 2.64-8.85 4.716-5.838-4.296 4.734-9.675 12.346-6.174z"/><path d="M5.42 11.03c.569 7.356 7.409 14.128 11.629 6.971-1.363-1.52-3.853-3.306-8.133-5.513 3.33 1.132 6.335 2.64 8.85 4.716 5.838-4.296-4.734-9.675-12.346-6.174z"/></g></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/serial.svg b/packages/node_modules/@node-red/nodes/icons/serial.svg
index 53c08c448..b07af8123 100644
--- a/packages/node_modules/@node-red/nodes/icons/serial.svg
+++ b/packages/node_modules/@node-red/nodes/icons/serial.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M4.5 47.5h4l.04-34.995L19.5 12.5v35h11v-35h5" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="5"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M4.5 47.5h4l.04-34.995L19.5 12.5v35h11v-35h5" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="5"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/sort.svg b/packages/node_modules/@node-red/nodes/icons/sort.svg
index 6af54d712..bfb34d19b 100644
--- a/packages/node_modules/@node-red/nodes/icons/sort.svg
+++ b/packages/node_modules/@node-red/nodes/icons/sort.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M20.001 19.955l-7.5-8.178-7.5 8.178h5v28h5v-28zM35.001 39.955l-7.5 8.177-7.5-8.177h5v-28h5v28z" fill="#fff" stroke-width=".531"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M20.001 19.955l-7.5-8.178-7.5 8.178h5v28h5v-28zM35.001 39.955l-7.5 8.177-7.5-8.177h5v-28h5v28z" fill="#fff" stroke-width=".531"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/split.svg b/packages/node_modules/@node-red/nodes/icons/split.svg
index a4609534a..56e078698 100644
--- a/packages/node_modules/@node-red/nodes/icons/split.svg
+++ b/packages/node_modules/@node-red/nodes/icons/split.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M16.001 39.99l-.032-19.957-11.968.017v19.983l12-.045M34.001 28.027l-4 .004v3.997l4-.01M40.001 28.027l-4 .004v3.997l4-.01M27.001 30.027l-7-7.986v15.986M34.001 20.027l-4 .004v3.997l4-.01M40.001 20.027l-4 .004v3.997l4-.01M34.001 36.027l-4 .004v3.997l4-.01M40.001 36.027l-4 .004v3.997l4-.01" fill="#fff" stroke-width=".612"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M16.001 39.99l-.032-19.957-11.968.017v19.983l12-.045M34.001 28.027l-4 .004v3.997l4-.01M40.001 28.027l-4 .004v3.997l4-.01M27.001 30.027l-7-7.986v15.986M34.001 20.027l-4 .004v3.997l4-.01M40.001 20.027l-4 .004v3.997l4-.01M34.001 36.027l-4 .004v3.997l4-.01M40.001 36.027l-4 .004v3.997l4-.01" fill="#fff" stroke-width=".612"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/status.svg b/packages/node_modules/@node-red/nodes/icons/status.svg
index 514e451aa..ec92644a1 100644
--- a/packages/node_modules/@node-red/nodes/icons/status.svg
+++ b/packages/node_modules/@node-red/nodes/icons/status.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M0 30h9l3.5-10 5 25 5.125-30L27.5 40 31 30h9" fill="none" stroke="#fff" stroke-miterlimit="6.5" stroke-width="4"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M0 30h9l3.5-10 5 25 5.125-30L27.5 40 31 30h9" fill="none" stroke="#fff" stroke-miterlimit="6.5" stroke-width="4"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/subflow.svg b/packages/node_modules/@node-red/nodes/icons/subflow.svg
index d211f94ce..2eef4f73d 100644
--- a/packages/node_modules/@node-red/nodes/icons/subflow.svg
+++ b/packages/node_modules/@node-red/nodes/icons/subflow.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M25 25.94h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-17 12h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 48.94 4 47.315 4 45.356V14.522c0-1.96 1.625-3.582 3.584-3.582h24.832c1.96 0 3.584 1.623 3.584 3.582v30.834c0 1.96-1.625 3.584-3.584 3.584zM32 36.94H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16v-4.418c0-.35-.235-.582-.584-.582H7.584c-.35 0-.584.233-.584.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4h8z" color="#000" fill="#fff"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M25 25.94h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-17 12h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 48.94 4 47.315 4 45.356V14.522c0-1.96 1.625-3.582 3.584-3.582h24.832c1.96 0 3.584 1.623 3.584 3.582v30.834c0 1.96-1.625 3.584-3.584 3.584zM32 36.94H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16v-4.418c0-.35-.235-.582-.584-.582H7.584c-.35 0-.584.233-.584.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4h8z" color="#000" fill="#fff"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/swap.svg b/packages/node_modules/@node-red/nodes/icons/swap.svg
index 0e67fda9c..e004e8b97 100644
--- a/packages/node_modules/@node-red/nodes/icons/swap.svg
+++ b/packages/node_modules/@node-red/nodes/icons/swap.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M12.787 26.432L9.5 18.003h-4.5v-5h8l2.286 6.286m5.357 14.286l3.357 8.428h4v-8l7 10.5-7 10.5v-8h-7.5l-2.357-6.286"/><path d="M13.001 47.003l10.857-29h4.143v8l7-10.5-7-10.5v8h-7.5l-11 29h-4.5v5z"/></g></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="M12.787 26.432L9.5 18.003h-4.5v-5h8l2.286 6.286m5.357 14.286l3.357 8.428h4v-8l7 10.5-7 10.5v-8h-7.5l-2.357-6.286"/><path d="M13.001 47.003l10.857-29h4.143v8l7-10.5-7-10.5v8h-7.5l-11 29h-4.5v5z"/></g></svg>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/icons/switch.svg b/packages/node_modules/@node-red/nodes/icons/switch.svg
index 378e84b4b..639d46829 100644
--- a/packages/node_modules/@node-red/nodes/icons/switch.svg
+++ b/packages/node_modules/@node-red/nodes/icons/switch.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M5.001 27.006v6l10.12-.014 3.023 7.728 2.357 6.286h7.5v8l7-10.5-7-10.5v8h-4l-3.357-8.429c-.475-1.267-.93-2.435-1.295-3.601l4.51-11.97H28v8l7-10.5-7-10.5v8h-7.5L15.098 27z" fill="#fff" stroke="none"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M5.001 27.006v6l10.12-.014 3.023 7.728 2.357 6.286h7.5v8l7-10.5-7-10.5v8h-4l-3.357-8.429c-.475-1.267-.93-2.435-1.295-3.601l4.51-11.97H28v8l7-10.5-7-10.5v8h-7.5L15.098 27z" fill="#fff" stroke="none"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/template.svg b/packages/node_modules/@node-red/nodes/icons/template.svg
index ad23bf31e..f8cf412c0 100644
--- a/packages/node_modules/@node-red/nodes/icons/template.svg
+++ b/packages/node_modules/@node-red/nodes/icons/template.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M30.041 47.91v3.485h-1.5q-6.027 0-8.084-1.79-2.033-1.792-2.033-7.14V36.68q0-3.655-1.307-5.058-1.306-1.404-4.743-1.404h-1.476v-3.46h1.476q3.46 0 4.743-1.38 1.307-1.404 1.307-5.01v-5.808q0-5.349 2.033-7.116 2.057-1.79 8.083-1.79h1.501v3.46h-1.646q-3.412 0-4.453 1.065-1.04 1.065-1.04 4.477v6.002q0 3.8-1.114 5.518-1.089 1.719-3.75 2.324 2.685.653 3.775 2.371 1.089 1.719 1.089 5.494v6.002q0 3.412 1.04 4.477t4.453 1.065z" fill="#fff" stroke="#fff" stroke-width=".719"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M30.041 47.91v3.485h-1.5q-6.027 0-8.084-1.79-2.033-1.792-2.033-7.14V36.68q0-3.655-1.307-5.058-1.306-1.404-4.743-1.404h-1.476v-3.46h1.476q3.46 0 4.743-1.38 1.307-1.404 1.307-5.01v-5.808q0-5.349 2.033-7.116 2.057-1.79 8.083-1.79h1.501v3.46h-1.646q-3.412 0-4.453 1.065-1.04 1.065-1.04 4.477v6.002q0 3.8-1.114 5.518-1.089 1.719-3.75 2.324 2.685.653 3.775 2.371 1.089 1.719 1.089 5.494v6.002q0 3.412 1.04 4.477t4.453 1.065z" fill="#fff" stroke="#fff" stroke-width=".719"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/timer.svg b/packages/node_modules/@node-red/nodes/icons/timer.svg
index c579cc298..fd7d3f485 100644
--- a/packages/node_modules/@node-red/nodes/icons/timer.svg
+++ b/packages/node_modules/@node-red/nodes/icons/timer.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g color="#000" transform="translate(-540 -987.36)"><path d="M565.43 1001.9c6.562 2.089 11.316 8.233 11.316 15.488 0 8.975-7.275 16.25-16.25 16.25s-16.25-7.275-16.25-16.25c0-2.802.71-5.438 1.958-7.74" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" style="isolation:auto;mix-blend-mode:normal"/><circle cx="560" cy="1001.4" r="1.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" style="isolation:auto;mix-blend-mode:normal"/><path d="M560 1014.4c-1.206 0-11-10.999-12.354-9.975S557 1016.148 557 1017.4s1.36 3 3 3 3-1.361 3-3-1.794-3-3-3z" fill="#fff"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g color="#000" transform="translate(-540 -987.36)"><path d="M565.43 1001.9c6.562 2.089 11.316 8.233 11.316 15.488 0 8.975-7.275 16.25-16.25 16.25s-16.25-7.275-16.25-16.25c0-2.802.71-5.438 1.958-7.74" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" style="isolation:auto;mix-blend-mode:normal"/><circle cx="560" cy="1001.4" r="1.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" style="isolation:auto;mix-blend-mode:normal"/><path d="M560 1014.4c-1.206 0-11-10.999-12.354-9.975S557 1016.148 557 1017.4s1.36 3 3 3 3-1.361 3-3-1.794-3-3-3z" fill="#fff"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/trigger.svg b/packages/node_modules/@node-red/nodes/icons/trigger.svg
index a7c2d87f2..c13298598 100644
--- a/packages/node_modules/@node-red/nodes/icons/trigger.svg
+++ b/packages/node_modules/@node-red/nodes/icons/trigger.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M4.5 47.46h4l.04-34.995 10.96-.005v35h16" stroke="#fff" stroke-linecap="square" stroke-width="5" fill="none"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M4.5 47.46h4l.04-34.995 10.96-.005v35h16" stroke="#fff" stroke-linecap="square" stroke-width="5" fill="none"/></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/watch.svg b/packages/node_modules/@node-red/nodes/icons/watch.svg
index fb9535b2d..e6411fd19 100644
--- a/packages/node_modules/@node-red/nodes/icons/watch.svg
+++ b/packages/node_modules/@node-red/nodes/icons/watch.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-355 -704.36)"><circle transform="translate(-43.091 -44.752) scale(.81818)" cx="505.5" cy="941.86" r="14.5" color="#000" fill="none" stroke="#fff" stroke-width="4"/><path d="M377.62 737.86l8.877 15.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-width="6"/></g></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-355 -704.36)"><circle transform="translate(-43.091 -44.752) scale(.81818)" cx="505.5" cy="941.86" r="14.5" color="#000" fill="none" stroke="#fff" stroke-width="4"/><path d="M377.62 737.86l8.877 15.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-width="6"/></g></svg>
diff --git a/packages/node_modules/@node-red/nodes/icons/white-globe.svg b/packages/node_modules/@node-red/nodes/icons/white-globe.svg
index 474c2f9a6..63679c8ad 100644
--- a/packages/node_modules/@node-red/nodes/icons/white-globe.svg
+++ b/packages/node_modules/@node-red/nodes/icons/white-globe.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M20 12a18 18 0 0 0-14.246 7.033l2.527.844 1.983-1.797 4.89-3.715.99.93-4.085 1.918-.063 2.416 3.22-.805c.95-.68 1.899-1.364 2.849-2.045l-.249-2.29h1.364c1.506-.517 3.013-1.032 4.52-1.548l1.341 1.325-.351 1.957-2.043-.186 1.982 2.662-2.477 1.858v-1.61l-2.29.123c-.868.66-1.735 1.322-2.602 1.983l-.371 3.343-3.096.497-1.053 2.414.494.496 1.178-.31 1.238-1.425 2.106.371 1.113 1.239c1.569.691 3.139 1.382 4.707 2.074H11.068l-1.672 1.455-.31 2.662 1.797 2.85 4.582.867.99 2.662-.371 3.096 2.105 1.61 3.281.31L25 43.158l.37-1.61.56-2.044c.495-.495.988-.991 1.484-1.486l.125-1.67-2.85-1.672-1.484-2.168 1.547.496 2.416 2.414 2.351-1.3.186-2.663-2.414-.371.123-1.332h4.644l1.424 2.2c.578.309 1.157.617 1.735.927l-.249-3.127h1.239l1.3 3.437.405-1.42A18 18 0 0 0 38 30a18 18 0 0 0-18-18zM2.957 33.809l-.518.043a18 18 0 0 0 2.676 6.238c.21-.628.418-1.256.627-1.885v-2.29L5 34.242l-2.043-.434zm25.527 12.049l-5.496 1.889a18 18 0 0 0 5.496-1.889z" color="#000" fill="#fff" style="isolation:auto;mix-blend-mode:normal"/></svg>
\ No newline at end of file
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M20 12a18 18 0 0 0-14.246 7.033l2.527.844 1.983-1.797 4.89-3.715.99.93-4.085 1.918-.063 2.416 3.22-.805c.95-.68 1.899-1.364 2.849-2.045l-.249-2.29h1.364c1.506-.517 3.013-1.032 4.52-1.548l1.341 1.325-.351 1.957-2.043-.186 1.982 2.662-2.477 1.858v-1.61l-2.29.123c-.868.66-1.735 1.322-2.602 1.983l-.371 3.343-3.096.497-1.053 2.414.494.496 1.178-.31 1.238-1.425 2.106.371 1.113 1.239c1.569.691 3.139 1.382 4.707 2.074H11.068l-1.672 1.455-.31 2.662 1.797 2.85 4.582.867.99 2.662-.371 3.096 2.105 1.61 3.281.31L25 43.158l.37-1.61.56-2.044c.495-.495.988-.991 1.484-1.486l.125-1.67-2.85-1.672-1.484-2.168 1.547.496 2.416 2.414 2.351-1.3.186-2.663-2.414-.371.123-1.332h4.644l1.424 2.2c.578.309 1.157.617 1.735.927l-.249-3.127h1.239l1.3 3.437.405-1.42A18 18 0 0 0 38 30a18 18 0 0 0-18-18zM2.957 33.809l-.518.043a18 18 0 0 0 2.676 6.238c.21-.628.418-1.256.627-1.885v-2.29L5 34.242l-2.043-.434zm25.527 12.049l-5.496 1.889a18 18 0 0 0 5.496-1.889z" color="#000" fill="#fff" style="isolation:auto;mix-blend-mode:normal"/></svg>
\ No newline at end of file

From b763e0b0cb0200bc4eaf0a5af50351e615499716 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 2 Oct 2019 09:52:26 +0100
Subject: [PATCH 156/305] Let switch node between rule work both ways round

and add test
---
 .../node_modules/@node-red/nodes/core/function/10-switch.js | 2 +-
 test/nodes/core/function/10-switch_spec.js                  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
index 296851e14..1761853a6 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
@@ -24,7 +24,7 @@ module.exports = function(RED) {
         'lte': function(a, b) { return a <= b; },
         'gt': function(a, b) { return a > b; },
         'gte': function(a, b) { return a >= b; },
-        'btwn': function(a, b, c) { return a >= b && a <= c; },
+        'btwn': function(a, b, c) { return (a >= b && a <= c) || (a <= b && a >= c); },
         'cont': function(a, b) { return (a + "").indexOf(b) != -1; },
         'regex': function(a, b, c, d) { return (a + "").match(new RegExp(b,d?'i':'')); },
         'true': function(a) { return a === true; },
diff --git a/test/nodes/core/function/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
index 3865bdb99..b431fcaaf 100644
--- a/test/nodes/core/function/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -268,6 +268,10 @@ describe('switch Node', function() {
         twoFieldSwitchTest("btwn", "3", "5", true, true, 4, done);
     });
 
+    it('should check if payload is between given values in "wrong" order', function(done) {
+        twoFieldSwitchTest("btwn", "5", "3", true, true, 4, done);
+    });
+
     it('should check if payload is between given string values', function(done) {
         twoFieldSwitchTest("btwn", "c", "e", true, true, "d", done);
     });
@@ -585,7 +589,7 @@ describe('switch Node', function() {
                         done(err);
                     }
                 } else {
-                    done();
+                    //done();
                 }
             });
             switchNode1.receive({payload:0});

From 7efe4a2776201fde05a215be10382f408cf229a8 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 2 Oct 2019 18:22:43 +0900
Subject: [PATCH 157/305] Fix large icon on subflow tab in IE

---
 .../@node-red/editor-client/src/images/subflow_tab.svg          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg b/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg
index 4acb241e4..0a0f4b45f 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/subflow_tab.svg
@@ -1 +1 @@
-<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>
\ No newline at end of file
+<svg width="40" height="40" viewBox="0, 0, 40, 40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>

From c09004dbc8ab6af95e399712c4c0e82076d3df96 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 3 Oct 2019 15:04:27 +0100
Subject: [PATCH 158/305] Fix error when setting typedInput to boolean
 true/false

---
 .../@node-red/editor-client/src/js/ui/common/typedInput.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index 7b3ed45f2..cb4de12d2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -632,7 +632,7 @@
                         for (var i=0;i<opt.options.length;i++) {
                             var op = opt.options[i];
                             if (typeof op === "string") {
-                                if (op === value) {
+                                if (op === value || op === ""+value) {
                                     selectedOption.push(that.activeOptions[op]);
                                     break;
                                 }
@@ -644,7 +644,7 @@
                     })
                     this.input.val(value);
                     if (!opt.multiple) {
-                        if (!selectedOption.length === 0) {
+                        if (selectedOption.length === 0) {
                             selectedOption = [{value:""}];
                         }
                         this._updateOptionSelectLabel(selectedOption[0])

From 1395092ca6ae47d466992b8b0a297c2ceb78d251 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 3 Oct 2019 15:53:26 +0100
Subject: [PATCH 159/305] Add viewbox to default icon

---
 .../@node-red/editor-client/src/images/icons/arrow-in.svg       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg b/packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg
index a5fcb49af..de75fbe4e 100644
--- a/packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg
@@ -1 +1 @@
-<svg width="40" height="60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>

From c7bbe2f1fea014fa1559dc8c56c45f23b2abe41c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 3 Oct 2019 20:31:16 +0100
Subject: [PATCH 160/305] Add env vars to enable safe mode and projects (#2301)

* Add NODE_RED_ENABLE_SAFE_MODE and NODE_RED_ENABLE_PROJECTS

* Allow env-vars to be set to false to disable features
---
 packages/node_modules/node-red/red.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js
index 94cebdfaa..26b6d1fc8 100755
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -133,9 +133,14 @@ try {
 if (parsedArgs.verbose) {
     settings.verbose = true;
 }
-if (parsedArgs.safe) {
+if (parsedArgs.safe || (process.env.NODE_RED_ENABLE_SAFE_MODE && !/^false$/i.test(process.env.NODE_RED_ENABLE_SAFE_MODE) )) {
     settings.safeMode = true;
 }
+if (process.env.NODE_RED_ENABLE_PROJECTS) {
+    settings.editorTheme = settings.editorTheme || {};
+    settings.editorTheme.projects = settings.editorTheme.projects || {};
+    settings.editorTheme.projects.enabled = !/^false$/i.test(process.env.NODE_RED_ENABLE_PROJECTS);
+}
 
 if (settings.https) {
     server = https.createServer(settings.https,function(req,res) {app(req,res);});

From 2c89b2d262e5b4975b6c87ad90cc6b3d31e5d2cb Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 4 Oct 2019 04:32:56 +0900
Subject: [PATCH 161/305] update Japanese info text of range node (#2302)

---
 .../nodes/locales/ja/function/16-range.html        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
index f3572502c..b1294f658 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
@@ -30,4 +30,18 @@
     <p>このノードは受け取った数値を線形スケーリングします。デフォルトでは、結果の値はノードに設定した範囲内に限定しません。</p>
     <p>「<i>入力値の範囲外の値を最小値/最大値として拡大/縮小</i>」を指定すると、値が指定した範囲外の値にならないようにします。</p>
     <p>「<i>入力値の範囲外の値を範囲幅で割った余りとし拡大/縮小</i>」を指定すると、結果を範囲幅で折り返します。</p>
+    <p>例: 入力値0 - 10を0 - 100に変換</p>
+    <table style="outline-width:#888 solid thin">
+        <tr><th width="80px">モード</th><th width="80px">入力</th><th width="80px">出力</th></tr>
+        <tr><td><center>scale</center></td><td><center>12</center></td><td><center>120</center></td></tr>
+        <tr><td><center>limit</center></td><td><center>12</center></td><td><center>100</center></td></tr>
+        <tr><td><center>wrap</center></td><td><center>12</center></td><td><center>20</center></td></tr>
+    </table>
+    <br/>
+    モード:<br/>
+    <ul>
+        <li>scale: msg.payloadの値を拡大/縮小</li>
+        <li>limit: 入力値の範囲外の値を最小値/最大値とし拡大/縮小</li>
+        <li>wrap: 入力値の範囲外の値を範囲幅で割った余りとし拡大/縮小</li>
+    </ul>
 </script>

From 0124bb17e8af8726f66ce9a22908fc1a51fdfe53 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 4 Oct 2019 12:22:09 +0900
Subject: [PATCH 162/305] i18n support in tooltips

---
 .../@node-red/editor-client/locales/de/editor.json         | 2 +-
 .../@node-red/editor-client/locales/en-US/editor.json      | 7 +++++--
 .../@node-red/editor-client/locales/ja/editor.json         | 5 ++++-
 .../@node-red/editor-client/locales/ko/editor.json         | 2 +-
 .../@node-red/editor-client/locales/zh-CN/editor.json      | 2 +-
 .../@node-red/editor-client/src/js/ui/editor.js            | 2 +-
 .../@node-red/editor-client/src/js/ui/tab-config.js        | 4 ++--
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
index 911816bcc..c7394c347 100755
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -444,8 +444,8 @@
       "none" : "keine",
       "subflows" : "Subflows",
       "flows" : "Flows",
-      "filterUnused" : "Nicht verwendet",
       "filterAll" : "alle",
+      "filterUnused" : "Nicht verwendet",
       "filtered" : "__count__ verdeckt"
     },
     "context" : {
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 7bae69c57..fa347e6ea 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -315,6 +315,7 @@
         "labelInputs": "Inputs",
         "labelOutputs": "Outputs",
         "settingIcon": "Icon",
+        "default": "default",
         "noDefaultLabel": "none",
         "defaultLabel": "use default label",
         "searchIcons": "Search icons",
@@ -557,8 +558,10 @@
             "none": "none",
             "subflows": "subflows",
             "flows": "flows",
-            "filterUnused":"unused",
-            "filterAll":"all",
+            "filterAll": "all",
+            "showAllConfigNodes": "Show all config nodes",
+            "filterUnused": "unused",
+            "showAllUnusedConfigNodes": "Show all unused config nodes",
             "filtered": "__count__ hidden"
         },
         "context": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index c57062be1..989516b65 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -315,6 +315,7 @@
         "labelInputs": "入力",
         "labelOutputs": "出力",
         "settingIcon": "アイコン",
+        "default": "デフォルト",
         "noDefaultLabel": "なし",
         "defaultLabel": "既定のラベルを使用",
         "searchIcons": "アイコンを検索",
@@ -557,8 +558,10 @@
             "none": "なし",
             "subflows": "サブフロー",
             "flows": "フロー",
-            "filterUnused": "未使用",
             "filterAll": "全て",
+            "showAllConfigNodes": "全設定ノードを表示",
+            "filterUnused": "未使用",
+            "showAllUnusedConfigNodes": "未使用の全設定ノードを表示",
             "filtered": "__count__ 個が無効"
         },
         "context": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
index 7f3c9ea76..3c12e116a 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
@@ -494,8 +494,8 @@
       "none": "없음",
       "subflows": "보조 플로우",
       "flows": "플로우",
-      "filterUnused": "미사용",
       "filterAll": "전체",
+      "filterUnused": "미사용",
       "filtered": "__count__ 개 숨김"
     },
     "context": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
index f65f428f6..a45f37f66 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@@ -385,8 +385,8 @@
             "none": "无",
             "subflows": "子流程",
             "flows": "流程",
-            "filterUnused": "未使用",
             "filterAll": "所有",
+            "filterUnused": "未使用",
             "filtered": "__count__ 个隐藏"
         },
         "palette": {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 60ce66e61..84c7c5fe3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1034,7 +1034,7 @@ RED.editor = (function() {
             });
 
             RED.popover.tooltip(iconButton, function() {
-                return $("#red-ui-editor-node-icon").val()||"default";
+                return $("#red-ui-editor-node-icon").val() || RED._("editor.default");
             })
             $('<input type="hidden" id="red-ui-editor-node-icon">').val(node.icon).appendTo(iconRow);
         }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
index 86785c385..c16be54e2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@@ -346,8 +346,8 @@ RED.sidebar.config = (function() {
                 refreshConfigNodeList();
             }
         });
-        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'),"Show all config nodes");
-        RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'),"Show all unused config nodes");
+        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllUnusedConfigNodes"));
+        RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'), RED._("sidebar.config.showAllUnusedConfigNodes"));
 
     }
     function show(id) {

From 1c424e2e0afaf3c6fda2f8e746083324f66adb2d Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 4 Oct 2019 15:33:31 +0900
Subject: [PATCH 163/305] Fix width on inject node property

---
 .../node_modules/@node-red/nodes/core/common/20-inject.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index 4953505eb..87ec3f86b 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -138,11 +138,11 @@
         width: 100px;
     }
     .inject-time-days input {
-        width: auto;
-        vertical-align: baseline;
+        width: auto !important;
+        vertical-align: baseline !important;
     }
     .inject-time-times {
-        width: 90px;
+        width: 90px !important;
     }
     #inject-time-time {
         width: 75px;

From 895156675fd0fcd639b8167127d38461926770dc Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 4 Oct 2019 18:15:32 +0900
Subject: [PATCH 164/305] Fix grid setting

---
 .../@node-red/editor-client/src/js/ui/userSettings.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
index 0bd241dfc..07ab12180 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
@@ -118,8 +118,8 @@ RED.userSettings = (function() {
         },{
             title: "menu.label.view.grid",
             options: [
-                {setting:"view-show-grid",oldSetting:"menu-menu-item-view-show-grid",label:"menu.label.view.showGrid",toggle:true,onchange:"core:toggle-show-grid"},
-                {setting:"view-snap-grid",oldSetting:"menu-menu-item-view-snap-grid",label:"menu.label.view.snapGrid",toggle:true,onchange:"core:toggle-snap-grid"},
+                {setting:"view-show-grid",oldSetting:"menu-menu-item-view-show-grid",label:"menu.label.view.showGrid", default: true, toggle:true,onchange:"core:toggle-show-grid"},
+                {setting:"view-snap-grid",oldSetting:"menu-menu-item-view-snap-grid",label:"menu.label.view.snapGrid", default: true, toggle:true,onchange:"core:toggle-snap-grid"},
                 {setting:"view-grid-size",label:"menu.label.view.gridSize",type:"number",default: 20, onchange:RED.view.gridSize}
             ]
         },

From e35f6d9e3535d7103e92c4d1b3c3c55a04403a7c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 4 Oct 2019 11:01:15 +0100
Subject: [PATCH 165/305] Allow TLS config node to provide just CA cert Fixes
 #2297

---
 packages/node_modules/@node-red/nodes/core/network/05-tls.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/05-tls.js b/packages/node_modules/@node-red/nodes/core/network/05-tls.js
index f5dca7beb..078bac2cc 100644
--- a/packages/node_modules/@node-red/nodes/core/network/05-tls.js
+++ b/packages/node_modules/@node-red/nodes/core/network/05-tls.js
@@ -27,7 +27,7 @@ module.exports = function(RED) {
         var caPath = n.ca.trim();
         this.servername = (n.servername||"").trim();
 
-        if ((certPath.length > 0) || (keyPath.length > 0)) {
+        if ((certPath.length > 0) || (keyPath.length > 0) || (caPath.length > 0)) {
 
             if ( (certPath.length > 0) !== (keyPath.length > 0)) {
                 this.valid = false;

From f75dd2209d51d7cad39586f3ace999241e9f69f0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 4 Oct 2019 11:13:46 +0100
Subject: [PATCH 166/305] Bump for 1.0.1

---
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 package.json                                  |  2 +-
 .../@node-red/editor-api/package.json         |  6 ++---
 .../@node-red/editor-client/package.json      |  2 +-
 .../node_modules/@node-red/nodes/package.json |  2 +-
 .../@node-red/registry/package.json           |  4 ++--
 .../@node-red/runtime/package.json            |  6 ++---
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   | 10 ++++-----
 9 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0842ef66d..e0e6e2cb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+#### 1.0.1: Maintenance Release
+
+Runtime
+ - #2301 Add env vars to enable safe mode and projects
+   - `NODE_RED_ENABLE_SAFE_MODE`
+   - `NODE_RED_ENABLE_PROJECTS`
+
+Editor
+ - #2308 Fix grid setting
+ - #2306 i18n support in tooltips
+ - Fix error when setting typedInput to boolean true/false
+ - #2299 Fix SVG icons in IE11
+ - #2303 Fix issue where subflow color did not update when not on a flow
+
+Nodes
+ - #2297 TLS: Allow TLS config node to provide just CA cert
+ - #2307 Inject: Fix width on inject node property
+ - #2305 Switch: Let switch node between rule work both ways round
+ - Range: Add example to range node info and make use of target consistent
+ - Join: node must clone group message before sending
+
+
 #### 1.0.0: Milestone Release
 
 Editor
diff --git a/package.json b/package.json
index f72dd9c4a..61242d8e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 001ec5cf3..bd461734d 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0",
-        "@node-red/editor-client": "1.0.0",
+        "@node-red/util": "1.0.1",
+        "@node-red/editor-client": "1.0.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index ea34f5f60..410e154e7 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index ae2f74aa7..1147c59b1 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index a97a5af2c..c50243c04 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0",
+        "@node-red/util": "1.0.1",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index bffa5813a..0d7faa6f4 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.0",
-        "@node-red/util": "1.0.0",
+        "@node-red/registry": "1.0.1",
+        "@node-red/util": "1.0.1",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 028bae0d3..f3751d4e2 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 38fc52fe6..46e34c891 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.0",
-        "@node-red/runtime": "1.0.0",
-        "@node-red/util": "1.0.0",
-        "@node-red/nodes": "1.0.0",
+        "@node-red/editor-api": "1.0.1",
+        "@node-red/runtime": "1.0.1",
+        "@node-red/util": "1.0.1",
+        "@node-red/nodes": "1.0.1",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From a0026e66cea66fdf493a2ca52af18ff4b0690878 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 7 Oct 2019 16:13:04 +0900
Subject: [PATCH 167/305] Fix element to collapse items in visual JSON editor

---
 .../@node-red/editor-client/src/js/ui/editors/json.js            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 26b84ecaa..cce079581 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -141,6 +141,7 @@
                 })
             }});
             options.push({id:"red-ui-editor-type-json-menu-collapse-children",icon:"fa fa-angle-double-up", label:RED._('jsonEditor.collapseItems'),onselect:function(){
+                item.treeList.collapse();
                 item.children.forEach(function(child) {
                     child.treeList.collapse();
                 })

From 5056203023f03a3236b6507af57f43fe8cee1aaa Mon Sep 17 00:00:00 2001
From: Thierry Le Gal <thierry.le.gal@gmail.com>
Date: Mon, 7 Oct 2019 14:47:20 +0200
Subject: [PATCH 168/305] Insert divider in menu by calling
 RED.menu.addItem('id', null);

---
 .../@node-red/editor-client/src/js/ui/common/menu.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
index 131dc1f13..e73c82293 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -244,7 +244,7 @@ RED.menu = (function() {
 
     function addItem(id,opt) {
         var item = createMenuItem(opt);
-        if (opt.group) {
+        if (opt !== null && opt.group) {
             var groupItems = $("#"+id+"-submenu").children(".red-ui-menu-group-"+opt.group);
             if (groupItems.length === 0) {
                 item.appendTo("#"+id+"-submenu");

From 8df86a75b1f59d018a21df7c6ef9ebff5b489fef Mon Sep 17 00:00:00 2001
From: Ryoichi Obara <ryoichi-obara@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:39:08 +0900
Subject: [PATCH 169/305] Interval of inject node should be 596 hours or less.
 (#2319)

---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 4999cb8a7..4b0b0a3b3 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -79,7 +79,7 @@
         "on": "on",
         "onstart": "Inject once after",
         "onceDelay": "seconds, then",
-        "tip": "<b>Note:</b> \"interval between times\" and \"at a specific time\" will use cron.<br/>\"interval\" should be less than 596 hours.<br/>See info box for details.",
+        "tip": "<b>Note:</b> \"interval between times\" and \"at a specific time\" will use cron.<br/>\"interval\" should be 596 hours or less.<br/>See info box for details.",
         "success": "Successfully injected: __label__",
         "errors": {
             "failed": "inject failed, see log for details",

From bf9e04d9db3b94d327b24fe70f4a844c3049d1b2 Mon Sep 17 00:00:00 2001
From: Ryoichi Obara <ryoichi-obara@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:40:36 +0900
Subject: [PATCH 170/305] Unify translations of "boolean". (#2318)

---
 .../@node-red/nodes/locales/ja/common/20-inject.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
index a9ecef1c4..429471173 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
@@ -25,7 +25,7 @@
 </dl>
 <h3>詳細</h3>
 <p>injectノードを用いることで、指定したペイロード値を用いてフローを開始できます。デフォルトのペイロード値は現在時刻のタイムスタンプを1970年1月1日からの経過ミリ秒で表現した値です。</p>
-<p>文字列、数値、論理値、JavaScriptオブジェクト、フロー/グローバルコンテキストの値などの送出も可能です。</p>
+<p>文字列、数値、真偽値、JavaScriptオブジェクト、フロー/グローバルコンテキストの値などの送出も可能です。</p>
 <p> デフォルト設定では、エディタ内に表示されるボタンをクリックすることで、ノードを手動で起動できます。指定間隔もしくはスケジュールに従ってメッセージを送出するように設定することも可能です。</p>
 <p>また、フロー開始の際に一度だけメッセージを送出させることもできます。</p>
 <p>「<i>時間間隔</i>」に指定可能な値の最大値は、約596時間(もしくは24日)です。一日より長い間隔を扱いたい場合は、電源停止や再起動にも対応可能なスケジューラノードの利用を検討すると良いでしょう。</p>

From 16bda530f6727840efe4c8883e93798f5b5f5906 Mon Sep 17 00:00:00 2001
From: Ryoichi Obara <ryoichi-obara@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:41:33 +0900
Subject: [PATCH 171/305] Remove unnecessary comma. (#2312)

---
 .../@node-red/nodes/locales/en-US/function/80-template.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
index 8be8234b5..47e24a8a3 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -38,7 +38,7 @@
     <pre>{
   date: "Monday"
   payload: {
-    name: "Fred",
+    name: "Fred"
   }
 }</pre>
     <p>The resulting property will be:

From a1e10e99fa41cf7d651edf064a44ba102917f7c8 Mon Sep 17 00:00:00 2001
From: kitazaki <kitazaki@gmail.com>
Date: Wed, 9 Oct 2019 22:51:38 +0900
Subject: [PATCH 172/305] Update 10-file.html (#2320)

---
 .../@node-red/nodes/locales/ja/storage/10-file.html             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
index 6bf7f5999..2df174104 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
@@ -52,7 +52,7 @@
     <p>Windowsではパスの区切り文字を(例えば、<code>\\ユーザー\\名前</code>のように)エスケープする必要があります。</p>
     <p>テキストファイルの場合、行毎に分割して各々メッセージを送信することができます。また、バイナリファイルの場合、小さな塊のバッファに分割して送信できます。バッファの分割単位はオペレーティングシステム依存ですが、一般に64k(Linux/Mac)もしくは41k(Windows)です。</p>
     <p>複数のメッセージに分割する場合、各メッセージには<code>parts</code>プロパティが設定され、メッセージ列を構成します。</p>
-    <p>主力形式が文字列の場合、入力データのエンコーディングをエンコーディングリストから選択できます。</p>
+    <p>出力形式が文字列の場合、入力データのエンコーディングをエンコーディングリストから選択できます。</p>
     <h4>旧式のエラー処理</h4>
     <p>Node-RED 0.17より前の版では、ファイルの読み込み時にエラーが発生すると<code>payload</code>を持たず<code>error</code>プロパティにエラーの詳細情報を設定したメッセージを送信します。この動作モードは非推奨であり、新しいノード実装ではデフォルトでは無効としています。ノードの設定により、必要に応じてこのモードを有効にできます。</p>
     <p>エラーはcatchノードで補足して処理することを推奨します。</p>

From ff4d58f64823eebbc0fcc6600af9a12df29265a9 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 10 Oct 2019 18:34:10 +0900
Subject: [PATCH 173/305] Fix invalid JSON data in template node (#2322)

---
 .../nodes/locales/de/function/80-template.html         | 10 ++++++----
 .../nodes/locales/en-US/function/80-template.html      |  2 +-
 .../nodes/locales/ja/function/80-template.html         |  4 ++--
 .../nodes/locales/ko/function/80-template.html         |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
index a00b8d449..e3d58d2eb 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
@@ -35,10 +35,12 @@
   <p> Beispiel: Wenn eine Vorlage von:
   <pre> Hallo {{payload.name}}. Heute ist {{date}} </pre>
   <p> eine Nachricht empfangt, die folgendes enthält:
-  <pre> {
-Datum: "Montag"
-Payload: { Name: "Fred"}
-} </pre>
+  <pre>{
+  date: "Montag",
+  payload: {
+    name: "Fred"
+  }
+}</pre>
   <p> wird die resultierende Nachrich wie folgt sein:
   <pre> Hallo Fred. Heute ist Montag </pre>
   <p> Es ist möglich, eine Eigenschaft aus dem Flowkontext oder dem globalen Kontext zu verwenden. 
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
index 47e24a8a3..1e541c605 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -36,7 +36,7 @@
     <pre>Hello {{payload.name}}. Today is {{date}}</pre>
     <p>receives a message containing:
     <pre>{
-  date: "Monday"
+  date: "Monday",
   payload: {
     name: "Fred"
   }
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
index f8c97ab59..802c268f6 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
@@ -34,9 +34,9 @@
     <pre>こんにちは{{payload.name}}さん。今日は{{date}}です。</pre>
     <p>というテンプレートに対して、
     <pre>{
-  date: "月曜日"
+  date: "月曜日",
   payload: {
-    name: "山田",
+    name: "山田"
   }
 }</pre>
     <p>というメッセージを受信した場合、</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
index c3e3d7226..7415b63c3 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
@@ -34,9 +34,9 @@
     <pre>안녕하세요, {{payload.name}}씨. 오늘은 {{date}}입니다.</pre>
     <p>라는 템플릿에 대해,
     <pre>{
-  date: "월요일"
+  date: "월요일",
   payload: {
-    name: "홍길동",
+    name: "홍길동"
   }
 }</pre>
     <p>이라는 메세지를 수신한 경우,</p>

From ca7a2985097bae1066f281ab383fb421e3cf97a2 Mon Sep 17 00:00:00 2001
From: Arlena Derksen <arlena@hubsec.eu>
Date: Thu, 10 Oct 2019 14:57:19 +0200
Subject: [PATCH 174/305] Fixed docstrings to have them match the function
 signature (name of parameters).

---
 packages/node_modules/@node-red/util/lib/util.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index b4512f1ea..69ed930bb 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -301,7 +301,7 @@ function normalisePropertyExpression(str) {
  * front of the property expression if present.
  *
  * @param  {Object} msg - the message object
- * @param  {String} str - the property expression
+ * @param  {String} expr - the property expression
  * @return {any} the message property, or undefined if it does not exist
  * @memberof @node-red/util_util
  */
@@ -316,7 +316,7 @@ function getMessageProperty(msg,expr) {
  * Gets a property of an object.
  *
  * @param  {Object} msg - the object
- * @param  {String} str - the property expression
+ * @param  {String} expr - the property expression
  * @return {any} the object property, or undefined if it does not exist
  * @memberof @node-red/util_util
  */
@@ -468,7 +468,7 @@ function evaluateEnvProperty(value, node) {
  *
  * For example, `#:(file)::foo` results in ` { store: "file", key: "foo" }`.
  *
- * @param  {String} value - the context property string to parse
+ * @param  {String} key - the context property string to parse
  * @return {Object} The parsed property
  * @memberof @node-red/util_util
  */

From 547e7a1b21857f6ecc15468c703fec5c17d02371 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 10 Oct 2019 16:35:12 +0100
Subject: [PATCH 175/305] Allow node emitted events to have multiple arguments

This is fixing a regression introduced in 1.0 where a custom
`Node.emit` function was added that could only handle a single
argument.
---
 packages/node_modules/@node-red/runtime/lib/nodes/Node.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index 7d2424e18..c58fa65cc 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -169,20 +169,20 @@ Node.prototype._emit = Node.prototype.emit;
 /**
  * Emit an event to all registered listeners.
  */
-Node.prototype.emit = function(event,arg) {
+Node.prototype.emit = function(event, ...args) {
     var node = this;
     if (event === "input") {
         // When Pluggable Message Routing arrives, this will be called from
         // that and will already be sync/async depending on the router.
         if (this._asyncDelivery) {
             setImmediate(function() {
-                node._emitInput(arg);
+                node._emitInput.apply(node,args);
             });
         } else {
-            this._emitInput(arg);
+            this._emitInput.apply(this,args);
         }
     } else {
-        this._emit(event,arg);
+        this._emit.apply(this,arguments);
     }
 }
 

From 451835fbebf1ed134abdff2a98c18489d45215f5 Mon Sep 17 00:00:00 2001
From: 1ft-seabass <seigo@1ft-seabass.jp>
Date: Fri, 11 Oct 2019 16:55:23 +0900
Subject: [PATCH 176/305] Fixed editor.json (#2321)

---
 .../node_modules/@node-red/editor-client/locales/ja/editor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 989516b65..a6aab331d 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -955,7 +955,7 @@
             "confirm": "<p>デプロイされていない変更は失われます。</p><p>続けますか?</p>"
         },
         "send-req": {
-            "auth-req": "リポジトリ対する認証が必要です",
+            "auth-req": "リポジトリに対する認証が必要です",
             "username": "ユーザ名",
             "password": "パスワード",
             "passphrase": "パスフレーズ",

From f62a933d1c70e93ec5e35494e74c2baf033ee512 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 11 Oct 2019 11:07:48 +0100
Subject: [PATCH 177/305] Ensure z property included in full message debug
 payload Fixes #2315 #2316

---
 packages/node_modules/@node-red/nodes/core/common/21-debug.js | 4 ++--
 .../@node-red/nodes/core/common/lib/debug/debug-utils.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
index 9beff7809..8477ed525 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
@@ -62,7 +62,7 @@ module.exports = function(RED) {
                     if (err) {
                         done(RED._("debug.invalid-exp", {error: editExpression}));
                     } else {
-                        done(null,{id:node.id, name:node.name, topic:msg.topic, msg:value, _path:msg._path});
+                        done(null,{id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:value, _path:msg._path});
                     }
                 });
             } else {
@@ -88,7 +88,7 @@ module.exports = function(RED) {
                     node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
                 }
                 if (this.active && this.tosidebar) {
-                    sendDebug({id:node.id, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
+                    sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
                 }
                 done();
             } else {
diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
index b2d96893c..db1a85510 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
@@ -448,7 +448,7 @@ RED.debug = (function() {
         var metaRow = $('<div class="red-ui-debug-msg-meta"></div>').appendTo(msg);
         $('<span class="red-ui-debug-msg-date">'+ getTimestamp()+'</span>').appendTo(metaRow);
         if (sourceNode) {
-            $('<a>',{href:"#",class:"red-ui-debug-msg-name"}).text('node: '+(sourceNode.name||sourceNode.id))
+            $('<a>',{href:"#",class:"red-ui-debug-msg-name"}).text('node: '+sanitize(o.name||sourceNode.name||sourceNode.id))
             .appendTo(metaRow)
             .on("click", function(evt) {
                 evt.preventDefault();

From 6f91786f4dfcbd81047cf8238641567b12440f89 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 11 Oct 2019 11:08:25 +0100
Subject: [PATCH 178/305] Fixup Change node use of node.done

---
 .../node_modules/@node-red/nodes/core/function/15-change.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.js b/packages/node_modules/@node-red/nodes/core/function/15-change.js
index ae377ed1e..5c9093bb6 100644
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -331,11 +331,11 @@ module.exports = function(RED) {
             this.on('input', function(msg, send, done) {
                 applyRules(msg, 0, (err,msg) => {
                     if (err) {
-                        node.error(err,msg);
+                        done(err);
                     } else if (msg) {
                         send(msg);
+                        done();
                     }
-                    done();
                 })
             });
         }

From 147d2a02bee96471bd1cdc0639842c88c7a60134 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 14 Oct 2019 13:05:45 +0100
Subject: [PATCH 179/305] Ensure node status is refreshed whenever node is
 edited

Fixes an issue where, if the number of node outputs was changes
the node would resize, but the status text would not reposition
until a new status message arrived.

This change marks status as dirty whenever the node has been
edited, forcing it to be redrawn.
---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 84c7c5fe3..c3d8b1a4f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -202,6 +202,7 @@ RED.editor = (function() {
     function updateNodeProperties(node, outputMap) {
         node.resize = true;
         node.dirty = true;
+        node.dirtyStatus = true;
         var removedLinks = [];
         if (node.ports) {
             if (outputMap) {

From c1c694035d1692ec952ea82d3908552cb0dfde98 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 14 Oct 2019 13:06:59 +0100
Subject: [PATCH 180/305] Allow node.status() to be passed number/bool types

Adds to the existing support for string types. Also
adds unit tests for all three cases
---
 .../@node-red/runtime/lib/nodes/Node.js       |  7 ++++-
 .../@node-red/runtime/lib/nodes/Node_spec.js  | 30 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index c58fa65cc..c465f0b5b 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -539,7 +539,12 @@ Node.prototype.metric = function(eventname, msg, metricValue) {
  * status: "simple text status"
  */
 Node.prototype.status = function(status) {
-    if (typeof(status) === "string") { status = {text:status}; }
+    switch (typeof status) {
+        case "string":
+        case "number":
+        case "boolean":
+            status = {text:""+status}
+    }
     this._flow.handleStatus(this,status);
 };
 
diff --git a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
index 5ad52211e..1f9ca04ce 100644
--- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
@@ -613,9 +613,6 @@ describe('Node', function() {
             }
             var n = new RedNode({_flow:flow,id:'123',type:'abc'});
             var status = {fill:"green",shape:"dot",text:"connected"};
-            var topic;
-            var message;
-            var retain;
 
             n.status(status);
 
@@ -624,6 +621,33 @@ describe('Node', function() {
             flow.handleStatus.args[0][1].should.eql(status);
             done();
         });
+        it('publishes status for plain string', function(done) {
+            var flow = { handleStatus: sinon.stub() }
+            var n = new RedNode({_flow:flow,id:'123',type:'abc'});
+            n.status("text status");
+            flow.handleStatus.called.should.be.true();
+            flow.handleStatus.args[0][0].should.eql(n);
+            flow.handleStatus.args[0][1].should.eql({text:"text status"});
+            done();
+        });
+        it('publishes status for plain boolean', function(done) {
+            var flow = { handleStatus: sinon.stub() }
+            var n = new RedNode({_flow:flow,id:'123',type:'abc'});
+            n.status(false);
+            flow.handleStatus.called.should.be.true();
+            flow.handleStatus.args[0][0].should.eql(n);
+            flow.handleStatus.args[0][1].should.eql({text:"false"});
+            done();
+        });
+        it('publishes status for plain number', function(done) {
+            var flow = { handleStatus: sinon.stub() }
+            var n = new RedNode({_flow:flow,id:'123',type:'abc'});
+            n.status(123);
+            flow.handleStatus.called.should.be.true();
+            flow.handleStatus.args[0][0].should.eql(n);
+            flow.handleStatus.args[0][1].should.eql({text:"123"});
+            done();
+        });
     });
 
 });

From 07fe5b247b1b97fdf2c79d90cb6f390d9f960d1b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 14 Oct 2019 13:17:48 +0100
Subject: [PATCH 181/305] Bump for 1.0.2

---
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 package.json                                  |  2 +-
 .../@node-red/editor-api/package.json         |  6 ++---
 .../@node-red/editor-client/package.json      |  2 +-
 .../node_modules/@node-red/nodes/package.json |  2 +-
 .../@node-red/registry/package.json           |  4 ++--
 .../@node-red/runtime/package.json            |  6 ++---
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   | 10 ++++-----
 9 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0e6e2cb6..28f11c2db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+#### 1.0.2: Maintenance Release
+
+Runtime
+ - Allow node.status() to be passed number/bool types
+ - Allow node emitted events to have multiple arguments
+ - #2323 Fixed docstrings to have them match the function signature (name of parameters).
+ - #2318 NLS: Unify translations of "boolean"
+
+Editor
+ - Ensure node status is refreshed whenever node is edited
+ - #2315 #2316 Ensure z property included in full message debug payload
+ - #2321 Fixed editor.json (JA nls)
+ - #2313 Fix element to collapse items in visual JSON editor
+ - #2314 Insert divider in menu by calling RED.menu.addItem('id', null);
+
+Nodes
+ - Change: Fixup use of node.done
+ - #2322 Template: Fix invalid JSON data in template node docs
+ - #2320 File: Fixed a typo in 10-file.html (JA nls)
+ - #2312 Template: Remove unnecessary comma in help text
+ - #2319 Inject: Interval of inject node should be 596 hours or less.
+
 #### 1.0.1: Maintenance Release
 
 Runtime
diff --git a/package.json b/package.json
index 61242d8e1..8d2ac8a4c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index bd461734d..ac86c1f9b 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.1",
-        "@node-red/editor-client": "1.0.1",
+        "@node-red/util": "1.0.2",
+        "@node-red/editor-client": "1.0.2",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 410e154e7..441a19629 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 1147c59b1..f4a031630 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index c50243c04..5b0503d6d 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.1",
+        "@node-red/util": "1.0.2",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 0d7faa6f4..3315ecb2f 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.1",
-        "@node-red/util": "1.0.1",
+        "@node-red/registry": "1.0.2",
+        "@node-red/util": "1.0.2",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index f3751d4e2..ca2b77a65 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 46e34c891..b57ef69bf 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.1",
-        "@node-red/runtime": "1.0.1",
-        "@node-red/util": "1.0.1",
-        "@node-red/nodes": "1.0.1",
+        "@node-red/editor-api": "1.0.2",
+        "@node-red/runtime": "1.0.2",
+        "@node-red/util": "1.0.2",
+        "@node-red/nodes": "1.0.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From e94634544cd21d5e4e0c7c9da9320a004cf1a2a3 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 14 Oct 2019 15:50:48 +0100
Subject: [PATCH 182/305] Add script to generate npm publish script

---
 Gruntfile.js                       | 15 +++++++++++-
 scripts/generate-publish-script.js | 38 ++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 scripts/generate-publish-script.js

diff --git a/Gruntfile.js b/Gruntfile.js
index caa043e76..28f510e50 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -562,7 +562,20 @@ module.exports = function(grunt) {
             return false;
         }
     });
+    grunt.registerTask('generatePublishScript',
+        'Generates a script to publish build output to npm',
+            function () {
+                const done = this.async();
+                const generatePublishScript = require("./scripts/generate-publish-script.js");
+                generatePublishScript().then(function(output) {
+                    grunt.log.writeln(output);
 
+                    const filePath = path.join(grunt.config.get('paths.dist'),"modules","publish.sh");
+                    grunt.file.write(filePath,output);
+
+                    done();
+                });
+            });
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -605,7 +618,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules']);
+        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules','generatePublishScript']);
 
     grunt.registerTask('pack-modules',
         'Create module pack files for release',
diff --git a/scripts/generate-publish-script.js b/scripts/generate-publish-script.js
new file mode 100644
index 000000000..45a4e8423
--- /dev/null
+++ b/scripts/generate-publish-script.js
@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+const path = require("path");
+const fs = require("fs-extra");
+const should = require("should");
+
+function generateScript() {
+    return new Promise((resolve, reject) => {
+        const packages = [
+            "node-red-util",
+            "node-red-runtime",
+            "node-red-registry",
+            "node-red-nodes",
+            "node-red-editor-client",
+            "node-red-editor-api",
+            "node-red"
+        ];
+        const rootPackage = require(path.join(__dirname,"..","package.json"));
+        const version = rootPackage.version;
+
+        const tagArg = /-/.test(version) ? "--tag next" : ""
+
+        const lines = [];
+
+        packages.forEach(name => {
+            lines.push(`npm publish ${name}-${version}.tgz ${tagArg}\n`);
+        })
+        resolve(lines.join(""))
+    });
+}
+
+if (require.main === module) {
+    generateScript().then(output => {
+        console.log(output);
+    });
+} else {
+    module.exports = generateScript;
+}

From a08c2c643794a208f89be4dcc26a1afd61ff32f2 Mon Sep 17 00:00:00 2001
From: Mauricio Bonani <bonanitech@gmail.com>
Date: Mon, 14 Oct 2019 15:13:59 -0400
Subject: [PATCH 183/305] Fix palette editor search visualization

---
 .../@node-red/editor-client/src/js/ui/palette-editor.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index 074a54469..ee5221554 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -788,7 +788,7 @@ RED.palette.editor = (function() {
             initInstallTab();
         })
 
-        packageList = $('<ol>',{style:"position: absolute;top: 78px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({
+        packageList = $('<ol>',{style:"position: absolute;top: 79px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({
             addButton: false,
             scrollOnAdd: false,
             addItem: function(container,i,object) {

From 56c41374bf7147b5093f187fcc4e5a192f8d91af Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 15 Oct 2019 16:50:16 +0900
Subject: [PATCH 184/305] Fix language handling in subflow node

---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 5ea39be6a..c83a1dd8a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -806,12 +806,12 @@ RED.subflow = (function() {
         locales.val(currentLocale);
 
         locales.on("change", function() {
-            currentLocale = $(this).val();
+            var locale = $(this).val();
             var items = $("#node-input-env-container").editableList("items");
             items.each(function (i, item) {
                 var entry = $(this).data('data');
                 var labelField = entry.ui.labelField;
-                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
+                labelField.val(lookupLabel(entry.ui.label, "", locale));
                 if (labelField.timeout) {
                     clearTimeout(labelField.timeout);
                     delete labelField.timeout;

From faf6fa945084a9bee3084d9d22dd6f867b8caa53 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 16 Oct 2019 20:59:01 +0900
Subject: [PATCH 185/305] Fix copy and paste handling in subflow

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index d956684ce..5c0778fba 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -845,7 +845,7 @@ RED.nodes = (function() {
             var m = /^subflow:(.+)$/.exec(newNodes[i].type);
             if (m) {
                 var subflowId = m[1];
-                var parent = getSubflow(newNodes[i].z || activeWorkspace);
+                var parent = getSubflow(activeWorkspace);
                 if (parent) {
                     var err;
                     if (subflowId === parent.id) {

From e5c27d0236569192eb84b71d2e35e38c8f99663a Mon Sep 17 00:00:00 2001
From: TJKoury <TJKoury@gmail.com>
Date: Wed, 16 Oct 2019 20:00:11 -0400
Subject: [PATCH 186/305] Remove msg

`msg` not defined in scope.
---
 packages/node_modules/@node-red/runtime/lib/nodes/Node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index c465f0b5b..d860fb5b0 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -224,7 +224,7 @@ Node.prototype._emitInput = function(arg) {
                     }
                 );
             } catch(err) {
-                node.error(err,msg);
+                node.error(err);
             }
         }
     }

From cb8deab1f99b5f7854450eb961d72587a556232a Mon Sep 17 00:00:00 2001
From: TJKoury <TJKoury@gmail.com>
Date: Thu, 17 Oct 2019 07:42:11 -0400
Subject: [PATCH 187/305] Update
 packages/node_modules/@node-red/runtime/lib/nodes/Node.js

Co-Authored-By: Nick O'Leary <nick.oleary@gmail.com>
---
 packages/node_modules/@node-red/runtime/lib/nodes/Node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index d860fb5b0..d35ced395 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -224,7 +224,7 @@ Node.prototype._emitInput = function(arg) {
                     }
                 );
             } catch(err) {
-                node.error(err);
+                node.error(err,arg);
             }
         }
     }

From e10dd54e2b83030b79fdd40799568133787d25b4 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 17 Oct 2019 21:05:06 +0900
Subject: [PATCH 188/305] Revert "Merge pull request #2328 from
 kazuhitoyokoi/master-fixsubflowlang"

This reverts commit 873bdc673300f2bacfb1b3968f1328e241fa79c8, reversing
changes made to 8a40b075b57bb792a5a3324416b6601c7e893b2d.
---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index c83a1dd8a..5ea39be6a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -806,12 +806,12 @@ RED.subflow = (function() {
         locales.val(currentLocale);
 
         locales.on("change", function() {
-            var locale = $(this).val();
+            currentLocale = $(this).val();
             var items = $("#node-input-env-container").editableList("items");
             items.each(function (i, item) {
                 var entry = $(this).data('data');
                 var labelField = entry.ui.labelField;
-                labelField.val(lookupLabel(entry.ui.label, "", locale));
+                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
                 if (labelField.timeout) {
                     clearTimeout(labelField.timeout);
                     delete labelField.timeout;

From 78b735276b6fa3f37a35ecadab17fe19ec0704d3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 17 Oct 2019 13:24:51 +0100
Subject: [PATCH 189/305] fix httprequest timeout units info

to close #2333
---
 .../@node-red/nodes/locales/en-US/network/21-httprequest.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
index fcc852c65..3daf92f49 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
@@ -36,7 +36,7 @@
         <dt class="optional">followRedirects</dt>
         <dd>If set to <code>false</code> prevent following Redirect (HTTP 301).<code>true</code> by default</dd>
         <dt class="optional">requestTimeout</dt>
-        <dd>If set to a positive number, will override the globally set <code>httpRequestTimeout</code> parameter.</dd>
+        <dd>If set to a positive number of milliseconds, will override the globally set <code>httpRequestTimeout</code> parameter.</dd>
     </dl>
     <h3>Outputs</h3>
     <dl class="message-properties">

From dae9ac8173946bd0e776314e0f9cb5e2f9443556 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 17 Oct 2019 21:24:55 +0900
Subject: [PATCH 190/305] Fix language handling in subflow node

---
 .../@node-red/editor-client/src/js/ui/subflow.js         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 5ea39be6a..2646704ae 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -802,8 +802,8 @@ RED.subflow = (function() {
             }
             $("<option/>", opt).text(item.text).appendTo(locales);
         });
-        currentLocale = RED.i18n.lang();
-        locales.val(currentLocale);
+        var locale = RED.i18n.lang();
+        locales.val(locale);
 
         locales.on("change", function() {
             currentLocale = $(this).val();
@@ -1371,7 +1371,8 @@ RED.subflow = (function() {
         }
 
         var labels = ui.label || {};
-        var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, currentLocale);
+        var locale = RED.i18n.lang();
+        var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, locale);
         var label = $('<label>').appendTo(row);
         var labelContainer = $('<span></span>').appendTo(label);
         if (ui.icon) {
@@ -1423,7 +1424,7 @@ RED.subflow = (function() {
                 input = $('<select>').css('width','70%').appendTo(row);
                 if (ui.opts.opts) {
                     ui.opts.opts.forEach(function(o) {
-                        $('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, currentLocale)).appendTo(input);
+                        $('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
                     })
                 }
                 input.val(val.value);

From 75a5b1354c0fb97c39227850036592e0e13fa799 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 17 Oct 2019 21:56:22 +0900
Subject: [PATCH 191/305] Add translation for http request node

---
 .../@node-red/nodes/locales/ja/network/21-httprequest.html      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
index ba20c8bc7..e87bb7542 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
@@ -33,6 +33,8 @@
         <dd><code>false</code>をセットすると、自己署名証明書を使用するhttpsサイトへのリクエストを許可します。</dd>
         <dt class="optional">followRedirects</dt>
         <dd><code>false</code>をセットすると、リダイレクトを行いません。デフォルトは<code>true</code>です。</dd>
+        <dt class="optional">requestTimeout</dt>
+        <dd>正のミリ秒数をセットすると、 グローバルに設定された<code>httpRequestTimeout</code>パラメータを上書きします。</dd>
     </dl>
     <h3>出力</h3>
     <dl class="message-properties">

From dd20a3e68560fd23c8cab9cfe7b0366aa30ed974 Mon Sep 17 00:00:00 2001
From: "NAKAJIMA,Tomohiro" <piyo.0912@gmail.com>
Date: Thu, 17 Oct 2019 19:27:08 +0900
Subject: [PATCH 192/305] Fix the language of the tooltip

---
 .../node_modules/@node-red/editor-client/src/js/ui/subflow.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index c83a1dd8a..acb479670 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -1048,7 +1048,7 @@ RED.subflow = (function() {
              }
              langs.forEach(function(l) {
                  var row = $('<div>').appendTo(content);
-                 $('<span>').css({display:"inline-block",width:"50px"}).text(l+(l===currentLocale?"*":"")).appendTo(row);
+                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row); 
                  $('<span>').text(ui.label[l]||"").appendTo(row);
              });
              return content;

From 29f1651a18cdd2c178dba65ea7a500ceaca7cf4c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 18 Oct 2019 16:09:14 +0100
Subject: [PATCH 193/305] Use default language if lng param not set in i18n req

---
 .../node_modules/@node-red/editor-api/lib/editor/locales.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
index 5e10647e7..a7f300cd3 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
@@ -15,7 +15,7 @@
  **/
 var fs = require('fs');
 var path = require('path');
-//var apiUtil = require('../util');
+// var apiUtil = require('../util');
 
 var i18n = require("@node-red/util").i18n; // TODO: separate module
 
@@ -41,7 +41,7 @@ module.exports = {
         var namespace = req.params[0];
         var lngs = req.query.lng;
         namespace = namespace.replace(/\.json$/,"");
-        var lang = req.query.lng; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
+        var lang = req.query.lng || i18n.defaultLang; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){

From 0d673486a30ef013b4f94dbf7aa530ed633d4edf Mon Sep 17 00:00:00 2001
From: bartbutenaers <bart.butenaers@gmail.com>
Date: Sat, 19 Oct 2019 14:16:03 +0200
Subject: [PATCH 194/305] Check auth type on opening

---
 .../@node-red/nodes/core/network/21-httprequest.html             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index 01f8e33cb..cb97c68a5 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -170,6 +170,7 @@
             if (this.authType) {
                 $('#node-input-useAuth').prop('checked', true);
                 $("#node-input-authType-select").val(this.authType);
+                $("#node-input-authType-select").change();
             } else {
                 $('#node-input-useAuth').prop('checked', false);
             }

From 5d36539271fc30b72ac3236c940b48fe6832b9f7 Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sat, 19 Oct 2019 12:37:54 -0700
Subject: [PATCH 195/305] Update JSONata to 1.7.0

---
 package.json                                  |  2 +-
 .../editor-client/locales/en-US/jsonata.json  | 39 +++++++++++++++++--
 .../src/vendor/jsonata/formatter.js           | 12 +++++-
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 8d2ac8a4c..83b114175 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.6.5",
+        "jsonata": "1.7.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
index 9c33e8d6d..8f516a289 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -1,7 +1,7 @@
 {
     "$string": {
-        "args": "arg",
-        "desc": "Casts the *arg* parameter to a string using the following casting rules:\n\n - Strings are unchanged\n - Functions are converted to an empty string\n - Numeric infinity and NaN throw an error because they cannot be represented as a JSON number\n - All other values are converted to a JSON string using the `JSON.stringify` function"
+        "args": "arg[, prettify]",
+        "desc": "Casts the `arg` parameter to a string using the following casting rules:\n\n - Strings are unchanged\n - Functions are converted to an empty string\n - Numeric infinity and NaN throw an error because they cannot be represented as a JSON number\n - All other values are converted to a JSON string using the `JSON.stringify` function.  If `prettify` is true, then \"prettified\" JSON is produced. i.e One line per field and lines will be indented based on the field depth."
     },
     "$length": {
         "args": "str",
@@ -185,7 +185,7 @@
     },
     "$reduce": {
         "args":"array, function [, init]",
-        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`.\n\nThe optional `init` parameter is used as the initial value in the aggregation."
+        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
     },
     "$flowContext": {
         "args": "string[, string]",
@@ -230,6 +230,37 @@
     "$parseInteger": {
         "args": "string, picture",
         "desc": "Parses the contents of the `string` parameter to an integer (as a JSON number) using the format specified by the `picture` string. The `picture` string parameter has the same format as `$formatInteger`."
-
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "Throws an error with a message.  The optional `str` will replace the default message of `$error() function evaluated`"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "If `arg` is true the function returns undefined.  If `arg` is false an exception is thrown with `str` as the message of the exception."
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "Returns the one and only value in the `array` parameter that satisfies the `function` predicate (i.e. the `function` returns Boolean `true` when passed the value).  Throws an exception if the number of matching values is not exactly one.\n\nThe function should be supplied in the following signature: `function(value [, index [, array]])` where value is each input of the array, index is the position of that value and the whole array is passed as the third argument"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Encodes a Uniform Resource Locator (URL) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.\n\nExample: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Encodes a Uniform Resource Locator (URL) by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character. \n\nExample: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "Decodes a Uniform Resource Locator (URL) previously created by encodeUrl. \n\nExample: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "Returns an array with duplicate values removed from `array`"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
index 4929def85..0cc69715a 100644
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -109,6 +109,7 @@
     {
         '$abs':{ args:[ 'number' ]},
         '$append':{ args:[ 'array1', 'array2' ]},
+        '$assert':{ args: [ 'arg', 'str' ]},
         '$average':{ args:[ 'array' ]},
         '$base64decode':{ args:[  ]},
         '$base64encode':{ args:[  ]},
@@ -116,8 +117,14 @@
         '$ceil':{ args:[ 'number' ]},
         '$contains':{ args:[ 'str', 'pattern' ]},
         '$count':{ args:[ 'array' ]},
+        '$decodeUrl':{ args:[ 'str' ]},
+        '$decodeUrlComponent':{ args:[ 'str' ]},
+        '$distinct':{ args:[ 'array' ]},
         '$each':{ args:[ 'object', 'function' ]},
+        '$encodeUrl':{ args: ['str'] },
+        '$encodeUrlComponent':{ args:[ 'str' ]},
         '$env': { args:[ 'arg' ]},
+        '$error':{ args:[ 'str' ]},
         '$eval': { args: ['expr', 'context']},
         '$exists':{ args:[ 'arg' ]},
         '$filter':{ args:[ 'array', 'function' ]},
@@ -151,12 +158,13 @@
         '$reverse':{ args:[ 'array' ]},
         '$round':{ args:[ 'number', 'precision' ]},
         '$shuffle':{ args:[ 'array' ]},
-        '$sift':{ args:[ 'object', 'function' ]},
+        '$sift':{ args: ['object', 'function'] },
+        '$single':{ args: ['array', 'function'] },
         '$sort':{ args:[ 'array', 'function' ]},
         '$split':{ args:[ 'str', 'separator', 'limit' ]},
         '$spread':{ args:[ 'object' ]},
         '$sqrt':{ args:[ 'number' ]},
-        '$string':{ args:[ 'arg' ]},
+        '$string':{ args:[ 'arg', 'prettify' ]},
         '$substring':{ args:[ 'str', 'start', 'length' ]},
         '$substringAfter':{ args:[ 'str', 'chars' ]},
         '$substringBefore':{ args:[ 'str', 'chars' ]},

From c590247afa3b7db842c646386c231a040079fc22 Mon Sep 17 00:00:00 2001
From: Phi Dong <phidong@gmail.com>
Date: Sat, 19 Oct 2019 14:33:13 -0700
Subject: [PATCH 196/305] Update node-red/util JSONata to 1.7.0

---
 packages/node_modules/@node-red/util/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index ca2b77a65..e844929ad 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -18,7 +18,7 @@
         "clone": "2.1.2",
         "i18next": "15.1.2",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.6.5",
+        "jsonata": "1.7.0",
         "when": "3.7.8"
     }
 }

From 25de4e4782719853df3ffd9317a613f1de47e93b Mon Sep 17 00:00:00 2001
From: tseigo <tnk.seigo+bitbucket@gmail.com>
Date: Tue, 22 Oct 2019 00:24:10 +0900
Subject: [PATCH 197/305] Fixed the code format of 70-CSV.js from Tab to Space.
 try again.

---
 .../@node-red/nodes/core/parsers/70-CSV.js    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
index e8a45a535..290b159a9 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -230,17 +230,17 @@ module.exports = function(RED) {
                                 node.send(msg); // finally send the array
                             }
                         }
-            			else {
-            			    var len = a.length;
-            			    for (var i = 0; i < len; i++) {
+                        else {
+                            var len = a.length;
+                            for (var i = 0; i < len; i++) {
                                 var newMessage = RED.util.cloneMessage(msg);
                                 newMessage.payload = a[i];
                                 if (!has_parts) {
-                				    newMessage.parts = {
-                    				    id: msg._msgid,
-                    				    index: i,
-                    				    count: len
-                    				};
+                                    newMessage.parts = {
+                                        id: msg._msgid,
+                                        index: i,
+                                        count: len
+                                    };
                                 }
                                 else {
                                     newMessage.parts.index -= node.skip;
@@ -251,8 +251,8 @@ module.exports = function(RED) {
                                     }
                                 }
                                 node.send(newMessage);
-            			    }
-            			}
+                            }
+                        }
                         node.linecount = 0;
                     }
                     catch(e) { node.error(e,msg); }

From bd67731bb7c795ceb393c3a3ee45a368c0e81dd5 Mon Sep 17 00:00:00 2001
From: tseigo <tnk.seigo+bitbucket@gmail.com>
Date: Tue, 22 Oct 2019 00:28:57 +0900
Subject: [PATCH 198/305] Removed unused variable "remoteDetails"

---
 packages/node_modules/@node-red/nodes/core/network/31-tcpin.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
index eb365a54c..e52e9c382 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
@@ -371,7 +371,6 @@ module.exports = function(RED) {
             var server = net.createServer(function (socket) {
                 socket.setKeepAlive(true,120000);
                 if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
-                var remoteDetails = socket.remoteAddress+":"+socket.remotePort;
                 node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort}));
                 connectedSockets.push(socket);
                 node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});

From e022b782a968d7e6696c8dbba156541dcb0eb1f0 Mon Sep 17 00:00:00 2001
From: tseigo <tnk.seigo+bitbucket@gmail.com>
Date: Tue, 22 Oct 2019 00:35:35 +0900
Subject: [PATCH 199/305] Fixed jsdoc descriptions

---
 packages/node_modules/@node-red/editor-api/lib/index.js         | 2 +-
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/index.js b/packages/node_modules/@node-red/editor-api/lib/index.js
index 10c9912ed..0dc06ab71 100644
--- a/packages/node_modules/@node-red/editor-api/lib/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/index.js
@@ -42,7 +42,7 @@ var editor;
 /**
  * Initialise the module.
  * @param  {Object}     settings   The runtime settings
- * @param  {HTTPServer} server     An instance of HTTP Server
+ * @param  {HTTPServer} _server     An instance of HTTP Server
  * @param  {Storage}    storage    An instance of Node-RED Storage
  * @param  {Runtime}    runtimeAPI An instance of Node-RED Runtime
  * @memberof @node-red/editor-api
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index c3d8b1a4f..27655f162 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2558,7 +2558,7 @@ RED.editor = (function() {
         /**
          * Register a type editor.
          * @param {string} type - the type name
-         * @param {object} options - the editor definition
+         * @param {object} definition - the editor definition
          * @function
          * @memberof RED.editor
          */

From 080487cb3383cf6f01f7b3ae46e63931e073eda0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 25 Oct 2019 10:21:48 +0100
Subject: [PATCH 200/305] Bump https-proxy-agent version

---
 package.json                                       | 2 +-
 packages/node_modules/@node-red/nodes/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8d2ac8a4c..57ce32dfd 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.2",
+        "https-proxy-agent": "2.2.3",
         "i18next": "15.1.2",
         "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index f4a031630..1d015d00f 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -27,7 +27,7 @@
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.2",
+        "https-proxy-agent": "2.2.3",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "media-typer": "1.1.0",

From 6026da867b96dcc7343e76994086ce8eec022890 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 25 Oct 2019 11:47:55 +0100
Subject: [PATCH 201/305] Fix timings of Delay node tests

---
 test/nodes/core/function/89-delay_spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/nodes/core/function/89-delay_spec.js b/test/nodes/core/function/89-delay_spec.js
index f16a13636..51583d8a4 100644
--- a/test/nodes/core/function/89-delay_spec.js
+++ b/test/nodes/core/function/89-delay_spec.js
@@ -251,7 +251,8 @@ describe('delay Node', function() {
             var helperNode1 = helper.getNode("helperNode1");
             var receivedMessagesStack = [];
 
-            var rate = 1000/aLimit;
+            // Add a small grace to the calculated delay
+            var rate = 1000/aLimit + 10;
 
             var receiveTimestamp;
 

From 22b9df62d1b7fb2aaf40ac7f1dd307fbde6cdbbb Mon Sep 17 00:00:00 2001
From: juggledad <juggledad@users.noreply.github.com>
Date: Fri, 25 Oct 2019 09:51:50 -0400
Subject: [PATCH 202/305] =?UTF-8?q?Using=20the=20=E2=80=98a=20msg=20per=20?=
 =?UTF-8?q?line=E2=80=99=20the=20last=20line=20does=20not=20get=20msg.topi?=
 =?UTF-8?q?c=20passed=20(#2352)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When using the file-in node and ‘a msg per line’ the last line does not get msg.topic passed.

In the
   .on(‘end’, function() {
code (starting at line 334) the msg is created but no msg.topic is set. Adding
   topic:msg.topic,
after line 343 (var m = { payload: spare,) fixes the issue.
---
 packages/node_modules/@node-red/nodes/core/storage/10-file.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/core/storage/10-file.js b/packages/node_modules/@node-red/nodes/core/storage/10-file.js
index c27c3ed5f..54ce55764 100644
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.js
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.js
@@ -341,6 +341,7 @@ module.exports = function(RED) {
                         }
                         else if (node.format === "lines") {
                             var m = { payload: spare,
+                                      topic:msg.topic,
                                       parts: {
                                           index: count,
                                           count: count+1,

From e8ef476a6d42a3564980c6d8c7a5c8d90f33f088 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 25 Oct 2019 15:23:51 +0100
Subject: [PATCH 203/305] update grunt-sass and add node-sass for node12
 support

and update Gruntfile.js to use them
---
 Gruntfile.js | 2 ++
 package.json | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 28f510e50..a6e896b9e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,6 +16,7 @@
 
 var path = require("path");
 var fs = require("fs-extra");
+var sass = require("node-sass");
 
 module.exports = function(grunt) {
 
@@ -220,6 +221,7 @@ module.exports = function(grunt) {
         sass: {
             build: {
                 options: {
+                    implementation: sass,
                     outputStyle: 'compressed'
                 },
                 files: [{
diff --git a/package.json b/package.json
index d20f43240..aa09435e4 100644
--- a/package.json
+++ b/package.json
@@ -93,19 +93,20 @@
         "grunt-mocha-istanbul": "5.0.2",
         "grunt-nodemon": "~0.4.2",
         "grunt-npm-command": "~0.1.2",
-        "grunt-sass": "~2.0.0",
+        "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
         "http-proxy": "^1.16.2",
         "istanbul": "0.4.5",
+        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
         "mosca": "^2.8.3",
+        "node-red-node-test-helper": "^0.2.3",
+        "node-sass": "^4.13.0",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",
-        "supertest": "3.4.2",
-        "node-red-node-test-helper": "^0.2.3",
-        "jsdoc-nr-template": "node-red/jsdoc-nr-template"
+        "supertest": "3.4.2"
     },
     "engines": {
         "node": ">=8"

From a96d5096fee8f12f362bde8e70ddc9d3aa1ea34e Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 25 Oct 2019 16:48:35 +0100
Subject: [PATCH 204/305] Fix delay to not pass through .reset and .flush props
 consistently

to close #2349
(it used to not pass them through but did on initial message... now it doesn't)
---
 .../@node-red/nodes/core/function/89-delay.js | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
index ebb16bd5f..374ffadb0 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -153,15 +153,26 @@ module.exports = function(RED) {
         }
         else if (node.pauseType === "rate") {
             node.on("input", function(msg) {
+                if (msg.hasOwnProperty("reset")) {
+                    if (node.intervalID !== -1 ) {
+                        clearInterval(node.intervalID);
+                        node.intervalID = -1;
+                    }
+                    node.buffer = [];
+                    node.status({text:"reset"});
+                    return;
+                }
                 if (!node.drop) {
+                    var m = RED.util.cloneMessage(msg);
+                    delete m.flush;
                     if (node.intervalID !== -1) {
-                        if (!msg.hasOwnProperty("flush")) {
-                            node.buffer.push(msg);
+                        //if (!msg.hasOwnProperty("flush")) {
+                            node.buffer.push(m);
                             node.reportDepth();
-                        }
+                        //}
                     }
                     else {
-                        node.send(msg);
+                        node.send(m);
                         node.reportDepth();
                         node.intervalID = setInterval(function() {
                             if (node.buffer.length === 0) {
@@ -174,6 +185,12 @@ module.exports = function(RED) {
                             node.reportDepth();
                         }, node.rate);
                     }
+                    if (msg.hasOwnProperty("flush")) {
+                        while (node.buffer.length > 0) {
+                            node.send(node.buffer.shift());
+                        }
+                        node.status({});
+                    }
                 }
                 else {
                     var timeSinceLast;
@@ -189,18 +206,6 @@ module.exports = function(RED) {
                         node.send(msg);
                     }
                 }
-                if (msg.hasOwnProperty("reset")) {
-                    clearInterval(node.intervalID);
-                    node.intervalID = -1;
-                    node.buffer = [];
-                    node.status({text:"reset"});
-                }
-                if (msg.hasOwnProperty("flush")) {
-                    while (node.buffer.length > 0) {
-                        node.send(node.buffer.shift());
-                    }
-                    node.status({});
-                }
             });
             node.on("close", function() {
                 clearInterval(node.intervalID);

From 0ff324b0db65ed783897550b49adb736eca42beb Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 25 Oct 2019 17:03:16 +0100
Subject: [PATCH 205/305] delay node- remove commented out code

---
 .../node_modules/@node-red/nodes/core/function/89-delay.js  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
index 374ffadb0..49d856deb 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -166,10 +166,8 @@ module.exports = function(RED) {
                     var m = RED.util.cloneMessage(msg);
                     delete m.flush;
                     if (node.intervalID !== -1) {
-                        //if (!msg.hasOwnProperty("flush")) {
-                            node.buffer.push(m);
-                            node.reportDepth();
-                        //}
+                        node.buffer.push(m);
+                        node.reportDepth();
                     }
                     else {
                         node.send(m);

From 000765fb7778bc4404f32672323e77a46b63a1e9 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 25 Oct 2019 21:15:32 +0100
Subject: [PATCH 206/305] Increase timeouts in Subflow tests to minimise false
 positives

---
 .../runtime/lib/nodes/flows/Subflow_spec.js   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js b/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
index f92a01328..71bd9ad19 100644
--- a/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/flows/Subflow_spec.js
@@ -298,7 +298,7 @@ describe('Subflow', function() {
                     // // stoppedNodes.should.have.a.property(sfConfigId);
                     done();
                 });
-            },50);
+            },150);
         });
         it("instantiates a subflow inside a subflow and stops it",function(done) {
             var config = flowUtils.parseConfig([
@@ -331,7 +331,7 @@ describe('Subflow', function() {
                     Object.keys(currentNodes).should.have.length(0);
                     done();
                 });
-            },50);
+            },150);
         });
         it("rewires a subflow node on update/start",function(done){
 
@@ -391,8 +391,8 @@ describe('Subflow', function() {
                     flow.stop().then(function() {
                         done();
                     });
-                },50);
-            },50);
+                },150);
+            },150);
         });
     });
     describe('#stop', function() {
@@ -452,7 +452,7 @@ describe('Subflow', function() {
                 flow.stop().then(function() {
                     done();
                 });
-            },50);
+            },150);
         });
         it("passes a status event to the subflow's parent tab status node - targetted scope",function(done) {
             var config = flowUtils.parseConfig([
@@ -491,7 +491,7 @@ describe('Subflow', function() {
 
                     done();
                 });
-            },50);
+            },150);
         });
     });
 
@@ -536,7 +536,7 @@ describe('Subflow', function() {
 
                     done();
                 });
-            },50);
+            },150);
         });
         it("emits a status event when a message is passed to a subflow-status node - msg.payload as status obj", function(done) {
             var config = flowUtils.parseConfig([
@@ -578,7 +578,7 @@ describe('Subflow', function() {
 
                     done();
                 });
-            },50);
+            },150);
         });
         it("emits a status event when a message is passed to a subflow-status node - msg.status", function(done) {
             var config = flowUtils.parseConfig([
@@ -620,7 +620,7 @@ describe('Subflow', function() {
 
                     done();
                 });
-            },50);
+            },150);
         });
         it("does not emit a regular status event if it contains a subflow-status node", function(done) {
             var config = flowUtils.parseConfig([
@@ -690,7 +690,7 @@ describe('Subflow', function() {
                 flow.stop().then(function() {
                     done();
                 });
-            },50);
+            },150);
         });
         it("passes an error event to the subflow's parent tab catch node - targetted scope",function(done) {
             var config = flowUtils.parseConfig([
@@ -727,7 +727,7 @@ describe('Subflow', function() {
                 flow.stop().then(function() {
                     done();
                 });
-            },50);
+            },150);
 
         });
     });
@@ -777,7 +777,7 @@ describe('Subflow', function() {
                 flow.stop().then(function() {
                     done();
                 });
-            },50);
+            },150);
         });
 
         it("can access subflow env var", function(done) {
@@ -817,7 +817,7 @@ describe('Subflow', function() {
                 flow.stop().then(function() {
                     done();
                 });
-            },50);
+            },150);
         });
 
         it("can access nested subflow env var", function(done) {
@@ -875,9 +875,9 @@ describe('Subflow', function() {
                         flow.stop().then(function() {
                             done();
                         });
-                    },50);
-                },50);
-            },50);
+                    },150);
+                },150);
+            },150);
         });
 
     });

From 2cd5e1d3c530fc1963769be91a90b1f53c266ce7 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 27 Oct 2019 21:22:20 +0000
Subject: [PATCH 207/305] Bump for 1.0.3

---
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 package.json                                  |  2 +-
 .../@node-red/editor-api/package.json         |  6 ++---
 .../@node-red/editor-client/package.json      |  2 +-
 .../node_modules/@node-red/nodes/package.json |  2 +-
 .../@node-red/registry/package.json           |  4 ++--
 .../@node-red/runtime/package.json            |  6 ++---
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   | 10 ++++-----
 9 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f11c2db..513311517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+#### 1.0.3: Maintenance Release
+
+Runtime
+ - Increase timeouts in Subflow tests to minimise false positives
+ - Update grunt-sass and add node-sass for node12 support
+ - Fix timings of Delay node tests
+ - #2340 Update JSONata to 1.7.0
+ - Bump https-proxy-agent version
+ - #2332 Fix error handling of nodes with multiple input handlers
+ - Add script to generate npm publish script
+
+Editor
+ - #2328 Fix language handling in subflow node
+ - Use default language if lng param not set in i18n req
+ - #2326 Fix palette editor search visualization
+
+Nodes
+ - Delay: Fix delay to not pass through .reset and .flush props consistently
+ - #2352 File: Using the ‘a msg per line’ the last line does not get msg.topic passed
+ - #2339 HTTP Request: Check auth type on opening
+ - HTTP Request: add units info
+
 #### 1.0.2: Maintenance Release
 
 Runtime
diff --git a/package.json b/package.json
index aa09435e4..5f0818bd7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index ac86c1f9b..6af8de7bf 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.2",
-        "@node-red/editor-client": "1.0.2",
+        "@node-red/util": "1.0.3",
+        "@node-red/editor-client": "1.0.3",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 441a19629..7f8061c6d 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 1d015d00f..896c378d2 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 5b0503d6d..f4103e8ab 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.2",
+        "@node-red/util": "1.0.3",
         "semver": "6.3.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 3315ecb2f..0d03b355b 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.0.2",
-        "@node-red/util": "1.0.2",
+        "@node-red/registry": "1.0.3",
+        "@node-red/util": "1.0.3",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index e844929ad..174db5bfd 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index b57ef69bf..46f064b24 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "1.0.2",
-        "@node-red/runtime": "1.0.2",
-        "@node-red/util": "1.0.2",
-        "@node-red/nodes": "1.0.2",
+        "@node-red/editor-api": "1.0.3",
+        "@node-red/runtime": "1.0.3",
+        "@node-red/util": "1.0.3",
+        "@node-red/nodes": "1.0.3",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

From 7b1411d171403e03a901fa6d140f41a9952f69b8 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 28 Oct 2019 22:45:53 +0900
Subject: [PATCH 208/305] update Japanese JSONata message catalogue

---
 .../editor-client/locales/ja/jsonata.json     | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
index 14cadfecf..ba873c448 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
@@ -1,7 +1,7 @@
 {
     "$string": {
-        "args": "arg",
-        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。"
+        "args": "arg[, prettify]",
+        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。`prettify`が真の場合、JSONを整形出力します。フィールドを1行毎に出力。フィールドのネスト深さによってインデントを行います。"
     },
     "$length": {
         "args": "str",
@@ -185,7 +185,7 @@
     },
     "$reduce": {
         "args": "array, function [, init]",
-        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
+        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。関数`function`のシグネチャは`myfunc($accumulator, $value[, $index[, $array]])`という形式でなければなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
     },
     "$flowContext": {
         "args": "string",
@@ -230,5 +230,37 @@
     "$parseInteger": {
         "args": "string, picture",
         "desc": "`picture`文字列の指定に従って、`string`パラメータを整数(JSON数値)に変換します。`picture`文字列は`$formatInteger`と同じ形式です。"
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "メッセージを指定して例外を送出します。メッセージ`str`を省略した場合は`$error() function evaluated`をメッセージとします。"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "`arg`が真の場合、undefinedを返します。偽の場合、`str`をメッセージとする例外を送出します。"
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Uniform Resource Locator (URL)を構成する文字を1、２、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、２、３、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "encodeUrlで置換したUniform Resource Locator (URL)要素をデコードします。 \n\n例: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "配列`array`から重複要素を削除した配列を返します。"
     }
 }

From 18ff2df65c2408058f2ae2cdfa859739a15d0880 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 28 Oct 2019 23:49:14 +0900
Subject: [PATCH 209/305] prohibit line break in type menu of typedInput

---
 .../@node-red/editor-client/src/sass/ui/common/typedInput.scss   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
index 247b6dfe2..be2d50674 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
@@ -70,6 +70,7 @@
     border: 1px solid $primary-border-color;
     box-sizing: border-box;
     background: $secondary-background;
+    white-space: nowrap;
     z-index: 2000;
     a {
         padding: 6px 18px 6px 6px;

From 07061928dfc4256b64007490dd3b67a3951a0006 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 29 Oct 2019 10:24:15 +0900
Subject: [PATCH 210/305] make JSONata help initially shown

---
 .../@node-red/editor-client/src/js/ui/editors/expression.js      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
index 8213d93d7..c8a93964d 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -207,6 +207,7 @@
                         }
                         expressionEditor.getSession().setValue(v||"",-1);
                     });
+                    funcSelect.change();
 
                     var tabs = RED.tabs.create({
                         element: $("#red-ui-editor-type-expression-tabs"),

From 5f67f1f0782da56d58a12b9a93e5988e69996c4f Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 29 Oct 2019 20:45:57 +0900
Subject: [PATCH 211/305] Add placeholders to name fields

---
 .../@node-red/editor-client/src/js/ui/subflow.js       | 10 ++++++++--
 .../@node-red/editor-client/src/js/ui/workspaces.js    |  2 +-
 .../node_modules/@node-red/nodes/99-sample.html.demo   |  4 ++--
 .../@node-red/nodes/core/common/90-comment.html        |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 8d11240d0..9f1e7f3e0 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -19,12 +19,18 @@ RED.subflow = (function() {
     var currentLocale = "en-US";
 
     var _subflowEditTemplate = '<script type="text/x-red" data-template-name="subflow">'+
-        '<div class="form-row"><label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label><input type="text" id="node-input-name"></div>'+
+        '<div class="form-row">'+
+            '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
+            '<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">'+
+        '</div>'+
         '<div id="subflow-input-ui"></div>'+
         '</script>';
 
     var _subflowTemplateEditTemplate = '<script type="text/x-red" data-template-name="subflow-template">'+
-        '<div class="form-row"><label for="subflow-input-name" data-i18n="[append]common.label.name"><i class="fa fa-tag"></i>  </label><input type="text" id="subflow-input-name"></div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-name" data-i18n="[append]common.label.name"><i class="fa fa-tag"></i>  </label>'+
+            '<input type="text" id="subflow-input-name" data-i18n="[placeholder]common.label.name">'+
+        '</div>'+
         '<div class="form-row">'+
             '<ul style="margin-bottom: 20px;" id="subflow-env-tabs"></ul>'+
         '</div>'+
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index bb64f848a..1f361d0f7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -164,7 +164,7 @@ RED.workspaces = (function() {
                 var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
                 $('<div class="form-row">'+
                     '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
-                    '<input type="text" id="node-input-name">'+
+                    '<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">'+
                 '</div>').appendTo(dialogForm);
 
 
diff --git a/packages/node_modules/@node-red/nodes/99-sample.html.demo b/packages/node_modules/@node-red/nodes/99-sample.html.demo
index c7548b032..d18744040 100644
--- a/packages/node_modules/@node-red/nodes/99-sample.html.demo
+++ b/packages/node_modules/@node-red/nodes/99-sample.html.demo
@@ -38,8 +38,8 @@
     <!-- By convention, most nodes have a 'name' property. The following div -->
     <!-- provides the necessary field. Should always be the last option      -->
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/core/common/90-comment.html b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
index 1631c6314..76c4547c0 100644
--- a/packages/node_modules/@node-red/nodes/core/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
@@ -2,7 +2,7 @@
 <script type="text/x-red" data-template-name="comment">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name">
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
     <div class="form-row node-text-editor-row">
         <input type="hidden" id="node-input-info" autofocus="autofocus">

From 1b78bd16840a0ea3afb79fb5c7feb8e1a51462ea Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 30 Oct 2019 19:39:38 +0900
Subject: [PATCH 212/305] Add placeholder to topic field

---
 packages/node_modules/@node-red/nodes/99-sample.html.demo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/99-sample.html.demo b/packages/node_modules/@node-red/nodes/99-sample.html.demo
index d18744040..467815f7c 100644
--- a/packages/node_modules/@node-red/nodes/99-sample.html.demo
+++ b/packages/node_modules/@node-red/nodes/99-sample.html.demo
@@ -30,8 +30,8 @@
    <!-- (with the 'node-input-' prefix).                                     -->
    <!-- The available icon classes are defined Font Awesome Icons (FA Icons) -->
     <div class="form-row">
-        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
-        <input type="text" id="node-input-topic" placeholder="Topic">
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> <span data-i18n="common.label.topic"></span></label>
+        <input type="text" id="node-input-topic" data-i18n="[placeholder]common.label.topic">
     </div>
 
     <br/>

From d2755a8049918a83e505cb724045521c1e31e291 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 30 Oct 2019 19:58:29 +0900
Subject: [PATCH 213/305] Support i18n for typedInput in split and switch nodes

---
 .../nodes/core/function/10-switch.html        |  20 ++--
 .../nodes/core/sequence/17-split.html         |  12 +-
 .../nodes/locales/en-US/messages.json         | 109 ++++++++++--------
 .../@node-red/nodes/locales/ja/messages.json  |  11 ++
 4 files changed, 91 insertions(+), 61 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 5312d2ba6..7b28976b0 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -127,7 +127,7 @@
         },
         oneditprepare: function() {
             var node = this;
-            var previousValueType = {value:"prev",label:this._("inject.previous"),hasValue:false};
+            var previousValueType = {value:"prev",label:this._("switch.previous"),hasValue:false};
 
             $("#node-input-property").typedInput({default:this.propertyType||'msg',types:['msg','flow','global','jsonata','env']});
             var outputCount = $("#node-input-outputs").val("{}");
@@ -237,15 +237,15 @@
 
                     function createTypeValueField(){
                         return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'string',types:[
-                            {value:"string",label:"string",hasValue:false},
-                            {value:"number",label:"number",hasValue:false},
-                            {value:"boolean",label:"boolean",hasValue:false},
-                            {value:"array",label:"array",hasValue:false},
-                            {value:"buffer",label:"buffer",hasValue:false},
-                            {value:"object",label:"object",hasValue:false},
-                            {value:"json",label:"JSON string",hasValue:false},
-                            {value:"undefined",label:"undefined",hasValue:false},
-                            {value:"null",label:"null",hasValue:false}
+                            {value:"string",label:RED._("node-red:switch.label.string"),hasValue:false},
+                            {value:"number",label:RED._("node-red:switch.label.number"),hasValue:false},
+                            {value:"boolean",label:RED._("node-red:switch.label.boolean"),hasValue:false},
+                            {value:"array",label:RED._("node-red:switch.label.array"),hasValue:false},
+                            {value:"buffer",label:RED._("node-red:switch.label.buffer"),hasValue:false},
+                            {value:"object",label:RED._("node-red:switch.label.object"),hasValue:false},
+                            {value:"json",label:RED._("node-red:switch.label.jsonString"),hasValue:false},
+                            {value:"undefined",label:RED._("node-red:switch.label.undefined"),hasValue:false},
+                            {value:"null",label:RED._("node-red:switch.label.null"),hasValue:false}
                         ]});
                     }
 
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/17-split.html b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
index 7751a1c55..d730bb221 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
@@ -285,7 +285,11 @@
                     $("#node-input-property").typedInput('types',['msg']);
                     $("#node-input-joiner").typedInput("show");
                 } else {
-                    $("#node-input-property").typedInput('types',['msg', {value:"full",label:"complete message",hasValue:false}]);
+                    $("#node-input-property").typedInput('types', ['msg', {
+                        value: "full",
+                        label: RED._("node-red:join.completeMessage"),
+                        hasValue: false
+                    }]);
                 }
             });
 
@@ -297,7 +301,11 @@
 
             $("#node-input-property").typedInput({
                 typeField: $("#node-input-propertyType"),
-                types:['msg', {value:"full", label:"complete message", hasValue:false}]
+                types: ['msg', {
+                    value: "full",
+                    label: RED._("node-red:join.completeMessage"),
+                    hasValue: false
+                }]
             });
 
             $("#node-input-key").typedInput({
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 4b0b0a3b3..689b6f2b6 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -604,33 +604,43 @@
         "label": {
             "property": "Property",
             "rule": "rule",
-            "repair" :  "recreate message sequences"
+            "string": "string",
+            "number": "number",
+            "boolean": "boolean",
+            "array": "array",
+            "buffer": "buffer",
+            "object": "object",
+            "jsonString": "JSON string",
+            "undefined": "undefined",
+            "null": "null",
+            "repair": "recreate message sequences"
         },
+        "previous": "previous value",
         "and": "and",
         "checkall": "checking all rules",
         "stopfirst": "stopping after first match",
         "ignorecase": "ignore case",
         "rules": {
-            "btwn":"is between",
-            "cont":"contains",
-            "regex":"matches regex",
-            "true":"is true",
-            "false":"is false",
-            "null":"is null",
-            "nnull":"is not null",
-            "istype":"is of type",
-            "empty":"is empty",
-            "nempty":"is not empty",
-            "head":"head",
-            "tail":"tail",
-            "index":"index between",
-            "exp":"JSONata exp",
-            "else":"otherwise",
-            "hask":"has key"
+            "btwn": "is between",
+            "cont": "contains",
+            "regex": "matches regex",
+            "true": "is true",
+            "false": "is false",
+            "null": "is null",
+            "nnull": "is not null",
+            "istype": "is of type",
+            "empty": "is empty",
+            "nempty": "is not empty",
+            "head": "head",
+            "tail": "tail",
+            "index": "index between",
+            "exp": "JSONata exp",
+            "else": "otherwise",
+            "hask": "has key"
         },
         "errors": {
             "invalid-expr": "Invalid JSONata expression: __error__",
-            "too-many" : "too many pending messages in switch node"
+            "too-many": "too many pending messages in switch node"
         }
     },
     "change": {
@@ -848,41 +858,42 @@
         "stream":"Handle as a stream of messages",
         "addname":" Copy key to "
     },
-    "join":{
+    "join": {
         "join": "join",
-        "mode":{
-            "mode":"Mode",
-            "auto":"automatic",
-            "merge":"merge sequences",
-            "reduce":"reduce sequence",
-            "custom":"manual"
+        "mode": {
+            "mode": "Mode",
+            "auto": "automatic",
+            "merge": "merge sequences",
+            "reduce": "reduce sequence",
+            "custom": "manual"
         },
-        "combine":"Combine each",
-        "create":"to create",
-        "type":{
-            "string":"a String",
-            "array":"an Array",
-            "buffer":"a Buffer",
-            "object":"a key/value Object",
-            "merged":"a merged Object"
+        "combine": "Combine each",
+        "completeMessage": "complete message",
+        "create": "to create",
+        "type": {
+            "string": "a String",
+            "array": "an Array",
+            "buffer": "a Buffer",
+            "object": "a key/value Object",
+            "merged": "a merged Object"
         },
-        "using":"using the value of",
-        "key":"as the key",
-        "joinedUsing":"joined using",
-        "send":"Send the message:",
-        "afterCount":"After a number of message parts",
-        "count":"count",
-        "subsequent":"and every subsequent message.",
-        "afterTimeout":"After a timeout following the first message",
-        "seconds":"seconds",
-        "complete":"After a message with the <code>msg.complete</code> property set",
-        "tip":"This mode assumes this node is either paired with a <i>split</i> node or the received messages will have a properly configured <code>msg.parts</code> property.",
-        "too-many" : "too many pending messages in join node",
+        "using": "using the value of",
+        "key": "as the key",
+        "joinedUsing": "joined using",
+        "send": "Send the message:",
+        "afterCount": "After a number of message parts",
+        "count": "count",
+        "subsequent": "and every subsequent message.",
+        "afterTimeout": "After a timeout following the first message",
+        "seconds": "seconds",
+        "complete": "After a message with the <code>msg.complete</code> property set",
+        "tip": "This mode assumes this node is either paired with a <i>split</i> node or the received messages will have a properly configured <code>msg.parts</code> property.",
+        "too-many": "too many pending messages in join node",
         "merge": {
-            "topics-label":"Merged Topics",
-            "topics":"topics",
-            "topic" : "topic",
-            "on-change":"Send merged message on arrival of a new topic"
+            "topics-label": "Merged Topics",
+            "topics": "topics",
+            "topic": "topic",
+            "on-change": "Send merged message on arrival of a new topic"
         },
         "reduce": {
             "exp": "Reduce exp",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index 8e241dc5f..a7d5c2bfa 100755
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -602,8 +602,18 @@
         "label": {
             "property": "プロパティ",
             "rule": "条件",
+            "string": "文字列",
+            "number": "数値",
+            "boolean": "真偽値",
+            "array": "配列",
+            "buffer": "バッファ",
+            "object": "オブジェクト",
+            "jsonString": "JSON文字列",
+            "undefined": "undefined",
+            "null": "null",
             "repair": "メッセージ列の補正"
         },
+        "previous": "前回の値",
         "and": "～",
         "checkall": "全ての条件を適用",
         "stopfirst": "最初に合致した条件で終了",
@@ -856,6 +866,7 @@
             "custom": "手動"
         },
         "combine": "結合",
+        "completeMessage": "メッセージ全体",
         "create": "出力",
         "type": {
             "string": "文字列",

From 8c1aa83d1228d060bd1f17f9a9f7fcdf081b637a Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 31 Oct 2019 12:26:04 +0900
Subject: [PATCH 214/305] update support of i18n of JSON editor

---
 .../@node-red/editor-client/locales/en-US/editor.json      | 7 ++++++-
 .../@node-red/editor-client/locales/ja/editor.json         | 7 ++++++-
 .../@node-red/editor-client/src/js/ui/editors/json.js      | 6 +++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index fa347e6ea..366922940 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -792,7 +792,12 @@
         "copyPath": "Copy path to item",
         "expandItems": "Expand items",
         "collapseItems": "Collapse items",
-        "duplicate": "Duplicate"
+        "duplicate": "Duplicate",
+	"array": "array",
+	"object": "object",
+	"error": {
+	    "invalidJSON": "Invalid JSON: "
+	}
     },
     "markdownEditor": {
         "title": "Markdown editor",
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index a6aab331d..e84b6c7bf 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -791,7 +791,12 @@
         "copyPath": "要素のパスをコピー",
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
-        "duplicate": "複製"
+        "duplicate": "複製",
+	"array": "配列",
+	"object": "オブジェクト",
+	"error": {
+	    "invalidJSON": "不正なJSON: "
+	}
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index cce079581..c7267d885 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -302,8 +302,8 @@
                 types:[
                     'str','num','bool',
                     {value:"null",label:"null",hasValue:false},
-                    {value:"array",label:"array",hasValue:false},
-                    {value:"object",label:"object",hasValue:false}
+                    {value:"array",label:RED._("jsonEditor.array"),hasValue:false},
+                    {value:"object",label:RED._("jsonEditor.object"),hasValue:false}
                 ],
                 default: valType
             });
@@ -577,7 +577,7 @@
                                     } catch(err) {
                                         rootNode = null;
                                         list.treeList('data',[{
-                                            label: "Invalid JSON: "+err.toString()
+                                            label: RED._("jsonEditor.error.invalidJSON")+err.toString()
                                         }]);
                                     }
                                 }

From 361dc194ee1fc3cc9f8bcad6901a7fe00dd88a2b Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 31 Oct 2019 14:46:29 +0900
Subject: [PATCH 215/305] Support ctrl key to select tabs for Windows

---
 .../@node-red/editor-client/src/js/ui/common/tabs.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 0d371e56f..249d7daa7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -218,7 +218,7 @@ RED.tabs = (function() {
             var thisTab = $(this).parent();
             var fireSelectionChanged = false;
             if (options.onselect) {
-                if (evt.metaKey) {
+                if (evt.metaKey || evt.ctrlKey) {
                     if (thisTab.hasClass("selected")) {
                         thisTab.removeClass("selected");
                         if (thisTab[0] !== currentTab[0]) {

From 7c21bf45551d212521e3989ad65ed90851b42b21 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 31 Oct 2019 16:03:27 +0900
Subject: [PATCH 216/305] Add icons for typedInput

---
 .../@node-red/nodes/core/function/10-switch.html   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 7b28976b0..f89288afa 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -237,13 +237,13 @@
 
                     function createTypeValueField(){
                         return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'string',types:[
-                            {value:"string",label:RED._("node-red:switch.label.string"),hasValue:false},
-                            {value:"number",label:RED._("node-red:switch.label.number"),hasValue:false},
-                            {value:"boolean",label:RED._("node-red:switch.label.boolean"),hasValue:false},
-                            {value:"array",label:RED._("node-red:switch.label.array"),hasValue:false},
-                            {value:"buffer",label:RED._("node-red:switch.label.buffer"),hasValue:false},
-                            {value:"object",label:RED._("node-red:switch.label.object"),hasValue:false},
-                            {value:"json",label:RED._("node-red:switch.label.jsonString"),hasValue:false},
+                            {value:"string",label:RED._("node-red:switch.label.string"),hasValue:false,icon:"red/images/typedInput/az.png"},
+                            {value:"number",label:RED._("node-red:switch.label.number"),hasValue:false,icon:"red/images/typedInput/09.png"},
+                            {value:"boolean",label:RED._("node-red:switch.label.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"},
+                            {value:"array",label:RED._("node-red:switch.label.array"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                            {value:"buffer",label:RED._("node-red:switch.label.buffer"),hasValue:false,icon:"red/images/typedInput/bin.png"},
+                            {value:"object",label:RED._("node-red:switch.label.object"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                            {value:"json",label:RED._("node-red:switch.label.jsonString"),hasValue:false,icon:"red/images/typedInput/json.png"},
                             {value:"undefined",label:RED._("node-red:switch.label.undefined"),hasValue:false},
                             {value:"null",label:RED._("node-red:switch.label.null"),hasValue:false}
                         ]});

From 9dbdf0947b479bb8a698b8a875c76bc916fc71ab Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 31 Oct 2019 17:21:26 +0900
Subject: [PATCH 217/305] Add tooltip to expand button in markdown editor

---
 .../@node-red/editor-client/locales/en-US/editor.json           | 1 +
 .../node_modules/@node-red/editor-client/locales/ja/editor.json | 1 +
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index fa347e6ea..fa8d34a22 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -796,6 +796,7 @@
     },
     "markdownEditor": {
         "title": "Markdown editor",
+        "expand": "Expand",
         "format": "Formatted with markdown",
         "heading1": "Heading 1",
         "heading2": "Heading 2",
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index a6aab331d..f8003aca8 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -795,6 +795,7 @@
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
+        "expand": "拡大",
         "format": "マークダウン形式で記述",
         "heading1": "見出しレベル1",
         "heading2": "見出しレベル2",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 27655f162..867dca967 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -2484,7 +2484,7 @@ RED.editor = (function() {
             editor.toolbar = customEditTypes['_markdown'].buildToolbar(toolbarRow,editor);
             if (options.expandable !== false) {
                 var expandButton = $('<button type="button" class="red-ui-button" style="float: right;"><i class="fa fa-expand"></i></button>').appendTo(editor.toolbar);
-
+                RED.popover.tooltip(expandButton, RED._("markdownEditor.expand"));
                 expandButton.on("click", function(e) {
                     e.preventDefault();
                     var value = editor.getValue();

From bc283aa02507ea73e4b8186ad6d2ed7fff4c61f8 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Fri, 1 Nov 2019 11:38:26 +0000
Subject: [PATCH 218/305] Catches bad objects being encoded, returning instead
 the error. Symptom- Observed that global context would not display in front
 end, the call returning 400. Traced to an object in global which cause
 encodeObject to except. This push catches that, and now global will display,
 but the object in question display as an error.

---
 .../node_modules/@node-red/util/lib/util.js   | 241 ++++++++++--------
 1 file changed, 128 insertions(+), 113 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index 69ed930bb..d40a4de05 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -652,130 +652,145 @@ function normaliseNodeTypeName(name) {
  * @memberof @node-red/util_util
  */
 function encodeObject(msg,opts) {
-    var debuglength = 1000;
-    if (opts && opts.hasOwnProperty('maxLength')) {
-        debuglength = opts.maxLength;
-    }
-    var msgType = typeof msg.msg;
-    if (msg.msg instanceof Error) {
-        msg.format = "error";
-        var errorMsg = {};
-        if (msg.msg.name) {
-            errorMsg.name = msg.msg.name;
+    try {
+        var debuglength = 1000;
+        if (opts && opts.hasOwnProperty('maxLength')) {
+            debuglength = opts.maxLength;
         }
-        if (msg.msg.hasOwnProperty('message')) {
-            errorMsg.message = msg.msg.message;
-        } else {
-            errorMsg.message = msg.msg.toString();
-        }
-        msg.msg = JSON.stringify(errorMsg);
-    } else if (msg.msg instanceof Buffer) {
-        msg.format = "buffer["+msg.msg.length+"]";
-        msg.msg = msg.msg.toString('hex');
-        if (msg.msg.length > debuglength) {
-            msg.msg = msg.msg.substring(0,debuglength);
-        }
-    } else if (msg.msg && msgType === 'object') {
-        try {
-            msg.format = msg.msg.constructor.name || "Object";
-            // Handle special case of msg.req/res objects from HTTP In node
-            if (msg.format === "IncomingMessage" || msg.format === "ServerResponse") {
+        var msgType = typeof msg.msg;
+        if (msg.msg instanceof Error) {
+            msg.format = "error";
+            var errorMsg = {};
+            if (msg.msg.name) {
+                errorMsg.name = msg.msg.name;
+            }
+            if (msg.msg.hasOwnProperty('message')) {
+                errorMsg.message = msg.msg.message;
+            } else {
+                errorMsg.message = msg.msg.toString();
+            }
+            msg.msg = JSON.stringify(errorMsg);
+        } else if (msg.msg instanceof Buffer) {
+            msg.format = "buffer["+msg.msg.length+"]";
+            msg.msg = msg.msg.toString('hex');
+            if (msg.msg.length > debuglength) {
+                msg.msg = msg.msg.substring(0,debuglength);
+            }
+        } else if (msg.msg && msgType === 'object') {
+            try {
+                msg.format = msg.msg.constructor.name || "Object";
+                // Handle special case of msg.req/res objects from HTTP In node
+                if (msg.format === "IncomingMessage" || msg.format === "ServerResponse") {
+                    msg.format = "Object";
+                }
+            } catch(err) {
                 msg.format = "Object";
             }
-        } catch(err) {
-            msg.format = "Object";
-        }
-        if (/error/i.test(msg.format)) {
-            msg.msg = JSON.stringify({
-                name: msg.msg.name,
-                message: msg.msg.message
-            });
-        } else {
-            var isArray = util.isArray(msg.msg);
-            if (isArray) {
-                msg.format = "array["+msg.msg.length+"]";
-                if (msg.msg.length > debuglength) {
-                    // msg.msg = msg.msg.slice(0,debuglength);
-                    msg.msg = {
-                        __enc__: true,
-                        type: "array",
-                        data: msg.msg.slice(0,debuglength),
-                        length: msg.msg.length
-                    }
-                }
-            }
-            if (isArray || (msg.format === "Object")) {
-                msg.msg = safeJSONStringify(msg.msg, function(key, value) {
-                    if (key === '_req' || key === '_res') {
-                        value = {
-                            __enc__: true,
-                            type: "internal"
-                        }
-                    } else if (value instanceof Error) {
-                        value = value.toString()
-                    } else if (util.isArray(value) && value.length > debuglength) {
-                        value = {
+            if (/error/i.test(msg.format)) {
+                msg.msg = JSON.stringify({
+                    name: msg.msg.name,
+                    message: msg.msg.message
+                });
+            } else {
+                var isArray = util.isArray(msg.msg);
+                if (isArray) {
+                    msg.format = "array["+msg.msg.length+"]";
+                    if (msg.msg.length > debuglength) {
+                        // msg.msg = msg.msg.slice(0,debuglength);
+                        msg.msg = {
                             __enc__: true,
                             type: "array",
-                            data: value.slice(0,debuglength),
-                            length: value.length
-                        }
-                    } else if (typeof value === 'string') {
-                        if (value.length > debuglength) {
-                            value = value.substring(0,debuglength)+"...";
-                        }
-                    } else if (typeof value === 'function') {
-                        value = {
-                            __enc__: true,
-                            type: "function"
-                        }
-                    } else if (typeof value === 'number') {
-                        if (isNaN(value) || value === Infinity || value === -Infinity) {
-                            value = {
-                                __enc__: true,
-                                type: "number",
-                                data: value.toString()
-                            }
-                        }
-                    } else if (value && value.constructor) {
-                        if (value.type === "Buffer") {
-                            value.__enc__ = true;
-                            value.length = value.data.length;
-                            if (value.length > debuglength) {
-                                value.data = value.data.slice(0,debuglength);
-                            }
-                        } else if (value.constructor.name === "ServerResponse") {
-                            value = "[internal]"
-                        } else if (value.constructor.name === "Socket") {
-                            value = "[internal]"
+                            data: msg.msg.slice(0,debuglength),
+                            length: msg.msg.length
                         }
                     }
-                    return value;
-                }," ");
-            } else {
-                try { msg.msg = msg.msg.toString(); }
-                catch(e) { msg.msg = "[Type not printable]"; }
+                }
+                if (isArray || (msg.format === "Object")) {
+                    msg.msg = safeJSONStringify(msg.msg, function(key, value) {
+                        if (key === '_req' || key === '_res') {
+                            value = {
+                                __enc__: true,
+                                type: "internal"
+                            }
+                        } else if (value instanceof Error) {
+                            value = value.toString()
+                        } else if (util.isArray(value) && value.length > debuglength) {
+                            value = {
+                                __enc__: true,
+                                type: "array",
+                                data: value.slice(0,debuglength),
+                                length: value.length
+                            }
+                        } else if (typeof value === 'string') {
+                            if (value.length > debuglength) {
+                                value = value.substring(0,debuglength)+"...";
+                            }
+                        } else if (typeof value === 'function') {
+                            value = {
+                                __enc__: true,
+                                type: "function"
+                            }
+                        } else if (typeof value === 'number') {
+                            if (isNaN(value) || value === Infinity || value === -Infinity) {
+                                value = {
+                                    __enc__: true,
+                                    type: "number",
+                                    data: value.toString()
+                                }
+                            }
+                        } else if (value && value.constructor) {
+                            if (value.type === "Buffer") {
+                                value.__enc__ = true;
+                                value.length = value.data.length;
+                                if (value.length > debuglength) {
+                                    value.data = value.data.slice(0,debuglength);
+                                }
+                            } else if (value.constructor.name === "ServerResponse") {
+                                value = "[internal]"
+                            } else if (value.constructor.name === "Socket") {
+                                value = "[internal]"
+                            }
+                        }
+                        return value;
+                    }," ");
+                } else {
+                    try { msg.msg = msg.msg.toString(); }
+                    catch(e) { msg.msg = "[Type not printable]"; }
+                }
+            }
+        } else if (msgType === "function") {
+            msg.format = "function";
+            msg.msg = "[function]"
+        } else if (msgType === "boolean") {
+            msg.format = "boolean";
+            msg.msg = msg.msg.toString();
+        } else if (msgType === "number") {
+            msg.format = "number";
+            msg.msg = msg.msg.toString();
+        } else if (msg.msg === null || msgType === "undefined") {
+            msg.format = (msg.msg === null)?"null":"undefined";
+            msg.msg = "(undefined)";
+        } else {
+            msg.format = "string["+msg.msg.length+"]";
+            if (msg.msg.length > debuglength) {
+                msg.msg = msg.msg.substring(0,debuglength)+"...";
             }
         }
-    } else if (msgType === "function") {
-        msg.format = "function";
-        msg.msg = "[function]"
-    } else if (msgType === "boolean") {
-        msg.format = "boolean";
-        msg.msg = msg.msg.toString();
-    } else if (msgType === "number") {
-        msg.format = "number";
-        msg.msg = msg.msg.toString();
-    } else if (msg.msg === null || msgType === "undefined") {
-        msg.format = (msg.msg === null)?"null":"undefined";
-        msg.msg = "(undefined)";
-    } else {
-        msg.format = "string["+msg.msg.length+"]";
-        if (msg.msg.length > debuglength) {
-            msg.msg = msg.msg.substring(0,debuglength)+"...";
+        return msg;
+    } catch(e) {
+        msg.format = "error";
+        var errorMsg = {};
+        if (e.name) {
+            errorMsg.name = e.name;
         }
+        if (e.hasOwnProperty('message')) {
+            errorMsg.message = e.message;
+        } else {
+            errorMsg.message = e.toString();
+        }
+        msg.msg = JSON.stringify(errorMsg);
+        return msg;
     }
-    return msg;
 }
 
 module.exports = {

From 397fe31f97a95e5948e99184e3ede42425c883b5 Mon Sep 17 00:00:00 2001
From: piyonakajima <piyo.0912@gmail.com>
Date: Fri, 1 Nov 2019 22:04:43 +0900
Subject: [PATCH 219/305] Update 17-split.html (#2365)

---
 .../@node-red/nodes/locales/ja/sequence/17-split.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
index e94134a59..6205bac52 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
@@ -98,7 +98,7 @@
     <p>「<i>合計値</i>」には出力メッセージを送信する前に受信すべきメッセージ数を指定します。オブジェクト出力の場合、この合計値に達すると後続メッセージの到着毎にメッセージを出力するように設定することもできます。</p>
     <p>「<i>秒</i>」には新規メッセージを送信するまでの経過時間を設定します。</p>
     <p><code>msg.complete</code>プロパティを設定したメッセージを受信すると、出力メッセージを送信します。この時、メッセージ列の数をリセットします。</p>
-    <p><code>msg.reset</code>プロパティを設定したメッセージを受診すると、部分的に受信済みのメッセージを破棄します。これらのメッセージは送信されません。この時、メッセージ列の数をリセットします。</p>
+    <p><code>msg.reset</code>プロパティを設定したメッセージを受信すると、部分的に受信済みのメッセージを破棄します。これらのメッセージは送信されません。この時、メッセージ列の数をリセットします。</p>
 
     <h4>列の集約モード</h4>
     <p>列の集約モードを選択すると、メッセージ列を構成する各々のメッセージに対して式を適用し、集約した値を用いて一つのメッセージを構成します。</p>

From eb09ec6834e1c8600cc0c8bc5212ef5ba451dc16 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 10:39:22 +0000
Subject: [PATCH 220/305] add utils.inspect result and be more explicit about
 the error.

---
 packages/node_modules/@node-red/util/lib/util.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index d40a4de05..df7c404b0 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -784,9 +784,12 @@ function encodeObject(msg,opts) {
             errorMsg.name = e.name;
         }
         if (e.hasOwnProperty('message')) {
-            errorMsg.message = e.message;
+            errorMsg.message = 'encodeObject Error: ['+e.message + '] Value: '+util.inspect(msg.msg);
         } else {
-            errorMsg.message = e.toString();
+            errorMsg.message = 'encodeObject Error: ['+e.toString() + '] Value: '+util.inspect(msg.msg);
+        }
+        if (errorMsg.message.length > debuglength) {
+            errorMsg.message = errorMsg.message.substring(0,debuglength);
         }
         msg.msg = JSON.stringify(errorMsg);
         return msg;

From d46531def82ea60a16e330f38b9f830cab566d86 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 11:27:08 +0000
Subject: [PATCH 221/305] add unit tests for encode Object changes.

---
 test/unit/@node-red/util/lib/util_spec.js | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js
index 17304e811..603f4524c 100644
--- a/test/unit/@node-red/util/lib/util_spec.js
+++ b/test/unit/@node-red/util/lib/util_spec.js
@@ -772,6 +772,57 @@ describe("@node-red/util/util", function() {
                 var resultJson = JSON.parse(result.msg);
                 resultJson.socket.should.eql('[internal]');
             });
+            it('object which fails to serialise', function(done) {
+                var msg = {
+                    msg: {
+                        obj:{
+                            cantserialise:{
+                                message:'this will not be displayed',
+                                toJSON: function(val) {
+                                    throw 'this exception should have been caught';
+                                    return 'should not display because we threw first';
+                                },
+                            },
+                            canserialise:{
+                                message:'this should be displayed',
+                            }
+                        },
+                    }
+                };
+                var result = util.encodeObject(msg);
+                result.format.should.eql("error");
+                var success = (result.msg.indexOf('cantserialise') > 0);
+                success &= (result.msg.indexOf('this exception should have been caught') > 0);
+                success &= (result.msg.indexOf('canserialise') > 0);
+                success.should.eql(1);
+                done();
+            });
+            it('object which fails to serialise - different error type', function(done) {
+                var msg = {
+                    msg: {
+                        obj:{
+                            cantserialise:{
+                                message:'this will not be displayed',
+                                toJSON: function(val) {
+                                    throw new Error('this exception should have been caught');
+                                    return 'should not display because we threw first';
+                                },
+                            },
+                            canserialise:{
+                                message:'this should be displayed',
+                            }
+                        },
+                    }
+                };
+                var result = util.encodeObject(msg);
+                result.format.should.eql("error");
+                var success = (result.msg.indexOf('cantserialise') > 0);
+                success &= (result.msg.indexOf('this exception should have been caught') > 0);
+                success &= (result.msg.indexOf('canserialise') > 0);
+                success.should.eql(1);
+                done();
+            });
+            
         });
     });
 });

From 74d760a46d395e77a4991a9d9843e6f1b5f63dd5 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 12:37:07 +0000
Subject: [PATCH 222/305] add util.inspect data to 'type not printable'.  Add
 test to cover these lines (no existing test).

---
 .../node_modules/@node-red/util/lib/util.js   |  2 +-
 test/unit/@node-red/util/lib/util_spec.js     | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index df7c404b0..ef43739e6 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -755,7 +755,7 @@ function encodeObject(msg,opts) {
                     }," ");
                 } else {
                     try { msg.msg = msg.msg.toString(); }
-                    catch(e) { msg.msg = "[Type not printable]"; }
+                    catch(e) { msg.msg = "[Type not printable]" + util.inspect(msg.msg); }
                 }
             }
         } else if (msgType === "function") {
diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js
index 603f4524c..b3f9fe57d 100644
--- a/test/unit/@node-red/util/lib/util_spec.js
+++ b/test/unit/@node-red/util/lib/util_spec.js
@@ -822,6 +822,53 @@ describe("@node-red/util/util", function() {
                 success.should.eql(1);
                 done();
             });
+            it('very large object which fails to serialise should be truncated', function(done) {
+                var msg = {
+                    msg: {
+                        obj:{
+                            big:"",
+                            cantserialise:{
+                                message:'this will not be displayed',
+                                toJSON: function(val) {
+                                    throw new Error('this exception should have been caught');
+                                    return 'should not display because we threw first';
+                                },
+                            },
+                            canserialise:{
+                                message:'this should be displayed',
+                            }
+                        },
+                    }
+                };
+                
+                for (var i = 0; i < 1000; i++) {
+                  msg.msg.obj.big += 'some more string ';
+                }
+                
+                var result = util.encodeObject(msg);
+                result.format.should.eql("error");
+                var resultJson = JSON.parse(result.msg);
+                var success = (resultJson.message.length <= 1000);
+                success.should.eql(true);
+                done();
+            });
+            it('test bad toString', function(done) {
+                var msg = {
+                    msg: {
+                      mystrangeobj:"hello",
+                    },
+                };
+                msg.msg.toString = function(){
+                  throw new Error('Exception in toString - should have been caught');
+                }
+                msg.msg.constructor = { name: "strangeobj" };
+                
+                var result = util.encodeObject(msg);
+                var success = (result.msg.indexOf('[Type not printable]') >= 0);
+                success.should.eql(true);
+                done();
+            });
+
             
         });
     });

From 63cc9adeaa98bae3d4ad60270b108d2ada8355a0 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 12:38:40 +0000
Subject: [PATCH 223/305] small update to log - if toString() causes exception,
 then note and use util.inspect instead - prevents log from causing processes
 to abort through exception. Add tests.

---
 packages/node_modules/@node-red/util/lib/log.js |  9 +++++++--
 test/unit/@node-red/util/lib/log_spec.js        | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/log.js b/packages/node_modules/@node-red/util/lib/log.js
index 155863802..8d7b84966 100644
--- a/packages/node_modules/@node-red/util/lib/log.js
+++ b/packages/node_modules/@node-red/util/lib/log.js
@@ -84,9 +84,14 @@ var consoleLogger = function(msg) {
             util.log("["+levelNames[msg.level]+"] "+(msg.type?"["+msg.type+":"+(msg.name||msg.id)+"] ":"")+msg.msg.stack);
         } else {
             var message = msg.msg;
-            if (typeof message === 'object' && message !== null && message.toString() === '[object Object]' && message.message) {
-                message = message.message;
+            try {
+                if (typeof message === 'object' && message !== null && message.toString() === '[object Object]' && message.message) {
+                    message = message.message;
+                }
+            } catch(e){
+                message = 'Exception trying to log: '+util.inspect(message);
             }
+            
             util.log("["+levelNames[msg.level]+"] "+(msg.type?"["+msg.type+":"+(msg.name||msg.id)+"] ":"")+message);
         }
     }
diff --git a/test/unit/@node-red/util/lib/log_spec.js b/test/unit/@node-red/util/lib/log_spec.js
index 9a6f1ac28..73df7d620 100644
--- a/test/unit/@node-red/util/lib/log_spec.js
+++ b/test/unit/@node-red/util/lib/log_spec.js
@@ -224,5 +224,19 @@ describe("@node-red/util/log", function() {
 
 
     });
+    it('it can log without exception', function() {
+        var msg = {
+            msg: {
+              mystrangeobj:"hello",
+            },
+        };
+        msg.msg.toString = function(){
+          throw new Error('Exception in toString - should have been caught');
+        }
+        msg.msg.constructor = { name: "strangeobj" };
+        var ret = log.info(msg.msg);
+    });
 
+    
+    
 });

From c54509df3d31f8a4808bda23d27946c734e70bff Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 13:03:37 +0000
Subject: [PATCH 224/305] additional test to cover last line in encodeObject

---
 test/unit/@node-red/util/lib/util_spec.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js
index b3f9fe57d..cf59df55e 100644
--- a/test/unit/@node-red/util/lib/util_spec.js
+++ b/test/unit/@node-red/util/lib/util_spec.js
@@ -842,7 +842,7 @@ describe("@node-red/util/util", function() {
                 };
                 
                 for (var i = 0; i < 1000; i++) {
-                  msg.msg.obj.big += 'some more string ';
+                    msg.msg.obj.big += 'some more string ';
                 }
                 
                 var result = util.encodeObject(msg);
@@ -855,11 +855,11 @@ describe("@node-red/util/util", function() {
             it('test bad toString', function(done) {
                 var msg = {
                     msg: {
-                      mystrangeobj:"hello",
+                        mystrangeobj:"hello",
                     },
                 };
                 msg.msg.toString = function(){
-                  throw new Error('Exception in toString - should have been caught');
+                    throw new Error('Exception in toString - should have been caught');
                 }
                 msg.msg.constructor = { name: "strangeobj" };
                 
@@ -868,8 +868,21 @@ describe("@node-red/util/util", function() {
                 success.should.eql(true);
                 done();
             });
+            it('test bad object constructor', function(done) {
+                var msg = {
+                    msg: {
+                        mystrangeobj:"hello",
+                        constructor: { 
+                            get name(){
+                                throw new Error('Exception in constructor name');
+                            }
+                        }                      
+                    },
+                };
+                var result = util.encodeObject(msg);
+                done();
+            });
 
-            
         });
     });
 });

From 5e9e523d4c63b4ec8b969a8169a4ee742532db76 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 2 Nov 2019 13:21:58 +0000
Subject: [PATCH 225/305] add one line of coverage in log tests.

---
 test/unit/@node-red/util/lib/log_spec.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/unit/@node-red/util/lib/log_spec.js b/test/unit/@node-red/util/lib/log_spec.js
index 73df7d620..c882dd2ae 100644
--- a/test/unit/@node-red/util/lib/log_spec.js
+++ b/test/unit/@node-red/util/lib/log_spec.js
@@ -236,6 +236,16 @@ describe("@node-red/util/log", function() {
         msg.msg.constructor = { name: "strangeobj" };
         var ret = log.info(msg.msg);
     });
+    it('it can log an object but use .message', function() {
+        var msg = {
+            msg: {
+              message: "my special message",
+              mystrangeobj:"hello",
+            },
+        };
+        var ret = log.info(msg.msg);
+        sinon.assert.calledWithMatch(util.log,"my special message");
+    });
 
     
     

From 72deee5d742553b52c060cd52571b9fd3c90645c Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 08:24:47 +0000
Subject: [PATCH 226/305] Detect windows UNC '\\' as well as 'X:' as an
 absolute flow path - use the path.isAbsolute function instead of rolling our
 own.

---
 .../runtime/lib/storage/localfilesystem/projects/index.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
index 674b380e6..82c1f8d39 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
@@ -56,8 +56,9 @@ function init(_settings, _runtime) {
 
     if (settings.flowFile) {
         flowsFile = settings.flowFile;
-        // handle Unix and Windows "C:\"
-        if ((flowsFile[0] == "/") || (flowsFile[1] == ":")) {
+        // handle Unix and Windows "C:\" and Windows "\\" for UNC.
+        if (fspath.isAbsolute(flowsFile)) {
+        //if (((flowsFile[0] == "\\") && (flowsFile[1] == "\\")) || (flowsFile[0] == "/") || (flowsFile[1] == ":")) {
             // Absolute path
             flowsFullPath = flowsFile;
         } else if (flowsFile.substring(0,2) === "./") {

From a4af7b8e21a2990dcca821f83f66e569a72d7cb9 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 09:10:32 +0000
Subject: [PATCH 227/305] localfilesystem - ensure folder is present before
 write (e.g. flows file not in user folder)

---
 .../lib/storage/localfilesystem/util.js       | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js
index 267f8c933..b18c80643 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/util.js
@@ -15,6 +15,7 @@
  **/
 
 var fs = require('fs-extra');
+var fspath = require('path');
 var when = require('when');
 var nodeFn = require('when/node/function');
 
@@ -79,25 +80,31 @@ module.exports = {
      * the write hits disk.
      */
      writeFile: function(path,content,backupPath) {
-         if (backupPath) {
+        if (backupPath) {
             if (fs.existsSync(path)) {
                 fs.renameSync(path,backupPath);
             }
         }
         return when.promise(function(resolve,reject) {
-            var stream = fs.createWriteStream(path);
-            stream.on('open',function(fd) {
-                stream.write(content,'utf8',function() {
-                    fs.fsync(fd,function(err) {
-                        if (err) {
-                            log.warn(log._("storage.localfilesystem.fsync-fail",{path: path, message: err.toString()}));
-                        }
-                        stream.end(resolve);
+            fs.ensureDir(fspath.dirname(path), (err)=>{
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                var stream = fs.createWriteStream(path);
+                stream.on('open',function(fd) {
+                    stream.write(content,'utf8',function() {
+                        fs.fsync(fd,function(err) {
+                            if (err) {
+                                log.warn(log._("storage.localfilesystem.fsync-fail",{path: path, message: err.toString()}));
+                            }
+                            stream.end(resolve);
+                        });
                     });
                 });
-            });
-            stream.on('error',function(err) {
-                reject(err);
+                stream.on('error',function(err) {
+                    reject(err);
+                });
             });
         });
      },

From 0b3e9bf5e21e04f9ff888a3330b1d949002f79a1 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 09:54:23 +0000
Subject: [PATCH 228/305] mqtt & httprequest: change proxy comparison from null
 to falsy. mqtt - add no_proxy support.

---
 .../@node-red/nodes/core/network/10-mqtt.js   | 23 ++++++++++++++-----
 .../nodes/core/network/21-httprequest.js      |  8 +++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 4945c5c8b..28d72a811 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -111,9 +111,13 @@ module.exports = function(RED) {
         if (typeof this.cleansession === 'undefined') {
             this.cleansession = true;
         }
-        var prox;
-        if (process.env.http_proxy != null) { prox = process.env.http_proxy; }
-        if (process.env.HTTP_PROXY != null) { prox = process.env.HTTP_PROXY; }
+
+        var prox, noprox;
+        if (process.env.http_proxy) { prox = process.env.http_proxy; }
+        if (process.env.HTTP_PROXY) { prox = process.env.HTTP_PROXY; }
+        if (process.env.no_proxy) { noprox = process.env.no_proxy.split(","); }
+        if (process.env.NO_PROXY) { noprox = process.env.NO_PROXY.split(","); }
+
 
         // Create the URL to pass in to the MQTT.js library
         if (this.brokerurl === "") {
@@ -121,9 +125,15 @@ module.exports = function(RED) {
             if (this.broker.indexOf("://") > -1) {
                 this.brokerurl = this.broker;
                 // Only for ws or wss, check if proxy env var for additional configuration
-                if (this.brokerurl.indexOf("wss://") > -1 || this.brokerurl.indexOf("ws://") > -1 )
-                // check if proxy is set in env
-                    if (prox) {
+                if (this.brokerurl.indexOf("wss://") > -1 || this.brokerurl.indexOf("ws://") > -1 ) {
+                    // check if proxy is set in env
+                    var noproxy;
+                    if (noprox) {
+                        for (var i in noprox) {
+                            if (this.brokerurl.indexOf(noprox[i].trim()) !== -1) { noproxy=true; }
+                        }
+                    }
+                    if (prox && !noproxy) {
                         var parsedUrl = url.parse(this.brokerurl);
                         var proxyOpts = url.parse(prox);
                         // true for wss
@@ -134,6 +144,7 @@ module.exports = function(RED) {
                             agent: agent
                         }
                     }
+                }
             } else {
                 // construct the std mqtt:// url
                 if (this.usetls) {
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index 5384d1805..54456d4b5 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -39,10 +39,10 @@ module.exports = function(RED) {
         else { this.reqTimeout = 120000; }
 
         var prox, noprox;
-        if (process.env.http_proxy != null) { prox = process.env.http_proxy; }
-        if (process.env.HTTP_PROXY != null) { prox = process.env.HTTP_PROXY; }
-        if (process.env.no_proxy != null) { noprox = process.env.no_proxy.split(","); }
-        if (process.env.NO_PROXY != null) { noprox = process.env.NO_PROXY.split(","); }
+        if (process.env.http_proxy) { prox = process.env.http_proxy; }
+        if (process.env.HTTP_PROXY) { prox = process.env.HTTP_PROXY; }
+        if (process.env.no_proxy) { noprox = process.env.no_proxy.split(","); }
+        if (process.env.NO_PROXY) { noprox = process.env.NO_PROXY.split(","); }
 
         var proxyConfig = null;
         if (n.proxy) {

From d32d04bd4e27ba723c7441f1e6361e2b8acad8fa Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 09:55:11 +0000
Subject: [PATCH 229/305] websocket - add proxy support.

---
 .../nodes/core/network/22-websocket.js        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
index 957b7d8ed..315f3caaa 100644
--- a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
+++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
@@ -19,6 +19,8 @@ module.exports = function(RED) {
     var ws = require("ws");
     var inspect = require("util").inspect;
     var url = require("url");
+    var HttpsProxyAgent = require('https-proxy-agent');
+
 
     var serverUpgradeAdded = false;
     function handleServerUpgrade(request, socket, head) {
@@ -55,7 +57,28 @@ module.exports = function(RED) {
 
         function startconn() {    // Connect to remote endpoint
             node.tout = null;
+            var prox, noprox;
+            if (process.env.http_proxy) { prox = process.env.http_proxy; }
+            if (process.env.HTTP_PROXY) { prox = process.env.HTTP_PROXY; }
+            if (process.env.no_proxy) { noprox = process.env.no_proxy.split(","); }
+            if (process.env.NO_PROXY) { noprox = process.env.NO_PROXY.split(","); }
+            
+            var noproxy = false;
+            if (noprox) {
+                for (var i in noprox) {
+                    if (node.path.indexOf(noprox[i].trim()) !== -1) { noproxy=true; }
+                }
+            }
+            
+            var agent = undefined;
+            if (prox && !noproxy) {
+                agent = new HttpsProxyAgent(prox);
+            }
+
             var options = {};
+            if (agent) {
+                options.agent = agent;
+            }
             if (node.tls) {
                 var tlsNode = RED.nodes.getNode(node.tls);
                 if (tlsNode) {

From 6931cb98958c87994ead45ab0797de67a99a649f Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 10:42:50 +0000
Subject: [PATCH 230/305] Added test for both UNC path and flow in non-existent
 subfolder.

---
 .../lib/storage/localfilesystem/index_spec.js | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js b/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js
index 464afa7e0..acfe3db43 100644
--- a/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/storage/localfilesystem/index_spec.js
@@ -19,6 +19,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var sinon = require('sinon');
 var NR_TEST_UTILS = require("nr-test-utils");
+var process = require("process");
 
 var localfilesystem = NR_TEST_UTILS.require("@node-red/runtime/lib/storage/localfilesystem");
 var log = NR_TEST_UTILS.require("@node-red/util").log;
@@ -474,4 +475,44 @@ describe('storage/localfilesystem', function() {
             done(err);
         });
     });
+
+    it('should handle flow file in random unc path and non-existent subfolder',function(done) {
+        // only test on win32
+        if (process.platform !== 'win32') {
+          console.log('skipped test as not win32');
+          done();
+          return;
+        }
+        
+        // get a real windows path
+        var flowFile = path.win32.resolve(userDir+'/some/random/path');
+        var rootdir = path.win32.resolve(userDir+'/some');
+        // make it into a local UNC path
+        flowFile = flowFile.replace('C:\\', '\\\\localhost\\c$\\');
+        localfilesystem.init({userDir:userDir, flowFile:flowFile}, mockRuntime).then(function() {
+            fs.existsSync(flowFile).should.be.false();
+            localfilesystem.saveFlows(testFlow).then(function() {
+                fs.existsSync(flowFile).should.be.true();
+                localfilesystem.getFlows().then(function(flows) {
+                    flows.should.eql(testFlow);
+                    // cleanup
+                    fs.removeSync(rootdir);
+                    done();
+                }).catch(function(err) {
+                    // cleanup
+                    fs.removeSync(rootdir);
+                    done(err);
+                });
+            }).catch(function(err) {
+                // cleanup
+                fs.removeSync(rootdir);
+                done(err);
+            });
+        }).catch(function(err) {
+            // cleanup
+            fs.removeSync(rootdir);
+            done(err);
+        });
+    });
+    
 });

From aa86cfc55f534ef6950786799ab521f541e4bc6a Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sun, 3 Nov 2019 11:08:24 +0000
Subject: [PATCH 231/305] Add fix for HttpsProxyAgent using an incorrect
 default port for http:

---
 .../@node-red/nodes/core/network/21-httprequest.js          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index 54456d4b5..16b4cb950 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -88,8 +88,13 @@ module.exports = function(RED) {
             if (msg.method && n.method && (n.method === "use")) {
                 method = msg.method.toUpperCase();          // use the msg parameter
             }
+
+            var isHttps = (/^https/.test(url));
+
             var opts = {};
             opts.url = url;
+            // set defaultport, else when using HttpsProxyAgent, it's defaultPort of 443 will be used :(.
+            opts.defaultPort = isHttps?443:80;
             opts.timeout = node.reqTimeout;
             opts.method = method;
             opts.headers = {};
@@ -284,6 +289,7 @@ module.exports = function(RED) {
                 opts.headers[clSet] = opts.headers['content-length'];
                 delete opts.headers['content-length'];
             }
+            
             var noproxy;
             if (noprox) {
                 for (var i in noprox) {

From 9e16d7f4339cb4640d9f8bcd781c96046a758516 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 5 Nov 2019 11:29:43 +0900
Subject: [PATCH 232/305] Move messages to editor.json

---
 .../editor-client/locales/en-US/editor.json    | 11 +++++++++++
 .../editor-client/locales/ja/editor.json       | 11 +++++++++++
 .../nodes/core/function/10-switch.html         | 18 +++++++++---------
 .../nodes/locales/en-US/messages.json          |  9 ---------
 .../@node-red/nodes/locales/ja/messages.json   |  9 ---------
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index fa347e6ea..e36629b9f 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -15,6 +15,17 @@
             "next": "Next",
             "clone": "Clone project",
             "cont": "Continue"
+        },
+        "type": {
+            "string": "string",
+            "number": "number",
+            "boolean": "boolean",
+            "array": "array",
+            "buffer": "buffer",
+            "object": "object",
+            "jsonString": "JSON string",
+            "undefined": "undefined",
+            "null": "null"
         }
     },
     "workspace": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index a6aab331d..839e9bbd9 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -15,6 +15,17 @@
             "next": "進む",
             "clone": "プロジェクトをクローン",
             "cont": "続ける"
+        },
+        "type": {
+            "string": "文字列",
+            "number": "数値",
+            "boolean": "真偽値",
+            "array": "配列",
+            "buffer": "バッファ",
+            "object": "オブジェクト",
+            "jsonString": "JSON文字列",
+            "undefined": "undefined",
+            "null": "null"
         }
     },
     "workspace": {
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index f89288afa..9f072ad8a 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -237,15 +237,15 @@
 
                     function createTypeValueField(){
                         return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'string',types:[
-                            {value:"string",label:RED._("node-red:switch.label.string"),hasValue:false,icon:"red/images/typedInput/az.png"},
-                            {value:"number",label:RED._("node-red:switch.label.number"),hasValue:false,icon:"red/images/typedInput/09.png"},
-                            {value:"boolean",label:RED._("node-red:switch.label.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"},
-                            {value:"array",label:RED._("node-red:switch.label.array"),hasValue:false,icon:"red/images/typedInput/json.png"},
-                            {value:"buffer",label:RED._("node-red:switch.label.buffer"),hasValue:false,icon:"red/images/typedInput/bin.png"},
-                            {value:"object",label:RED._("node-red:switch.label.object"),hasValue:false,icon:"red/images/typedInput/json.png"},
-                            {value:"json",label:RED._("node-red:switch.label.jsonString"),hasValue:false,icon:"red/images/typedInput/json.png"},
-                            {value:"undefined",label:RED._("node-red:switch.label.undefined"),hasValue:false},
-                            {value:"null",label:RED._("node-red:switch.label.null"),hasValue:false}
+                            {value:"string",label:RED._("common.type.string"),hasValue:false,icon:"red/images/typedInput/az.png"},
+                            {value:"number",label:RED._("common.type.number"),hasValue:false,icon:"red/images/typedInput/09.png"},
+                            {value:"boolean",label:RED._("common.type.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"},
+                            {value:"array",label:RED._("common.type.array"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                            {value:"buffer",label:RED._("common.type.buffer"),hasValue:false,icon:"red/images/typedInput/bin.png"},
+                            {value:"object",label:RED._("common.type.object"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                            {value:"json",label:RED._("common.type.jsonString"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                            {value:"undefined",label:RED._("common.type.undefined"),hasValue:false},
+                            {value:"null",label:RED._("common.type.null"),hasValue:false}
                         ]});
                     }
 
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 689b6f2b6..e1d7c6368 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -604,15 +604,6 @@
         "label": {
             "property": "Property",
             "rule": "rule",
-            "string": "string",
-            "number": "number",
-            "boolean": "boolean",
-            "array": "array",
-            "buffer": "buffer",
-            "object": "object",
-            "jsonString": "JSON string",
-            "undefined": "undefined",
-            "null": "null",
             "repair": "recreate message sequences"
         },
         "previous": "previous value",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index a7d5c2bfa..adc033390 100755
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -602,15 +602,6 @@
         "label": {
             "property": "プロパティ",
             "rule": "条件",
-            "string": "文字列",
-            "number": "数値",
-            "boolean": "真偽値",
-            "array": "配列",
-            "buffer": "バッファ",
-            "object": "オブジェクト",
-            "jsonString": "JSON文字列",
-            "undefined": "undefined",
-            "null": "null",
             "repair": "メッセージ列の補正"
         },
         "previous": "前回の値",

From 4f6023e44c0083ed9f200987eaf998ba099299a2 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 5 Nov 2019 11:40:20 +0900
Subject: [PATCH 233/305] Support UI testing on the latest Google Chrome

---
 scripts/install-ui-test-dependencies.sh | 3 ++-
 test/editor/wdio.conf.js                | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 scripts/install-ui-test-dependencies.sh

diff --git a/scripts/install-ui-test-dependencies.sh b/scripts/install-ui-test-dependencies.sh
old mode 100755
new mode 100644
index 0148633be..608c32f70
--- a/scripts/install-ui-test-dependencies.sh
+++ b/scripts/install-ui-test-dependencies.sh
@@ -4,4 +4,5 @@ npm install --no-save \
  wdio-mocha-framework@^0.6.4 \
  wdio-spec-reporter@^0.1.5 \
  webdriverio@^4.14.1 \
- chromedriver@2
+ chromedriver@^78.0.1 \
+ @wdio/cli@^5.15.6
diff --git a/test/editor/wdio.conf.js b/test/editor/wdio.conf.js
index 7822cbbf3..37426cf14 100644
--- a/test/editor/wdio.conf.js
+++ b/test/editor/wdio.conf.js
@@ -61,7 +61,7 @@ exports.config = {
         maxInstances: 2,
         //
         browserName: 'chrome',
-        chromeOptions: {
+        'goog:chromeOptions': {
             args: process.env.NODE_RED_NON_HEADLESS
                 // Runs tests with opening a browser.
                 ? ['--disable-gpu']
@@ -134,7 +134,7 @@ exports.config = {
     // Services take over a specific job you don't want to take care of. They enhance
     // your test setup with almost no effort. Unlike plugins, they don't add new
     // commands. Instead, they hook themselves up into the test process.
-    port: '9515',
+    port: 9515,
     path: '/',
     services: ['chromedriver'],
     //

From 6726c42cc86318cdf842b0cd2ea98609a76cbda5 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 5 Nov 2019 21:59:37 +0900
Subject: [PATCH 234/305] Remove @wdio/cli module

---
 scripts/install-ui-test-dependencies.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/install-ui-test-dependencies.sh b/scripts/install-ui-test-dependencies.sh
index 608c32f70..0e13f0b4f 100644
--- a/scripts/install-ui-test-dependencies.sh
+++ b/scripts/install-ui-test-dependencies.sh
@@ -4,5 +4,4 @@ npm install --no-save \
  wdio-mocha-framework@^0.6.4 \
  wdio-spec-reporter@^0.1.5 \
  webdriverio@^4.14.1 \
- chromedriver@^78.0.1 \
- @wdio/cli@^5.15.6
+ chromedriver@^78.0.1

From dae1d6057e61dc5bf5d9d96bf4422e210f0a9acb Mon Sep 17 00:00:00 2001
From: tot92 <tobi-theis@gmx.de>
Date: Sat, 9 Nov 2019 22:07:06 +0100
Subject: [PATCH 235/305] fixed i18n language fallback behaviour

---
 .../node_modules/@node-red/util/lib/i18n.js   | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index 738212b82..51b488129 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -81,35 +81,58 @@ function mergeCatalog(fallback,catalog) {
     }
 }
 
-var MessageFileLoader = {
-    type: "backend",
-    init: function(services, backendOptions, i18nextOptions) {},
-    read: function(lng, ns, callback) {
-        if (resourceMap[ns]) {
-            var file = path.join(resourceMap[ns].basedir,lng,resourceMap[ns].file);
-            //console.log(file);
-            fs.readFile(file,"utf8",function(err,content) {
+
+function readFile(lng, ns) {
+    return new Promise((resolve, reject) => {
+        if (resourceCache[ns] && resourceCache[ns][lng]) {
+            resolve(resourceCache[ns][lng]);
+        } else if (resourceMap[ns]) {
+            var file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file);
+            fs.readFile(file, "utf8", function (err, content) {
                 if (err) {
-                    callback(err);
+                    reject(err);
                 } else {
                     try {
-                        resourceCache[ns] = resourceCache[ns]||{};
+                        resourceCache[ns] = resourceCache[ns] || {};
                         resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, ''));
-                        //console.log(resourceCache[ns][lng]);
-                        if (lng !== defaultLang) {
-                            mergeCatalog(resourceCache[ns][defaultLang],resourceCache[ns][lng]);
+                        var baseLng = lng.split('-')[0];
+                        if (baseLng !== lng && resourceCache[ns][baseLng]) {
+                            mergeCatalog(resourceCache[ns][baseLng], resourceCache[ns][lng]);
                         }
-                        callback(null, resourceCache[ns][lng]);
-                    } catch(e) {
-                        callback(e);
+                        if (lng !== defaultLang) {
+                            mergeCatalog(resourceCache[ns][defaultLang], resourceCache[ns][lng]);
+                        }
+                        resolve(resourceCache[ns][lng]);
+                    } catch (e) {
+                        reject(e);
                     }
                 }
             });
         } else {
-            callback(new Error("Unrecognised namespace"));
+            reject(new Error("Unrecognised namespace"));
         }
-    }
+    });
+}
 
+var MessageFileLoader = {
+    type: "backend",
+    init: function (services, backendOptions, i18nextOptions) { },
+    read: function (lng, ns, callback) {
+        // there are two languages to consider:
+        // 1) the actual language lng (e. g. 'en-US' or 'de-DE', 'fr-FR',...)
+        // 2) the base language (e. g. 'en', 'de', 'fr',...)
+        var baseLng = lng.split('-')[0];
+        // read base language (e. g. 'de'), then actual language (e. g. 'de-DE') 
+        readFile(baseLng, ns).then(
+            baseData => {
+                // scenario 2: reading base language was successful -> read actual language -> if this fails, return base language data
+                readFile(lng, ns).then(data => callback(null, data), () => callback(null, baseData))
+            },
+            () => {
+                // scenario 2: reading base language failed -> read actual language -> if this fails too, return error
+                readFile(lng, ns).then(data => callback(null, data), err => callback(err))
+            });
+    }
 }
 
 function getCurrentLocale() {

From 4d6828ec1423ea1aaeef6ec0a5ccf95f999b2806 Mon Sep 17 00:00:00 2001
From: tot92 <tobi-theis@gmx.de>
Date: Sat, 9 Nov 2019 22:09:02 +0100
Subject: [PATCH 236/305] typo

---
 packages/node_modules/@node-red/util/lib/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index 51b488129..39e4a2c1a 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -125,7 +125,7 @@ var MessageFileLoader = {
         // read base language (e. g. 'de'), then actual language (e. g. 'de-DE') 
         readFile(baseLng, ns).then(
             baseData => {
-                // scenario 2: reading base language was successful -> read actual language -> if this fails, return base language data
+                // scenario 1: reading base language was successful -> read actual language -> if this fails, return base language data
                 readFile(lng, ns).then(data => callback(null, data), () => callback(null, baseData))
             },
             () => {

From ff96773295f459e21893a218c8aabdc855612541 Mon Sep 17 00:00:00 2001
From: KAZUHIRO ITO <kazuhiro.ito.ek@hitachi-solutions.com>
Date: Mon, 11 Nov 2019 18:25:36 +0900
Subject: [PATCH 237/305] Add node installation from other than public site

---
 .../@node-red/editor-api/lib/admin/nodes.js   |  1 +
 .../editor-client/src/js/ui/palette-editor.js | 13 ++++---
 .../@node-red/registry/lib/installer.js       |  8 +++--
 .../@node-red/runtime/lib/api/nodes.js        | 11 +++---
 .../@node-red/runtime/lib/nodes/index.js      |  4 +--
 .../editor-api/lib/admin/nodes_spec.js        |  5 +--
 .../@node-red/registry/lib/installer_spec.js  | 34 +++++++++++++++++++
 7 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
index 2787a5c36..b78de9d75 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
@@ -44,6 +44,7 @@ module.exports = {
             user: req.user,
             module: req.body.module,
             version: req.body.version,
+            url: req.body.url,
             req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.addModule(opts).then(function(info) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index 074a54469..a89003856 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -75,13 +75,16 @@ RED.palette.editor = (function() {
             });
         })
     }
-    function installNodeModule(id,version,callback) {
+    function installNodeModule(id,version,url,callback) {
         var requestBody = {
             module: id
         };
         if (version) {
             requestBody.version = version;
         }
+        if (url) {
+            requestBody.url = url;
+        }
         $.ajax({
             url:"nodes",
             type: "POST",
@@ -622,7 +625,7 @@ RED.palette.editor = (function() {
                         if ($(this).hasClass('disabled')) {
                             return;
                         }
-                        update(entry,loadedIndex[entry.name].version,container,function(err){});
+                        update(entry,loadedIndex[entry.name].version,loadedIndex[entry.name].pkg_url,container,function(err){});
                     })
 
 
@@ -872,7 +875,7 @@ RED.palette.editor = (function() {
 
         $('<div id="red-ui-palette-module-install-shade" class="red-ui-palette-module-shade hide"><div class="red-ui-palette-module-shade-status"></div><img src="red/images/spin.svg" class="red-ui-palette-spinner"/></div>').appendTo(installTab);
     }
-    function update(entry,version,container,done) {
+    function update(entry,version,url,container,done) {
         if (RED.settings.theme('palette.editable') === false) {
             done(new Error('Palette not editable'));
             return;
@@ -898,7 +901,7 @@ RED.palette.editor = (function() {
                             RED.actions.invoke("core:show-event-log");
                         });
                         RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.name+" "+version);
-                        installNodeModule(entry.name,version,function(xhr) {
+                        installNodeModule(entry.name,version,url,function(xhr) {
                             spinner.remove();
                             if (xhr) {
                                 if (xhr.responseJSON) {
@@ -1023,7 +1026,7 @@ RED.palette.editor = (function() {
                     RED.actions.invoke("core:show-event-log");
                 });
                 RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
-                installNodeModule(entry.id,entry.version,function(xhr) {
+                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr) {
                     spinner.remove();
                      if (xhr) {
                          if (xhr.responseJSON) {
diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
index 3562dfb47..e70952832 100644
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -32,6 +32,7 @@ var paletteEditorEnabled = false;
 var settings;
 var moduleRe = /^(@[^/]+?[/])?[^/]+?$/;
 var slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
+var pkgurlRe = /^(https?|git(|\+https?|\+ssh|\+file)):\/\//;
 
 function init(runtime) {
     events = runtime.events;
@@ -76,14 +77,17 @@ function checkExistingModule(module,version) {
     }
     return false;
 }
-function installModule(module,version) {
+function installModule(module,version,url) {
     activePromise = activePromise.then(() => {
         //TODO: ensure module is 'safe'
         return new Promise((resolve,reject) => {
             var installName = module;
             var isUpgrade = false;
             try {
-                if (moduleRe.test(module)) {
+                if (url && pkgurlRe.test(url)) { 
+                    // Git remote url or Tarball url - check the valid package url
+                    installName = url;
+                } else if (moduleRe.test(module)) {
                     // Simple module name - assume it can be npm installed
                     if (version) {
                         installName += "@"+version;
diff --git a/packages/node_modules/@node-red/runtime/lib/api/nodes.js b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
index ee4d3bc1a..fb16cc631 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/nodes.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
@@ -159,6 +159,7 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module to install
     * @param {String} opts.version - (optional) the version of the module to install
+    * @param {String} opts.url - (optional) url to install
     * @param {Object} opts.req - the request to log (optional)
     * @return {Promise<ModuleInfo>} - the node module info
     * @memberof @node-red/runtime_nodes
@@ -183,20 +184,20 @@ var api = module.exports = {
                         return reject(err);
                     }
                 }
-                runtime.nodes.installModule(opts.module,opts.version).then(function(info) {
-                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version}, opts.req);
+                runtime.nodes.installModule(opts.module,opts.version,opts.url).then(function(info) {
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url}, opts.req);
                     return resolve(info);
                 }).catch(function(err) {
                     if (err.code === 404) {
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:"not_found"}, opts.req);
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:"not_found"}, opts.req);
                         // TODO: code/status
                         err.status = 404;
                     } else if (err.code) {
                         err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code}, opts.req);
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code}, opts.req);
                     } else {
                         err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                     }
                     return reject(err);
                 })
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/index.js
index fcb153fe1..09aebe6eb 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/index.js
@@ -150,10 +150,10 @@ function reportNodeStateChange(info,enabled) {
     }
 }
 
-function installModule(module,version) {
+function installModule(module,version,url) {
     var existingModule = registry.getModuleInfo(module);
     var isUpgrade = !!existingModule;
-    return registry.installModule(module,version).then(function(info) {
+    return registry.installModule(module,version,url).then(function(info) {
         if (isUpgrade) {
             events.emit("runtime-event",{id:"node/upgraded",retain:false,payload:{module:module,version:version}});
         } else {
diff --git a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
index ef98fb677..0d373b8d0 100644
--- a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
+++ b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
@@ -227,7 +227,7 @@ describe("api/admin/nodes", function() {
             });
             request(app)
             .post('/nodes')
-            .send({module: 'foo',version:"1.2.3"})
+            .send({module: 'foo',version:"1.2.3",url:"https://example/foo-1.2.3.tgz"})
             .expect(200)
             .end(function(err,res) {
                 if (err) {
@@ -238,6 +238,7 @@ describe("api/admin/nodes", function() {
                 res.body.nodes[0].should.have.property("id","123");
                 opts.should.have.property("module","foo");
                 opts.should.have.property("version","1.2.3");
+                opts.should.have.property("url","https://example/foo-1.2.3.tgz");
                 done();
             });
         });
@@ -256,7 +257,7 @@ describe("api/admin/nodes", function() {
             });
             request(app)
                 .post('/nodes')
-                .send({module: 'foo',version:"1.2.3"})
+                .send({module: 'foo',version:"1.2.3",url:"https://example/foo-1.2.3.tgz"})
                 .expect(400)
                 .end(function(err,res) {
                     if (err) {
diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js
index f3bae8b3a..045a81e0d 100644
--- a/test/unit/@node-red/registry/lib/installer_spec.js
+++ b/test/unit/@node-red/registry/lib/installer_spec.js
@@ -121,6 +121,17 @@ describe('nodes/registry/installer', function() {
                 done();
             });
         });
+        it("rejects when update requested to existing version and url", function(done) {
+            sinon.stub(typeRegistry,"getModuleInfo", function() {
+                return {
+                    version: "0.1.1"
+                }
+            });
+            installer.installModule("this_wont_exist","0.1.1","https://example/foo-0.1.1.tgz").catch(function(err) {
+                err.code.should.be.eql('module_already_loaded');
+                done();
+            });
+        });
         it("rejects with generic error", function(done) {
             var res = {
                 code: 1,
@@ -201,6 +212,29 @@ describe('nodes/registry/installer', function() {
                 done(err);
             });
         });
+        it("succeeds when url is valid node-red module", function(done) {
+            var nodeInfo = {nodes:{module:"foo",types:["a"]}};
+
+            var res = {
+                code: 0,
+                stdout:"",
+                stderr:""
+            }
+            var p = Promise.resolve(res);
+            p.catch((err)=>{});
+            initInstaller(p)
+
+            var addModule = sinon.stub(registry,"addModule",function(md) {
+                return when.resolve(nodeInfo);
+            });
+
+            installer.installModule("this_wont_exist",null,"https://example/foo-0.1.1.tgz").then(function(info) {
+                info.should.eql(nodeInfo);
+                done();
+            }).catch(function(err) {
+                done(err);
+            });
+        });
 
     });
     describe("uninstalls module", function() {

From a54ca699b5c7d845bee97099b28ccfdee3be6a3d Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 13 Nov 2019 10:06:25 +0000
Subject: [PATCH 238/305] Scroll the view with WASD/Cursor keys when nothing
 selected

---
 .../@node-red/editor-client/src/js/keymap.json       |  8 ++++++++
 .../@node-red/editor-client/src/js/ui/view-tools.js  | 12 ++++++++++++
 .../@node-red/editor-client/src/js/ui/view.js        |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/keymap.json b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
index 2677321b7..b7d25e160 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -44,6 +44,14 @@
         "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
+        "w": "core:scroll-view-up",
+        "d": "core:scroll-view-right",
+        "s": "core:scroll-view-down",
+        "a": "core:scroll-view-left",
+        "shift-w": "core:step-view-up",
+        "shift-d": "core:step-view-right",
+        "shift-s": "core:step-view-down",
+        "shift-a": "core:step-view-left",
         "up": "core:move-selection-up",
         "right": "core:move-selection-right",
         "down": "core:move-selection-down",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
index 0814892be..539fb763d 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@@ -105,6 +105,8 @@ RED.view.tools = (function() {
                 }
             }
             RED.view.redraw();
+        } else {
+            RED.view.scroll(dx*10,dy*10);
         }
     }
 
@@ -112,6 +114,16 @@ RED.view.tools = (function() {
         init: function() {
             RED.actions.add("core:align-selection-to-grid", alignToGrid);
 
+            RED.actions.add("core:scroll-view-up", function() { RED.view.scroll(0,-RED.view.gridSize());});
+            RED.actions.add("core:scroll-view-right", function() { RED.view.scroll(RED.view.gridSize(),0);});
+            RED.actions.add("core:scroll-view-down", function() { RED.view.scroll(0,RED.view.gridSize());});
+            RED.actions.add("core:scroll-view-left", function() { RED.view.scroll(-RED.view.gridSize(),0);});
+
+            RED.actions.add("core:step-view-up", function() { RED.view.scroll(0,-5*RED.view.gridSize());});
+            RED.actions.add("core:step-view-right", function() { RED.view.scroll(5*RED.view.gridSize(),0);});
+            RED.actions.add("core:step-view-down", function() { RED.view.scroll(0,5*RED.view.gridSize());});
+            RED.actions.add("core:step-view-left", function() { RED.view.scroll(-5*RED.view.gridSize(),0);});
+
             RED.actions.add("core:move-selection-up", function() { moveSelection(0,-1);});
             RED.actions.add("core:move-selection-right", function() { moveSelection(1,0);});
             RED.actions.add("core:move-selection-down", function() { moveSelection(0,1);});
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 0967c630e..534475e09 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -3846,6 +3846,10 @@ RED.view = (function() {
                 type: "compact",
                 buttons: buttons
             })
+        },
+        scroll: function(x,y) {
+            chart.scrollLeft(chart.scrollLeft()+x);
+            chart.scrollTop(chart.scrollTop()+y)
         }
     };
 })();

From 21635aadfe86930043cba92901bc07f58472f335 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 13 Nov 2019 22:50:44 +0900
Subject: [PATCH 239/305] use type name from common.type

---
 .../@node-red/editor-client/locales/en-US/editor.json         | 2 --
 .../@node-red/editor-client/locales/ja/editor.json            | 2 --
 .../@node-red/editor-client/src/js/ui/editors/json.js         | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index aed9c4583..72af1d38b 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -804,8 +804,6 @@
         "expandItems": "Expand items",
         "collapseItems": "Collapse items",
         "duplicate": "Duplicate",
-	"array": "array",
-	"object": "object",
 	"error": {
 	    "invalidJSON": "Invalid JSON: "
 	}
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index dc0282d73..8290ca1c1 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -803,8 +803,6 @@
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
         "duplicate": "複製",
-	"array": "配列",
-	"object": "オブジェクト",
 	"error": {
 	    "invalidJSON": "不正なJSON: "
 	}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index c7267d885..7cf1c6ec7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -302,8 +302,8 @@
                 types:[
                     'str','num','bool',
                     {value:"null",label:"null",hasValue:false},
-                    {value:"array",label:RED._("jsonEditor.array"),hasValue:false},
-                    {value:"object",label:RED._("jsonEditor.object"),hasValue:false}
+                    {value:"array",label:RED._("common.type.array"),hasValue:false},
+                    {value:"object",label:RED._("common.type.object"),hasValue:false}
                 ],
                 default: valType
             });

From 8f45e8f84aeaf4c6a85a1644495ed490cdae79e1 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 14 Nov 2019 12:37:32 +0900
Subject: [PATCH 240/305] Revert permission of script file

---
 scripts/install-ui-test-dependencies.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/install-ui-test-dependencies.sh

diff --git a/scripts/install-ui-test-dependencies.sh b/scripts/install-ui-test-dependencies.sh
old mode 100644
new mode 100755

From 88cbc32abc75fac4c9886aa19e411e85826c3f94 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 14 Nov 2019 19:13:23 +0000
Subject: [PATCH 241/305] Fix inverse of 'replace' editor event

---
 packages/node_modules/@node-red/editor-client/src/js/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index db54701bb..51d0e00a0 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -39,7 +39,7 @@ RED.history = (function() {
                 inverseEv = {
                     t: 'replace',
                     config: RED.nodes.createCompleteNodeSet(),
-                    changed: [],
+                    changed: {},
                     rev: RED.nodes.version()
                 };
                 RED.nodes.clear();

From b4e2061e85438f968cf7979b84e4a609bc3a3f59 Mon Sep 17 00:00:00 2001
From: btsimonh <simon@yellaumbrella.tv>
Date: Mon, 18 Nov 2019 17:03:59 +0000
Subject: [PATCH 242/305] Update
 packages/node_modules/@node-red/nodes/core/network/21-httprequest.js

Co-Authored-By: Nick O'Leary <nick.oleary@gmail.com>
---
 .../node_modules/@node-red/nodes/core/network/21-httprequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index 16b4cb950..0d919cad9 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -89,7 +89,7 @@ module.exports = function(RED) {
                 method = msg.method.toUpperCase();          // use the msg parameter
             }
 
-            var isHttps = (/^https/.test(url));
+            var isHttps = (/^https/i.test(url));
 
             var opts = {};
             opts.url = url;

From 175a871ee0484ce6eb1ae8a9c9fda26fa11041e1 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Mon, 18 Nov 2019 17:14:38 +0000
Subject: [PATCH 243/305] repalce for-in with 'normal' for loop in mqtt and
 http

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.js   | 2 +-
 .../node_modules/@node-red/nodes/core/network/21-httprequest.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 28d72a811..6f682b279 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -129,7 +129,7 @@ module.exports = function(RED) {
                     // check if proxy is set in env
                     var noproxy;
                     if (noprox) {
-                        for (var i in noprox) {
+                        for (var i = 0; i < noprox.length; i += 1) {
                             if (this.brokerurl.indexOf(noprox[i].trim()) !== -1) { noproxy=true; }
                         }
                     }
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index 0d919cad9..4c39f9f8c 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -292,7 +292,7 @@ module.exports = function(RED) {
             
             var noproxy;
             if (noprox) {
-                for (var i in noprox) {
+                for (var i = 0; i < noprox.length; i += 1) {
                     if (url.indexOf(noprox[i]) !== -1) { noproxy=true; }
                 }
             }

From 683c6a748ee510efb52848f37fd2018511f4f63d Mon Sep 17 00:00:00 2001
From: tot92 <tobi-theis@gmx.de>
Date: Mon, 18 Nov 2019 20:45:48 +0100
Subject: [PATCH 244/305] switched loading order

---
 .../node_modules/@node-red/util/lib/i18n.js   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index 39e4a2c1a..236b66306 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -118,19 +118,12 @@ var MessageFileLoader = {
     type: "backend",
     init: function (services, backendOptions, i18nextOptions) { },
     read: function (lng, ns, callback) {
-        // there are two languages to consider:
-        // 1) the actual language lng (e. g. 'en-US' or 'de-DE', 'fr-FR',...)
-        // 2) the base language (e. g. 'en', 'de', 'fr',...)
-        var baseLng = lng.split('-')[0];
-        // read base language (e. g. 'de'), then actual language (e. g. 'de-DE') 
-        readFile(baseLng, ns).then(
-            baseData => {
-                // scenario 1: reading base language was successful -> read actual language -> if this fails, return base language data
-                readFile(lng, ns).then(data => callback(null, data), () => callback(null, baseData))
-            },
-            () => {
-                // scenario 2: reading base language failed -> read actual language -> if this fails too, return error
-                readFile(lng, ns).then(data => callback(null, data), err => callback(err))
+        readFile(lng, ns)
+            .then(data => callback(null, data))
+            .catch(() => {
+                // if reading language file fails -> try reading base language (e. g. 'fr' instead of 'fr-FR' or 'de' for 'de-DE')
+                var baseLng = lng.split('-')[0];
+                readFile(baseLng, ns).then(baseData => callback(null, baseData)).catch(err => callback(err));
             });
     }
 }

From 2f4dcba54dd7075df07c734302924175bb223283 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 20 Nov 2019 06:12:33 -0500
Subject: [PATCH 245/305] let subflow add node-red context to status

For all those nodes thaht don't specify it.
So that subflow status then works ok
---
 .../@node-red/runtime/lib/nodes/flows/Subflow.js             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
index 47c382688..6221ff318 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
@@ -200,6 +200,9 @@ class Subflow extends Flow {
                     self.node.status({text:text});
                 } else if (msg.status !== undefined) {
                     // if msg.status exists
+                    if (msg.status.hasOwnProperty("text") && msg.status.text.indexOf("common.") === 0) {
+                        msg.status.text = "node-red:"+msg.status.text;
+                    }
                     self.node.status(msg.status)
                 }
             })
@@ -310,7 +313,6 @@ class Subflow extends Flow {
                 }
             }
         }
-
         super.start(diff);
     }
 
@@ -435,7 +437,6 @@ class Subflow extends Flow {
         }
         return handled;
     }
-
 }
 
 

From 3088115abaabd0f2154c7e0937befcbc8b1dbe0c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Nov 2019 10:42:40 +0000
Subject: [PATCH 246/305] Avoid unnecessary i18n catalog load if base lng
 provided

---
 packages/node_modules/@node-red/util/lib/i18n.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index 236b66306..49a327382 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -83,6 +83,7 @@ function mergeCatalog(fallback,catalog) {
 
 
 function readFile(lng, ns) {
+    console.log(lng,ns);
     return new Promise((resolve, reject) => {
         if (resourceCache[ns] && resourceCache[ns][lng]) {
             resolve(resourceCache[ns][lng]);
@@ -120,10 +121,14 @@ var MessageFileLoader = {
     read: function (lng, ns, callback) {
         readFile(lng, ns)
             .then(data => callback(null, data))
-            .catch(() => {
-                // if reading language file fails -> try reading base language (e. g. 'fr' instead of 'fr-FR' or 'de' for 'de-DE')
-                var baseLng = lng.split('-')[0];
-                readFile(baseLng, ns).then(baseData => callback(null, baseData)).catch(err => callback(err));
+            .catch(err => {
+                if (/-/.test(lng)) {
+                    // if reading language file fails -> try reading base language (e. g. 'fr' instead of 'fr-FR' or 'de' for 'de-DE')
+                    var baseLng = lng.split('-')[0];
+                    readFile(baseLng, ns).then(baseData => callback(null, baseData)).catch(err => callback(err));
+                } else {
+                    callback(err);
+                }
             });
     }
 }

From 64580237d55c52885a47557fdc01dcbf7bfe0072 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Nov 2019 11:07:58 +0000
Subject: [PATCH 247/305] Remove rogue debug

---
 packages/node_modules/@node-red/util/lib/i18n.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index 49a327382..d95f4bec6 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -83,7 +83,6 @@ function mergeCatalog(fallback,catalog) {
 
 
 function readFile(lng, ns) {
-    console.log(lng,ns);
     return new Promise((resolve, reject) => {
         if (resourceCache[ns] && resourceCache[ns][lng]) {
             resolve(resourceCache[ns][lng]);

From aa6c0b9d6e8b5601b22d543c700ead9166f10903 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Nov 2019 16:56:01 +0000
Subject: [PATCH 248/305] Add clarification that MQTT Out requires payload to
 send msg Fixes #2370

---
 .../@node-red/nodes/locales/en-US/network/10-mqtt.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
index c0bf67f40..94c9c091a 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
@@ -36,7 +36,7 @@
     <h3>Inputs</h3>
     <dl class="message-properties">
        <dt>payload <span class="property-type">string | buffer</span></dt>
-       <dd> most users prefer simple text payloads, but binary buffers can also be published.</dd>
+       <dd> the payload to publish. If this property is not set, no message will be sent. To send a blank message, set this property to an empty String.</dd>
 
        <dt class="optional">topic <span class="property-type">string</span></dt>
        <dd> the MQTT topic to publish to.</dd>

From b81be8f35864e50c0589eca149d46f52c31059b4 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 21 Nov 2019 17:28:28 +0000
Subject: [PATCH 249/305] Update for 1.0.3 again

---
 CHANGELOG.md                                       | 14 ++++++++++++++
 package.json                                       | 12 ++++++------
 .../node_modules/@node-red/editor-api/package.json |  2 +-
 packages/node_modules/@node-red/nodes/package.json |  6 +++---
 .../node_modules/@node-red/registry/package.json   |  2 +-
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 513311517..b7b75d30f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,17 +8,31 @@ Runtime
  - Bump https-proxy-agent version
  - #2332 Fix error handling of nodes with multiple input handlers
  - Add script to generate npm publish script
+ - #2371 Ensure folder is present before write (e.g. flows file not in user folder)
+ - #2371 Handle windows UNC '\\' paths
+ - #2366 Handle logging of non-JSON encodable objects
 
 Editor
  - #2328 Fix language handling in subflow node
  - Use default language if lng param not set in i18n req
  - #2326 Fix palette editor search visualization
+ - #2375 Subflow status not showing i18n version of contained core nodes status
+ - Fix inverse of 'replace' editor event
+ - #2376 Fallback to base language files if present
+ - #2373 Support UI testing on the latest Google Chrome
+ - #2364 Add tooltip to expand button in markdown editor
+ - #2363 Support ctrl key to select tabs for Windows
+ - #2356 Make JSONata help initially shown in expression editor
+ - #2355 Prohibit line break in type menu of typedInput
 
 Nodes
  - Delay: Fix delay to not pass through .reset and .flush props consistently
  - #2352 File: Using the ‘a msg per line’ the last line does not get msg.topic passed
  - #2339 HTTP Request: Check auth type on opening
  - HTTP Request: add units info
+ - #2372 MQTT/WS: Improved proxy support for MQTT and WebSocket nodes
+ - #2370 MQTT: Add clarification that MQTT Out requires payload to send msg
+
 
 #### 1.0.2: Maintenance Release
 
diff --git a/package.json b/package.json
index 5f0818bd7..b0b30df07 100644
--- a/package.json
+++ b/package.json
@@ -34,14 +34,14 @@
         "cookie": "0.4.0",
         "cookie-parser": "1.4.4",
         "cors": "2.8.5",
-        "cron": "1.7.1",
+        "cron": "1.7.2",
         "denque": "1.4.1",
         "express": "4.17.1",
-        "express-session": "1.16.2",
+        "express-session": "1.17.0",
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.3",
+        "https-proxy-agent": "2.2.4",
         "i18next": "15.1.2",
         "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
@@ -66,10 +66,10 @@
         "raw-body": "2.4.1",
         "request": "2.88.0",
         "semver": "6.3.0",
-        "uglify-js": "3.6.0",
+        "uglify-js": "3.6.9",
         "when": "3.7.8",
         "ws": "6.2.1",
-        "xml2js": "0.4.19"
+        "xml2js": "0.4.22"
     },
     "optionalDependencies": {
         "bcrypt": "3.0.6"
@@ -95,7 +95,7 @@
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
-        "http-proxy": "^1.16.2",
+        "http-proxy": "1.18.0",
         "istanbul": "0.4.5",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "minami": "1.2.3",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 6af8de7bf..824f4df5b 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -22,7 +22,7 @@
         "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.16.2",
+        "express-session": "1.17.0",
         "express": "4.17.1",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 896c378d2..d2b3060ee 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -22,12 +22,12 @@
         "cookie-parser": "1.4.4",
         "cookie": "0.4.0",
         "cors": "2.8.5",
-        "cron": "1.7.1",
+        "cron": "1.7.2",
         "denque": "1.4.1",
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.3",
+        "https-proxy-agent": "2.2.4",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "media-typer": "1.1.0",
@@ -38,7 +38,7 @@
         "raw-body": "2.4.1",
         "request": "2.88.0",
         "ws": "6.2.1",
-        "xml2js": "0.4.19",
+        "xml2js": "0.4.22",
         "iconv-lite": "0.5.0"
     }
 }
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index f4103e8ab..fefb24360 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -18,7 +18,7 @@
     "dependencies": {
         "@node-red/util": "1.0.3",
         "semver": "6.3.0",
-        "uglify-js": "3.6.0",
+        "uglify-js": "3.6.9",
         "when": "3.7.8"
     }
 }

From 25459b52a136f675b89e316b8966486f678001c4 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 22 Nov 2019 12:47:36 +0900
Subject: [PATCH 250/305] udate Japanese info text of mqtt

---
 .../@node-red/nodes/locales/ja/network/10-mqtt.html             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
index 2beb49493..b30e9d7a1 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
@@ -38,7 +38,7 @@
     <h3>入力</h3>
     <dl class="message-properties">
        <dt>payload <span class="property-type">文字列 | バッファ</span></dt>
-       <dd>多くの場合単純なテキスト形式のペイロードが使われますが、バイナリバッファを発行することも可能です。</dd>
+       <dd>パブリッシュするペイロード。プロパティが設定されていない場合には、メッセージは送信されません。空のメッセージを送信するには、プロパティに空文字列を設定します。</dd>
 
        <dt class="optional">topic <span class="property-type">文字列</span></dt>
        <dd>発行対象のMQTTトピック</dd>

From e7c2ff3bd2befe64a5b457a3db0c7eaf9adecfce Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Fri, 22 Nov 2019 13:01:50 +0900
Subject: [PATCH 251/305] fix typos in Japanese info text of mqtt out

---
 .../@node-red/nodes/locales/ja/network/10-mqtt.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
index b30e9d7a1..c4a3ce0dd 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
@@ -38,13 +38,13 @@
     <h3>入力</h3>
     <dl class="message-properties">
        <dt>payload <span class="property-type">文字列 | バッファ</span></dt>
-       <dd>パブリッシュするペイロード。プロパティが設定されていない場合には、メッセージは送信されません。空のメッセージを送信するには、プロパティに空文字列を設定します。</dd>
+       <dd>発行するペイロード。プロパティが設定されていない場合には、メッセージは送信されません。空のメッセージを送信するには、プロパティに空文字列を設定します。</dd>
 
        <dt class="optional">topic <span class="property-type">文字列</span></dt>
        <dd>発行対象のMQTTトピック</dd>
 
        <dt class="optional">qos <span class="property-type">数値</span></dt>
-       <dd>0: 最大1度到着, 1: 一度以上到着, 2: 1度のみ到着。デフォルトは0です。</dd>
+       <dd>0: 最大一度到着, 1: 一度以上到着, 2: 一度のみ到着。デフォルトは0です。</dd>
 
        <dt class="optional">retain <span class="property-type">真偽値</span></dt>
        <dd>真の場合、メッセージをブローカに保持します。デフォルトは偽です。</dd>

From 7805974736925d5f5cfb99483ca0703ad929a8a8 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 25 Nov 2019 14:36:34 +0900
Subject: [PATCH 252/305] Add icons and support i18n in typedInput of JSON
 editor

---
 .../@node-red/editor-client/src/js/ui/editors/json.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 7cf1c6ec7..9ebb82b0b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -301,9 +301,9 @@
             var val = $('<input type="text" class="red-ui-editor-type-json-editor-value">').css({width:w+"px"}).val(""+valValue).insertAfter(valueLabel).typedInput({
                 types:[
                     'str','num','bool',
-                    {value:"null",label:"null",hasValue:false},
-                    {value:"array",label:RED._("common.type.array"),hasValue:false},
-                    {value:"object",label:RED._("common.type.object"),hasValue:false}
+                    {value:"null",label:RED._("common.type.null"),hasValue:false},
+                    {value:"array",label:RED._("common.type.array"),hasValue:false,icon:"red/images/typedInput/json.png"},
+                    {value:"object",label:RED._("common.type.object"),hasValue:false,icon:"red/images/typedInput/json.png"}
                 ],
                 default: valType
             });

From a364d4950d7fc69612331f2a523d9e5266c63b27 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 2 Dec 2019 12:43:13 +0900
Subject: [PATCH 253/305] Fix test cases for UI

---
 test/editor/editor_helper.js                  |   7 +-
 .../editor/pageobjects/editor/palette_page.js |   4 +-
 .../pageobjects/editor/workspace_page.js      |  10 +-
 .../nodes/core/core/20-inject_page.js         |   4 +-
 .../nodes/core/core/58-debug_page.js          |   2 +-
 .../nodes/core/io/10-mqttconfig_page.js       |   7 +-
 .../nodes/core/io/21-httpin_page.js           |  10 +-
 .../nodes/core/logic/15-change_page.js        |   4 +-
 .../nodes/core/storage/50-filein_page.js      |  10 +-
 test/editor/pageobjects/nodes/node_page.js    |  10 +-
 .../pageobjects/nodes/nodefactory_page.js     |   8 +-
 test/editor/specs/editor/workspace_uispec.js  |   2 +-
 .../scenario/cookbook_endpoint_uispec.js      | 170 +++++++++---------
 test/editor/specs/scenario/cookbook_uispec.js |  36 ++--
 test/editor/wdio.conf.js                      |   4 +-
 15 files changed, 149 insertions(+), 139 deletions(-)

diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js
index 8de197cef..81e3a54f5 100644
--- a/test/editor/editor_helper.js
+++ b/test/editor/editor_helper.js
@@ -52,8 +52,11 @@ function getFlowFilename() {
 }
 
 function cleanup(flowFile) {
-    deleteFile(homeDir+"/"+flowFile);
-    deleteFile(homeDir+"/."+flowFile+".backup");
+    var credentialFile = flowFile.replace(/\.json$/, '') + '_cred.json';
+    deleteFile(homeDir + "/" + flowFile);
+    deleteFile(homeDir + "/." + flowFile + ".backup");
+    deleteFile(homeDir + "/" + credentialFile);
+    deleteFile(homeDir + "/." + credentialFile + ".backup");
 }
 
 function deleteFile(flowFile) {
diff --git a/test/editor/pageobjects/editor/palette_page.js b/test/editor/pageobjects/editor/palette_page.js
index 878f218fb..a35859c5f 100644
--- a/test/editor/pageobjects/editor/palette_page.js
+++ b/test/editor/pageobjects/editor/palette_page.js
@@ -17,7 +17,7 @@
 var idMap = {
     // input
     "inject": ".red-ui-palette-node[data-palette-type='inject']",
-    "httpin": ".red-ui-palette-node[data-palette-type='http in']",
+    "httpIn": ".red-ui-palette-node[data-palette-type='http in']",
     "mqttIn": ".red-ui-palette-node[data-palette-type='mqtt in']",
     // output
     "debug": ".red-ui-palette-node[data-palette-type='debug']",
@@ -32,7 +32,7 @@ var idMap = {
     "html": ".red-ui-palette-node[data-palette-type='html']",
     "json": ".red-ui-palette-node[data-palette-type='json']",
     // storage
-    "filein": ".red-ui-palette-node[data-palette-type='file in']",
+    "fileIn": ".red-ui-palette-node[data-palette-type='file in']",
 };
 
 function getId(type) {
diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index 18e50dcf2..560a0992f 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  **/
 
- var when = require("when");
+var when = require("when");
 
 var events = require("nr-test-utils").require("@node-red/runtime/lib/events.js");
 
@@ -44,6 +44,7 @@ function addNode(type, x, y) {
             previousY = previousY + flowLayout.heightInterval;
         }
     }
+    browser.waitForVisible(palette.getId(type));
     browser.moveToObject(palette.getId(type));
     browser.buttonDown();
     browser.moveToObject("#red-ui-palette-search", previousX + 300, previousY + 100); // adjust to the top-left corner of workspace.
@@ -56,7 +57,12 @@ function addNode(type, x, y) {
 }
 
 function deleteAllNodes() {
-    browser.click('.red-ui-workspace-chart-event-layer');
+    browser.waitForVisible('.red-ui-workspace-chart-event-layer');
+    try {
+        browser.click('.red-ui-workspace-chart-event-layer');
+    } catch (e) {
+        console.log(e);
+    }
     browser.keys(['Control', 'a', 'a', 'Control']); // call twice to release the keys.
     browser.keys(['Delete']);
 }
diff --git a/test/editor/pageobjects/nodes/core/core/20-inject_page.js b/test/editor/pageobjects/nodes/core/core/20-inject_page.js
index 82a4e6d6e..38e6e32ed 100644
--- a/test/editor/pageobjects/nodes/core/core/20-inject_page.js
+++ b/test/editor/pageobjects/nodes/core/core/20-inject_page.js
@@ -47,11 +47,11 @@ injectNode.prototype.setPayload = function(payloadType, payload) {
     // Open a payload type list.
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]');
     // Select a payload type.
-    var payloadTypeXPath = '//*[@class="red-ui-typedInput-options"]/a[' + payloadTypeList[payloadType] + ']';
+    var payloadTypeXPath = '//*[contains(@class, "red-ui-typedInput-options")]/a[' + payloadTypeList[payloadType] + ']';
     browser.clickWithWait(payloadTypeXPath);
     if (payload) {
         // Input a value.
-        browser.setValue('//*[@class="red-ui-typedInput-input"]/input', payload);
+        browser.setValue('//*[contains(@class, "red-ui-typedInput-input")]/input', payload);
     }
 }
 
diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
index 2b1eabe64..52cb60f44 100644
--- a/test/editor/pageobjects/nodes/core/core/58-debug_page.js
+++ b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
@@ -31,7 +31,7 @@ debugNode.prototype.setOutput = function(complete) {
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
     if (complete !== 'true') {
         // Select the "msg" type.
-        browser.clickWithWait('//div[@class="red-ui-typedInput-options"][1]/a[1]');
+        browser.clickWithWait('//div[contains(@class, "red-ui-typedInput-options")][1]/a[1]');
         // Input the path in msg.
         browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
         browser.keys(keyPage.selectAll());
diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js b/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js
index 69266f9e8..3266a1bd3 100644
--- a/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js
+++ b/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js
@@ -23,13 +23,14 @@ function setServer(broker, port) {
 function clickOk() {
     browser.clickWithWait('#node-config-dialog-ok');
     // Wait until an config dialog closes.
-    browser.waitForVisible('#node-config-dialog-ok', 2000, true);
+    browser.waitForVisible('#node-config-dialog-ok', 4000, true);
 }
 
 function edit() {
-    browser.clickWithWait('#node-input-lookup-broker');
+    browser.waitForVisible('#node-input-lookup-broker');
+    browser.click('#node-input-lookup-broker');
     // Wait until a config dialog opens.
-    browser.waitForVisible('#node-config-dialog-ok', 2000);
+    browser.waitForVisible('#node-config-dialog-ok', 4000);
 }
 
 module.exports = {
diff --git a/test/editor/pageobjects/nodes/core/io/21-httpin_page.js b/test/editor/pageobjects/nodes/core/io/21-httpin_page.js
index 97648f395..9454ef034 100644
--- a/test/editor/pageobjects/nodes/core/io/21-httpin_page.js
+++ b/test/editor/pageobjects/nodes/core/io/21-httpin_page.js
@@ -18,18 +18,18 @@ var util = require("util");
 
 var nodePage = require("../../node_page");
 
-function httpinNode(id) {
+function httpInNode(id) {
     nodePage.call(this, id);
 }
 
-util.inherits(httpinNode, nodePage);
+util.inherits(httpInNode, nodePage);
 
-httpinNode.prototype.setMethod = function(method) {
+httpInNode.prototype.setMethod = function(method) {
     browser.selectWithWait('#node-input-method', method);
 }
 
-httpinNode.prototype.setUrl = function(url) {
+httpInNode.prototype.setUrl = function(url) {
     browser.setValue('#node-input-url', url);
 }
 
-module.exports = httpinNode;
+module.exports = httpInNode;
diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
index 51589f7b5..82441c9bc 100644
--- a/test/editor/pageobjects/nodes/core/logic/15-change_page.js
+++ b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
@@ -55,7 +55,7 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     if (pt) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]');
         var num = 5 * (index - 1) + 1;
-        var ptXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + ptType[pt] + ']';
+        var ptXPath = '//div[contains(@class, "red-ui-typedInput-options")][' + num + ']/a[' + ptType[pt] + ']';
         browser.clickWithWait(ptXPath);
     }
     if (p) {
@@ -64,7 +64,7 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     if (tot) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]');
         var num = 5 * (index - 1) + 2;
-        var totXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + totType[tot] + ']';
+        var totXPath = '//div[contains(@class, "red-ui-typedInput-options")][' + num + ']/a[' + totType[tot] + ']';
         browser.clickWithWait(totXPath);
     }
     if (to) {
diff --git a/test/editor/pageobjects/nodes/core/storage/50-filein_page.js b/test/editor/pageobjects/nodes/core/storage/50-filein_page.js
index 5a327f14c..942ea63d8 100644
--- a/test/editor/pageobjects/nodes/core/storage/50-filein_page.js
+++ b/test/editor/pageobjects/nodes/core/storage/50-filein_page.js
@@ -18,11 +18,11 @@ var util = require("util");
 
 var nodePage = require("../../node_page");
 
-function fileinNode(id) {
+function fileInNode(id) {
     nodePage.call(this, id);
 }
 
-util.inherits(fileinNode, nodePage);
+util.inherits(fileInNode, nodePage);
 
 var formatType = {
     "utf8": 1,
@@ -31,14 +31,14 @@ var formatType = {
     "stream": 4
 };
 
-fileinNode.prototype.setFilename = function(filename) {
+fileInNode.prototype.setFilename = function(filename) {
     browser.setValue('#node-input-filename', filename);
 }
 
-fileinNode.prototype.setOutput = function(format) {
+fileInNode.prototype.setOutput = function(format) {
     browser.clickWithWait('#node-input-format');
     var formatTypeXPath = '//*[@id="node-input-format"]/option[' + formatType[format] + ']';
     browser.clickWithWait(formatTypeXPath);
 }
 
-module.exports = fileinNode;
+module.exports = fileInNode;
diff --git a/test/editor/pageobjects/nodes/node_page.js b/test/editor/pageobjects/nodes/node_page.js
index a093a2335..5234362ae 100644
--- a/test/editor/pageobjects/nodes/node_page.js
+++ b/test/editor/pageobjects/nodes/node_page.js
@@ -22,13 +22,13 @@ Node.prototype.edit = function() {
     browser.clickWithWait(this.id);
     browser.clickWithWait(this.id);
     // Wait until an edit dialog opens.
-    browser.waitForVisible('#node-dialog-ok', 2000);
+    browser.waitForVisible('#node-dialog-ok', 4000);
 }
 
 Node.prototype.clickOk = function() {
     browser.clickWithWait('#node-dialog-ok');
     // Wait untile an edit dialog closes.
-    browser.waitForVisible('#node-dialog-ok', 2000, true);
+    browser.waitForVisible('#node-dialog-ok', 4000, true);
     browser.pause(50);
 }
 
@@ -38,8 +38,10 @@ Node.prototype.connect = function(targetNode) {
     browser.dragAndDrop(outputPort, inputPort)
 }
 
-Node.prototype.clickLeftButton = function() {
-    browser.clickWithWait(this.id + '/*[@class="red-ui-flow-node-button"]');
+Node.prototype.clickLeftButton = function () {
+    browser.moveToObject(this.id + '/*[@class="red-ui-flow-node-button"]');
+    browser.buttonDown();
+    browser.buttonUp();
 }
 
 module.exports = Node;
diff --git a/test/editor/pageobjects/nodes/nodefactory_page.js b/test/editor/pageobjects/nodes/nodefactory_page.js
index 8cb364ad1..c518d89ff 100644
--- a/test/editor/pageobjects/nodes/nodefactory_page.js
+++ b/test/editor/pageobjects/nodes/nodefactory_page.js
@@ -20,20 +20,20 @@ var templateNode = require('./core/core/80-template_page');
 var functionNode = require('./core/core/80-function_page');
 var mqttInNode = require('./core/io/10-mqttin_page');
 var mqttOutNode = require('./core/io/10-mqttout_page');
-var httpinNode = require('./core/io/21-httpin_page');
+var httpInNode = require('./core/io/21-httpin_page');
 var httpResponseNode = require('./core/io/21-httpresponse_page');
 var changeNode = require('./core/logic/15-change_page');
 var rangeNode = require('./core/logic/16-range_page');
 var httpRequestNode = require('./core/io/21-httprequest_page');
 var htmlNode = require('./core/parsers/70-HTML_page');
 var jsonNode = require('./core/parsers/70-JSON_page');
-var fileinNode = require('./core/storage/50-filein_page');
+var fileInNode = require('./core/storage/50-filein_page');
 
 
 var nodeCatalog = {
     // input
     "inject": injectNode,
-    "httpin": httpinNode,
+    "httpIn": httpInNode,
     "mqttIn":mqttInNode,
     // output
     "debug": debugNode,
@@ -48,7 +48,7 @@ var nodeCatalog = {
     "html": htmlNode,
     "json":jsonNode,
     // storage
-    "filein": fileinNode,
+    "fileIn": fileInNode,
 }
 
 function create(type, id) {
diff --git a/test/editor/specs/editor/workspace_uispec.js b/test/editor/specs/editor/workspace_uispec.js
index fb6c02b9a..15de1a044 100644
--- a/test/editor/specs/editor/workspace_uispec.js
+++ b/test/editor/specs/editor/workspace_uispec.js
@@ -37,7 +37,7 @@ describe('Workspace', function() {
     });
 
     it('should have a right title', function () {
-        browser.getTitle().should.equal('Node-RED');
+        browser.getTitle().should.startWith('Node-RED');
     });
 
     it('should output a timestamp', function() {
diff --git a/test/editor/specs/scenario/cookbook_endpoint_uispec.js b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
index 95b78d03c..9a2ed0710 100644
--- a/test/editor/specs/scenario/cookbook_endpoint_uispec.js
+++ b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
@@ -38,14 +38,14 @@ describe('cookbook', function() {
 
     describe('HTTP endpoints', function () {
         it('create an HTTP endpoint', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -53,7 +53,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello World!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -77,14 +77,14 @@ describe('cookbook', function() {
         });
 
         it('handle query parameters passed to an HTTP endpoint', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-query");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-query");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -92,7 +92,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello {{req.query.name}}!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -116,14 +116,14 @@ describe('cookbook', function() {
         });
 
         it('handle url parameters in an HTTP endpoint', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-param/:name");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-param/:name");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -131,7 +131,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello {{req.params.name}}!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -155,14 +155,14 @@ describe('cookbook', function() {
         });
 
         it('access HTTP request headers', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-headers");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-headers");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -170,7 +170,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>User agent: {{req.headers.user-agent}}</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -203,7 +203,7 @@ describe('cookbook', function() {
             var injectNodeTimestamp = workspace.addNode("inject");
             var changeNodeStore = workspace.addNode("change");
 
-            var httpinNode = workspace.addNode("httpin", 0, 100);
+            var httpInNode = workspace.addNode("httpIn", 0, 100);
             var changeNodeCopy = workspace.addNode("change");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
@@ -218,10 +218,10 @@ describe('cookbook', function() {
 
             injectNodeTimestamp.connect(changeNodeStore);
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-data");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-data");
+            httpInNode.clickOk();
 
             changeNodeCopy.edit();
             changeNodeCopy.ruleSet("timestamp", "msg", "timestamp", "flow");
@@ -233,7 +233,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Time: {{ timestamp }}</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(changeNodeCopy);
+            httpInNode.connect(changeNodeCopy);
             changeNodeCopy.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
@@ -260,15 +260,15 @@ describe('cookbook', function() {
         });
 
         it('serve JSON content', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var changeNode = workspace.addNode("change");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-json");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-json");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -282,7 +282,7 @@ describe('cookbook', function() {
             changeNode.ruleSet("headers.content-type", "msg", "application/json", "str", "2");
             changeNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(changeNode);
             changeNode.connect(httpResponseNode);
 
@@ -314,20 +314,20 @@ describe('cookbook', function() {
         });
 
         it('serve a local file', function () {
-            var httpinNode = workspace.addNode("httpin");
-            var fileinNode = workspace.addNode("filein");
+            var httpInNode = workspace.addNode("httpIn");
+            var fileInNode = workspace.addNode("fileIn");
             var changeNode = workspace.addNode("change", 200, 100);
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/hello-file");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/hello-file");
+            httpInNode.clickOk();
 
-            fileinNode.edit();
-            fileinNode.setFilename("test/resources/file-in-node/test.txt");
-            fileinNode.setOutput("");
-            fileinNode.clickOk();
+            fileInNode.edit();
+            fileInNode.setFilename("test/resources/file-in-node/test.txt");
+            fileInNode.setOutput("");
+            fileInNode.clickOk();
 
             changeNode.edit();
             changeNode.ruleSet("headers", "msg", "{}", "json");
@@ -335,8 +335,8 @@ describe('cookbook', function() {
             changeNode.ruleSet("headers.content-type", "msg", "text/plain", "str", "2");
             changeNode.clickOk();
 
-            httpinNode.connect(fileinNode);
-            fileinNode.connect(changeNode);
+            httpInNode.connect(fileInNode);
+            fileInNode.connect(changeNode);
             changeNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -360,14 +360,14 @@ describe('cookbook', function() {
         });
 
         it('post raw data to a flow', function() {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("post");
-            httpinNode.setUrl("/hello-raw");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("post");
+            httpInNode.setUrl("/hello-raw");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -375,7 +375,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello {{ payload }}!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -403,14 +403,14 @@ describe('cookbook', function() {
         });
 
         it('post form data to a flow', function () {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("post");
-            httpinNode.setUrl("/hello-form");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("post");
+            httpInNode.setUrl("/hello-form");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -418,7 +418,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello {{ payload.name }}!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -452,14 +452,14 @@ describe('cookbook', function() {
         });
 
         it('post JSON data to a flow', function() {
-            var httpinNode = workspace.addNode("httpin");
+            var httpInNode = workspace.addNode("httpIn");
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("post");
-            httpinNode.setUrl("/hello-json");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("post");
+            httpInNode.setUrl("/hello-json");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -467,7 +467,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("<html>\n<head></head>\n<body>\n<h1>Hello {{ payload.name }}!</h1>\n</body>\n</html>");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
             // The code for confirmation starts from here.
@@ -501,24 +501,22 @@ describe('cookbook', function() {
         });
 
         it('work with cookies', function () {
-            this.timeout(60000);
-
-            var httpinNodeFormat = workspace.addNode("httpin");
+            var httpInNodeFormat = workspace.addNode("httpIn");
             var functionNodeFormat = workspace.addNode("function", 240);
             var templateNode = workspace.addNode("template", 400);
             var httpResponseNode = workspace.addNode("httpResponse", 600);
 
-            var httpinNodeAdd = workspace.addNode("httpin", 0, 100);
+            var httpInNodeAdd = workspace.addNode("httpIn", 0, 100);
             var functionNodeAdd = workspace.addNode("function", 240);
             var changeNode = workspace.addNode("change", 400);
 
-            var httpinNodeClear = workspace.addNode("httpin", 0, 200);
+            var httpInNodeClear = workspace.addNode("httpIn", 0, 200);
             var functionNodeClear = workspace.addNode("function", 250);
 
-            httpinNodeFormat.edit();
-            httpinNodeFormat.setMethod("get");
-            httpinNodeFormat.setUrl("/hello-cookie");
-            httpinNodeFormat.clickOk();
+            httpInNodeFormat.edit();
+            httpInNodeFormat.setMethod("get");
+            httpInNodeFormat.setUrl("/hello-cookie");
+            httpInNodeFormat.clickOk();
 
             functionNodeFormat.edit();
             functionNodeFormat.setFunction("msg.payload = JSON.stringify(msg.req.cookies,null,4);\nreturn msg;");
@@ -530,14 +528,14 @@ describe('cookbook', function() {
             templateNode.setTemplate('<html>\n<head></head>\n<body>\n<h1>Cookies</h1>\n<p></p><a href="hello-cookie/add">Add a cookie</a> &bull; <a href="hello-cookie/clear">Clear cookies</a></p>\n<pre>{{ payload }}</pre>\n</body>\n</html>');
             templateNode.clickOk();
 
-            httpinNodeFormat.connect(functionNodeFormat);
+            httpInNodeFormat.connect(functionNodeFormat);
             functionNodeFormat.connect(templateNode);
             templateNode.connect(httpResponseNode);
 
-            httpinNodeAdd.edit();
-            httpinNodeAdd.setMethod("get");
-            httpinNodeAdd.setUrl("/hello-cookie/add");
-            httpinNodeAdd.clickOk();
+            httpInNodeAdd.edit();
+            httpInNodeAdd.setMethod("get");
+            httpInNodeAdd.setUrl("/hello-cookie/add");
+            httpInNodeAdd.clickOk();
 
             functionNodeAdd.edit();
             functionNodeAdd.setFunction('msg.cookies = { };\n msg.cookies["demo-"+(Math.floor(Math.random()*1000))] = Date.now();\nreturn msg;');
@@ -551,20 +549,20 @@ describe('cookbook', function() {
             changeNode.ruleSet("headers.location", "msg", httpNodeRoot + "/hello-cookie", "str", "3");
             changeNode.clickOk();
 
-            httpinNodeAdd.connect(functionNodeAdd);
+            httpInNodeAdd.connect(functionNodeAdd);
             functionNodeAdd.connect(changeNode);
             changeNode.connect(httpResponseNode);
 
-            httpinNodeClear.edit();
-            httpinNodeClear.setMethod("get");
-            httpinNodeClear.setUrl("/hello-cookie/clear");
-            httpinNodeClear.clickOk();
+            httpInNodeClear.edit();
+            httpInNodeClear.setMethod("get");
+            httpInNodeClear.setUrl("/hello-cookie/clear");
+            httpInNodeClear.clickOk();
 
             functionNodeClear.edit();
             functionNodeClear.setFunction("var cookieNames = Object.keys(msg.req.cookies).filter(function(cookieName) { return /^demo-/.test(cookieName);});\nmsg.cookies = {};\n\ncookieNames.forEach(function(cookieName) {\n    msg.cookies[cookieName] = null;\n});\nreturn msg;\n");
             functionNodeClear.clickOk();
 
-            httpinNodeClear.connect(functionNodeClear);
+            httpInNodeClear.connect(functionNodeClear);
             functionNodeClear.connect(changeNode);
 
             workspace.deploy();
diff --git a/test/editor/specs/scenario/cookbook_uispec.js b/test/editor/specs/scenario/cookbook_uispec.js
index f14f02469..8619ddb0d 100644
--- a/test/editor/specs/scenario/cookbook_uispec.js
+++ b/test/editor/specs/scenario/cookbook_uispec.js
@@ -284,14 +284,14 @@ describe('cookbook', function() {
             httpRequetNode.connect(debugNode);
 
             // The code for confirmation starts from here.
-            var httpinNode = workspace.addNode("httpin", 0, 200);
+            var httpInNode = workspace.addNode("httpIn", 0, 200);
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/set-query");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/set-query");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -299,7 +299,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("Hello {{req.query.q}}");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
             // The code for confirmation ends here.
 
@@ -339,15 +339,15 @@ describe('cookbook', function() {
             httpRequetNode.connect(debugNode);
 
             // The code for confirmation starts from here.
-            var httpinNode = workspace.addNode("httpin", 0, 200);
+            var httpInNode = workspace.addNode("httpIn", 0, 200);
             var templateNode = workspace.addNode("template");
             var changeNodeSetHeader = workspace.addNode("change");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("get");
-            httpinNode.setUrl("/json-response");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("get");
+            httpInNode.setUrl("/json-response");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -359,7 +359,7 @@ describe('cookbook', function() {
             changeNodeSetHeader.ruleSet("headers", "msg", '{"content-type":"application/json"}', "json");
             changeNodeSetHeader.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(changeNodeSetHeader);
             changeNodeSetHeader.connect(httpResponseNode);
             // The code for confirmation ends here.
@@ -413,14 +413,14 @@ describe('cookbook', function() {
             httpRequetNode.connect(debugNode);
 
             // The code for confirmation starts from here.
-            var httpinNode = workspace.addNode("httpin", 0, 200);
+            var httpInNode = workspace.addNode("httpIn", 0, 200);
             var templateNode = workspace.addNode("template");
             var httpResponseNode = workspace.addNode("httpResponse");
 
-            httpinNode.edit();
-            httpinNode.setMethod("post");
-            httpinNode.setUrl("/set-header");
-            httpinNode.clickOk();
+            httpInNode.edit();
+            httpInNode.setMethod("post");
+            httpInNode.setUrl("/set-header");
+            httpInNode.clickOk();
 
             templateNode.edit();
             templateNode.setSyntax("mustache");
@@ -428,7 +428,7 @@ describe('cookbook', function() {
             templateNode.setTemplate("{{ payload }}");
             templateNode.clickOk();
 
-            httpinNode.connect(templateNode);
+            httpInNode.connect(templateNode);
             templateNode.connect(httpResponseNode);
             // The code for confirmation ends here.
 
diff --git a/test/editor/wdio.conf.js b/test/editor/wdio.conf.js
index 37426cf14..26d30570f 100644
--- a/test/editor/wdio.conf.js
+++ b/test/editor/wdio.conf.js
@@ -64,9 +64,9 @@ exports.config = {
         'goog:chromeOptions': {
             args: process.env.NODE_RED_NON_HEADLESS
                 // Runs tests with opening a browser.
-                ? ['--disable-gpu']
+                ? ['--disable-gpu', '--no-sandbox']
                 // Runs tests without opening a browser.
-                : ['--headless', '--disable-gpu', 'window-size=1920,1080']
+                : ['--headless', '--disable-gpu', 'window-size=1920,1080', '--no-sandbox']
         },
     }],
     //

From b22a4f94abd7f059c4c0e2294bd5f79625ef11e8 Mon Sep 17 00:00:00 2001
From: Yukio Onozuka <onozuka@unirobot.com>
Date: Fri, 13 Dec 2019 07:52:34 +0900
Subject: [PATCH 254/305] when call event. remove runtime event.

---
 test/editor/pageobjects/editor/workspace_page.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index 560a0992f..75dfff9cb 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -72,6 +72,7 @@ function deploy() {
         return when.promise(function(resolve, reject) {
             events.on("runtime-event", function(event) {
                 if (event.id === 'runtime-deploy') {
+                    events.removeListener("runtime-event", arguments.callee);
                     resolve();
                 }
             });

From 9cbd0fceeafb7aee60498f39aec025b9f9bdf14c Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 17 Dec 2019 21:00:50 +0900
Subject: [PATCH 255/305] Fix IME bug in text editor

---
 .../node_modules/@node-red/editor-client/src/sass/forms.scss   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
index 8b08d8996..db2ecd7a5 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
@@ -78,7 +78,8 @@
     }
 
     textarea {
-        overflow: auto;
+        overflow: hidden;
+        padding: 0px 1px !important;
         vertical-align: top;
     }
 

From 9c1d46ff92c61103f5a773a726928e7f20126ad3 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 26 Dec 2019 16:53:13 +0000
Subject: [PATCH 256/305] Make node highlighting a bit more obvious for busy
 flows

---
 .../node_modules/@node-red/editor-client/src/sass/flow.scss   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
index 4aae0869c..d92d1e964 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
@@ -145,8 +145,8 @@ g.red-ui-flow-node-selected {
     border-color: $node-selected-color !important;
     border-style: dashed !important;
     stroke: $node-selected-color;
-    stroke-width: 2;
-    stroke-dasharray: 8, 3;
+    stroke-width: 3;
+    stroke-dasharray: 8, 4;
 }
 
 .red-ui-flow-subflow .red-ui-flow-node {

From 902f477ee35eea24c2878526ad88eb603b263801 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 30 Dec 2019 15:46:08 +0000
Subject: [PATCH 257/305] Bump included nodes versions to mathc latest

rbe, tail (and sentiment).
To close #2415
---
 package.json                                | 6 +++---
 packages/node_modules/node-red/package.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b0b30df07..9aaeb8f9e 100644
--- a/package.json
+++ b/package.json
@@ -54,9 +54,9 @@
         "mqtt": "2.18.8",
         "multer": "1.4.2",
         "mustache": "3.0.2",
-        "node-red-node-rbe": "^0.2.5",
-        "node-red-node-sentiment": "^0.1.4",
-        "node-red-node-tail": "^0.0.3",
+        "node-red-node-rbe": "^0.2.6",
+        "node-red-node-sentiment": "^0.1.6",
+        "node-red-node-tail": "^0.1.0",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 46f064b24..618480400 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -39,8 +39,8 @@
         "bcryptjs": "2.4.3",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
-        "node-red-node-rbe": "^0.2.5",
-        "node-red-node-tail": "^0.0.3",
+        "node-red-node-rbe": "^0.2.6",
+        "node-red-node-tail": "^0.1.0",
         "nopt": "4.0.1",
         "semver": "6.3.0"
     },

From 1ee43113b156b7cf87a84b5d3e6c3066e233d51b Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 31 Dec 2019 20:22:13 +0900
Subject: [PATCH 258/305] remove undefined loadFlowLibrary call

---
 packages/node_modules/@node-red/editor-client/src/js/red.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index 78f82e507..a742577d7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -418,8 +418,6 @@ var RED = (function() {
                 RED.notify(RED._("palette.event.nodeUpgraded", {module:msg.module,version:msg.version}),"success");
                 RED.nodes.registry.setModulePendingUpdated(msg.module,msg.version);
             }
-            // Refresh flow library to ensure any examples are updated
-            RED.library.loadFlowLibrary();
         });
         RED.comms.subscribe("event-log/#", function(topic,payload) {
             var id = topic.substring(9);

From 9c4640e010e8d7644e010292e12fbab6564efe8c Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 1 Jan 2020 21:32:56 +0000
Subject: [PATCH 259/305] Make min-height for change, switch, batch and mqtt
 consistent

to allow fit to smaller screens before scrolling
(to fix comment from forum)
---
 .../@node-red/nodes/core/function/10-switch.html            | 5 +++--
 .../@node-red/nodes/core/function/15-change.html            | 6 +++---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.html  | 4 ++--
 .../@node-red/nodes/core/sequence/19-batch.html             | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 9f072ad8a..6524a1030 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="switch">
+<script type="text/html" data-template-name="switch">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -173,7 +173,7 @@
                 }
             }
 
-            $("#node-input-rule-container").css('min-height','250px').css('min-width','450px').editableList({
+            $("#node-input-rule-container").css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
                     if (!opt.hasOwnProperty('r')) {
                         opt.r = {};
@@ -453,6 +453,7 @@
             }
             var editorRow = $("#dialog-form>div.node-input-rule-container-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+            height += 16;
             $("#node-input-rule-container").editableList('height',height);
         }
     });
diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.html b/packages/node_modules/@node-red/nodes/core/function/15-change.html
index 5df7f9a6c..fc9fa8d84 100644
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="change">
+<script type="text/html" data-template-name="change">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -81,7 +81,7 @@
                 rule.find('.red-ui-typedInput').typedInput("width",newWidth-130);
 
             }
-            $('#node-input-rule-container').css('min-height','300px').css('min-width','450px').editableList({
+            $('#node-input-rule-container').css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
                     var rule = opt;
                     if (!rule.hasOwnProperty('t')) {
@@ -259,7 +259,7 @@
             }
             var editorRow = $("#dialog-form>div.node-input-rule-container-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-
+            height += 16;
             $("#node-input-rule-container").editableList('height',height);
         }
     });
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index cdafab9ce..91b3d8c6e 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -129,7 +129,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="mqtt-broker">
+<script type="text/html" data-template-name="mqtt-broker">
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-config-input-name" data-i18n="[placeholder]common.label.name">
@@ -137,7 +137,7 @@
     <div class="form-row">
         <ul style="min-width: 600px; margin-bottom: 20px;" id="node-config-mqtt-broker-tabs"></ul>
     </div>
-    <div id="node-config-mqtt-broker-tabs-content" style="min-height: 170px;">
+    <div id="node-config-mqtt-broker-tabs-content" style="min-height:150px;">
         <div id="mqtt-broker-tab-connection" style="display:none">
             <div class="form-row node-input-broker">
                 <label for="node-config-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
index 5781ffbe5..f3cb47a54 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="batch">
+<script type="text/html" data-template-name="batch">
     <div class="form-row">
         <label for="node-input-mode"><span data-i18n="batch.mode.label"></span></label>
         <select type="text" id="node-input-mode" style="width: 300px;">
@@ -99,7 +99,7 @@
             }
 
             $("#node-input-topics-container")
-                .css('min-height','200px').css('min-width','430px')
+                .css('min-height','150px').css('min-width','430px')
                 .editableList({
                     addItem: function(container, i, opt) {
                         if (!opt.hasOwnProperty('topic')) {

From 2436bb0128d09d76c81b97185a70211f488adaf5 Mon Sep 17 00:00:00 2001
From: Arlena Derksen <arlena@hubsec.eu>
Date: Fri, 3 Jan 2020 21:27:35 +0100
Subject: [PATCH 260/305] Fixes the routes described in #2418 regarding too
 broad matching of regex URLs.

---
 .../node_modules/@node-red/editor-api/lib/editor/index.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
index 3628fa702..a9cdf0ffc 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -88,13 +88,13 @@ module.exports = {
             // Locales
             var locales = require("./locales");
             locales.init(runtimeAPI);
-            editorApp.get(/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
+            editorApp.get(/^\/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
 
             // Library
             var library = require("./library");
             library.init(runtimeAPI);
-            editorApp.get(/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
-            editorApp.post(/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
+            editorApp.get(/^\/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
+            editorApp.post(/^\/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
 
 
             // Credentials

From f0584df1d07d847528f455d539f7d2e37c8c5186 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 9 Jan 2020 12:53:39 +0900
Subject: [PATCH 261/305] Revert "Fix IME bug in text editor"

This reverts commit 9cbd0fceeafb7aee60498f39aec025b9f9bdf14c.
---
 .../node_modules/@node-red/editor-client/src/sass/forms.scss   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
index db2ecd7a5..8b08d8996 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
@@ -78,8 +78,7 @@
     }
 
     textarea {
-        overflow: hidden;
-        padding: 0px 1px !important;
+        overflow: auto;
         vertical-align: top;
     }
 

From 944070dfb12cb34fb70b14feaebb63d58b64d3fd Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 9 Jan 2020 13:06:39 +0900
Subject: [PATCH 262/305] Move CSS definition to ace.scss

---
 .../node_modules/@node-red/editor-client/src/sass/ace.scss    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
index 588af07b1..fb6eaf8eb 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
@@ -52,6 +52,10 @@
         @include component-shadow;
         border-color: $popover-background;
     }
+    textarea.ace_text-input {
+        overflow: hidden;
+        padding: 0px 1px !important;
+    }
 
     #red-ui-event-log-editor {
         .ace_scroller {

From b96164d4f584b4579d3b7082a7669200d8741379 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 10 Jan 2020 14:52:20 +0000
Subject: [PATCH 263/305] Fix false change detection when no config node
 selected

---
 .../@node-red/editor-client/src/js/ui/editor.js           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 867dca967..5f8379aa1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1320,11 +1320,13 @@ RED.editor = (function() {
                                                 newValue = parseInt(newValue);
                                             }
                                         }
+                                        if (editing_node._def.defaults[d].type) {
+                                            if (newValue == "_ADD_") {
+                                                newValue = "";
+                                            }
+                                        }
                                         if (editing_node[d] != newValue) {
                                             if (editing_node._def.defaults[d].type) {
-                                                if (newValue == "_ADD_") {
-                                                    newValue = "";
-                                                }
                                                 // Change to a related config node
                                                 var configNode = RED.nodes.node(editing_node[d]);
                                                 if (configNode) {

From 63978e226bc90464cd7b1c2ff3e6df32fa847afe Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 15:42:56 +0900
Subject: [PATCH 264/305] Move node files for UI testing to v1.0 directory
 structures

---
 .../core/{core => common}/20-inject_page.js   |  0
 .../21-debug_page.js}                         |  0
 .../10-function_page.js}                      |  0
 .../{logic => function}/15-change_page.js     |  0
 .../core/{logic => function}/16-range_page.js |  0
 .../{core => function}/80-template_page.js    |  0
 .../{io => network}/10-mqttconfig_page.js     |  0
 .../core/{io => network}/10-mqttin_page.js    |  0
 .../core/{io => network}/10-mqttout_page.js   |  0
 .../core/{io => network}/21-httpin_page.js    |  0
 .../{io => network}/21-httprequest_page.js    |  0
 .../{io => network}/21-httpresponse_page.js   |  0
 .../{50-filein_page.js => 10-filein_page.js}  |  0
 .../pageobjects/nodes/nodefactory_page.js     | 50 +++++++++----------
 .../specs/scenario/cookbook_mqtt_uispec.js    |  2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)
 rename test/editor/pageobjects/nodes/core/{core => common}/20-inject_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{core/58-debug_page.js => common/21-debug_page.js} (100%)
 rename test/editor/pageobjects/nodes/core/{core/80-function_page.js => function/10-function_page.js} (100%)
 rename test/editor/pageobjects/nodes/core/{logic => function}/15-change_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{logic => function}/16-range_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{core => function}/80-template_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttconfig_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttin_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/10-mqttout_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/21-httpin_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/21-httprequest_page.js (100%)
 rename test/editor/pageobjects/nodes/core/{io => network}/21-httpresponse_page.js (100%)
 rename test/editor/pageobjects/nodes/core/storage/{50-filein_page.js => 10-filein_page.js} (100%)

diff --git a/test/editor/pageobjects/nodes/core/core/20-inject_page.js b/test/editor/pageobjects/nodes/core/common/20-inject_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/core/20-inject_page.js
rename to test/editor/pageobjects/nodes/core/common/20-inject_page.js
diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/common/21-debug_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/core/58-debug_page.js
rename to test/editor/pageobjects/nodes/core/common/21-debug_page.js
diff --git a/test/editor/pageobjects/nodes/core/core/80-function_page.js b/test/editor/pageobjects/nodes/core/function/10-function_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/core/80-function_page.js
rename to test/editor/pageobjects/nodes/core/function/10-function_page.js
diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/function/15-change_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/logic/15-change_page.js
rename to test/editor/pageobjects/nodes/core/function/15-change_page.js
diff --git a/test/editor/pageobjects/nodes/core/logic/16-range_page.js b/test/editor/pageobjects/nodes/core/function/16-range_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/logic/16-range_page.js
rename to test/editor/pageobjects/nodes/core/function/16-range_page.js
diff --git a/test/editor/pageobjects/nodes/core/core/80-template_page.js b/test/editor/pageobjects/nodes/core/function/80-template_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/core/80-template_page.js
rename to test/editor/pageobjects/nodes/core/function/80-template_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/10-mqttconfig_page.js
rename to test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttin_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttin_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/10-mqttin_page.js
rename to test/editor/pageobjects/nodes/core/network/10-mqttin_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/10-mqttout_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttout_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/10-mqttout_page.js
rename to test/editor/pageobjects/nodes/core/network/10-mqttout_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/21-httpin_page.js b/test/editor/pageobjects/nodes/core/network/21-httpin_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/21-httpin_page.js
rename to test/editor/pageobjects/nodes/core/network/21-httpin_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/21-httprequest_page.js b/test/editor/pageobjects/nodes/core/network/21-httprequest_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/21-httprequest_page.js
rename to test/editor/pageobjects/nodes/core/network/21-httprequest_page.js
diff --git a/test/editor/pageobjects/nodes/core/io/21-httpresponse_page.js b/test/editor/pageobjects/nodes/core/network/21-httpresponse_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/io/21-httpresponse_page.js
rename to test/editor/pageobjects/nodes/core/network/21-httpresponse_page.js
diff --git a/test/editor/pageobjects/nodes/core/storage/50-filein_page.js b/test/editor/pageobjects/nodes/core/storage/10-filein_page.js
similarity index 100%
rename from test/editor/pageobjects/nodes/core/storage/50-filein_page.js
rename to test/editor/pageobjects/nodes/core/storage/10-filein_page.js
diff --git a/test/editor/pageobjects/nodes/nodefactory_page.js b/test/editor/pageobjects/nodes/nodefactory_page.js
index c518d89ff..744c1570d 100644
--- a/test/editor/pageobjects/nodes/nodefactory_page.js
+++ b/test/editor/pageobjects/nodes/nodefactory_page.js
@@ -14,46 +14,46 @@
  * limitations under the License.
  **/
 
-var injectNode = require('./core/core/20-inject_page');
-var debugNode = require('./core/core/58-debug_page');
-var templateNode = require('./core/core/80-template_page');
-var functionNode = require('./core/core/80-function_page');
-var mqttInNode = require('./core/io/10-mqttin_page');
-var mqttOutNode = require('./core/io/10-mqttout_page');
-var httpInNode = require('./core/io/21-httpin_page');
-var httpResponseNode = require('./core/io/21-httpresponse_page');
-var changeNode = require('./core/logic/15-change_page');
-var rangeNode = require('./core/logic/16-range_page');
-var httpRequestNode = require('./core/io/21-httprequest_page');
+var injectNode = require('./core/common/20-inject_page');
+var debugNode = require('./core/common/21-debug_page');
+var functionNode = require('./core/function/10-function_page');
+var changeNode = require('./core/function/15-change_page');
+var rangeNode = require('./core/function/16-range_page');
+var templateNode = require('./core/function/80-template_page');
+var mqttInNode = require('./core/network/10-mqttin_page');
+var mqttOutNode = require('./core/network/10-mqttout_page');
+var httpInNode = require('./core/network/21-httpin_page');
+var httpResponseNode = require('./core/network/21-httpresponse_page');
+var httpRequestNode = require('./core/network/21-httprequest_page');
 var htmlNode = require('./core/parsers/70-HTML_page');
 var jsonNode = require('./core/parsers/70-JSON_page');
-var fileInNode = require('./core/storage/50-filein_page');
-
+var fileInNode = require('./core/storage/10-filein_page');
 
 var nodeCatalog = {
-    // input
+    // common
     "inject": injectNode,
-    "httpIn": httpInNode,
-    "mqttIn":mqttInNode,
-    // output
     "debug": debugNode,
-    "httpResponse": httpResponseNode,
-    "mqttOut": mqttOutNode,
     // function
     "function": functionNode,
-    "template": templateNode,
     "change": changeNode,
     "range": rangeNode,
+    "template": templateNode,
+    // network
+    "mqttIn": mqttInNode,
+    "mqttOut": mqttOutNode,
+    "httpIn": httpInNode,
+    "httpResponse": httpResponseNode,
     "httpRequest": httpRequestNode,
+    // parser
     "html": htmlNode,
-    "json":jsonNode,
+    "json": jsonNode,
     // storage
-    "fileIn": fileInNode,
-}
+    "fileIn": fileInNode
+};
 
 function create(type, id) {
-    var node = nodeCatalog[type];
-    return new node(id);
+    var Node = nodeCatalog[type];
+    return new Node(id);
 }
 
 module.exports = {
diff --git a/test/editor/specs/scenario/cookbook_mqtt_uispec.js b/test/editor/specs/scenario/cookbook_mqtt_uispec.js
index ecfe8da7d..887d9735c 100644
--- a/test/editor/specs/scenario/cookbook_mqtt_uispec.js
+++ b/test/editor/specs/scenario/cookbook_mqtt_uispec.js
@@ -22,7 +22,7 @@ var helper = require("../../editor_helper");
 var debugTab = require('../../pageobjects/editor/debugTab_page');
 var workspace = require('../../pageobjects/editor/workspace_page');
 var specUtil = require('../../pageobjects/util/spec_util_page');
-var mqttConfig = require('../../pageobjects/nodes/core/io/10-mqttconfig_page.js');
+var mqttConfig = require('../../pageobjects/nodes/core/network/10-mqttconfig_page.js');
 
 var httpNodeRoot = "/api";
 

From faf46e4447508715a481c029c693266972770e10 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 16:37:43 +0900
Subject: [PATCH 265/305] Improve node files for UI testing

---
 .../nodes/core/function/10-function_page.js      |  7 +++----
 .../nodes/core/function/15-change_page.js        | 16 ++++++++--------
 .../nodes/core/function/80-template_page.js      | 12 +++++-------
 .../nodes/core/network/10-mqttconfig_page.js     |  4 ++--
 test/editor/pageobjects/nodes/node_page.js       |  4 ++--
 test/editor/wdio.conf.js                         | 14 +++++++-------
 6 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/test/editor/pageobjects/nodes/core/function/10-function_page.js b/test/editor/pageobjects/nodes/core/function/10-function_page.js
index f39aba912..c1bb80a80 100644
--- a/test/editor/pageobjects/nodes/core/function/10-function_page.js
+++ b/test/editor/pageobjects/nodes/core/function/10-function_page.js
@@ -26,12 +26,11 @@ function functionNode(id) {
 
 util.inherits(functionNode, nodePage);
 
-functionNode.prototype.setFunction = function(func) {
+functionNode.prototype.setFunction = function (func) {
     browser.clickWithWait('#node-input-func-editor');
     browser.keys(keyPage.selectAll());
-    for (var i = 0; i < func.length; i++) {
-        browser.keys([func.charAt(i)]);
-    }
+    browser.keys(['Delete']);
+    browser.keys(func);
     // Delete the unnecessary code that ace editor does the autocompletion.
     browser.keys(keyPage.selectToEnd());
     browser.keys(['Delete']);
diff --git a/test/editor/pageobjects/nodes/core/function/15-change_page.js b/test/editor/pageobjects/nodes/core/function/15-change_page.js
index 82441c9bc..8e72afe38 100644
--- a/test/editor/pageobjects/nodes/core/function/15-change_page.js
+++ b/test/editor/pageobjects/nodes/core/function/15-change_page.js
@@ -49,8 +49,8 @@ function setT(t, index) {
 }
 
 // It is better to create a function whose input value is the object type in the future,
-changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
-    index = index ? index : 1;
+changeNode.prototype.ruleSet = function (p, pt, to, tot, index) {
+    index = index || 1;
     setT("set", index);
     if (pt) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]');
@@ -68,23 +68,23 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
         browser.clickWithWait(totXPath);
     }
     if (to) {
-        browser.setValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/div/input' , to);
+        browser.setValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/div/input', to);
     }
 }
 
-changeNode.prototype.ruleDelete = function(index) {
-    index = index ? index : 1;
+changeNode.prototype.ruleDelete = function (index) {
+    index = index || 1;
     setT("delete", index);
 }
 
-changeNode.prototype.ruleMove = function(p, to, index) {
-    index = index ? index : 1;
+changeNode.prototype.ruleMove = function (p, to, index) {
+    index = index || 1;
     setT("move", index);
     browser.setValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/div/input', p);
     browser.setValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[4]/div[2]/div/input', to);
 }
 
-changeNode.prototype.addRule = function() {
+changeNode.prototype.addRule = function () {
     browser.clickWithWait('//*[@id="dialog-form"]/div[3]/div/a');
 }
 
diff --git a/test/editor/pageobjects/nodes/core/function/80-template_page.js b/test/editor/pageobjects/nodes/core/function/80-template_page.js
index 68cf46acf..bf1786ba2 100644
--- a/test/editor/pageobjects/nodes/core/function/80-template_page.js
+++ b/test/editor/pageobjects/nodes/core/function/80-template_page.js
@@ -26,21 +26,19 @@ function templateNode(id) {
 
 util.inherits(templateNode, nodePage);
 
-templateNode.prototype.setSyntax = function(syntax) {
+templateNode.prototype.setSyntax = function (syntax) {
     browser.selectWithWait('#node-input-syntax', syntax);
 }
 
-templateNode.prototype.setFormat = function(format) {
+templateNode.prototype.setFormat = function (format) {
     browser.selectWithWait('#node-input-format', format);
 }
 
-templateNode.prototype.setTemplate = function(template) {
+templateNode.prototype.setTemplate = function (template) {
     browser.clickWithWait('#node-input-template-editor');
     browser.keys(keyPage.selectAll());
-    // Need to add a character one by one since some words such as 'Control' are treated as a special word.
-    for (var i = 0; i < template.length; i++) {
-        browser.keys([template.charAt(i)]);
-    }
+    browser.keys(['Delete']);
+    browser.keys(template);
     browser.keys(keyPage.selectToEnd());
     browser.keys(['Delete']);
     // Need to wait until ace editor correctly checks the syntax.
diff --git a/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js b/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js
index 3266a1bd3..c7cdc90c5 100644
--- a/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js
+++ b/test/editor/pageobjects/nodes/core/network/10-mqttconfig_page.js
@@ -23,14 +23,14 @@ function setServer(broker, port) {
 function clickOk() {
     browser.clickWithWait('#node-config-dialog-ok');
     // Wait until an config dialog closes.
-    browser.waitForVisible('#node-config-dialog-ok', 4000, true);
+    browser.waitForVisible('#node-config-dialog-ok', 10000, true);
 }
 
 function edit() {
     browser.waitForVisible('#node-input-lookup-broker');
     browser.click('#node-input-lookup-broker');
     // Wait until a config dialog opens.
-    browser.waitForVisible('#node-config-dialog-ok', 4000);
+    browser.waitForVisible('#node-config-dialog-ok', 10000);
 }
 
 module.exports = {
diff --git a/test/editor/pageobjects/nodes/node_page.js b/test/editor/pageobjects/nodes/node_page.js
index 5234362ae..123c1cc9d 100644
--- a/test/editor/pageobjects/nodes/node_page.js
+++ b/test/editor/pageobjects/nodes/node_page.js
@@ -22,13 +22,13 @@ Node.prototype.edit = function() {
     browser.clickWithWait(this.id);
     browser.clickWithWait(this.id);
     // Wait until an edit dialog opens.
-    browser.waitForVisible('#node-dialog-ok', 4000);
+    browser.waitForVisible('#node-dialog-ok', 10000);
 }
 
 Node.prototype.clickOk = function() {
     browser.clickWithWait('#node-dialog-ok');
     // Wait untile an edit dialog closes.
-    browser.waitForVisible('#node-dialog-ok', 4000, true);
+    browser.waitForVisible('#node-dialog-ok', 10000, true);
     browser.pause(50);
 }
 
diff --git a/test/editor/wdio.conf.js b/test/editor/wdio.conf.js
index 26d30570f..7bbfcbe24 100644
--- a/test/editor/wdio.conf.js
+++ b/test/editor/wdio.conf.js
@@ -15,7 +15,7 @@
  **/
 
 exports.config = {
-
+    
     //
     // ==================
     // Specify Test Files
@@ -150,12 +150,12 @@ exports.config = {
     // The only one supported by default is 'dot'
     // see also: http://webdriver.io/guide/reporters/dot.html
     reporters: ['spec'],
-
+    
     //
     // Options to be passed to Mocha.
     // See the full list at http://mochajs.org/
     mochaOpts: {
-        timeout: 60000,
+        timeout: 100000,
         ui: 'bdd'
     },
     //
@@ -197,7 +197,7 @@ exports.config = {
      */
     // beforeCommand: function (commandName, args) {
     // },
-
+    
     /**
      * Hook that gets executed before the suite starts
      * @param {Object} suite suite details
@@ -217,13 +217,13 @@ exports.config = {
     // beforeHook: function () {
     // },
     /**
-     * Hook that gets executed _after_ a hook within the suite starts (e.g. runs after calling
+     * Hook that gets executed _after_ a hook within the suite ends (e.g. runs after calling
      * afterEach in Mocha)
      */
     // afterHook: function () {
     // },
     /**
-     * Function to be executed after a test (in Mocha/Jasmine) or a step (in Cucumber) starts.
+     * Function to be executed after a test (in Mocha/Jasmine) or a step (in Cucumber) ends.
      * @param {Object} test test details
      */
     // afterTest: function (test) {
@@ -234,7 +234,7 @@ exports.config = {
      */
     // afterSuite: function (suite) {
     // },
-
+    
     /**
      * Runs after a WebdriverIO command gets executed
      * @param {String} commandName hook command name

From 8801ace24721f559ca9e1f0eb608dca55c28432c Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 16:56:39 +0900
Subject: [PATCH 266/305] Remain .payload in debug node property

---
 test/editor/pageobjects/nodes/core/common/21-debug_page.js | 5 +----
 test/editor/specs/scenario/cookbook_uispec.js              | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/editor/pageobjects/nodes/core/common/21-debug_page.js b/test/editor/pageobjects/nodes/core/common/21-debug_page.js
index 52cb60f44..602d4d542 100644
--- a/test/editor/pageobjects/nodes/core/common/21-debug_page.js
+++ b/test/editor/pageobjects/nodes/core/common/21-debug_page.js
@@ -26,16 +26,13 @@ function debugNode(id) {
 
 util.inherits(debugNode, nodePage);
 
-debugNode.prototype.setOutput = function(complete) {
+debugNode.prototype.setOutput = function (complete) {
     // Open a payload type list.
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
     if (complete !== 'true') {
         // Select the "msg" type.
         browser.clickWithWait('//div[contains(@class, "red-ui-typedInput-options")][1]/a[1]');
         // Input the path in msg.
-        browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
-        browser.keys(keyPage.selectAll());
-        browser.keys(['Delete']);
         browser.setValue('//*[contains(@class, "red-ui-typedInput-input")]/input', complete);
     } else {
         // Select the "complete msg object" type.
diff --git a/test/editor/specs/scenario/cookbook_uispec.js b/test/editor/specs/scenario/cookbook_uispec.js
index 8619ddb0d..6e16ca8a7 100644
--- a/test/editor/specs/scenario/cookbook_uispec.js
+++ b/test/editor/specs/scenario/cookbook_uispec.js
@@ -331,7 +331,7 @@ describe('cookbook', function() {
             httpRequetNode.clickOk();
 
             debugNode.edit();
-            debugNode.setOutput("payload.title");
+            debugNode.setOutput(".title");
             debugNode.clickOk();
 
             injectNode.connect(changeNodeSetPost);

From 3f72eb51a05ed347431e5a2d2db0356c2701df2f Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 17:18:46 +0900
Subject: [PATCH 267/305] Fix shortcut key handling

---
 test/editor/pageobjects/util/key_page.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/editor/pageobjects/util/key_page.js b/test/editor/pageobjects/util/key_page.js
index 9a8a867b4..509af9e22 100644
--- a/test/editor/pageobjects/util/key_page.js
+++ b/test/editor/pageobjects/util/key_page.js
@@ -17,21 +17,20 @@
 var os = require("os");
 
 var shortCutKeyMap = {
-    "selectAll": ['Control', 'a', 'Control'],
+    "selectAll": ['Control', 'a', 'a', 'Control'],
     "selectToEnd": ['Control', 'Shift', 'End', 'Shift', 'Control'],
 };
 
 var shortCutKeyMapForMac = {
-    "selectAll": ['Command', 'a', 'Command'],
+    "selectAll": ['Command', 'a', 'a', 'Command'],
     "selectToEnd": ['Command', 'Shift', 'ArrowDown', 'Shift', 'Command'],
 };
 
 function getShortCutKey(type) {
-    if (os.type() === "Darwin") {
+    if (os.type() === 'Darwin') {
         return shortCutKeyMapForMac[type];
-    } else {
-        return shortCutKeyMap[type];
     }
+    return shortCutKeyMap[type];
 }
 
 function selectAll() {

From 7640bc029c958dacb4067c0e14f50e908bfcc64c Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 17:24:16 +0900
Subject: [PATCH 268/305] Add handling to remove unused file and directories in
 UI testing

---
 test/editor/editor_helper.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js
index 81e3a54f5..73177c2ca 100644
--- a/test/editor/editor_helper.js
+++ b/test/editor/editor_helper.js
@@ -57,6 +57,9 @@ function cleanup(flowFile) {
     deleteFile(homeDir + "/." + flowFile + ".backup");
     deleteFile(homeDir + "/" + credentialFile);
     deleteFile(homeDir + "/." + credentialFile + ".backup");
+    deleteFile(homeDir + "/package.json");
+    deleteFile(homeDir + "/lib/flows");
+    deleteFile(homeDir + "/lib");
 }
 
 function deleteFile(flowFile) {
@@ -66,7 +69,7 @@ function deleteFile(flowFile) {
             fs.unlinkSync(flowFile);
         }
     } catch (e) {}
-};
+}
 
 module.exports = {
     startServer: function() {
@@ -104,7 +107,7 @@ module.exports = {
                 });
             });
             browser.url(url);
-            browser.waitForExist(".red-ui-palette-node[data-palette-type='inject']")
+            browser.waitForExist(".red-ui-palette-node[data-palette-type='inject']");
         } catch (err) {
             console.log(err);
             throw err;

From ccc98370eb804b7242c5e012eceb52c4d0d2313e Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 17:44:56 +0900
Subject: [PATCH 269/305] Use ephemeral port number for MQTT broker

---
 .../specs/scenario/cookbook_mqtt_uispec.js    | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/test/editor/specs/scenario/cookbook_mqtt_uispec.js b/test/editor/specs/scenario/cookbook_mqtt_uispec.js
index 887d9735c..655074750 100644
--- a/test/editor/specs/scenario/cookbook_mqtt_uispec.js
+++ b/test/editor/specs/scenario/cookbook_mqtt_uispec.js
@@ -29,35 +29,38 @@ var httpNodeRoot = "/api";
 var mqttServer;
 var mosca = require('mosca');
 var moscaSettings = {
-    port: 1883,
+    port: parseInt(Math.random() * 16383 + 49152),
     persistence: {
         // Needs for retaining messages.
         factory: mosca.persistence.Memory
     }
 };
 
-
 // https://cookbook.nodered.org/
-describe('cookbook', function() {
-    beforeEach(function() {
+describe('cookbook', function () {
+    beforeEach(function () {
         workspace.init();
     });
 
-    before(function() {
-        browser.call(function() {
-            return new Promise(function(resolve, reject) {
-                mqttServer = new mosca.Server(moscaSettings, function() {
-                    resolve();
+    before(function () {
+        browser.call(function () {
+            return new Promise(function (resolve, reject) {
+                mqttServer = new mosca.Server(moscaSettings, function (err) {
+                    if (err) {
+                        reject(err);
+                    } else {
+                        resolve();
+                    }
                 });
             });
         });
         helper.startServer();
     });
 
-    after(function() {
-        browser.call(function() {
-            return new Promise(function(resolve, reject) {
-                mqttServer.close(function() {
+    after(function () {
+        browser.call(function () {
+            return new Promise(function (resolve, reject) {
+                mqttServer.close(function () {
                     resolve();
                 });
             });
@@ -65,20 +68,20 @@ describe('cookbook', function() {
         helper.stopServer();
     });
 
-    describe('MQTT', function() {
-        it('Add an MQTT broker to prepare for UI test', function() {
+    describe('MQTT', function () {
+        it('Add an MQTT broker to prepare for UI test', function () {
             var mqttOutNode = workspace.addNode("mqttOut");
 
             mqttOutNode.edit();
             mqttConfig.edit();
-            mqttConfig.setServer("localhost");
+            mqttConfig.setServer("localhost", moscaSettings.port);
             mqttConfig.clickOk();
             mqttOutNode.clickOk();
 
             workspace.deploy();
         });
 
-        it('Connect to an MQTT broker', function() {
+        it('Connect to an MQTT broker', function () {
             var injectNode = workspace.addNode("inject");
             var mqttOutNode = workspace.addNode("mqttOut");
 
@@ -112,7 +115,7 @@ describe('cookbook', function() {
         // skip this case since it is same as other cases.
         it.skip('Publish messages to a topic');
 
-        it('Set the topic of a published message', function() {
+        it('Set the topic of a published message', function () {
             var injectNode = workspace.addNode("inject");
             var mqttOutNode = workspace.addNode("mqttOut");
 
@@ -144,7 +147,7 @@ describe('cookbook', function() {
             debugTab.getMessage().should.eql('"22"');
         });
 
-        it('Publish a retained message to a topic', function() {
+        it('Publish a retained message to a topic', function () {
             var injectNode = workspace.addNode("inject");
             var mqttOutNode = workspace.addNode("mqttOut");
 
@@ -182,7 +185,7 @@ describe('cookbook', function() {
         // skip this case since it is same as other cases.
         it.skip('Subscribe to a topic');
 
-        it('Receive a parsed JSON message', function() {
+        it('Receive a parsed JSON message', function () {
             var injectNode = workspace.addNode("inject");
             var mqttOutNode = workspace.addNode("mqttOut");
 

From 530bf22bd5fe92324d2c69b3df2641d9aa3b2ad5 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 18:02:27 +0900
Subject: [PATCH 270/305] Use palette search when selecting nodes

---
 test/editor/pageobjects/editor/workspace_page.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index 560a0992f..653d32165 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -44,6 +44,9 @@ function addNode(type, x, y) {
             previousY = previousY + flowLayout.heightInterval;
         }
     }
+    browser.waitForVisible('#red-ui-palette-search');
+    browser.setValue('//*[@id="red-ui-palette-search"]/div/input', type.replace(/([A-Z])/g,' $1').toLowerCase());
+    browser.pause(300);
     browser.waitForVisible(palette.getId(type));
     browser.moveToObject(palette.getId(type));
     browser.buttonDown();

From 214d788029046f4c1f13f1291f4f0c1fd41eb896 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 19:24:50 +0900
Subject: [PATCH 271/305] Use enter key to open node property instead of double
 click

---
 test/editor/pageobjects/nodes/node_page.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/editor/pageobjects/nodes/node_page.js b/test/editor/pageobjects/nodes/node_page.js
index 123c1cc9d..5250250e7 100644
--- a/test/editor/pageobjects/nodes/node_page.js
+++ b/test/editor/pageobjects/nodes/node_page.js
@@ -18,21 +18,24 @@ function Node(id) {
     this.id = '//*[@id="' + id + '"]';
 }
 
-Node.prototype.edit = function() {
-    browser.clickWithWait(this.id);
-    browser.clickWithWait(this.id);
+Node.prototype.edit = function () {
+    browser.waitForVisible(this.id);
+    browser.moveToObject(this.id);
+    browser.buttonDown();
+    browser.buttonUp();
+    browser.keys(['Enter']);
     // Wait until an edit dialog opens.
     browser.waitForVisible('#node-dialog-ok', 10000);
 }
 
-Node.prototype.clickOk = function() {
+Node.prototype.clickOk = function () {
     browser.clickWithWait('#node-dialog-ok');
     // Wait untile an edit dialog closes.
     browser.waitForVisible('#node-dialog-ok', 10000, true);
     browser.pause(50);
 }
 
-Node.prototype.connect = function(targetNode) {
+Node.prototype.connect = function (targetNode) {
     var outputPort = this.id + '/*[@class="red-ui-flow-port-output"]';
     var inputPort = targetNode.id + '/*[@class="red-ui-flow-port-input"]';
     browser.dragAndDrop(outputPort, inputPort)

From 0f8af4ba1c0bf9bcf8f346820ddecddb02238b39 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 14 Jan 2020 20:36:10 +0900
Subject: [PATCH 272/305] Use boolean value as flag instead of string value

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index a6e896b9e..67739afe2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,7 +28,7 @@ module.exports = function(grunt) {
 
     var nonHeadless = grunt.option('non-headless');
     if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = 'true';
+        process.env.NODE_RED_NON_HEADLESS = true;
     }
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),

From 44a07c74fd19f3de72e451c4b751ba88b07dc77c Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 15 Jan 2020 10:42:59 +0900
Subject: [PATCH 273/305] Click tab instead of workspace

---
 .../pageobjects/editor/workspace_page.js       | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index 653d32165..f3bbf1aa2 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -15,18 +15,15 @@
  **/
 
 var when = require("when");
-
 var events = require("nr-test-utils").require("@node-red/runtime/lib/events.js");
-
 var palette = require("./palette_page");
 var nodeFactory = require("../nodes/nodefactory_page");
-
+var keyPage = require("../util/key_page");
 var flowLayout = {
     flowRightEnd : 600,
     widthInterval : 300,
     heightInterval : 80
 };
-
 var previousX = -flowLayout.widthInterval;
 var previousY = 0;
 
@@ -60,13 +57,10 @@ function addNode(type, x, y) {
 }
 
 function deleteAllNodes() {
-    browser.waitForVisible('.red-ui-workspace-chart-event-layer');
-    try {
-        browser.click('.red-ui-workspace-chart-event-layer');
-    } catch (e) {
-        console.log(e);
-    }
-    browser.keys(['Control', 'a', 'a', 'Control']); // call twice to release the keys.
+    browser.waitForVisible('//*[contains(@class, "active")]/a[@class="red-ui-tab-label"]');
+    browser.click('//*[contains(@class, "active")]/a[@class="red-ui-tab-label"]');
+    browser.pause(1000);
+    browser.keys(keyPage.selectAll());
     browser.keys(['Delete']);
 }
 
@@ -81,7 +75,7 @@ function deploy() {
             browser.clickWithWait('#red-ui-header-button-deploy');
         });
     });
-    browser.waitForText('#red-ui-header-button-deploy', 2000);
+    browser.waitForText('#red-ui-header-button-deploy', 10000);
     // Need additional wait until buttons becomes clickable.
     browser.pause(50);
 }

From 74a015c329703fdf7ede44a207410d59c295855a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Wed, 15 Jan 2020 11:40:48 +0900
Subject: [PATCH 274/305] Change types from text/x-red to text/html in node
 html files

---
 .../@node-red/nodes/core/common/20-inject.html         |  2 +-
 .../@node-red/nodes/core/common/21-debug.html          |  2 +-
 .../@node-red/nodes/core/common/24-complete.html       |  2 +-
 .../@node-red/nodes/core/common/25-catch.html          |  2 +-
 .../@node-red/nodes/core/common/25-status.html         |  2 +-
 .../@node-red/nodes/core/common/60-link.html           |  4 ++--
 .../@node-red/nodes/core/common/90-comment.html        |  2 +-
 .../@node-red/nodes/core/common/98-unknown.html        |  2 +-
 .../@node-red/nodes/core/function/10-function.html     |  2 +-
 .../@node-red/nodes/core/function/10-switch.html       |  2 +-
 .../@node-red/nodes/core/function/15-change.html       |  2 +-
 .../@node-red/nodes/core/function/16-range.html        |  2 +-
 .../@node-red/nodes/core/function/80-template.html     |  2 +-
 .../@node-red/nodes/core/function/89-delay.html        |  2 +-
 .../@node-red/nodes/core/function/89-trigger.html      |  2 +-
 .../@node-red/nodes/core/function/90-exec.html         |  2 +-
 .../@node-red/nodes/core/network/05-tls.html           |  2 +-
 .../@node-red/nodes/core/network/06-httpproxy.html     |  2 +-
 .../@node-red/nodes/core/network/10-mqtt.html          |  6 +++---
 .../@node-red/nodes/core/network/21-httpin.html        |  4 ++--
 .../@node-red/nodes/core/network/21-httprequest.html   |  2 +-
 .../@node-red/nodes/core/network/22-websocket.html     |  8 ++++----
 .../@node-red/nodes/core/network/31-tcpin.html         |  6 +++---
 .../@node-red/nodes/core/network/32-udp.html           |  4 ++--
 .../@node-red/nodes/core/parsers/70-CSV.html           |  2 +-
 .../@node-red/nodes/core/parsers/70-HTML.html          |  2 +-
 .../@node-red/nodes/core/parsers/70-JSON.html          |  2 +-
 .../@node-red/nodes/core/parsers/70-XML.html           |  2 +-
 .../@node-red/nodes/core/parsers/70-YAML.html          |  2 +-
 .../@node-red/nodes/core/sequence/17-split.html        |  4 ++--
 .../@node-red/nodes/core/sequence/18-sort.html         |  2 +-
 .../@node-red/nodes/core/sequence/19-batch.html        |  2 +-
 .../@node-red/nodes/core/storage/10-file.html          |  4 ++--
 .../@node-red/nodes/core/storage/23-watch.html         |  2 +-
 .../@node-red/nodes/locales/de/common/20-inject.html   |  2 +-
 .../@node-red/nodes/locales/de/common/21-debug.html    |  2 +-
 .../@node-red/nodes/locales/de/common/25-catch.html    |  2 +-
 .../@node-red/nodes/locales/de/common/25-status.html   |  2 +-
 .../@node-red/nodes/locales/de/common/60-link.html     |  4 ++--
 .../@node-red/nodes/locales/de/common/90-comment.html  |  2 +-
 .../@node-red/nodes/locales/de/common/98-unknown.html  |  2 +-
 .../nodes/locales/de/function/10-function.html         |  2 +-
 .../@node-red/nodes/locales/de/function/10-switch.html |  2 +-
 .../@node-red/nodes/locales/de/function/15-change.html |  2 +-
 .../@node-red/nodes/locales/de/function/16-range.html  |  2 +-
 .../nodes/locales/de/function/80-template.html         |  2 +-
 .../@node-red/nodes/locales/de/function/89-delay.html  |  2 +-
 .../nodes/locales/de/function/89-trigger.html          |  2 +-
 .../@node-red/nodes/locales/de/function/90-exec.html   |  2 +-
 .../@node-red/nodes/locales/de/network/05-tls.html     |  2 +-
 .../nodes/locales/de/network/06-httpproxy.html         |  2 +-
 .../@node-red/nodes/locales/de/network/10-mqtt.html    |  6 +++---
 .../@node-red/nodes/locales/de/network/21-httpin.html  |  4 ++--
 .../nodes/locales/de/network/21-httprequest.html       |  2 +-
 .../nodes/locales/de/network/22-websocket.html         | 10 +++++-----
 .../@node-red/nodes/locales/de/network/31-tcpin.html   |  6 +++---
 .../@node-red/nodes/locales/de/network/32-udp.html     |  4 ++--
 .../@node-red/nodes/locales/de/parsers/70-CSV.html     |  2 +-
 .../@node-red/nodes/locales/de/parsers/70-HTML.html    |  2 +-
 .../@node-red/nodes/locales/de/parsers/70-JSON.html    |  2 +-
 .../@node-red/nodes/locales/de/parsers/70-XML.html     |  2 +-
 .../@node-red/nodes/locales/de/parsers/70-YAML.html    |  2 +-
 .../@node-red/nodes/locales/de/sequence/17-split.html  |  4 ++--
 .../@node-red/nodes/locales/de/sequence/18-sort.html   |  2 +-
 .../@node-red/nodes/locales/de/sequence/19-batch.html  |  2 +-
 .../@node-red/nodes/locales/de/storage/10-file.html    |  4 ++--
 .../@node-red/nodes/locales/de/storage/23-watch.html   |  2 +-
 .../nodes/locales/en-US/common/20-inject.html          |  2 +-
 .../@node-red/nodes/locales/en-US/common/21-debug.html |  2 +-
 .../nodes/locales/en-US/common/24-complete.html        |  2 +-
 .../@node-red/nodes/locales/en-US/common/25-catch.html |  2 +-
 .../nodes/locales/en-US/common/25-status.html          |  2 +-
 .../@node-red/nodes/locales/en-US/common/60-link.html  |  4 ++--
 .../nodes/locales/en-US/common/90-comment.html         |  2 +-
 .../nodes/locales/en-US/common/98-unknown.html         |  2 +-
 .../nodes/locales/en-US/function/10-function.html      |  2 +-
 .../nodes/locales/en-US/function/10-switch.html        |  2 +-
 .../nodes/locales/en-US/function/15-change.html        |  2 +-
 .../nodes/locales/en-US/function/16-range.html         |  2 +-
 .../nodes/locales/en-US/function/80-template.html      |  2 +-
 .../nodes/locales/en-US/function/89-delay.html         |  2 +-
 .../nodes/locales/en-US/function/89-trigger.html       |  2 +-
 .../nodes/locales/en-US/function/90-exec.html          |  2 +-
 .../@node-red/nodes/locales/en-US/network/05-tls.html  |  2 +-
 .../nodes/locales/en-US/network/06-httpproxy.html      |  2 +-
 .../@node-red/nodes/locales/en-US/network/10-mqtt.html |  6 +++---
 .../nodes/locales/en-US/network/21-httpin.html         |  4 ++--
 .../nodes/locales/en-US/network/21-httprequest.html    |  2 +-
 .../nodes/locales/en-US/network/22-websocket.html      |  8 ++++----
 .../nodes/locales/en-US/network/31-tcpin.html          |  6 +++---
 .../@node-red/nodes/locales/en-US/network/32-udp.html  |  4 ++--
 .../@node-red/nodes/locales/en-US/parsers/70-CSV.html  |  2 +-
 .../@node-red/nodes/locales/en-US/parsers/70-HTML.html |  2 +-
 .../@node-red/nodes/locales/en-US/parsers/70-JSON.html |  2 +-
 .../@node-red/nodes/locales/en-US/parsers/70-XML.html  |  2 +-
 .../@node-red/nodes/locales/en-US/parsers/70-YAML.html |  2 +-
 .../nodes/locales/en-US/sequence/17-split.html         |  4 ++--
 .../nodes/locales/en-US/sequence/18-sort.html          |  2 +-
 .../nodes/locales/en-US/sequence/19-batch.html         |  2 +-
 .../@node-red/nodes/locales/en-US/storage/10-file.html |  4 ++--
 .../nodes/locales/en-US/storage/23-watch.html          |  2 +-
 .../@node-red/nodes/locales/ja/common/20-inject.html   |  2 +-
 .../@node-red/nodes/locales/ja/common/21-debug.html    |  2 +-
 .../@node-red/nodes/locales/ja/common/24-complete.html |  2 +-
 .../@node-red/nodes/locales/ja/common/25-catch.html    |  2 +-
 .../@node-red/nodes/locales/ja/common/25-status.html   |  2 +-
 .../@node-red/nodes/locales/ja/common/60-link.html     |  4 ++--
 .../@node-red/nodes/locales/ja/common/90-comment.html  |  2 +-
 .../@node-red/nodes/locales/ja/common/98-unknown.html  |  2 +-
 .../nodes/locales/ja/function/10-function.html         |  2 +-
 .../@node-red/nodes/locales/ja/function/10-switch.html |  2 +-
 .../@node-red/nodes/locales/ja/function/15-change.html |  2 +-
 .../@node-red/nodes/locales/ja/function/16-range.html  |  2 +-
 .../nodes/locales/ja/function/80-template.html         |  2 +-
 .../@node-red/nodes/locales/ja/function/89-delay.html  |  2 +-
 .../nodes/locales/ja/function/89-trigger.html          |  2 +-
 .../@node-red/nodes/locales/ja/function/90-exec.html   |  2 +-
 .../@node-red/nodes/locales/ja/network/05-tls.html     |  2 +-
 .../nodes/locales/ja/network/06-httpproxy.html         |  2 +-
 .../@node-red/nodes/locales/ja/network/10-mqtt.html    |  6 +++---
 .../@node-red/nodes/locales/ja/network/21-httpin.html  |  4 ++--
 .../nodes/locales/ja/network/21-httprequest.html       |  2 +-
 .../nodes/locales/ja/network/22-websocket.html         |  8 ++++----
 .../@node-red/nodes/locales/ja/network/31-tcpin.html   |  6 +++---
 .../@node-red/nodes/locales/ja/network/32-udp.html     |  4 ++--
 .../@node-red/nodes/locales/ja/parsers/70-CSV.html     |  2 +-
 .../@node-red/nodes/locales/ja/parsers/70-HTML.html    |  2 +-
 .../@node-red/nodes/locales/ja/parsers/70-JSON.html    |  2 +-
 .../@node-red/nodes/locales/ja/parsers/70-XML.html     |  2 +-
 .../@node-red/nodes/locales/ja/parsers/70-YAML.html    |  2 +-
 .../@node-red/nodes/locales/ja/sequence/17-split.html  |  4 ++--
 .../@node-red/nodes/locales/ja/sequence/18-sort.html   |  2 +-
 .../@node-red/nodes/locales/ja/sequence/19-batch.html  |  2 +-
 .../@node-red/nodes/locales/ja/storage/10-file.html    |  4 ++--
 .../@node-red/nodes/locales/ja/storage/23-watch.html   |  2 +-
 .../@node-red/nodes/locales/ko/common/20-inject.html   |  2 +-
 .../@node-red/nodes/locales/ko/common/21-debug.html    |  2 +-
 .../@node-red/nodes/locales/ko/common/25-catch.html    |  2 +-
 .../@node-red/nodes/locales/ko/common/25-status.html   |  2 +-
 .../@node-red/nodes/locales/ko/common/60-link.html     |  2 +-
 .../@node-red/nodes/locales/ko/common/90-comment.html  |  2 +-
 .../@node-red/nodes/locales/ko/common/98-unknown.html  |  2 +-
 .../nodes/locales/ko/function/10-function.html         |  2 +-
 .../@node-red/nodes/locales/ko/function/10-switch.html |  2 +-
 .../@node-red/nodes/locales/ko/function/15-change.html |  2 +-
 .../@node-red/nodes/locales/ko/function/16-range.html  |  2 +-
 .../nodes/locales/ko/function/80-template.html         |  2 +-
 .../@node-red/nodes/locales/ko/function/89-delay.html  |  2 +-
 .../nodes/locales/ko/function/89-trigger.html          |  2 +-
 .../@node-red/nodes/locales/ko/function/90-exec.html   |  2 +-
 .../@node-red/nodes/locales/ko/network/05-tls.html     |  2 +-
 .../nodes/locales/ko/network/06-httpproxy.html         |  2 +-
 .../@node-red/nodes/locales/ko/network/10-mqtt.html    |  6 +++---
 .../@node-red/nodes/locales/ko/network/21-httpin.html  |  4 ++--
 .../nodes/locales/ko/network/21-httprequest.html       |  2 +-
 .../nodes/locales/ko/network/22-websocket.html         |  8 ++++----
 .../@node-red/nodes/locales/ko/network/31-tcpin.html   |  6 +++---
 .../@node-red/nodes/locales/ko/network/32-udp.html     |  4 ++--
 .../@node-red/nodes/locales/ko/parsers/70-CSV.html     |  2 +-
 .../@node-red/nodes/locales/ko/parsers/70-HTML.html    |  2 +-
 .../@node-red/nodes/locales/ko/parsers/70-JSON.html    |  2 +-
 .../@node-red/nodes/locales/ko/parsers/70-XML.html     |  2 +-
 .../@node-red/nodes/locales/ko/parsers/70-YAML.html    |  2 +-
 .../@node-red/nodes/locales/ko/sequence/17-split.html  |  4 ++--
 .../@node-red/nodes/locales/ko/sequence/18-sort.html   |  2 +-
 .../@node-red/nodes/locales/ko/sequence/19-batch.html  |  2 +-
 .../@node-red/nodes/locales/ko/storage/10-file.html    |  4 ++--
 .../@node-red/nodes/locales/ko/storage/23-watch.html   |  2 +-
 168 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index 87ec3f86b..77ced7d66 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="inject">
+<script type="text/html" data-template-name="inject">
     <div class="form-row">
         <label for="node-input-payload"><i class="fa fa-envelope"></i> <span data-i18n="common.label.payload"></span></label>
         <input type="text" id="node-input-payload" style="width:70%">
diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
index ebfb8532b..771ffdcda 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="debug">
+<script type="text/html" data-template-name="debug">
     <div class="form-row">
         <label for="node-input-typed-complete"><i class="fa fa-list"></i> <span data-i18n="debug.output"></span></label>
         <input id="node-input-typed-complete" type="text" style="width: 70%">
diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.html b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
index c801ca706..f1898d4da 100644
--- a/packages/node_modules/@node-red/nodes/core/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
@@ -1,4 +1,4 @@
-<script type="text/x-red" data-template-name="complete">
+<script type="text/html" data-template-name="complete">
     <div class="form-row node-input-target-row">
         <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
     </div>
diff --git a/packages/node_modules/@node-red/nodes/core/common/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
index 7cc170b89..a16bce803 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="catch">
+<script type="text/html" data-template-name="catch">
     <div class="form-row">
         <label style="width: auto" for="node-input-scope" data-i18n="catch.label.source"></label>
         <select id="node-input-scope-select">
diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html
index 283d505a7..b14188d62 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="status">
+<script type="text/html" data-template-name="status">
     <div class="form-row">
         <label style="width: auto" for="node-input-scope" data-i18n="status.label.source"></label>
         <select id="node-input-scope-select">
diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html
index 9c70b4eda..7f0656e58 100644
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html
@@ -1,12 +1,12 @@
 
-<script type="text/x-red" data-template-name="link in">
+<script type="text/html" data-template-name="link in">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
     <div class="form-row node-input-link-row"></div>
 </script>
-<script type="text/x-red" data-template-name="link out">
+<script type="text/html" data-template-name="link out">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/common/90-comment.html b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
index 76c4547c0..cca7cd51d 100644
--- a/packages/node_modules/@node-red/nodes/core/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/common/90-comment.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="comment">
+<script type="text/html" data-template-name="comment">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/common/98-unknown.html b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
index 1bb681f61..52071c30f 100644
--- a/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/core/common/98-unknown.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="unknown">
+<script type="text/html" data-template-name="unknown">
     <div class="form-tips"><span data-i18n="[html]unknown.tip"></span></div>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index 9202d96ba..c602995e5 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="function">
+<script type="text/html" data-template-name="function">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"></div>
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 9f072ad8a..5e6c237c9 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="switch">
+<script type="text/html" data-template-name="switch">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.html b/packages/node_modules/@node-red/nodes/core/function/15-change.html
index 5df7f9a6c..02d084775 100644
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="change">
+<script type="text/html" data-template-name="change">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/function/16-range.html b/packages/node_modules/@node-red/nodes/core/function/16-range.html
index 77d123d56..f108a99ce 100644
--- a/packages/node_modules/@node-red/nodes/core/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/core/function/16-range.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="range">
+<script type="text/html" data-template-name="range">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:calc(70% - 1px)"/>
diff --git a/packages/node_modules/@node-red/nodes/core/function/80-template.html b/packages/node_modules/@node-red/nodes/core/function/80-template.html
index e781b9572..98d4a0d37 100644
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="template">
+<script type="text/html" data-template-name="template">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name"></div>
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.html b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
index 76271c853..f157c6414 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="delay">
+<script type="text/html" data-template-name="delay">
     <div class="form-row">
         <label for="node-input-delay-action"><i class="fa fa-tasks"></i> <span data-i18n="delay.action"></span></label>
         <select id="node-input-delay-action" style="width:270px !important">
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
index 28bf0cdeb..b029fa668 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="trigger">
+<script type="text/html" data-template-name="trigger">
     <div class="form-row">
         <label data-i18n="trigger.send" for="node-input-op1"></label>
         <input type="hidden" id="node-input-op1type">
diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
index c6102d397..4a4e8942c 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="exec">
+<script type="text/html" data-template-name="exec">
     <div class="form-row">
         <label for="node-input-command"><i class="fa fa-file"></i> <span data-i18n="exec.label.command"></span></label>
         <input type="text" id="node-input-command" data-i18n="[placeholder]exec.label.command">
diff --git a/packages/node_modules/@node-red/nodes/core/network/05-tls.html b/packages/node_modules/@node-red/nodes/core/network/05-tls.html
index 281324211..81d1453f9 100644
--- a/packages/node_modules/@node-red/nodes/core/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/core/network/05-tls.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="tls-config">
+<script type="text/html" data-template-name="tls-config">
     <div class="form-row" class="hide" id="node-config-row-uselocalfiles">
         <input type="checkbox" id="node-config-input-uselocalfiles" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-config-input-uselocalfiles" style="width: 70%;"><span data-i18n="tls.label.use-local-files"></label>
diff --git a/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
index 37129e35f..85939a1ef 100644
--- a/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="http proxy">
+<script type="text/html" data-template-name="http proxy">
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-config-input-name">
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index cdafab9ce..b8aafd0d3 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -11,7 +11,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="mqtt in">
+<script type="text/html" data-template-name="mqtt in">
     <div class="form-row">
         <label for="node-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
         <input type="text" id="node-input-broker">
@@ -75,7 +75,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="mqtt out">
+<script type="text/html" data-template-name="mqtt out">
     <div class="form-row">
         <label for="node-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
         <input type="text" id="node-input-broker">
@@ -129,7 +129,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="mqtt-broker">
+<script type="text/html" data-template-name="mqtt-broker">
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-config-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httpin.html b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
index d3ab7fe6b..109177ec8 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="http in">
+<script type="text/html" data-template-name="http in">
     <div class="form-row">
         <label for="node-input-method"><i class="fa fa-tasks"></i> <span data-i18n="httpin.label.method"></span></label>
         <select type="text" id="node-input-method" style="width:70%;">
@@ -45,7 +45,7 @@
     <div id="node-input-tip" class="form-tips"><span data-i18n="httpin.tip.in"></span><code><span id="node-input-path"></span></code>.</div>
 </script>
 
-<script type="text/x-red" data-template-name="http response">
+<script type="text/html" data-template-name="http response">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index cb97c68a5..91555fb5c 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="http request">
+<script type="text/html" data-template-name="http request">
     <div class="form-row">
         <label for="node-input-method"><i class="fa fa-tasks"></i> <span data-i18n="httpin.label.method"></span></label>
         <select type="text" id="node-input-method" style="width:70%;">
diff --git a/packages/node_modules/@node-red/nodes/core/network/22-websocket.html b/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
index 4e62cb95e..e3d75e11f 100644
--- a/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 <!-- WebSocket Input Node -->
-<script type="text/x-red" data-template-name="websocket in">
+<script type="text/html" data-template-name="websocket in">
     <div class="form-row">
         <label for="node-input-mode"><i class="fa fa-dot-circle-o"></i> <span data-i18n="websocket.label.type"></span></label>
         <select id="node-input-mode">
@@ -198,7 +198,7 @@
 </script>
 
 <!-- WebSocket out Node -->
-<script type="text/x-red" data-template-name="websocket out">
+<script type="text/html" data-template-name="websocket out">
     <div class="form-row">
         <label for="node-input-mode"><i class="fa fa-dot-circle-o"></i> <span data-i18n="websocket.label.type"></span></label>
         <select id="node-input-mode">
@@ -221,7 +221,7 @@
 </script>
 
 <!-- WebSocket Server configuration node -->
-<script type="text/x-red" data-template-name="websocket-listener">
+<script type="text/html" data-template-name="websocket-listener">
     <div class="form-row">
         <label for="node-config-input-path"><i class="fa fa-bookmark"></i> <span data-i18n="websocket.label.path"></span></label>
         <input id="node-config-input-path" type="text" placeholder="/ws/example">
@@ -240,7 +240,7 @@
 </script>
 
 <!-- WebSocket Client configuration node -->
-<script type="text/x-red" data-template-name="websocket-client">
+<script type="text/html" data-template-name="websocket-client">
     <div class="form-row">
         <label for="node-config-input-path"><i class="fa fa-bookmark"></i> <span data-i18n="websocket.label.url"></span></label>
         <input id="node-config-input-path" type="text" placeholder="ws://example.com/ws">
diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
index 6029d61ce..e2786b9da 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="tcp in">
+<script type="text/html" data-template-name="tcp in">
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-dot-circle-o"></i> <span data-i18n="tcpin.label.type"></span></label>
         <select id="node-input-server" style="width:120px; margin-right:5px;">
@@ -108,7 +108,7 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="tcp out">
+<script type="text/html" data-template-name="tcp out">
     <div class="form-row">
         <label for="node-input-beserver"><i class="fa fa-dot-circle-o"></i> <span data-i18n="tcpin.label.type"></span></label>
         <select id="node-input-beserver" style="width:150px; margin-right:5px;">
@@ -188,7 +188,7 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="tcp request">
+<script type="text/html" data-template-name="tcp request">
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-globe"></i> <span data-i18n="tcpin.label.server"></span></label>
         <input type="text" id="node-input-server" placeholder="ip.address" style="width:45%">
diff --git a/packages/node_modules/@node-red/nodes/core/network/32-udp.html b/packages/node_modules/@node-red/nodes/core/network/32-udp.html
index ed867ae05..3a4e241af 100644
--- a/packages/node_modules/@node-red/nodes/core/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/core/network/32-udp.html
@@ -15,7 +15,7 @@
 -->
 
 <!--  The Input Node  -->
-<script type="text/x-red" data-template-name="udp in">
+<script type="text/html" data-template-name="udp in">
     <div class="form-row">
         <label for="node-input-port"><i class="fa fa-sign-in"></i> <span data-i18n="udp.label.listen"></span></label>
         <select id="node-input-multicast" style='width:70%'>
@@ -115,7 +115,7 @@
 
 
 <!--  The Output Node  -->
-<script type="text/x-red" data-template-name="udp out">
+<script type="text/html" data-template-name="udp out">
     <div class="form-row">
         <label for="node-input-port"><i class="fa fa-envelope"></i> <span data-i18n="udp.label.send"></span></label>
         <select id="node-input-multicast" style="width:40%">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
index d42e702ba..2e4ca0dd7 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="csv">
+<script type="text/html" data-template-name="csv">
     <div class="form-row">
         <label for="node-input-temp"><i class="fa fa-list"></i> <span data-i18n="csv.label.columns"></span></label>
         <input type="text" id="node-input-temp" data-i18n="[placeholder]csv.placeholder.columns">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
index 043d60e2b..dd16d395f 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="html">
+<script type="text/html" data-template-name="html">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
index 67323b228..6599cf0e0 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="json">
+<script type="text/html" data-template-name="json">
     <div class="form-row">
         <label for="node-input-action"><i class="fa fa-dot-circle-o"></i> <span data-i18n="json.label.action"></span></label>
         <select style="width:70%" id="node-input-action">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
index 52db99ff2..d48470e5c 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="xml">
+<script type="text/html" data-template-name="xml">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
index 6a9e4fd2e..5ce82e1ad 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="yaml">
+<script type="text/html" data-template-name="yaml">
     <div class="form-row">
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/17-split.html b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
index d730bb221..eccd33647 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="split">
+<script type="text/html" data-template-name="split">
     <div class="form-row"><span data-i18n="[html]split.intro"></span></div>
     <div class="form-row"><span data-i18n="[html]split.strBuff"></span></div>
     <div class="form-row">
@@ -113,7 +113,7 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="join">
+<script type="text/html" data-template-name="join">
     <div class="form-row">
         <label data-i18n="join.mode.mode"></label>
         <select id="node-input-mode" style="width:200px;">
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
index 8ca2e5be2..7b5847ffd 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="sort">
+<script type="text/html" data-template-name="sort">
 
     <div class="form-row">
         <label for="node-input-target"><i class="fa fa-dot-circle-o"></i> <span data-i18n="sort.target"></span></label>
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
index 5781ffbe5..8247486d9 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="batch">
+<script type="text/html" data-template-name="batch">
     <div class="form-row">
         <label for="node-input-mode"><span data-i18n="batch.mode.label"></span></label>
         <select type="text" id="node-input-mode" style="width: 300px;">
diff --git a/packages/node_modules/@node-red/nodes/core/storage/10-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
index d20ad75c5..5487920b8 100755
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="file">
+<script type="text/html" data-template-name="file">
     <div class="form-row node-input-filename">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
          <input id="node-input-filename" type="text">
@@ -34,7 +34,7 @@
     <div class="form-tips"><span data-i18n="file.tip"></span></div>
 </script>
 
-<script type="text/x-red" data-template-name="file in">
+<script type="text/html" data-template-name="file in">
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
          <input id="node-input-filename" type="text" data-i18n="[placeholder]file.label.filename">
diff --git a/packages/node_modules/@node-red/nodes/core/storage/23-watch.html b/packages/node_modules/@node-red/nodes/core/storage/23-watch.html
index 587eee756..eafbd46bc 100644
--- a/packages/node_modules/@node-red/nodes/core/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/23-watch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="watch">
+<script type="text/html" data-template-name="watch">
     <div class="form-row node-input-filename">
          <label for="node-input-files"><i class="fa fa-file"></i> <span data-i18n="watch.label.files"></span></label>
          <input id="node-input-files" type="text" tabindex="1" data-i18n="[placeholder]watch.placeholder.files">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
index 958698bcf..7c52028e7 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="inject">
+<script type="text/html" data-help-name="inject">
   <p> Injiziert eine Nachricht manuell oder in regelmäßigen Intervallen in einen Nachrichtenflow. 
     Bei den Nutzdaten kann es sich um eine Vielzahl von Typen handeln, einschließlich Zeichenfolgen, JavaScript-Objekte oder die aktuelle Zeit. </p>
     <h3> Ausgaben </h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
index 3152363e5..eb46bd7eb 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="debug">
+<script type="text/html" data-help-name="debug">
   <p> Zeigt die ausgewählten Nachrichteneigenschaften auf der Registerkarte "Debug" und 
     optional im Laufzeitprotokoll an. Standardmäßig wird  <code>msg.payload</code> angezeigt. </p>
   <h3> Details </h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
index 3f34bd407..1bbc03270 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="catch">
+<script type="text/html" data-help-name="catch">
     <p> Fängt Fehler von Nodes auf derselben Registerkarte ab. </p>
     <h3> Ausgaben </h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
index c0b7f23cb..8edcc4539 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="status">
+<script type="text/html" data-help-name="status">
     <p> Berichtet Statusnachrichten von anderen Node auf derselben Registerkarte. </p>
     <h3> Ausgaben </h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
index 3698b82c3..83e97ce4e 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="link in">
+<script type="text/html" data-help-name="link in">
    <p> Erstellt virtuelle Verbindungen zwischen Flows. </p>
    <h3> Details </h3>
    <p> Der Node kann mit jedem beliebigen  <code>Link-out</code> Node auf einer beliebigen Registerkarte verbunden werden.
@@ -25,7 +25,7 @@
    <p> <b> Hinweis:  </b> Links können nicht in einem Subflow erstellt oder aus einem Subflow heraus erstellt werden. </p>
 </script>
 
-<script type="text/x-red" data-help-name="link out">
+<script type="text/html" data-help-name="link out">
    <p> Erstellt virtuelle Verbindungen zwischen Flows. </p>
    <h3> Details </h3>
    <p> Der Node kann mit jedem beliebigen  <code>Link-out</code> Node auf einer beliebigen Registerkarte verbunden werden.
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
index 89368f50d..4ff1870e9 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="comment">
+<script type="text/html" data-help-name="comment">
     <p>Ein Node, der zur Kommentierung der Flows verwendet werden kann.</p>
     <h3>Details</h3>
     <p>Das Textfeld des Node akzeptiert die Markdown Syntax. Der eingegebene Text wird dann in diesem Informations Panel angezeigt.
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
index 30bfa8eea..5f1f7eb68 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="unknown">
+<script type="text/html" data-help-name="unknown">
     <p>Dieser Node ist von einem Typ, der in der aktuellen Node-RED Installation unbekannt ist.</p>
     <h3>Details</h3>
     <p><i>Wenn der Flow im aktuellen Zustand eingesetzt wird, bleibt die Konfiguration erhalten 
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
index 90e524cf7..7e7a6ab0c 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="function">
+<script type="text/html" data-help-name="function">
   <p> Ein JavaScript-Funktionsblock, der für die Nachrichten ausgeführt werden soll, die vom Node empfangen werden. </p>
   <p> Die Nachrichten werden als JavaScript-Objekt mit dem Namen  <code>msg</code> übergeben. </p>
   <p> Er erwartet eine Eigenschaft  <code> msg.payload </code> , die den Hauptteil der Nachricht enthält. </p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
index fcc2c6a65..956b8989d 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="switch">
+<script type="text/html" data-help-name="switch">
     <p>Weiterleitung von Nachrichten basierend auf den Werten ihrer Eigenschaften oder der Position der Sequenz.</p>
     <h3>Details</h3>
     <p>Wenn eine Nachricht ankommt, wertet der Node jede der definierten Regeln aus
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
index b78dd0f0d..1c6d7ee7f 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="change">
+<script type="text/html" data-help-name="change">
     <p>Setzen, Ändern, Löschen oder Verschieben von Eigenschaften einer Nachricht, eines Flow-Kontextes oder eines globalen Kontextes.</p>
     <p>Der Node kann mehrere Regeln angeben, die in der Reihenfolge ihrer Definition angewendet werden.</p>
     <h3>Details</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
index 73935d1b0..23fea7795 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="range">
+<script type="text/html" data-help-name="range">
     <p>Ordnet einen numerischen Wert einem anderen Bereich zu..</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
index e3d58d2eb..62da3f9f3 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="template">
+<script type="text/html" data-help-name="template">
   <p> Legt eine Eigenschaft fest, die auf der bereitgestellten Vorlage basiert. </p>
   <h3> Eingaben </h3>
   <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
index 499d6da39..f399c740a 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="delay">
+<script type="text/html" data-help-name="delay">
     <p> Verzögert jede Nachricht, die den Node durchläuft oder begrenzt die Geschwindigkeit, mit der sie übergeben werden können. </p>
     <h3> Eingaben </h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
index 0f4953c44..844670a89 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="trigger">
+<script type="text/html" data-help-name="trigger">
     <p> Wenn der Trigger ausgelöst wird, kann eine Nachricht gesendet werden und dann optional eine weitere Nachricht , 
         sofern der Trigger nicht verlängert oder zurückgesetzt wird. </p>
 
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
index 95413097f..e67a23e03 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="exec">
+<script type="text/html" data-help-name="exec">
     <p> Führt einen Systembefehl aus und gibt seine Ausgabe zurück. </p>
     <p> Der Node kann so konfiguriert werden, dass er entweder wartet, bis der Befehl abgeschlossen ist,
         oder die Ausgabe so sendet wie der Befehl sie generiert. </p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
index 5f61660fb..fac20ebe0 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
@@ -14,6 +14,6 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tls-config">
+<script type="text/html" data-help-name="tls-config">
     <p>Konfigurationsoptionen für TLS Verbindungen.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
index 228da487b..1ece7efe0 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http proxy">
+<script type="text/html" data-help-name="http proxy">
     <p>Konfigurationsoptionen für den HTTP Proxy.</p>
 
     <h3>Details</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
index 9572a7456..20162f421 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
@@ -11,7 +11,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="mqtt in">
+<script type="text/html" data-help-name="mqtt in">
    <p> Stellt eine Verbindung zu einem MQTT-Broker her und subskribiert Nachrichten zu dem angegebenen Topic. </p>
    <h3> Ausgaben </h3>
    <dl class="message-properties">
@@ -31,7 +31,7 @@
    <p> Mehrere MQTT-Nodes (in oder out) können bei Bedarf dieselbe Brokerverbindung nutzen. </p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt out">
+<script type="text/html" data-help-name="mqtt out">
     <p>Stellt eine Verbindung zu einem MQTT-Broker her und publiziert Nachrichten.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
@@ -61,7 +61,7 @@
     <p>Mehrere MQTT-Nodes (in oder out) können bei Bedarf dieselbe Brokerverbindung nutzen.</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt-broker">
+<script type="text/html" data-help-name="mqtt-broker">
    <p> Konfiguration für eine Verbindung zu einem MQTT-Broker. </p>
    <p> Diese Konfiguration erstellt eine Verbindung zu einem Broker, die anschließend von den 
       Nodes <code>MQTT In</code> und <code>MQTT Out</code> verwendet werden. </p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
index e38e9f16b..bf45dcff9 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http in">
+<script type="text/html" data-help-name="http in">
     <p>Erstellt einen HTTP Endpunkt zur Erzeugung von Web Services.</p>
     <h3>Outputs</h3>
     <dl class="message-properties">
@@ -53,7 +53,7 @@
         muss einen code>HTTP Response</code> Node enthalten, um die Anforderung abzuschließen. </p>
 </script>
 
-<script type="text/x-red" data-help-name="http response">
+<script type="text/html" data-help-name="http response">
     <p>Sendet Antworten auf Anforderungen, die von einem code>HTTP In</code> Node empfangen wurden. </p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
index 223854994..5e0e4f259 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http request">
+<script type="text/html" data-help-name="http request">
     <p>Sendet HTTP-Anforderungen und gibt die Antwort zurück.</p>
 
     <h3>Eingaben</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
index 5aa5cf884..d69229820 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
@@ -14,14 +14,14 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="websocket in">
+<script type="text/html" data-help-name="websocket in">
     <p>WebSocket Eingangs-Node.</p>
     <p>Standardmäßig befinden sich die vom WebSocket empfangenen Daten in <code>msg.payload</code>.
         Der Socket kann konfiguriert werden, um einen korrekt gebildeten JSON-String zu erwarten,
         in diesem Fall wird er das JSON analysieren und das resultierende Objekt als gesamte Nachricht senden.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket out">
+<script type="text/html" data-help-name="websocket out">
     <p>WebSocket Ausgabe-Node.</p>
     <p>Standardmäßig wird <code>msg.payload</code> über den WebSocket gesendet. 
        Der Socket kann so konfiguriert werden, dass er das gesamte <code>msg</code> Objekt als JSON-String kodiert und über den WebSocket sendet.</p>
@@ -33,12 +33,12 @@
         muss die Eigenschaft <code>msg._session</code> innerhalb des Flow gelöscht werden.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-listener">
+<script type="text/html" data-help-name="websocket-listener">
    <p>Dieser Konfigurations-Node erstellt einen WebSocket Server-Endpunkt unter Verwendung des angegebenen Pfades.</p>
 </script>
 
 <!-- WebSocket Client configuration node -->
-<script type="text/x-red" data-template-name="websocket-client">
+<script type="text/html" data-template-name="websocket-client">
     <div class="form-row">
         <label for="node-config-input-path"><i class="fa fa-bookmark"></i> <span data-i18n="websocket.label.url"></span></label>
         <input id="node-config-input-path" type="text" placeholder="ws://example.com/ws">
@@ -61,6 +61,6 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-client">
+<script type="text/html" data-help-name="websocket-client">
    <p>Dieser Konfigurations-Node verbindet einen WebSocket-Client mit der angegebenen URL.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
index 2b22418dc..51ec15c6f 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
@@ -14,13 +14,13 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tcp in">
+<script type="text/html" data-help-name="tcp in">
     <p>Bietet eine Auswahl an TCP-Eingängen. Kann sich entweder mit einem entfernten TCP-Port verbinden oder eingehende Verbindungen akzeptieren.</p>
     <p><b>Note: </b>Auf einigen Systemen benötigen Sie möglicherweise Root- oder Administratorzugriff, um 
         Ports unter 1024 und/oder Broadcast nutzen zu können.</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp out">
+<script type="text/html" data-help-name="tcp out">
     <p>Bietet eine Auswahl an TCP-Ausgängen. Kann sich entweder mit einem entfernten TCP-Port verbinden,
        eingehende Verbindungen akzeptieren oder auf Nachrichten antworten, die von einem TCP-In-Node empfangen werden.</p>
        <p>Nur der Inhalt von <code>msg.payload</code> wird gesendet.</p>
@@ -32,7 +32,7 @@
         Ports unter 1024 und/oder Broadcast nutzen zu können.</p>
 </script>
  
-<script type="text/x-red" data-help-name="tcp request">
+<script type="text/html" data-help-name="tcp request">
     <p>Ein einfacher TCP-Anforderungs-Node - sendet die <code>msg.payload</code> an einen Server-TCP-Port und erwartet eine Antwort.</p>
     <p>Verbindet sich, sendet die "Anforderung" und liest die "Antwort". Der Node wartet entweder auf eine vorgegebene Anzahl von
         Zeichen in einen festen Buffer, auf ein bestimmtes Zeichen oder einen festen Timeout ab der ersten Antwort,
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
index 2abc6cb75..f140c2f8d 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="udp in">
+<script type="text/html" data-help-name="udp in">
     <p>Ein UDP-Eingangs-Node, der eine <code>msg.payload</code> erzeugt, die einen
         Buffer, Strings oder base64-kodierter String enthält. Multicast wird unterstützt.</p>
     <p>Über die Eigenschaften <code>msg.ip</code> und <code>msg.port</code> kann auf die Werte der 
@@ -23,7 +23,7 @@
         Ports unter 1024 und/oder Broadcast nutzen zu können.</p>
 </script>
 
-<script type="text/x-red" data-help-name="udp out">
+<script type="text/html" data-help-name="udp out">
     <p>Dieser Node sendet <code>msg.payload</code> an den angegebenen UDP-Host und Port. Multicast wird unterstützt.</p>
     <p>Sie können <code>msg.ip</code> und <code>msg.port</code> verwenden, um die Zielwerte festzulegen, 
         aber die statisch im Node konfigurierten Werte haben Vorrang.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html
index 1dd5b71ba..8e60d33ad 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="csv">
+<script type="text/html" data-help-name="csv">
     <p>Konvertiert zwischen einem CSV-formatierten String und ihrer JavaScript-Objektdarstellung in beide Richtungen.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html
index fb6b446d7..246e68141 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="html">
+<script type="text/html" data-help-name="html">
     <p>Extrahiert unter Verwendung eines CSS-Selektors Elemente aus einem HTML-Dokument, das sich in <code>msg.payload</code> befindet.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html
index 1c2311a16..b06ceed31 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="json">
+<script type="text/html" data-help-name="json">
     <p>Konvertiert zwischen einem JSON-String und seiner JavaScript-Objektdarstellung in beide Richtungen.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html
index 2b9d172aa..4740ea204 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="xml">
+<script type="text/html" data-help-name="xml">
     <p>Konvertiert zwischen einem XML-String und seiner JavaScript-Objektdarstellung - in beiden Richtungen.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html
index 3d42494be..c8f14a2ba 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="yaml">
+<script type="text/html" data-help-name="yaml">
     <p>Konvertiert zwischen einer YAML-formatierten String und ihrer JavaScript-Objektdarstellung in beide Richtungen.</p>
     <h3>Eingaben</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
index eaa3f7d8c..3a2481c0b 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="split">
+<script type="text/html" data-help-name="split">
     <p>Teilt eine Nachricht in eine Folge von Nachrichten auf.</p>
 
     <h3>Eingaben</h3>
@@ -62,7 +62,7 @@
         Das bedeutet, dass er nicht mit dem <b>join</b> Node im Automatikmodus verwendet werden kann.</p>
 </script>
 
-<script type="text/x-red" data-help-name="join">
+<script type="text/html" data-help-name="join">
     <p>Verbindet Sequenzen von Nachrichten zu einer einzigen Nachricht.</p>
     <p>Es sind drei Modi verfügbar:</p>
     <dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
index d2351fbea..5659201c0 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="sort">
+<script type="text/html" data-help-name="sort">
     <p>Eine Funktion, die die Nachrichteneigenschaft oder eine Folge von Nachrichten sortiert.</p>
     <p>Wenn der Node konfiguriert ist, um die Nachrichteneigenschaft zu sortieren,
         sortiert er Array-Daten, auf die von der angegebenen Nachrichteneigenschaft verwiesen wird.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
index e16815b66..68df80963 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="batch">
+<script type="text/html" data-help-name="batch">
     <p>Erstellt Sequenzen von Nachrichten nach verschiedenen Regeln.</p>
     <h3>Details</h3>
     <p>Es gibt drei Modi für die Erstellung von Nachrichtensequenzen:</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
index 964b41cef..6c44682e6 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="file">
+<script type="text/html" data-help-name="file">
     <p>Schreibt <code>msg.payload</code> in eine Datei, wobei entweder der vorhandene Inhalt hinzugefügt oder ersetzt wird.
         Alternativ kann die Datei auch gelöscht werden.</p>
     <h3>Eingaben</h3>
@@ -34,7 +34,7 @@
     <p>Alternativ kann dieser Node konfiguriert werden, um die Datei zu löschen.</p>
 </script>
 
-<script type="text/x-red" data-help-name="file in">
+<script type="text/html" data-help-name="file in">
     <p>Reads the contents of a file as either a string or binary buffer.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
index 5f527561d..3377bf2fa 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="watch">
+<script type="text/html" data-help-name="watch">
     <p>Überwacht ein Verzeichnis oder eine Datei auf Änderungen.</p>
     <p>Es kann eine kommagetrennte Liste von Verzeichnissen und/oder Dateien eingeben werden. 
       Es müssen Anführungszeichen "...." um alle Einträge gesetzt werden, die Leerzeichen enthalten.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
index 6e37fd4f8..6f72a5c33 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="inject">
+<script type="text/html" data-help-name="inject">
 <p>Injects a message into a flow either manually or at regular intervals. The message
 payload can be a variety of types, including strings, JavaScript objects or the current time.</p>
 <h3>Outputs</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
index fe9017ff9..9812491d6 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/21-debug.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="debug">
+<script type="text/html" data-help-name="debug">
     <p>Displays selected message properties in the debug sidebar tab and optionally the runtime log. By default it displays <code>msg.payload</code>, but can be configured to display any property, the full message or the result of a JSONata expression.</p>
     <h3>Details</h3>
     <p>The debug sidebar provides a structured view of the messages it is sent, making it easier to understand their structure.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html
index d73f8e13d..8d7c9ea7f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/24-complete.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="complete">
+<script type="text/html" data-help-name="complete">
     <p>Trigger a flow when another node completes its handling of a message.</p>
     <h3>Details</h3>
     <p>If a node tells the runtime when it has finished handling a message,
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
index 49897fe39..9160b6e95 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-catch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="catch">
+<script type="text/html" data-help-name="catch">
     <p>Catch errors thrown by nodes on the same tab.</p>
     <h3>Outputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
index 96514412f..4f37c6771 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/25-status.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="status">
+<script type="text/html" data-help-name="status">
     <p>Report status messages from other nodes on the same tab.</p>
     <h3>Outputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
index b0545a368..3d986ee9f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="link in">
+<script type="text/html" data-help-name="link in">
     <p>Create virtual wires between flows.</p>
     <h3>Details</h3>
     <p>The node can be connected to any <code>link out</code> node that exists on any tab.
@@ -25,7 +25,7 @@
     <p><b>Note: </b>Links cannot be created going into, or out of, a subflow.</p>
 </script>
 
-<script type="text/x-red" data-help-name="link out">
+<script type="text/html" data-help-name="link out">
     <p>Create virtual wires between flows.</p>
     <h3>Details</h3>
     <p>The node can be connected to any <code>link in</code> node that exists on any tab.
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
index 1667930f0..56735d51f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/90-comment.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="comment">
+<script type="text/html" data-help-name="comment">
     <p>A node you can use to add comments to your flows.</p>
     <h3>Details</h3>
     <p>The edit panel will accept Markdown syntax. The text will be rendered into
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
index 0e8f405c5..a072a67c3 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/98-unknown.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="unknown">
+<script type="text/html" data-help-name="unknown">
     <p>This node is a type unknown to your installation of Node-RED.</p>
     <h3>Details</h3>
     <p><i>If you deploy with the node in this state, its configuration will be preserved, but
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
index 7bc99cc1e..28bc76f3a 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="function">
+<script type="text/html" data-help-name="function">
     <p>A JavaScript function block to run against the messages being received by the node.</p>
     <p>The messages are passed in as a JavaScript object called <code>msg</code>.</p>
     <p>By convention it will have a <code>msg.payload</code> property containing
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
index fb9af2a77..b5b825c20 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="switch">
+<script type="text/html" data-help-name="switch">
     <p>Route messages based on their property values or sequence position.</p>
     <h3>Details</h3>
     <p>When a message arrives, the node will evaluate each of the defined rules
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
index cb8470804..3305e1f76 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/15-change.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="change">
+<script type="text/html" data-help-name="change">
     <p>Set, change, delete or move properties of a message, flow context or global context.</p>
     <p>The node can specify multiple rules that will be applied in the order they are defined.</p>
     <h3>Details</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
index 16ea0d784..b391f5c04 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="range">
+<script type="text/html" data-help-name="range">
     <p>Maps a numeric value to a different range.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
index 1e541c605..95fa14225 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="template">
+<script type="text/html" data-help-name="template">
     <p>Sets a property based on the provided template.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
index d6977a34a..ca326e434 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="delay">
+<script type="text/html" data-help-name="delay">
     <p>Delays each message passing through the node or limits the rate at which they can pass.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
index 836cabc6f..7723cb9b8 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="trigger">
+<script type="text/html" data-help-name="trigger">
     <p>When triggered, can send a message, and then optionally a second message, unless extended or reset.</p>
 
     <h3>Inputs</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
index 69447bc60..ff515e781 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="exec">
+<script type="text/html" data-help-name="exec">
     <p>Runs a system command and returns its output.</p>
     <p>The node can be configured to either wait until the command completes, or to
     send its output as the command generates it.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html
index 08c4bca0a..cef5437d8 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/05-tls.html
@@ -14,6 +14,6 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tls-config">
+<script type="text/html" data-help-name="tls-config">
     <p>Configuration options for TLS connections.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html
index b17012e72..12bb3684c 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/06-httpproxy.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http proxy">
+<script type="text/html" data-help-name="http proxy">
     <p>Configuration options for HTTP proxy.</p>
 
     <h3>Details</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
index 94c9c091a..1c6d1a081 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
@@ -11,7 +11,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="mqtt in">
+<script type="text/html" data-help-name="mqtt in">
 <p>Connects to a MQTT broker and subscribes to messages from the specified topic.</p>
     <h3>Outputs</h3>
     <dl class="message-properties">
@@ -31,7 +31,7 @@
     <p>Several MQTT nodes (in or out) can share the same broker connection if required.</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt out">
+<script type="text/html" data-help-name="mqtt out">
     <p>Connects to a MQTT broker and publishes messages.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
@@ -60,7 +60,7 @@
     <p>Several MQTT nodes (in or out) can share the same broker connection if required.</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt-broker">
+<script type="text/html" data-help-name="mqtt-broker">
     <p>Configuration for a connection to an MQTT broker.</p>
     <p>This configuration will create a single connection to the broker which can
        then be reused by <code>MQTT In</code> and <code>MQTT Out</code> nodes.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html
index 3d91f835b..0bdf7949c 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http in">
+<script type="text/html" data-help-name="http in">
     <p>Creates an HTTP end-point for creating web services.</p>
     <h3>Outputs</h3>
     <dl class="message-properties">
@@ -54,7 +54,7 @@
        must include an HTTP Response node to complete the request.</p>
 </script>
 
-<script type="text/x-red" data-help-name="http response">
+<script type="text/html" data-help-name="http response">
     <p>Sends responses back to requests received from an HTTP Input node.</p>
 
     <h3>Inputs</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
index 3daf92f49..96241827f 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http request">
+<script type="text/html" data-help-name="http request">
     <p>Sends HTTP requests and returns the response.</p>
 
     <h3>Inputs</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html
index 8e814c625..49c17d42a 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/22-websocket.html
@@ -14,14 +14,14 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="websocket in">
+<script type="text/html" data-help-name="websocket in">
     <p>WebSocket input node.</p>
     <p>By default, the data received from the WebSocket will be in <code>msg.payload</code>.
     The socket can be configured to expect a properly formed JSON string, in which
     case it will parse the JSON and send on the resulting object as the entire message.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket out">
+<script type="text/html" data-help-name="websocket out">
     <p>WebSocket out node.</p>
     <p>By default, <code>msg.payload</code> will be sent over the WebSocket. The socket
     can be configured to encode the entire <code>msg</code> object as a JSON string and send that
@@ -34,10 +34,10 @@
     should delete the <code>msg._session</code> property within the flow.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-listener">
+<script type="text/html" data-help-name="websocket-listener">
    <p>This configuration node creates a WebSocket Server endpoint using the specified path.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-client">
+<script type="text/html" data-help-name="websocket-client">
    <p>This configuration node connects a WebSocket client to the specified URL.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html
index e8cb29ffc..31bdc4907 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html
@@ -14,14 +14,14 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tcp in">
+<script type="text/html" data-help-name="tcp in">
     <p>Provides a choice of TCP inputs. Can either connect to a remote TCP port,
        or accept incoming connections.</p>
     <p><b>Note: </b>On some systems you may need root or administrator access
     to access ports below 1024.</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp out">
+<script type="text/html" data-help-name="tcp out">
     <p>Provides a choice of TCP outputs. Can either connect to a remote TCP port,
     accept incoming connections, or reply to messages received from a TCP In node.</p>
     <p>Only the <code>msg.payload</code> is sent.</p>
@@ -34,7 +34,7 @@
     to access ports below 1024.</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp request">
+<script type="text/html" data-help-name="tcp request">
     <p>A simple TCP request node - sends the <code>msg.payload</code> to a server tcp port and expects a response.</p>
     <p>Connects, sends the "request", and reads the "response". It can either count a number of
     returned characters into a fixed buffer, match a specified character before returning,
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html
index 09e6aef34..666889be6 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/32-udp.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="udp in">
+<script type="text/html" data-help-name="udp in">
     <p>A UDP input node, that produces a <code>msg.payload</code> containing a
     Buffer, string, or base64 encoded string. Supports multicast.</p>
     <p>It also provides <code>msg.ip</code> and <code>msg.port</code> set to the
@@ -23,7 +23,7 @@
     ports below 1024 and/or broadcast.</p>
 </script>
 
-<script type="text/x-red" data-help-name="udp out">
+<script type="text/html" data-help-name="udp out">
     <p>This node sends <code>msg.payload</code> to the designated UDP host and port. Supports multicast.</p>
     <p>You may also use <code>msg.ip</code> and <code>msg.port</code> to set the destination values, but the statically configured values have precedence.</p>
     <p>If you select broadcast either set the address to the local broadcast ip address, or maybe try 255.255.255.255, which is the global broadcast address.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
index 8bae66ece..5b0731cb1 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="csv">
+<script type="text/html" data-help-name="csv">
     <p>Converts between a CSV formatted string and its JavaScript object representation, in either direction.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-HTML.html
index b9231663d..7b081976c 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-HTML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="html">
+<script type="text/html" data-help-name="html">
     <p>Extracts elements from an html document held in <code>msg.payload</code> using a CSS selector.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-JSON.html
index 972b4be33..e5c2e916c 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-JSON.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="json">
+<script type="text/html" data-help-name="json">
     <p>Converts between a JSON string and its JavaScript object representation, in either direction.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-XML.html
index 089d4a04e..07513907d 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-XML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="xml">
+<script type="text/html" data-help-name="xml">
     <p>Converts between an XML string and its JavaScript object representation, in either direction.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-YAML.html
index 1eada073a..8c758cee8 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-YAML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="yaml">
+<script type="text/html" data-help-name="yaml">
     <p>Converts between a YAML formatted string and its JavaScript object representation, in either direction.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
index 5d460f8ee..118df70af 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="split">
+<script type="text/html" data-help-name="split">
     <p>Splits a message into a sequence of messages.</p>
 
     <h3>Inputs</h3>
@@ -63,7 +63,7 @@
     means it cannot be used with the <b>join</b> node in its automatic mode</p>
 </script>
 
-<script type="text/x-red" data-help-name="join">
+<script type="text/html" data-help-name="join">
     <p>Joins sequences of messages into a single message.</p>
     <p>There are three modes available:</p>
     <dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
index 84484c2cb..67a4060cd 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/18-sort.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="sort">
+<script type="text/html" data-help-name="sort">
     <p>A function that sorts message property or a sequence of messages.</p>
     <p>When configured to sort message property, the node sorts array data pointed to by specified message property.</p>
     <p>When configured to sort a sequence of messages, it will reorder the messages.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
index 3a7d24fc6..0564957fc 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="batch">
+<script type="text/html" data-help-name="batch">
     <p>Creates sequences of messages based on various rules.</p>
     <h3>Details</h3>
     <p>There are three modes for creating message sequences:</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
index 26701d706..5933f9c2d 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/storage/10-file.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="file">
+<script type="text/html" data-help-name="file">
     <p>Writes <code>msg.payload</code> to a file, either adding to the end or replacing the existing content.
        Alternatively, it can delete the file.</p>
     <h3>Inputs</h3>
@@ -36,7 +36,7 @@
     <p>Alternatively, this node can be configured to delete the file.</p>
 </script>
 
-<script type="text/x-red" data-help-name="file in">
+<script type="text/html" data-help-name="file in">
     <p>Reads the contents of a file as either a string or binary buffer.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
index 4a28cfcab..bc6e4ad31 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/storage/23-watch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="watch">
+<script type="text/html" data-help-name="watch">
     <p>Watches a directory or file for changes.</p>
     <p>You can enter a list of comma separated directories and/or files. You will
     need to put quotes "..." around any that have spaces in.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
index 429471173..f6706844e 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="inject">
+<script type="text/html" data-help-name="inject">
 <p>手動もしくは一定間隔でメッセージをフローに注入します。メッセージのペイロードには、文字列、JavaScriptオブジェクト、現在の時刻など、さまざまな値を指定できます。</p>
 <h3>出力</h3>
 <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
index 13c097644..3a02ec5fc 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/21-debug.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="debug">
+<script type="text/html" data-help-name="debug">
     <p>サイドバーの「デバッグ」タブに、選択したメッセージプロパティの値を表示します。設定により、ランタイムログへの出力も可能です。デフォルトの表示対象は<code>msg.payload</code>ですが、設定により、指定したプロパティ、メッセージ全体、もしくは、JSONata式の評価結果を出力できます。</p>
     <h3>詳細</h3>
     <p>「デバッグ」サイドバーは受け取ったメッセージの階層構造を表示する機能を備えます。この機能によりメッセージの構造を容易に理解できます。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
index 2cb3004d0..2bfa1f112 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/24-complete.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="complete">
+<script type="text/html" data-help-name="complete">
     <p>他のノードにおけるメッセージ処理の完了を受けてフローを開始します。</p>
     <h3>詳細</h3>
     <p>ノードからランタイムに対してメッセージ処理の完了が通知されると、本ノードによって次のフローを開始できます。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
index 65777ddbe..3164f2869 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/25-catch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="catch">
+<script type="text/html" data-help-name="catch">
     <p>同じタブ内のノードが送出したエラーをキャッチします。</p>
     <h3>出力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
index aa8c68d69..bbf970a13 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/25-status.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="status">
+<script type="text/html" data-help-name="status">
     <p>同じタブ内のノードのステータスメッセージを取得します。</p>
     <h3>出力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
index 72f9f7c94..3ac3a4491 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="link in">
+<script type="text/html" data-help-name="link in">
     <p>フロー間に仮想的なリンクを作成します。</p>
     <h3>詳細</h3>
     <p>任意のタブ上に存在する<code>link out</code>ノードに接続できます。この接続はあたかも直接リンクしたかのように動作します。</p>
@@ -22,7 +22,7 @@
     <p><b>注: </b>サブフローの外から中、もしくは、中から外へのリンクを作成することはできません。</p>
 </script>
 
-<script type="text/x-red" data-help-name="link out">
+<script type="text/html" data-help-name="link out">
     <p>フロー間に仮想的なリンクを作成します。</p>
     <h3>詳細</h3>
     <p>任意のタブ上に存在する<code>link in</code>ノードに接続できます。この接続はあたかも直接リンクしたかのように動作します。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
index a2d5dbb28..4c9144368 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/90-comment.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="comment">
+<script type="text/html" data-help-name="comment">
     <p>フローにコメントを記述するために利用します。</p>
     <h3>詳細</h3>
     <p>編集パネルはMarkdown形式を記入可能です。入力したテキストは、「情報」サイドパネルに表示されます。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
index 312fbc774..3638a0047 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/98-unknown.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="unknown">
+<script type="text/html" data-help-name="unknown">
     <p>インストールされたNode-REDが認識できない種別のノードです。</p>
     <h3>詳細</h3>
     <p><i>この種別のノードをデプロイした場合、設定は保持されますが、足りないノードをインストールするまでフローを開始することはできません。</i></p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
index 12eb75ef3..2744cf53a 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="function">
+<script type="text/html" data-help-name="function">
     <p>受信メッセージに対して処理を行うJavaScriptコード(関数の本体)を定義します。</p>
     <p>入力メッセージは<code>msg</code>という名称のJavaScriptオブジェクトで受け渡されます。</p>
     <p><code>msg</code>オブジェクトは<code>msg.payload</code>プロパティにメッセージ本体を保持するのが慣例です。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
index 91ed9a717..af0ccde6d 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="switch">
+<script type="text/html" data-help-name="switch">
     <p>プロパティの値によってメッセージの振り分けを行います。</p>
     <h3>詳細</h3>
     <p>受信したメッセージに対し、指定されたルールを順に評価し、マッチしたルールに対応する出力ポートにメッセージを送出します。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
index bdcf7923d..b4a555702 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/15-change.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="change">
+<script type="text/html" data-help-name="change">
     <p>メッセージ、フローコンテキスト、グローバルコンテキストのプロパティを変更、削除、移動します。</p>
     <p>ルールを複数指定した場合、定義した順に適用します。</p>
     <h3>詳細</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
index b1294f658..63bfa62f7 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/16-range.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="range">
+<script type="text/html" data-help-name="range">
     <p>数値を異なる範囲の値に変換します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
index 802c268f6..84257bc9a 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="template">
+<script type="text/html" data-help-name="template">
     <p>テンプレートに基づいてプロパティを設定します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
index ed5046f03..d1d66801b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="delay">
+<script type="text/html" data-help-name="delay">
     <p>ノードを通過するメッセージを遅延もしくは流量を制限します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
index 51ab465f9..307950a4d 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="trigger">
+<script type="text/html" data-help-name="trigger">
     <p>メッセージを受信すると、別のメッセージの送信を行います。延長もしくは初期化が指定されていない場合には、2つ目のメッセージを送信することもできます。</p>
 
     <h3>入力</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
index 7eb75b10a..d034f71e1 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/90-exec.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="exec">
+<script type="text/html" data-help-name="exec">
     <p>システムのコマンドを実行し出力を返します。</p>
     <p>コマンドの完了まで待つか、コマンドが出力を行う毎にメッセージを出力するかを指定できます。</p>
     <p>実行対象のコマンドは、ノードの設定もしくは受信メッセージで指定します。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html
index 89b86c98a..3d88df172 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/05-tls.html
@@ -14,6 +14,6 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tls-config">
+<script type="text/html" data-help-name="tls-config">
     <p>TLS接続のためのオプション設定</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html
index 03beddb8d..24b15aa29 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/06-httpproxy.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http proxy">
+<script type="text/html" data-help-name="http proxy">
     <p>プロキシのためのオプション設定</p>
 
     <h3>詳細</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
index 2beb49493..ecae5165b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="mqtt in">
+<script type="text/html" data-help-name="mqtt in">
 <p>MQTTブローカに接続し、指定したトピックのメッセージをサブスクライブ(購読)します。</p>
     <h3>出力</h3>
     <dl class="message-properties">
@@ -33,7 +33,7 @@
     <p>MQTT(inおよびout)ノードはブローカへの接続設定を必要に応じて共有できます。</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt out">
+<script type="text/html" data-help-name="mqtt out">
     <p>MQTTブローカに接続し、メッセージをパブリッシュ(発行)します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
@@ -57,7 +57,7 @@
     <p>MQTT(inおよびout)ノードはブローカへの接続設定を必要に応じて共有できます。</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt-broker">
+<script type="text/html" data-help-name="mqtt-broker">
     <p>MQTTブローカへの接続設定</p>
     <p>ブローカへの接続設定を作成します。設定は<code>MQTT In</code>および<code>MQTT Out</code>ノードで再利用できます。</p>
     <p>ノードにクライアントIDを設定しておらずセッションの初期化を設定している場合、ランダムなクライアントIDを生成します。クライアントIDを設定する場合、接続先のブローカで一意となるようにしてください。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html
index 3f9ce0794..e340e20bb 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http in">
+<script type="text/html" data-help-name="http in">
     <p>HTTPエンドポイントを作成し、Webサービスを構成します。</p>
     <h3>出力</h3>
     <dl class="message-properties">
@@ -41,7 +41,7 @@
     <p><b>注:</b> このノードはリクエストに対するレスポンスの送信は行いません。リクエストを処理するにはフローにHTTP Responseノードを含めてください。</p>
 </script>
 
-<script type="text/x-red" data-help-name="http response">
+<script type="text/html" data-help-name="http response">
     <p>HTTP Inノードで受け付けたリクエストに対するレスポンスを送り返します。</p>
 
     <h3>入力</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
index e87bb7542..d592c1d6e 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/21-httprequest.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http request">
+<script type="text/html" data-help-name="http request">
     <p>HTTPリクエストを送信し、レスポンスを返します。</p>
 
     <h3>入力</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html
index 13dacd79b..78c3c3313 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/22-websocket.html
@@ -14,12 +14,12 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="websocket in">
+<script type="text/html" data-help-name="websocket in">
     <p>WebSocket入力ノード</p>
     <p>デフォルトでは、WebSocketにより受信したデータは<code>msg.payload</code>に格納します。ソケットはJSON形式の文字列を待ち受けるように設定することができます。JSON形式の文字列を受け付けると、オブジェクトへの変換を行い、メッセージ全体として送信します。</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket out">
+<script type="text/html" data-help-name="websocket out">
     <p>WebSocket出力ノード</p>
     <p>デフォルトでは、<code>msg.payload</code>をWebSocket経由で送信します。ソケットは<code>msg</code>全体をJSON文字列にエンコードしてWebSocketを介して送信することもできます。</p>
 
@@ -27,10 +27,10 @@
     <p>WebSocket Inノードが生成したメッセージをブロードキャストしたい場合には、フロー中で<code>msg._session</code>プロパティを削除します。</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-listener">
+<script type="text/html" data-help-name="websocket-listener">
     <p>この設定ノードはパスを指定してWebSocketサーバのエンドポイントを作成します。</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-client">
+<script type="text/html" data-help-name="websocket-client">
     <p>この設定ノードは指定したURLにWebSocketクライアントを接続します。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html
index efe82cbb1..1ab60b163 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/31-tcpin.html
@@ -14,12 +14,12 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tcp in">
+<script type="text/html" data-help-name="tcp in">
     <p>TCPからの入力を行います。リモートTCPポートに接続するか、外部からのコネクションを受け付けます。</p>
     <p><b>注: </b>1024番より小さな番号のポートをアクセスするにはrootもしくはadministrator権限が必要なシステムもあります。</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp out">
+<script type="text/html" data-help-name="tcp out">
     <p>TCPへの出力を行います。リモートTCPポートへ接続、外部からのコネクションの受け付け、もしくは、TCP Inノードで受け付けたメッセージへのリプライを行います。</p>
     <p><code>msg.payload</code>のみが送信対象となります。</p>
     <p><code>msg.payload</code>がバイナリデータをBase64エンコーディングの文字列に変換したものの場合、Base64デコードオプションを指定するとデータをバイナリに変換して送信します。</p>
@@ -27,7 +27,7 @@
     <p><b>注: </b>1024番より小さな番号のポートをアクセスするにはrootもしくはadministrator権限が必要なシステムもあります。</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp request">
+<script type="text/html" data-help-name="tcp request">
     <p>シンプルなTCPリクエストノード。<code>msg.payload</code>をサーバのTCPポートに送信し、レスポンスを待ちます。</p>
     <p>サーバに接続、"リクエスト"送信、"レスポンス"受信を行います。固定長の文字数、指定文字へのマッチ、最初のリプライの到着から指定した時間待つ、データの到着待ち、データ送信を行いリプライを待たず接続を即時解除、などから動作を選択できます。</p>
     <p>レスポンスはバッファ形式で<code>msg.payload</code>に出力されます。文字列として扱いには、.toString()を使用してください。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html
index ec07a865e..fffcbcec5 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/32-udp.html
@@ -14,13 +14,13 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="udp in">
+<script type="text/html" data-help-name="udp in">
     <p>UDP入力ノード。<code>msg.payload</code>にバッファ、文字列、もしくは、Base64エンコーディング文字列を生成します。マルチキャストをサポートしています。</p>
     <p><code>msg.ip</code>と<code>msg.port</code>に受信したメッセージのIPアドレスとポートを設定します。</p>
     <p><b>注</b>: 1024番より小さな番号のポートへのアクセス、ブロードキャストを行うにはrootもしくはadministrator権限が必要なシステムもあります。</p>
 </script>
 
-<script type="text/x-red" data-help-name="udp out">
+<script type="text/html" data-help-name="udp out">
     <p><code>msg.payload</code>を指定したUDPのホストとポートに送信します。マルチキャストをサポートします。</p>
     <p><code>msg.ip</code>と<code>msg.port</code>に接続先を設定できますが、ノード設定の方が優先されます。</p>
     <p>ブロードキャストを行うには、アドレスをローカルブロードキャストIPアドレスに設定するか、グローバルブロードキャストアドレスである255.255.255.255を試してください。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html
index 101ef39d1..38286e438 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="csv">
+<script type="text/html" data-help-name="csv">
     <p>CSV形式の文字列とそのJavaScriptオブジェクト表現の間で双方向の変換を行います。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-HTML.html
index eb7b00dff..19be36aed 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-HTML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="html">
+<script type="text/html" data-help-name="html">
     <p><code>msg.payload</code>に格納したHTMLドキュメントからCSSセレクタを使用して要素を取り出します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-JSON.html
index 80595789f..4aaa02368 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-JSON.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="json">
+<script type="text/html" data-help-name="json">
     <p>JSON文字列とJavaScriptオブジェクトとの間で相互変換を行います。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-XML.html
index 240fb5fb1..5c882a2ec 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-XML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="xml">
+<script type="text/html" data-help-name="xml">
     <p>XML文字列とJavaScriptオブジェクトとの間で相互変換を行います。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-YAML.html
index 6dd8d2805..253584260 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-YAML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="yaml">
+<script type="text/html" data-help-name="yaml">
     <p>YAML形式の文字列とJavaScriptオブジェクトの間で相互変換を行います。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
index 6205bac52..7702704df 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="split">
+<script type="text/html" data-help-name="split">
     <p>メッセージをメッセージ列に分割します。</p>
 
     <h3>入力</h3>
@@ -53,7 +53,7 @@
 </script>
 
 
-<script type="text/x-red" data-help-name="join">
+<script type="text/html" data-help-name="join">
     <p>メッセージ列を結合して一つのメッセージにします。</p>
     <p>メッセージの結合には次の3つのモードが利用できます。</p>
     <dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
index 8bb6b3478..aa7419bab 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/sequence/18-sort.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="sort">
+<script type="text/html" data-help-name="sort">
     <p>メッセージ列もしくは配列型のペイロードをソートします。</p>
     <p><b>split</b>ノードと組み合わせてメッセージの並べ替えを行うことができます。</p>
     <p>ソート順序は以下が指定可能です。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
index 41cef364c..03f2f3f17 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="batch">
+<script type="text/html" data-help-name="batch">
     <p>指定したルールによりメッセージ列を生成します。</p>
     <h3>詳細</h3>
     <p>メッセージ列の生成には以下の3つのモードが利用できます。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
index 2df174104..bc971049e 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/storage/10-file.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="file">
+<script type="text/html" data-help-name="file">
     <p><code>msg.payload</code>をファイルに書き出します。書き出しは、ファイルの最後に追記もしくは既存の内容の置き換えを選択できます。この他、ファイルの削除を行うことも可能です。</p>
     <h3>入力</h3>
     <dl class="message-properties">
@@ -31,7 +31,7 @@
     <p>この他、ファイルの削除を行うことも可能です。</p>
 </script>
 
-<script type="text/x-red" data-help-name="file in">
+<script type="text/html" data-help-name="file in">
     <p>ファイルの内容を文字列もしくはバイナリバッファとして読み出します。</p>
     <h3>入力</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
index 45f658c05..3a4594ccc 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/storage/23-watch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="watch">
+<script type="text/html" data-help-name="watch">
     <p>ディレクトリもしくはファイルの変化を検知します。</p>
     <p>カンマ区切りでディレクトリおよびファイルのリストを指定します。空白を含む場合は、引用符で"..."のように囲んでください。</p>
     <p>Windowsでは、2重バックスラッシュ\\をディレクトリ名に使用します。</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
index 254b542f3..25af86e54 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/20-inject.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="inject">
+<script type="text/html" data-help-name="inject">
 <p>수동, 혹은 일정간격으로 메세지를 플로우에 주입합니다. 메세지의 페이로드에는 문자열, JavaScript오브젝트, 현재시각 등 다양한 값을 지정할 수 있습니다.</p>
 <h3>출력</h3>
 <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
index 22395c451..0622fc92b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/21-debug.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="debug">
+<script type="text/html" data-help-name="debug">
     <p>사이브바의 '디버그'탭에 선택한 메세지 프로퍼티의 값을 표시합니다. 설정에 의해, 랜덤로그로 출력도 가능합니다. 기본값의 표시대상은 <code>msg.payload</code>이지만, 설정에 의해 지정한 프로퍼티, 메세지 전체, 혹은 JSONata식의 평가결과를 출력할 수 있습니다.</p>
     <h3>상세</h3>
     <p>'디버그'사이드바는 받은 메시지의 계층구조를 표시하는 기능을 갖추고 있습니다. 이 기능으로 메시지의 구조를 쉽게 이해할 수 있습니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
index 4cd49ff5a..e8349346c 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/25-catch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="catch">
+<script type="text/html" data-help-name="catch">
     <p>같은 탭내의 노드가 송출한 에러를 캐치합니다.</p>
     <h3>출력</h3>
     <dl class=message-properties>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
index fa36d439b..35d43fbb5 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/25-status.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="status">
+<script type="text/html" data-help-name="status">
     <p>같은 탭내 노드의 스테이터스 메시지를 취득합니다.</p>
     <h3>출력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
index 74aa41416..31ef2673a 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/60-link.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="link in">
+<script type="text/html" data-help-name="link in">
     <p>플로우간에 가상의 링크를 작성합니다.</p>
     <h3>상세</h3>
     <p>임의의 탭상에 존재하는 <code>link out</code>노드에 접속할 수 있습니다. 이 접속은 마치 직접 링크한 것 처럼 작동합니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
index 814bb63ad..1e146552c 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/90-comment.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="comment">
+<script type="text/html" data-help-name="comment">
     <p>플로우에 코멘트를 기술하기 위해 이용합니다.</p>
     <h3>상세</h3>
     <p>편집패널은 Markdown형식으로 기입가능 합니다. 입력한 텍스트는 '정보'사이드패널에 표시됩니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
index 83868af53..3009d9145 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/common/98-unknown.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="unknown">
+<script type="text/html" data-help-name="unknown">
     <p>설치된 Node-RED가 인식할 수 없는 종류의 노드입니다.</p>
     <h3>상세</h3>
     <p><i>이 종류의 노드를 배포한 경우, 설정은 유지되지만 부족한 노드를 설치할 때 까지 플로우를 시작할 수 없습니다.</i></p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
index 813fb9505..464030fa3 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="function">
+<script type="text/html" data-help-name="function">
     <p>수신 메시지에 대해서 처리를 실시하는 JavaScript코드(함수의 본체)를 정의합니다.</p>
     <p>입력 메시지는 <code>msg</code>라는 명칭의 JavaScript 객체로 전달됩니다.</p>
     <p><code>msg</code>오브젝트는<code>msg.payload</code>프로퍼티에 메시지 본체를 유지하는 것이 관례입니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
index 99b886978..44fcf67ac 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/10-switch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="switch">
+<script type="text/html" data-help-name="switch">
     <p>프로퍼티 값에 의해 메세지를 분류합니다.</p>
     <h3>상세</h3>
     <p>수신한 메세지에 대해, 지정된 룰을 순서대로 평가하여 매치된 룰에 대응하는 출력포트에 메세지를 송출합니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
index f971f0a15..d02f3e82b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/15-change.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="change">
+<script type="text/html" data-help-name="change">
     <p>메세지, 플로우컨텍스트, 글로벌컨텍스트의 프로퍼티를 변경, 삭제, 이동합니다.</p>
     <p>룰을 여러개 지정한 경우, 정의된 순으로 적용됩니다.</p>
     <h3>상세</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
index 5fd179bdb..d537c2564 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/16-range.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="range">
+<script type="text/html" data-help-name="range">
     <p>수치를 다른 범위 값으로 변환합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
index 7415b63c3..882f37751 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/80-template.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="template">
+<script type="text/html" data-help-name="template">
     <p>템플릿에 기초하여 프로퍼티를 설정합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
index f890ec895..e77051871 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/89-delay.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="delay">
+<script type="text/html" data-help-name="delay">
     <p>노드를 통과하는 메세지를 지연, 혹은 유량을 제한합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
index e89aac5fa..27b7de1e3 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="trigger">
+<script type="text/html" data-help-name="trigger">
     <p>메세지를 송신하면, 다른 메세지를 송신합니다. 지연 혹은 초기화가 지정되있지 않은 경우에는, 다음 2번째 메세지를 송신할 수 도 있습니다.</p>
 
     <h3>입력</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
index eaeb12b31..0abf9f94c 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/90-exec.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="exec">
+<script type="text/html" data-help-name="exec">
     <p>시스템 커맨드를 실행하여 출력을 반환합니다.</p>
     <p>커맨드 완료까지 기다릴지, 커맨드가 출력을 실행할 때 마다 메세지를 출력할지 지정할 수 있습니다.</p>
     <p>실행대상의 커맨드는, 노드의 설정 혹은 수신메세지에서 지정합니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html
index d800f14c9..a7f3bb7dd 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/05-tls.html
@@ -14,6 +14,6 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tls-config">
+<script type="text/html" data-help-name="tls-config">
     <p>TLS접속을 위한 옵션 설정</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html
index 4357c7f2b..cdfccd799 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/06-httpproxy.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http proxy">
+<script type="text/html" data-help-name="http proxy">
     <p>프록시를 위한 옵션 설정</p>
 
     <h3>상세</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html
index 613941c43..972e5d8b7 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/10-mqtt.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="mqtt in">
+<script type="text/html" data-help-name="mqtt in">
 <p>MQTT브로커에 접속하여, 지정한 토픽의 메세지를 서브스크랩(구독)합니다.</p>
     <h3>출력</h3>
     <dl class="message-properties">
@@ -33,7 +33,7 @@
     <p>MQTT(in 및 out)노드는 브로커로의 접속설정을 필요에 따라 공유할 수 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt out">
+<script type="text/html" data-help-name="mqtt out">
     <p>MQTT브로커에 접속하여, 메세지를 퍼블리쉬(발행) 합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
@@ -57,7 +57,7 @@
     <p>MQTT(in 및 out)노드는 브로커로의 접속설정을 필요에 따라 공유할 수 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="mqtt-broker">
+<script type="text/html" data-help-name="mqtt-broker">
     <p>MQTT브로커로의 접속설정</p>
     <p>브로커로의 접속설정을 작성합니다. 설정은 <code>MQTT In</code> 및 <code>MQTT Out</code>노드로 재이용할 수 있습니다.</p>
     <p>노드에 클라이언트 ID를 설정하지 않고 세션의 초기화를 설정하고 있는 경우, 랜덤한 클라이언트 ID를 생성합니다. 클라이언트 ID를 설정할 경우, 접속처의 브로커로 통일되게 해주세요.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html
index 680b28a79..55c4c72b6 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httpin.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http in">
+<script type="text/html" data-help-name="http in">
     <p>HTTP 엔드 포인트를 작성하여 Web 서비스를 구성합니다.</p>
     <h3>출력</h3>
     <dl class="message-properties">
@@ -41,7 +41,7 @@
     <p><b>주:</b> 이 노드는 리퀘스트에 대한 레스폰스 송신을 하지 않습니다. 리퀘스트를 처리하기 위해서는 플로우에 HTTP Response노드를 포함해 주십시오.</p>
 </script>
 
-<script type="text/x-red" data-help-name="http response">
+<script type="text/html" data-help-name="http response">
     <p>HTTP In노드에서 받은 리퀘스트에 대한 레스폰스를 반환합니다.</p>
 
     <h3>입력</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html
index 674faadcf..327541954 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/21-httprequest.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="http request">
+<script type="text/html" data-help-name="http request">
     <p>HTTP리퀘스트를 송신하여, 리스폰스를 반환합니다.</p>
 
     <h3>입력</h3>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html
index 09949bffb..bb128397f 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/22-websocket.html
@@ -14,12 +14,12 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="websocket in">
+<script type="text/html" data-help-name="websocket in">
     <p>WebSocket입력 노드</p>
     <p>기본값으로는, WebSocket에 의해 수신한 데이터는 <code>msg.payload</code>에 격납됩니다. 소켓은 JSON형식의 문자열을 대기하도록 설정할 수 있습니다. JSON형식의 문자열을 받으면, 오브젝트로 변환하여 메세지 전체로서 송신합니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket out">
+<script type="text/html" data-help-name="websocket out">
     <p>WebSocket출력 노드</p>
     <p>기본값으로는, <code>msg.payload</code>를 WebSocket경유로 송신합니다. 소켓은 <code>msg</code>전체를 JSON문자열로 인코딩하여 WebSocket을 통해 송신할 수 있습니다.</p>
 
@@ -27,10 +27,10 @@
     <p>WebSocket In노드가 생성한 메세지를 브로드캐스트하고 싶은 경우에는, 플로우 안에서 <code>msg._session</code>프로퍼티를 삭제합니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-listener">
+<script type="text/html" data-help-name="websocket-listener">
     <p>이 설정노드는 패스를 지정하여 WebSocket서버의 엔드포인트를 작성합니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="websocket-client">
+<script type="text/html" data-help-name="websocket-client">
     <p>이 설정노드는 지정한 URL에 WebSocket클라이언트를 접속합니다.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html
index 1c665bb8d..53c61e679 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/31-tcpin.html
@@ -14,12 +14,12 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="tcp in">
+<script type="text/html" data-help-name="tcp in">
     <p>TCP로 부터의 입력을 수행합니다. 리모트 TCP포트에 접속하거나, 외부로부터의 접속을 접수합니다.</p>
     <p><b>주: </b>1024번 보다 작은 번호의 포트를 액세스 하기 위해서는 root 혹은 administrator권한이 필요한 시스템도 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp out">
+<script type="text/html" data-help-name="tcp out">
     <p>TCP로의 출력을 수행합니다. 리모트 TCP포트로 접속, 외부로부터의 접속을 접수, 혹은 TCP In노드에서 받은 메세지로의 리플라이를 수행합니다.</p>
     <p><code>msg.payload</code>만이 송신대상입니다.</p>
     <p><code>msg.payload</code>가 바이너리데이터를 Base64인코딩의 문자열로 변환한 것일 경우, Base64디코딩 옵션을 지정하면 데이터를 바이너리로 변환하여 송신합니다.</p>
@@ -27,7 +27,7 @@
     <p><b>주: </b>1024번 보다 작은 번호의 포트를 액세스 하기 위해서는 root 혹은 administrator권한이 필요한 시스템도 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="tcp request">
+<script type="text/html" data-help-name="tcp request">
     <p>간단한 TCP리퀘스트 노드. <code>msg.payload</code>를 서버의 TCP포트에 송신하여, 리스폰스를 기다립니다.</p>
     <p>서버접속, "리퀘스트"송신, "리스폰스"수신을 수행합니다. 고정장의 문자수나 지정문자로의 매치, 첫 리플라이의 도착으로 부터 지정된 시간동안 대기, 데이터 도착 대기, 데이터 송신을 수행하여 리플라이를 기다리지 않고 접속을 즉시 삭제, 등의 동작을 선택할 수 있습니다.</p>
     <p>리스폰스는 버퍼형식으로 <code>msg.payload</code>에 출력됩니다. 문자열로서 취급하기 위해서는, .toString()을 사용해 주세요.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html
index f6a5889db..01704d912 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/network/32-udp.html
@@ -14,13 +14,13 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="udp in">
+<script type="text/html" data-help-name="udp in">
     <p>UDP입력 노드. <code>msg.payload</code>에 버퍼, 문자열, 혹은 Base64인코딩 문자열을 생성합니다. 멀티캐스트를 지원합니다.</p>
     <p><code>msg.ip</code>와 <code>msg.port</code>에 수신된 메세지의 IP주소와 포트를 설정합니다.</p>
     <p><b>주: </b>1024번 보다 작은 번호의 포트를 액세스, 브로드캐스트 하기 위해서는 root 혹은 administrator권한이 필요한 시스템도 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="udp out">
+<script type="text/html" data-help-name="udp out">
     <p><code>msg.payload</code>를 지정된 UDP 호스트와 포트에 송신합니다. 멀티캐스트를 지원합니다.</p>
     <p><code>msg.ip</code>와 <code>msg.port</code>에 접속처를 설정할수 있지만, 노드설정이 우선시 됩니다.</p>
     <p>브로드캐스트를 수행하기 위해서는, 주소를 로컬 브로드캐스트 IP주소로 설정하거나, 글로벌 브로드캐스트인 255.255.255.255를 시험해 주세요.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-CSV.html
index 728637559..b5f72594b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-CSV.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="csv">
+<script type="text/html" data-help-name="csv">
     <p>CSV형식의 문자열과 그 JavaScript오브젝트 표현의 사이에서 쌍방향의 변환을 수행합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-HTML.html
index 6988c1271..65d155376 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-HTML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="html">
+<script type="text/html" data-help-name="html">
     <p><code>msg.payload</code>에 격납한 HTML다큐멘트에서 CSS셀렉터를 사용하여 요소를 추출합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-JSON.html
index 05bd29541..83ffdc97f 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-JSON.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="json">
+<script type="text/html" data-help-name="json">
     <p>JSON문자열과 JavaScript오브젝트과의 사이에서 상호변환을 수행합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-XML.html
index 1156a3a0c..7d601f6c1 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-XML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="xml">
+<script type="text/html" data-help-name="xml">
     <p>XML문자열과 JavaScript오브젝트와의 사이에서 상호변환을 수행합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-YAML.html
index 8af9321f4..c606d5c39 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/parsers/70-YAML.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="yaml">
+<script type="text/html" data-help-name="yaml">
     <p>YAML형식의 문자열과 JavaScript오브젝트 사이에서 상호변환을 수행합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
index 6b2907185..f937adbff 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/sequence/17-split.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="split">
+<script type="text/html" data-help-name="split">
     <p>메세지를 메세지열로 분할합니다.</p>
 
     <h3>입력</h3>
@@ -53,7 +53,7 @@
 </script>
 
 
-<script type="text/x-red" data-help-name="join">
+<script type="text/html" data-help-name="join">
     <p>메세지열를 결합하여 하나의 메세지로 만듭니다.</p>
     <p>메세지의 결합에는 다음 3개의 모드를 이용할 수 있습니다.</p>
     <dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
index d05c253b8..716f3bcc9 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/sequence/18-sort.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="sort">
+<script type="text/html" data-help-name="sort">
     <p>메세지 열 혹은 배열형의 페이로드를 정렬합니다.</p>
     <p><b>split</b>노드와 조합하여 메세지의 순서를 정렬할 수 있습니다.</p>
     <p>아래의 정렬순서를 지정할 수 있습니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
index b2287245c..78aa007fc 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/sequence/19-batch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="batch">
+<script type="text/html" data-help-name="batch">
     <p>지정한 룰에 의해 메세지열을 생성합니다.</p>
     <h3>상세</h3>
     <p>메세지열의 생성에는 아래의 3가지 모드를 이용할 수 있습니다.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
index 4f22308e9..cc852db14 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/storage/10-file.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="file">
+<script type="text/html" data-help-name="file">
     <p><code>msg.payload</code>를 파일로 내보냅니다. 내보내기는, 파일의 마지막에 추기 혹은 기존 내용의 치환을 선택할 수 있습니다. 또한, 파일을 삭제하는 것도 가능합니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
@@ -31,7 +31,7 @@
     <p>또한, 파일을 삭제할 수도 있습니다.</p>
 </script>
 
-<script type="text/x-red" data-help-name="file in">
+<script type="text/html" data-help-name="file in">
     <p>파일 내용을 문자열 혹은 바이너리버퍼로 불러옵니다.</p>
     <h3>입력</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
index f51ac08f9..4491551a1 100644
--- a/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/storage/23-watch.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-help-name="watch">
+<script type="text/html" data-help-name="watch">
     <p>디렉토리 혹은 파일의 변화를 감지합니다.</p>
     <p>콤마로 나누어 디렉토리 및 파일 리스트를 지정합니다. 공백을 포함하는 경우, 인용부를 이용해 "..." 형태로 만들어 주세요.</p>
     <p>Windows에서는, 2중 백슬래쉬\\를 디렉토리 이름으로 사용합니다.</p>

From 95a51aafdcabe75b26d0108172adbc815e793a7e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 17 Jan 2020 16:53:01 +0000
Subject: [PATCH 275/305] Add path property to debug messages Fixes #2358

This property can be used to identify the full path to the node that
logged a given message. If the node is inside a subflow (and maybe
nested many levels deep), this path can be used to help find the
node, rather than just the top-level subflow instance node.

A side-effect of this change is the Debug sidebar is now able to
show the message tools for a message coming from a deeply nested
subflow
---
 .../@node-red/nodes/core/common/21-debug.html | 69 +++++++++++++++++--
 .../@node-red/nodes/core/common/21-debug.js   |  6 +-
 .../core/common/lib/debug/debug-utils.js      | 11 ++-
 .../nodes/core/common/lib/debug/debug.js      |  4 +-
 .../@node-red/runtime/lib/nodes/Node.js       |  5 +-
 .../@node-red/runtime/lib/nodes/flows/Flow.js |  5 +-
 .../runtime/lib/nodes/flows/Subflow.js        |  5 +-
 7 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
index ebfb8532b..5e2f3ba49 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -131,8 +131,32 @@
                         RED.view.redraw();
                     }
                 },
-                messageSourceClick: function(sourceId) {
-                    RED.view.reveal(sourceId);
+                messageSourceClick: function(sourceId, aliasId, path) {
+                    // Get all of the nodes that could have logged this message
+                    var candidateNodes = [RED.nodes.node(sourceId)]
+                    if (path) {
+                        for (var i=2;i<path.length;i++) {
+                            candidateNodes.push(RED.nodes.node(path[i]))
+                        }
+                    }
+                    if (aliasId) {
+                        candidateNodes.push(RED.nodes.node(aliasId));
+                    }
+                    if (candidateNodes.length > 1) {
+                        // The node is in a subflow. Check to see if the active
+                        // workspace is a subflow in the node's parentage. If
+                        // so, reveal the relevant subflow instance node.
+                        var ws = RED.workspaces.active();
+                        for (var i=0;i<candidateNodes.length;i++) {
+                            if (candidateNodes[i].z === ws) {
+                                RED.view.reveal(candidateNodes[i].id);
+                                return
+                            }
+                        }
+                        // The active workspace is unrelated to the node. So
+                        // fall back to revealing the top most node
+                    }
+                    RED.view.reveal(candidateNodes[0].id);
                 },
                 clear: function() {
                     RED.nodes.eachNode(function(node) {
@@ -179,9 +203,44 @@
             RED.events.on("workspace:change", this.refreshMessageList);
 
             this.handleDebugMessage = function(t,o) {
-                var sourceNode = RED.nodes.node(o.id) || RED.nodes.node(o.z);
+                // console.log("->",o.id,o.z,o._alias);
+                //
+                // sourceNode should be the top-level node - one that is on a flow.
+                var sourceNode;
+                var pathParts;
+                if (o.path) {
+                    // Path is a `/`-separated list of ids that identifies the
+                    // complete parentage of the node that generated this message.
+                    //    flow-id/subflow-A-instance/subflow-A-type/subflow-B-instance/subflow-B-type/node-id
+
+                    // If it has one id, that is a top level flow
+                    // each subsequent id is the instance id of a subflow node
+                    //
+                    pathParts = o.path.split("/");
+                    if (pathParts.length === 1) {
+                        // The source node is on a flow - so can use its id to find
+                        sourceNode = RED.nodes.node(o.id);
+                    } else if (pathParts.length > 1) {
+                        // Highlight the subflow instance node.
+                        sourceNode = RED.nodes.node(pathParts[1]);
+                    }
+                } else {
+                    // This is probably redundant...
+                    sourceNode = RED.nodes.node(o.id) || RED.nodes.node(o.z);
+                }
                 if (sourceNode) {
-                    o._source = {id:sourceNode.id,z:sourceNode.z,name:sourceNode.name,type:sourceNode.type,_alias:o._alias};
+                    o._source = {
+                        id:sourceNode.id,
+                        z:sourceNode.z,
+                        name:sourceNode.name,
+                        type:sourceNode.type,
+                        // _alias identifies the actual logging node. This is
+                        // not necessarily the same as sourceNode, which will be
+                        // the top-level subflow instance node.
+                        // This means the node's name is displayed in the sidebar.
+                        _alias:o._alias,
+                        path: pathParts
+                    };
                 }
                 RED.debug.handleDebugMessage(o);
                 if (subWindow) {
@@ -235,7 +294,7 @@
                 } else if (msg.event === "mouseLeave") {
                     options.messageMouseLeave(msg.id);
                 } else if (msg.event === "mouseClick") {
-                    options.messageSourceClick(msg.id);
+                    options.messageSourceClick(msg.id,msg._alias,msg.path);
                 } else if (msg.event === "clear") {
                     options.clear();
                 }
diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.js b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
index 8477ed525..b00371bbd 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
@@ -62,7 +62,7 @@ module.exports = function(RED) {
                     if (err) {
                         done(RED._("debug.invalid-exp", {error: editExpression}));
                     } else {
-                        done(null,{id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:value, _path:msg._path});
+                        done(null,{id:node.id, z:node.z, _alias: node._alias, path:node._flow.path, name:node.name, topic:msg.topic, msg:value});
                     }
                 });
             } else {
@@ -77,7 +77,7 @@ module.exports = function(RED) {
                         output = undefined;
                     }
                 }
-                done(null,{id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:output, _path:msg._path});
+                done(null,{id:node.id, z:node.z, _alias: node._alias,  path:node._flow.path, name:node.name, topic:msg.topic, property:property, msg:output});
             }
         }
 
@@ -88,7 +88,7 @@ module.exports = function(RED) {
                     node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
                 }
                 if (this.active && this.tosidebar) {
-                    sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
+                    sendDebug({id:node.id, z:node.z, _alias: node._alias,  path:node._flow.path, name:node.name, topic:msg.topic, msg:msg});
                 }
                 done();
             } else {
diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
index db1a85510..ddab5bbe2 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js
@@ -406,10 +406,16 @@ RED.debug = (function() {
         msg.on("mouseenter", function() {
             msg.addClass('red-ui-debug-msg-hover');
             if (o._source) {
+                // highlight the top-level node (could be subflow instance)
                 config.messageMouseEnter(o._source.id);
                 if (o._source._alias) {
+                    // this is inside a subflow - highlight the node itself
                     config.messageMouseEnter(o._source._alias);
                 }
+                // if path.length > 2, we are nested - highlight subflow instances
+                for (var i=2;i<o._source.path.length;i++) {
+                    config.messageMouseEnter(o._source.path[i]);
+                }
             }
         });
         msg.on("mouseleave", function() {
@@ -419,6 +425,9 @@ RED.debug = (function() {
                 if (o._source._alias) {
                     config.messageMouseLeave(o._source._alias);
                 }
+                for (var i=2;i<o._source.path.length;i++) {
+                    config.messageMouseLeave(o._source.path[i]);
+                }
             }
         });
         var name = sanitize(((o.name?o.name:o.id)||"").toString());
@@ -452,7 +461,7 @@ RED.debug = (function() {
             .appendTo(metaRow)
             .on("click", function(evt) {
                 evt.preventDefault();
-                config.messageSourceClick(sourceNode.id);
+                config.messageSourceClick(sourceNode.id, sourceNode._alias, sourceNode.path);
             });
         } else if (name) {
             $('<span class="red-ui-debug-msg-name">'+name+'</span>').appendTo(metaRow);
diff --git a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
index 97f6cc8a7..3cca62e01 100644
--- a/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/lib/debug/debug.js
@@ -7,8 +7,8 @@ $(function() {
             messageMouseLeave: function(sourceId) {
                 window.opener.postMessage({event:"mouseLeave",id:sourceId},'*');
             },
-            messageSourceClick: function(sourceId) {
-                window.opener.postMessage({event:"mouseClick",id:sourceId},'*');
+            messageSourceClick: function(sourceId, aliasId, path) {
+                window.opener.postMessage({event:"mouseClick",id:sourceId, _alias: aliasId, path: path},'*');
             },
             clear: function() {
                 window.opener.postMessage({event:"clear"},'*');
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index d35ced395..c62895f7f 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -52,7 +52,7 @@ function Node(n) {
         // the object (such as dashboard) will not like circular refs
         // The value must still be writable in the case that a node does:
         //     Object.assign(this,config)
-        // as part of its constructure - config._flow will overwrite this._flow
+        // as part of its constructor - config._flow will overwrite this._flow
         // which we can tolerate as they are the same object.
         Object.defineProperty(this,'_flow', {value: n._flow, enumerable: false, writable: true })
         this._asyncDelivery = n._flow.asyncMessageDelivery;
@@ -462,6 +462,9 @@ function log_helper(self, level, msg) {
     if (self._alias) {
         o._alias = self._alias;
     }
+    if (self._flow) {
+        o.path = self._flow.path;
+    }
     if (self.z) {
         o.z = self.z;
     }
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
index 40855793f..db15e8eb5 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
@@ -53,6 +53,7 @@ class Flow {
         this.subflowInstanceNodes = {};
         this.catchNodes = [];
         this.statusNodes = [];
+        this.path = this.id;
     }
 
     /**
@@ -120,7 +121,7 @@ class Flow {
      * @return {[type]}     [description]
      */
     start(diff) {
-        this.trace("start "+this.TYPE);
+        this.trace("start "+this.TYPE+" ["+this.path+"]");
         var node;
         var newNode;
         var id;
@@ -234,7 +235,7 @@ class Flow {
         for (id in this.activeNodes) {
             if (this.activeNodes.hasOwnProperty(id)) {
                 node = this.activeNodes[id];
-                this.trace(" "+id.padEnd(16)+" | "+node.type.padEnd(12)+" | "+(node._alias||""));
+                this.trace(" "+id.padEnd(16)+" | "+node.type.padEnd(12)+" | "+(node._alias||"")+(node._zAlias?" [zAlias:"+node._zAlias+"]":""));
                 if (node.type === "catch") {
                     this.catchNodes.push(node);
                 } else if (node.type === "status") {
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
index 6221ff318..a7bec1234 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
@@ -88,7 +88,7 @@ class Subflow extends Flow {
      * @param {[type]} subflowInstance [description]
      */
     constructor(parent,globalFlow,subflowDef,subflowInstance) {
-        // console.log("CREATE SUBFLOW",subflowDef.id,subflowInstance.id);
+        // console.log("CREATE SUBFLOW",subflowDef.id,subflowInstance.id,"alias?",subflowInstance._alias);
         // console.log("SubflowInstance\n"+JSON.stringify(subflowInstance," ",2));
         // console.log("SubflowDef\n"+JSON.stringify(subflowDef," ",2));
         var subflows = parent.flow.subflows;
@@ -140,6 +140,7 @@ class Subflow extends Flow {
         this.subflowDef = subflowDef;
         this.subflowInstance = subflowInstance;
         this.node_map = node_map;
+        this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id);
 
         var env = [];
         if (this.subflowDef.env) {
@@ -451,7 +452,7 @@ class Subflow extends Flow {
 function createNodeInSubflow(subflowInstanceId, def) {
     let node = clone(def);
     let nid = redUtil.generateId();
-    // console.log("Create Node In subflow",node.id, "--->",nid, "(",node.type,")")
+    // console.log("Create Node In subflow",node._alias, "--->",nid, "(",node.type,")")
     // node_map[node.id] = node;
     node._alias = node.id;
     node.id = nid;

From ee6f6ae39106350d9d1552409407bc2e62362554 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 17 Jan 2020 20:57:13 +0000
Subject: [PATCH 276/305] Fixup debug tests

---
 test/nodes/core/common/21-debug_spec.js       | 71 ++++++++++---------
 .../nodes/core/network/21-httprequest_spec.js | 11 ++-
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/test/nodes/core/common/21-debug_spec.js b/test/nodes/core/common/21-debug_spec.js
index c3a5d4d2a..bdff7976c 100644
--- a/test/nodes/core/common/21-debug_spec.js
+++ b/test/nodes/core/common/21-debug_spec.js
@@ -58,7 +58,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:"test"});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",name:"Debug",msg:"test",
+                    topic:"debug",data:{id:"n1",name:"Debug",msg:"test",path:"global",
                     format:"string[4]",property:"payload"}
                 }]);
             }, done);
@@ -74,7 +74,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:"test"});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"test",property:"payload",format:"string[4]"}
+                    topic:"debug",data:{id:"n1",msg:"test",property:"payload",format:"string[4]",path:"global"}
                 }]);
                 count++;
             }, function() {
@@ -85,7 +85,7 @@ describe('debug node', function() {
                     });
                     logEvents.should.have.length(1);
                     var tstmp = logEvents[0][0].timestamp;
-                    logEvents[0][0].should.eql({level:helper.log().INFO, id:'n1',type:'debug',msg:'test', timestamp:tstmp});
+                    logEvents[0][0].should.eql({level:helper.log().INFO, id:'n1',type:'debug',msg:'test', timestamp:tstmp,path:"global"});
 
                     done();
                 } catch(err) {
@@ -104,7 +104,7 @@ describe('debug node', function() {
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
                     topic:"debug",
-                    data:{id:"n1",msg:'{\n "payload": "test"\n}',format:"Object"}
+                    data:{id:"n1",msg:'{\n "payload": "test"\n}',format:"Object",path:"global"}
                 }]);
             }, done);
         });
@@ -119,7 +119,7 @@ describe('debug node', function() {
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
                     topic:"debug",
-                    data:{id:"n1",msg:'{\n "payload": "test"\n}',format:"Object"}
+                    data:{id:"n1",msg:'{\n "payload": "test"\n}',format:"Object",path:"global"}
                 }]);
             }, function() {
                 try {
@@ -129,7 +129,7 @@ describe('debug node', function() {
                     });
                     logEvents.should.have.length(1);
                     var tstmp = logEvents[0][0].timestamp;
-                    logEvents[0][0].should.eql({level:helper.log().INFO, id:"n1",type:"debug",msg:'\n{ payload: \'test\' }',timestamp:tstmp});
+                    logEvents[0][0].should.eql({level:helper.log().INFO, id:"n1",type:"debug",msg:'\n{ payload: \'test\' }',timestamp:tstmp,path:"global"});
                     done();
                 } catch(err) {
                     done(err);
@@ -146,7 +146,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:"test", foo:"bar"});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"bar",property:"foo",format:"string[3]"}
+                    topic:"debug",data:{id:"n1",msg:"bar",property:"foo",format:"string[3]",path:"global"}
                 }]);
             }, done);
         });
@@ -160,7 +160,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:"test", foo: {bar:"bar"}});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"bar",property:"foo.bar",format:"string[3]"}
+                    topic:"debug",data:{id:"n1",msg:"bar",property:"foo.bar",format:"string[3]",path:"global"}
                 }]);
             }, done);
         });
@@ -174,7 +174,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload: new Error("oops")});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:'{"name":"Error","message":"oops"}',property:"payload",format:"error"}
+                    topic:"debug",data:{id:"n1",msg:'{"name":"Error","message":"oops"}',property:"payload",format:"error",path:"global"}
                 }]);
             }, done);
         });
@@ -188,7 +188,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload: true});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg: 'true',property:"payload",format:"boolean"}
+                    topic:"debug",data:{id:"n1",msg: 'true',property:"payload",format:"boolean",path:"global"}
                 }]);
             }, done);
         });
@@ -202,7 +202,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload: 7});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"7",property:"payload",format:"number"}
+                    topic:"debug",data:{id:"n1",msg:"7",property:"payload",format:"number",path:"global"}
                 }]);
             }, done);
         });
@@ -216,7 +216,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload: Number.NaN});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"NaN",property:"payload",format:"number"}
+                    topic:"debug",data:{id:"n1",msg:"NaN",property:"payload",format:"number",path:"global"}
                 }]);
             }, done);
         });
@@ -230,7 +230,7 @@ describe('debug node', function() {
                 n1.emit("input", {});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:'(undefined)',property:"payload",format:"undefined"}
+                    topic:"debug",data:{id:"n1",msg:'(undefined)',property:"payload",format:"undefined",path:"global"}
                 }]);
             }, done);
         });
@@ -244,7 +244,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:null});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:'(undefined)',property:"payload",format:"null"}
+                    topic:"debug",data:{id:"n1",msg:'(undefined)',property:"payload",format:"null",path:"global"}
                 }]);
             }, done);
         });
@@ -259,7 +259,7 @@ describe('debug node', function() {
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
                     topic:"debug",
-                    data:{id:"n1",msg:'{\n "type": "foo"\n}',property:"payload",format:"Object"}
+                    data:{id:"n1",msg:'{\n "type": "foo"\n}',property:"payload",format:"Object",path:"global"}
                 }]);
             }, done);
         });
@@ -275,7 +275,7 @@ describe('debug node', function() {
                 JSON.parse(msg).should.eql([{
                     topic:"debug",
                     data:{id:"n1",msg: '[\n 0,\n 1,\n 2,\n 3\n]',format:"array[4]",
-                    property:"payload"}
+                    property:"payload",path:"global"}
                 }]);
             }, done);
         });
@@ -295,7 +295,7 @@ describe('debug node', function() {
                     data:{
                         id:"n1",
                         msg:'{\n "name": "bar",\n "o": "[Circular ~]"\n}',
-                        property:"payload",format:"Object"
+                        property:"payload",format:"Object",path:"global"
                     }
                 }]);
             }, done);
@@ -310,7 +310,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload: {type:'foo'}});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:'{\n "type": "foo"\n}',property:"payload",format:"Object"}
+                    topic:"debug",data:{id:"n1",msg:'{\n "type": "foo"\n}',property:"payload",format:"Object",path:"global"}
                 }]);
             }, function() {
                 try {
@@ -320,7 +320,7 @@ describe('debug node', function() {
                     });
                     logEvents.should.have.length(1);
                     var tstmp = logEvents[0][0].timestamp;
-                    logEvents[0][0].should.eql({level:helper.log().INFO,id:"n1",type:"debug",msg:'\n{ type: \'foo\' }',timestamp:tstmp});
+                    logEvents[0][0].should.eql({level:helper.log().INFO,id:"n1",type:"debug",msg:'\n{ type: \'foo\' }',timestamp:tstmp,path:"global"});
                     done();
                 } catch(err) {
                     done(err);
@@ -337,7 +337,7 @@ describe('debug node', function() {
                 n1.emit("input", {payload:"test\ntest"});
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"test\ntest",property:"payload",format:"string[9]"}
+                    topic:"debug",data:{id:"n1",msg:"test\ntest",property:"payload",format:"string[9]",path:"global"}
                 }]);
             }, function() {
                 try {
@@ -347,7 +347,7 @@ describe('debug node', function() {
                     });
                     logEvents.should.have.length(1);
                     var tstmp = logEvents[0][0].timestamp;
-                    logEvents[0][0].should.eql({level:helper.log().INFO,id:"n1",type:"debug",msg:"\ntest\ntest",timestamp:tstmp});
+                    logEvents[0][0].should.eql({level:helper.log().INFO,id:"n1",type:"debug",msg:"\ntest\ntest",timestamp:tstmp,path:"global"});
                     done();
                 } catch(err) {
                     done(err);
@@ -366,7 +366,7 @@ describe('debug node', function() {
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
                     topic:"debug",data:{id:"n1",name:"Debug",msg:"<test>",
-                    format:"string[6]"}
+                    format:"string[6]",path:"global"}
                 }]);
             }, done);
         });
@@ -386,7 +386,8 @@ describe('debug node', function() {
                         id:"n1",
                         msg: Array(1001).join("X")+'...',
                         property:"payload",
-                        format:"string[1001]"
+                        format:"string[1001]",
+                        path:"global"
                     }
                 }]);
             }, done);
@@ -407,7 +408,8 @@ describe('debug node', function() {
                         id:"n1",
                         msg:'{\n "foo": "'+Array(1001).join("X")+'..."\n}',
                         property:"payload",
-                        format:"Object"
+                        format:"Object",
+                        path:"global"
                     }
                 }]);
             }, done);
@@ -433,7 +435,8 @@ describe('debug node', function() {
                             length: 1001
                         },null," "),
                         property:"payload",
-                        format:"array[1001]"
+                        format:"array[1001]",
+                        path:"global"
                     }
                 }]);
             }, done);
@@ -461,7 +464,8 @@ describe('debug node', function() {
                             }
                         },null," "),
                         property:"payload",
-                        format:"Object"
+                        format:"Object",
+                        path:"global"
                     }
                 }]);
             }, done);
@@ -473,7 +477,7 @@ describe('debug node', function() {
         helper.load(debugNode, flow, function() {
             var n1 = helper.getNode("n1");
             websocket_test(function() {
-                n1.emit("input", {payload: Buffer(501).fill("\"")});
+                n1.emit("input", {payload: Buffer.alloc(501,"\"")});
             }, function(msg) {
                 var a = JSON.parse(msg);
                 a[0].should.eql({
@@ -482,7 +486,8 @@ describe('debug node', function() {
                         id:"n1",
                         msg: Array(1001).join("2"),
                         property:"payload",
-                        format:"buffer[501]"
+                        format:"buffer[501]",
+                        path:"global"
                     }
                 });
             }, done);
@@ -494,7 +499,7 @@ describe('debug node', function() {
         helper.load(debugNode, flow, function() {
             var n1 = helper.getNode("n1");
             websocket_test(function() {
-                n1.emit("input", {payload: {foo: Buffer(1001).fill("X")}});
+                n1.emit("input", {payload: {foo: Buffer.alloc(1001,"X")}});
             }, function(msg) {
                 var a = JSON.parse(msg);
                 a[0].should.eql({
@@ -510,7 +515,8 @@ describe('debug node', function() {
                             }
                         },null," "),
                         property:"payload",
-                        format:"Object"
+                        format:"Object",
+                        path:"global"
                     }
                 });
             }, done);
@@ -530,7 +536,8 @@ describe('debug node', function() {
                         id:"n1",
                         msg:'48454c4c4f',
                         property:"payload",
-                        format:"buffer[5]"
+                        format:"buffer[5]",
+                        path:"global"
                     }
                 }]);
             }, done);
@@ -551,7 +558,7 @@ describe('debug node', function() {
                     });
             }, function(msg) {
                 JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",msg:"message 2",property:"payload",format:"string[9]"}
+                    topic:"debug",data:{id:"n1",msg:"message 2",property:"payload",format:"string[9]",path:"global"}
                 }]);
             }, done);
         });
diff --git a/test/nodes/core/network/21-httprequest_spec.js b/test/nodes/core/network/21-httprequest_spec.js
index 39667f1f2..ab9020a64 100644
--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -898,7 +898,7 @@ describe('HTTP Request Node', function() {
                         });
                         logEvents.should.have.length(1);
                         var tstmp = logEvents[0][0].timestamp;
-                        logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp});
+                        logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp, path:"global"});
                         done();
                     } catch(err) {
                         done(err);
@@ -924,7 +924,7 @@ describe('HTTP Request Node', function() {
                         });
                         logEvents.should.have.length(1);
                         var tstmp = logEvents[0][0].timestamp;
-                        logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp});
+                        logEvents[0][0].should.eql({level:helper.log().ERROR, id:'n1',type:'http request',msg:'common.notification.errors.no-response', timestamp:tstmp, path:"global"});
                         done();
                     } catch(err) {
                         done(err);
@@ -947,7 +947,7 @@ describe('HTTP Request Node', function() {
                         });
                         logEvents.should.have.length(2);
                         var tstmp = logEvents[0][0].timestamp;
-                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnan', timestamp:tstmp});
+                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnan', timestamp:tstmp, path:"global"});
                         done();
                     } catch(err) {
                         done(err);
@@ -970,7 +970,7 @@ describe('HTTP Request Node', function() {
                         });
                         logEvents.should.have.length(2);
                         var tstmp = logEvents[0][0].timestamp;
-                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnegative', timestamp:tstmp});
+                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnegative', timestamp:tstmp, path:"global"});
                         done();
                     } catch(err) {
                         done(err);
@@ -993,7 +993,7 @@ describe('HTTP Request Node', function() {
                         });
                         logEvents.should.have.length(2);
                         var tstmp = logEvents[0][0].timestamp;
-                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnegative', timestamp:tstmp});
+                        logEvents[0][0].should.eql({level:helper.log().WARN, id:'n1',type:'http request',msg:'httpin.errors.timeout-isnegative', timestamp:tstmp, path:"global"});
                         done();
                     } catch(err) {
                         done(err);
@@ -1291,7 +1291,6 @@ describe('HTTP Request Node', function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
-                    console.log(msg.payload);
                     try {
                         msg.payload.headers.should.have.property('content-type').which.startWith('application/json');
                         msg.payload.headers.should.not.have.property('x-node-red-request-node');

From b49835c72ff176a0e990cce03b07e1352682430d Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 21 Jan 2020 09:49:19 +0900
Subject: [PATCH 277/305] Support BrowserStack in UI testing

---
 Gruntfile.js                             |   4 +
 scripts/install-ui-test-dependencies.sh  |   6 +-
 test/editor/pageobjects/util/key_page.js |   6 ++
 test/editor/wdio.conf.js                 | 108 ++++++++++++++++++-----
 4 files changed, 101 insertions(+), 23 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 67739afe2..bbba61390 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,6 +26,10 @@ module.exports = function(grunt) {
         nodemonArgs.push(flowFile);
     }
 
+    var browserstack = grunt.option('browserstack');
+    if (browserstack) {
+        process.env.BROWSERSTACK = true;
+    }
     var nonHeadless = grunt.option('non-headless');
     if (nonHeadless) {
         process.env.NODE_RED_NON_HEADLESS = true;
diff --git a/scripts/install-ui-test-dependencies.sh b/scripts/install-ui-test-dependencies.sh
index 0e13f0b4f..155d2b275 100755
--- a/scripts/install-ui-test-dependencies.sh
+++ b/scripts/install-ui-test-dependencies.sh
@@ -3,5 +3,7 @@ npm install --no-save \
  wdio-chromedriver-service@^0.1.5 \
  wdio-mocha-framework@^0.6.4 \
  wdio-spec-reporter@^0.1.5 \
- webdriverio@^4.14.1 \
- chromedriver@^78.0.1
+ webdriverio@^4.14.4 \
+ chromedriver@^79.0.0 \
+ wdio-browserstack-service@^0.1.19 \
+ browserstack-local@^1.4.4
diff --git a/test/editor/pageobjects/util/key_page.js b/test/editor/pageobjects/util/key_page.js
index 509af9e22..497a8a141 100644
--- a/test/editor/pageobjects/util/key_page.js
+++ b/test/editor/pageobjects/util/key_page.js
@@ -27,6 +27,12 @@ var shortCutKeyMapForMac = {
 };
 
 function getShortCutKey(type) {
+    if (process.env.BROWSERSTACK) {
+        if (browser.desiredCapabilities.os === 'OS X') {
+            return shortCutKeyMapForMac[type];
+        }
+        return shortCutKeyMap[type];
+    }
     if (os.type() === 'Darwin') {
         return shortCutKeyMapForMac[type];
     }
diff --git a/test/editor/wdio.conf.js b/test/editor/wdio.conf.js
index 7bbfcbe24..4e5a602e0 100644
--- a/test/editor/wdio.conf.js
+++ b/test/editor/wdio.conf.js
@@ -14,6 +14,7 @@
  * limitations under the License.
  **/
 
+var browserstack = require('browserstack-local');
 exports.config = {
     
     //
@@ -48,27 +49,20 @@ exports.config = {
     // and 30 processes will get spawned. The property handles how many capabilities
     // from the same test should run tests.
     //
-    maxInstances: 10,
+    // maxInstances: 10,
     //
     // If you have trouble getting all important capabilities together, check out the
     // Sauce Labs platform configurator - a great tool to configure your capabilities:
     // https://docs.saucelabs.com/reference/platforms-configurator
     //
-    capabilities: [{
+    // capabilities: [{
         // maxInstances can get overwritten per capability. So if you have an in-house Selenium
         // grid with only 5 firefox instances available you can make sure that not more than
         // 5 instances get started at a time.
-        maxInstances: 2,
+        // maxInstances: 5,
         //
-        browserName: 'chrome',
-        'goog:chromeOptions': {
-            args: process.env.NODE_RED_NON_HEADLESS
-                // Runs tests with opening a browser.
-                ? ['--disable-gpu', '--no-sandbox']
-                // Runs tests without opening a browser.
-                : ['--headless', '--disable-gpu', 'window-size=1920,1080', '--no-sandbox']
-        },
-    }],
+        // browserName: 'firefox'
+    // }],
     //
     // ===================
     // Test Configurations
@@ -103,7 +97,7 @@ exports.config = {
     baseUrl: 'http://localhost',
     //
     // Default timeout for all waitFor* commands.
-    waitforTimeout: 10000,
+    waitforTimeout: 20000,
     //
     // Default timeout in milliseconds for request
     // if Selenium Grid doesn't send response
@@ -134,9 +128,7 @@ exports.config = {
     // Services take over a specific job you don't want to take care of. They enhance
     // your test setup with almost no effort. Unlike plugins, they don't add new
     // commands. Instead, they hook themselves up into the test process.
-    port: 9515,
-    path: '/',
-    services: ['chromedriver'],
+    //services: ['chromedriver'],
     //
     // Framework you want to run your specs with.
     // The following are supported: Mocha, Jasmine, and Cucumber
@@ -155,7 +147,7 @@ exports.config = {
     // Options to be passed to Mocha.
     // See the full list at http://mochajs.org/
     mochaOpts: {
-        timeout: 100000,
+        timeout: 1000000,
         ui: 'bdd'
     },
     //
@@ -171,8 +163,44 @@ exports.config = {
      * @param {Object} config wdio configuration object
      * @param {Array.<Object>} capabilities list of capabilities details
      */
-    // onPrepare: function (config, capabilities) {
-    // },
+    onPrepare: function (config, capabilities) {
+        if (process.env.BROWSERSTACK) {
+            return new Promise(function (resolve, reject) {
+                var options = { key: exports.config.key };
+                var proxy = process.env.http_proxy || process.env.HTTP_PROXY;
+                if (proxy) {
+                    var proxyConfigs = proxy.match(/^(https?):\/\/(([^:@\/]+):([^:@\/]+)@)?([^:@\/]+)(:([^:@\/]+))?\/?$/);
+                    if (proxyConfigs) {
+                        var protocol = proxyConfigs[1];
+                        var user = proxyConfigs[3];
+                        var pass = proxyConfigs[4];
+                        var host = proxyConfigs[5];
+                        var port = proxyConfigs[7];
+                        if (!port) {
+                            if (protocol === 'http') {
+                                port = 80;
+                            } else if (protocol === 'https') {
+                                port = 443;
+                            }
+                        }
+                        if (host) { options.proxyHost = host; }
+                        if (port) { options.proxyPort = port; }
+                        if (user) { options.proxyUser = user; }
+                        if (pass) { options.proxyPass = pass; }
+                    } else {
+                        reject('error in parsing the environment variable, http_proxy');
+                    }
+                }
+                exports.bs_local = new browserstack.Local();
+                exports.bs_local.start(options, function (error) {
+                    if (error) {
+                        return reject(error);
+                    }
+                    resolve();
+                });
+            });
+        }
+    },
     /**
      * Gets executed just before initialising the webdriver session and test framework. It allows you
      * to manipulate configurations depending on the capability or spec.
@@ -267,6 +295,44 @@ exports.config = {
      * @param {Object} config wdio configuration object
      * @param {Array.<Object>} capabilities list of capabilities details
      */
-    // onComplete: function(exitCode, config, capabilities) {
-    // }
+    onComplete: function(exitCode, config, capabilities) { 
+        if (process.env.BROWSERSTACK) {
+            exports.bs_local.stop(function () {});
+        }
+    }
+};
+
+if (process.env.BROWSERSTACK) {
+    exports.config.maxInstances = 1;
+    if (process.env.BROWSERSTACK_USERNAME && process.env.BROWSERSTACK_ACCESS_KEY) {
+        exports.config.user = process.env.BROWSERSTACK_USERNAME;
+        exports.config.key = process.env.BROWSERSTACK_ACCESS_KEY;
+    } else {
+        console.log('You need to set the following environment variables.');
+        console.log('BROWSERSTACK_USERNAME=<BrowserStack user name>');
+        console.log('BROWSERSTACK_ACCESS_KEY=<BrowserStack access key>');
+    }
+    exports.config.services = ['browserstack'];
+    var capabilities = [];
+    capabilities.push({ os: 'Windows', os_version: '10', browser: 'Chrome', resolution: '1920x1080', 'browserstack.local': true });
+    capabilities.push({ os: 'Windows', os_version: '10', browser: 'Firefox', resolution: '1920x1080', 'browserstack.local': true });
+    capabilities.push({ os: 'OS X', os_version: 'Catalina', browser: 'Chrome', resolution: '1920x1080', 'browserstack.local': true });
+    capabilities.push({ os: 'OS X', os_version: 'Catalina', browser: 'Firefox', resolution: '1920x1080', 'browserstack.local': true });
+    exports.config.capabilities = capabilities;
+} else {
+    exports.config.maxInstances = 10;
+    exports.config.port = 9515;
+    exports.config.path = '/';
+    exports.config.services = ['chromedriver'];
+    exports.config.capabilities = [{
+        maxInstances: 2,
+        browserName: 'chrome',
+        'goog:chromeOptions': {
+            args: process.env.NODE_RED_NON_HEADLESS
+                // Runs tests with opening a browser.
+                ? ['--disable-gpu', '--no-sandbox']
+                // Runs tests without opening a browser.
+                : ['--headless', '--disable-gpu', 'window-size=1920,1080', '--no-sandbox']
+        }
+    }];
 }

From c16c119a7db3747142c9be34d722f15da7024c89 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Tue, 21 Jan 2020 20:13:34 +0900
Subject: [PATCH 278/305] Remove unnecessary namespaces for i18n

---
 .../@node-red/editor-client/locales/ja/editor.json          | 6 +++---
 .../node_modules/@node-red/nodes/core/parsers/70-HTML.html  | 2 +-
 .../node_modules/@node-red/nodes/core/parsers/70-XML.html   | 2 +-
 .../node_modules/@node-red/nodes/core/parsers/70-YAML.html  | 2 +-
 .../node_modules/@node-red/nodes/core/sequence/18-sort.html | 4 ++--
 .../@node-red/nodes/core/sequence/19-batch.html             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 8290ca1c1..b8e790b66 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -803,9 +803,9 @@
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
         "duplicate": "複製",
-	"error": {
-	    "invalidJSON": "不正なJSON: "
-	}
+        "error": {
+            "invalidJSON": "不正なJSON: "
+        }
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
index 043d60e2b..8fa714ccf 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html
@@ -1,7 +1,7 @@
 
 <script type="text/x-red" data-template-name="html">
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%">
     </div>
     <div class="form-row">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
index 52db99ff2..46ca965e6 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
@@ -1,7 +1,7 @@
 
 <script type="text/x-red" data-template-name="xml">
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
index 6a9e4fd2e..403f40a7a 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
@@ -1,7 +1,7 @@
 
 <script type="text/x-red" data-template-name="yaml">
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
index 8ca2e5be2..cf3fa246d 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.html
@@ -53,8 +53,8 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
index f3cb47a54..418ac605b 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.html
@@ -60,8 +60,8 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
 
 </script>

From 9d4238e5cc11397b5c2aad4e150cf14afca39d58 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 22 Jan 2020 11:53:41 +0000
Subject: [PATCH 279/305] Re-enable jshint on editor and fixup issues

---
 Gruntfile.js                                  | 30 +++++++++----------
 .../editor-client/src/js/settings.js          |  3 +-
 .../src/js/ui/common/treeList.js              |  6 ++--
 .../@node-red/editor-client/src/js/ui/diff.js |  4 +--
 .../editor-client/src/js/ui/editors/json.js   | 10 +++----
 .../src/js/ui/editors/markdown.js             |  2 +-
 .../editor-client/src/js/ui/palette.js        | 14 +++------
 .../src/js/ui/projects/projects.js            |  3 +-
 .../@node-red/editor-client/src/js/ui/view.js |  8 ++---
 9 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 67739afe2..1e421f62d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -80,20 +80,20 @@ module.exports = function(grunt) {
                 //"loopfunc": true, // allow functions to be defined in loops
                 //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
             },
-            all: [
-                'Gruntfile.js',
-                'red.js',
-                'packages/**/*.js'
-            ],
-            core: {
-                files: {
-                    src: [
-                        'Gruntfile.js',
-                        'red.js',
-                        'packages/**/*.js',
-                    ]
-                }
-            },
+            // all: [
+            //     'Gruntfile.js',
+            //     'red.js',
+            //     'packages/**/*.js'
+            // ],
+            // core: {
+            //     files: {
+            //         src: [
+            //             'Gruntfile.js',
+            //             'red.js',
+            //             'packages/**/*.js',
+            //         ]
+            //     }
+            // },
             nodes: {
                 files: {
                     src: [ 'nodes/core/*/*.js' ]
@@ -101,7 +101,7 @@ module.exports = function(grunt) {
             },
             editor: {
                 files: {
-                    src: [ 'editor/js/**/*.js' ]
+                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
                 }
             },
             tests: {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/settings.js b/packages/node_modules/@node-red/editor-client/src/js/settings.js
index e360cea7d..760165581 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -56,8 +56,9 @@ RED.settings = (function () {
         if (key === "auth-tokens") {
             return JSON.parse(localStorage.getItem(key));
         } else {
+            var v;
             try {
-                var v = RED.utils.getMessageProperty(userSettings,key);
+                v = RED.utils.getMessageProperty(userSettings,key);
                 if (v === undefined) {
                     v = defaultIfUndefined;
                 }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index 0e391a5b8..ed04733c9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -410,7 +410,7 @@
                     return;
                 }
                 if (container.hasClass("expanded")) {
-                    done && done();
+                    if (done) { done() }
                     return;
                 }
                 if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
@@ -435,7 +435,7 @@
                                 spinner.remove();
                             }
                         }
-                        done && done();
+                        if (done) { done() }
                         that._trigger("childrenloaded",null,item)
                     }
                     if (typeof item.children === 'function') {
@@ -457,7 +457,7 @@
                     } else {
                         item.treeList.childList.slideDown('fast');
                     }
-                    done && done();
+                    if (done) { done() }
                 }
                 container.addClass("expanded");
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 7c5b22f26..13a157e21 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -1029,9 +1029,9 @@ RED.diff = (function() {
         }
 
         var localSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-local"}).on("click", function(e) { e.stopPropagation();}).appendTo(localDiv);
-        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
+        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-local",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
         var remoteSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-remote"}).on("click", function(e) { e.stopPropagation();}).appendTo(remoteDiv);
-        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
+        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-remote",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
         if (state === 'local') {
             localRadio.prop('checked',true);
         } else if (state === 'remote') {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 9ebb82b0b..3b83e3089 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -327,10 +327,10 @@
                     item.value = valValue;
                     var valClass;
                     switch(valType) {
-                        case 'str':    item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "string";  valClass = "red-ui-debug-msg-type-string"; valValue = '"'+valValue+'"'; break;
-                        case 'num':    item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "number";  valClass = "red-ui-debug-msg-type-number"; break;
-                        case 'bool':   item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "boolean"; valClass = "red-ui-debug-msg-type-other";  item.value = (valValue === "true"); break;
-                        case 'null':   item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "null";    valClass = "red-ui-debug-msg-type-null"; item.value = valValue = "null"; break;
+                        case 'str':    if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "string";  valClass = "red-ui-debug-msg-type-string"; valValue = '"'+valValue+'"'; break;
+                        case 'num':    if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "number";  valClass = "red-ui-debug-msg-type-number"; break;
+                        case 'bool':   if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "boolean"; valClass = "red-ui-debug-msg-type-other";  item.value = (valValue === "true"); break;
+                        case 'null':   if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "null";    valClass = "red-ui-debug-msg-type-null"; item.value = valValue = "null"; break;
                         case 'object':
                             item.treeList.makeParent(orphanedChildren);
                             item.type = "object";
@@ -485,7 +485,7 @@
                             } else if (activeTab === "json-raw") {
                                 result = expressionEditor.getValue();
                             }
-                            onComplete && onComplete(result);
+                            if (onComplete) { onComplete(result) }
                             RED.tray.close();
                         }
                     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 1363ba717..97957eadf 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -32,7 +32,7 @@
             '<button type="button" class="red-ui-button" data-style="bq"><i class="fa fa-quote-left"></i></button>'+
             '<button type="button" class="red-ui-button" data-style="hr"><i class="fa fa-minus"></i></button>'+
             '<button type="button" class="red-ui-button" data-style="link"><i class="fa fa-link"></i></button>'+
-        '</span>'
+        '</span>'+
     '</div>';
 
     var template = '<script type="text/x-red" data-template-name="_markdown">'+
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index d2ef971b3..9961cbf2b 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -212,16 +212,14 @@ RED.palette = (function() {
             }
 
             $('<div/>', {
-                class: "red-ui-palette-label"
-                     + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "")
+                class: "red-ui-palette-label"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "")
             }).appendTo(d);
 
 
             if (def.icon) {
                 var icon_url = RED.utils.getNodeIcon(def);
                 var iconContainer = $('<div/>', {
-                    class: "red-ui-palette-icon-container"
-                         + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "")
+                    class: "red-ui-palette-icon-container"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "")
                 }).appendTo(d);
                 RED.utils.createIconElement(icon_url, iconContainer, true);
             }
@@ -419,14 +417,10 @@ RED.palette = (function() {
             var portOutput = paletteNode.find(".red-ui-palette-port-output");
 
             var paletteLabel = paletteNode.find(".red-ui-palette-label");
-            paletteLabel.attr("class","red-ui-palette-label"
-                 + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : "")
-             );
+            paletteLabel.attr("class","red-ui-palette-label" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : ""));
 
             var paletteIconContainer = paletteNode.find(".red-ui-palette-icon-container");
-            paletteIconContainer.attr("class","red-ui-palette-icon-container"
-                  + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : "")
-              );
+            paletteIconContainer.attr("class","red-ui-palette-icon-container" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : ""));
 
             if (portInput.length === 0 && sf.in.length > 0) {
                 var portIn = document.createElement("div");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
index dc48e558c..0c297c82a 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -1938,8 +1938,9 @@ RED.projects = (function() {
                 resultCallbackArgs = data;
             }
         }).fail(function(xhr,textStatus,err) {
+            var responses;
             if (options.responses && options.responses[xhr.status]) {
-                var responses = options.responses[xhr.status];
+                responses = options.responses[xhr.status];
                 if (typeof responses === 'function') {
                     resultCallback = responses;
                     resultCallbackArgs = {error:responses.statusText};
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 0967c630e..7a561d9cd 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -753,7 +753,7 @@ RED.view = (function() {
         //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
         //     .attr("opacity",0);
 
-        var filter = undefined;
+        var filter;
         if (drag_lines.length > 0) {
             if (drag_lines[0].virtualLink) {
                 filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
@@ -1495,6 +1495,7 @@ RED.view = (function() {
     var lastSelection = null;
     function updateSelection() {
         var selection = {};
+        var activeWorkspace = RED.workspaces.active();
 
         var workspaceSelection = RED.workspaces.selection();
         if (workspaceSelection.length === 0) {
@@ -1504,7 +1505,6 @@ RED.view = (function() {
             if (selected_link != null) {
                 selection.link = selected_link;
             }
-            var activeWorkspace = RED.workspaces.active();
             activeLinks = RED.nodes.filterLinks({
                 source:{z:activeWorkspace},
                 target:{z:activeWorkspace}
@@ -1622,7 +1622,7 @@ RED.view = (function() {
         var workspaceSelection = RED.workspaces.selection();
         if (workspaceSelection.length > 0) {
             var workspaceCount = 0;
-            workspaceSelection.forEach(function(ws) { if (ws.type === 'tab') workspaceCount++ });
+            workspaceSelection.forEach(function(ws) { if (ws.type === 'tab') { workspaceCount++ } });
             if (workspaceCount === RED.workspaces.count()) {
                 // Cannot delete all workspaces
                 return;
@@ -1663,7 +1663,7 @@ RED.view = (function() {
             var removedLinks = [];
             var removedSubflowOutputs = [];
             var removedSubflowInputs = [];
-            var removedSubflowStatus = undefined;
+            var removedSubflowStatus;
             var subflowInstances = [];
 
             var startDirty = RED.nodes.dirty();

From 504d13943df699e53faa8cd21ec8c2743d188521 Mon Sep 17 00:00:00 2001
From: Jiye Yu <jiye.yu.kb@hitachi.com>
Date: Thu, 30 Jan 2020 21:40:44 +0900
Subject: [PATCH 280/305] wrap up the zh-tw UI translation (#2443)

* zh-tw UI translation: complement the rest part

* fix translated sentence according to comments
---
 .../editor-client/locales/zh-TW/editor.json   | 694 +++++++++---------
 1 file changed, 347 insertions(+), 347 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
index 95129acb3..492fce58c 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
@@ -111,17 +111,17 @@
         "warnings": {
             "undeployedChanges": "節點中存在未部署的更改",
             "nodeActionDisabled": "節點動作在子流程中被禁用",
-            "nodeActionDisabledSubflow": "node actions disabled within subflow",
+            "nodeActionDisabledSubflow": "子流程中禁用了節點操作",
             "missing-types": "流程由於缺少節點類型而停止。請檢查日誌的詳細資訊",
-            "safe-mode": "<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.</p>",
+            "safe-mode": "<p>流程在安全模式下停止。</p><p>您可以修改流程並部署更改以重新啟動。</p>",
             "restartRequired": "Node-RED必須重新啟動，以啟用升級的模組",
-            "credentials_load_failed": "<p>Flows stopped as the credentials could not be decrypted.</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p>",
-            "credentials_load_failed_reset": "<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
-            "missing_flow_file": "<p>Project flow file not found.</p><p>The project is not configured with a flow file.</p>",
-            "missing_package_file": "<p>Project package file not found.</p><p>The project is missing a package.json file.</p>",
-            "project_empty": "<p>The project is empty.</p><p>Do you want to create a default set of project files?<br/>Otherwise, you will have to manually add files to the project outside of the editor.</p>",
-            "project_not_found": "<p>Project '__project__' not found.</p>",
-            "git_merge_conflict": "<p>Automatic merging of changes failed.</p><p>Fix the unmerged conflicts then commit the results.</p>"
+            "credentials_load_failed": "<p>流程由於無法解密證書而停止。</p> <p>流程證書文件已加密，但是項目的加密密鑰丟失或無效。</p>",
+            "credentials_load_failed_reset": "<p>證書無法解密</p><p>流程證書文件已加密，但是項目的加密密鑰丟失或無效。</p><p>流程證書文件將在下一次部署時重置。任何現有的流程證書將被清除。</p>",
+            "missing_flow_file": "<p>找不到項目流程文件。</p><p>該項目未配置流程文件。</p>",
+            "missing_package_file": "<p>找不到項目包文件。</p><p>項目缺少package.json文件。</p>",
+            "project_empty": "<p>該項目為空。</p><p>是否要創建一組默認的項目文件？<br/>否則，您將不得不在編輯器外部手動將文件添加到項目中。</p>",
+            "project_not_found": "<p>找不到項目的'__project__'</p>",
+            "git_merge_conflict": "<p>自動合併更改失敗。</p><p>修復未合併的衝突，然後提交結果。</p>"
         },
         "error": "<strong>Error</strong>: __message__",
         "errors": {
@@ -131,30 +131,30 @@
             "cannotAddSubflowToItself": "無法向其自身添加子流程",
             "cannotAddCircularReference": "無法添加子流程 - 迴圈引用",
             "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>請升級到最新版本的Node.js LTS",
-            "failedToAppendNode": "<p>Failed to load '__module__'</p><p>__error__</p>"
+            "failedToAppendNode": "<p>加載'__module__'失敗</p><p>__error__</p>"
         },
         "project": {
-            "change-branch": "Change to local branch '__project__'",
-            "merge-abort": "Git merge aborted",
-            "loaded": "Project '__project__' loaded",
-            "updated": "Project '__project__' updated",
-            "pull": "Project '__project__' reloaded",
-            "revert": "Project '__project__' reverted",
-            "merge-complete": "Git merge completed",
-            "setupCredentials": "Setup credentials",
-            "setupProjectFiles": "Setup project files",
-            "no": "No thanks",
-            "createDefault": "Create default project files",
-            "mergeConflict": "Show merge conflicts"
+            "change-branch": "轉到本地分支'__project__'",
+            "merge-abort": "Git合併中止",
+            "loaded": "已加載項目'__project__'",
+            "updated": "已更新項目'__project__'",
+            "pull": "已重新加載項目'__project__'",
+            "revert": "項目“__project__”已還原",
+            "merge-complete": "Git合併完成",
+            "setupCredentials": "設定證書",
+            "setupProjectFiles": "設置項目文件",
+            "no": "不了，謝謝",
+            "createDefault": "創建默認項目文件",
+            "mergeConflict": "顯示合併衝突"
         },
         "label": {
-            "manage-project-dep": "Manage project dependencies",
-            "setup-cred": "Setup credentials",
-            "setup-project": "Setup project files",
-            "create-default-package": "Create default package file",
-            "no-thanks": "No thanks",
-            "create-default-project": "Create default project files",
-            "show-merge-conflicts": "Show merge conflicts"
+            "manage-project-dep": "管理項目依賴性",
+            "setup-cred": "設定憑證",
+            "setup-project": "設置項目文件",
+            "create-default-package": "創建默認的包文件",
+            "no-thanks": "不了，謝謝",
+            "create-default-project": "創建默認項目文件",
+            "show-merge-conflicts": "顯示合併衝突"
         }
     },
     "clipboard": {
@@ -196,10 +196,10 @@
             "import": "匯入到",
             "newFlow": "新流程",
             "errors": {
-                "notArray": "Input not a JSON Array",
-                "itemNotObject": "Input not a valid flow - item __index__ not a node object",
-                "missingId": "Input not a valid flow - item __index__ missing 'id' property",
-                "missingType": "Input not a valid flow - item __index__ missing 'type' property"
+                "notArray": "輸入的不是JSON數組",
+                "itemNotObject": "輸入的流程無效-項目__index__不是節點對象",
+                "missingId": "輸入的流程無效-項__index__缺少“ id”屬性",
+                "missingType": "輸入的流程無效-項__index__缺少“類型”屬性"
             }
         },
         "copyMessagePath": "已複製路徑",
@@ -212,13 +212,13 @@
         "full": "全面",
         "fullDesc": "在工作區中部署所有內容",
         "modifiedFlows": "已修改的流程",
-        "modifiedFlowsDesc": "只部署包含已更改節點的流",
+        "modifiedFlowsDesc": "只部署包含已更改節點的流程",
         "modifiedNodes": "已更改的節點",
         "modifiedNodesDesc": "只部署已經更改的節點",
-        "restartFlows": "Restart Flows",
-        "restartFlowsDesc": "Restarts the current deployed flows",
+        "restartFlows": "重新啟動流程",
+        "restartFlowsDesc": "重新啟動當前部署的流程",
         "successfulDeploy": "部署成功",
-        "successfulRestart": "Successfully restarted flows",
+        "successfulRestart": "成功重啟流程",
         "deployFailed": "部署失敗: __message__",
         "unusedConfigNodes": "您有一些未使用的配置節點",
         "unusedConfigNodesLink": "點擊此處查看它們",
@@ -238,13 +238,13 @@
             "improperlyConfigured": "工作區包含一些未正確配置的節點:",
             "unknown": "工作區包含一些未知的節點類型:",
             "confirm": "你確定要部署嗎?",
-            "doNotWarn": "do not warn about this again",
+            "doNotWarn": "不要再對此發出警告",
             "conflict": "伺服器正在運行較新的一組流程。",
             "backgroundUpdate": "伺服器上的流程已更新。",
             "conflictChecking": "檢查是否可以自動合併更改",
             "conflictAutoMerge": "此更改不包括衝突，可以自動合併",
             "conflictManualMerge": "這些更改包括了在部署之前必須解決的衝突。",
-            "plusNMore": "+ __count__ more"
+            "plusNMore": "+更多的__count__"
         }
     },
     "eventLog": {
@@ -254,8 +254,8 @@
     "diff": {
         "unresolvedCount": "__count__個未解決的衝突",
         "unresolvedCount_plural": "__count__個未解決的衝突",
-        "globalNodes": "Global nodes",
-        "flowProperties": "Flow Properties",
+        "globalNodes": "全局節點",
+        "flowProperties": "流程屬性",
         "type": {
             "added": "已添加",
             "changed": "已更改",
@@ -270,18 +270,18 @@
         "nodeCount_plural": "__count__個節點",
         "local": "本地",
         "remote": "遠端",
-        "reviewChanges": "Review Changes",
-        "noBinaryFileShowed": "Cannot show binary file contents",
-        "viewCommitDiff": "View Commit Changes",
-        "compareChanges": "Compare Changes",
-        "saveConflict": "Save conflict resolution",
-        "conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
-        "commonVersionError": "Common Version doesn't contain valid JSON:",
-        "oldVersionError": "Old Version doesn't contain valid JSON:",
-        "newVersionError": "New Version doesn't contain valid JSON:"
+        "reviewChanges": "查看變更",
+        "noBinaryFileShowed": "無法顯示二進製文件內容",
+        "viewCommitDiff": "查看提交更改",
+        "compareChanges": "比較變更",
+        "saveConflict": "保存衝突解決",
+        "conflictHeader": "已解決<span>__unresolved__</span>中的<span>__resolved__</span>個衝突",
+        "commonVersionError": "通用版本不包含有效的JSON：",
+        "oldVersionError": "舊版本不包含有效的JSON：",
+        "newVersionError": "新版本不包含有效的JSON："
     },
     "subflow": {
-        "editSubflowInstance": "Edit subflow instance: __name__",
+        "editSubflowInstance": "編輯子流程實例：__name__",
         "editSubflow": "編輯流程範本: __name__",
         "edit": "編輯流程範本",
         "subflowInstances": "這個子流程範本有__count__個實例",
@@ -289,13 +289,13 @@
         "editSubflowProperties": "編輯屬性",
         "input": "輸入:",
         "output": "輸出:",
-        "status": "status node",
+        "status": "狀態節點",
         "deleteSubflow": "刪除子流程",
         "info": "詳細描述",
-        "category": "Category",
+        "category": "類別",
         "env": {
-            "restore": "Restore to subflow default",
-            "remove": "Remove environment variable"
+            "restore": "恢復為默認子流程",
+            "remove": "類別刪除環境變量"
         },
         "errors": {
             "noNodesSelected": "<strong>無法創建子流程</strong>: 未選擇節點",
@@ -323,24 +323,24 @@
         "noDefaultLabel": "無",
         "defaultLabel": "使用默認標籤",
         "searchIcons": "搜尋 icons",
-        "useDefault": "use default",
-        "description": "Description",
-        "show": "Show",
-        "hide": "Hide",
+        "useDefault": "使用默認",
+        "description": "描述",
+        "show": "顯示",
+        "hide": "隱藏",
         "errors": {
-            "scopeChange": "更改範圍將使其他流中的節點無法使用",
-            "invalidProperties": "Invalid properties:"
+            "scopeChange": "更改範圍將使其他流程中的節點無法使用",
+            "invalidProperties": "無效的屬性："
         }
     },
     "keyboard": {
         "title": "鍵盤快速鍵",
-        "keyboard": "Keyboard",
-        "filterActions": "filter actions",
-        "shortcut": "shortcut",
-        "scope": "scope",
+        "keyboard": "鍵盤",
+        "filterActions": "篩選動作",
+        "shortcut": "快捷鍵",
+        "scope": "範圍",
         "unassigned": "未分配",
-        "global": "global",
-        "workspace": "workspace",
+        "global": "全局",
+        "workspace": "工作區",
         "selectAll": "選擇所有節點",
         "selectAllConnected": "選擇所有連接的節點",
         "addRemoveNode": "從選擇中添加/刪除節點",
@@ -351,7 +351,7 @@
         "nudgeNode": "移動所選節點(1px)",
         "moveNode": "移動所選節點(20px)",
         "toggleSidebar": "切換側邊欄",
-        "togglePalette": "Toggle palette",
+        "togglePalette": "切換調色板",
         "copyNode": "複製所選節點",
         "cutNode": "剪切所選節點",
         "pasteNode": "粘貼節點",
@@ -360,20 +360,20 @@
         "managePalette": "管理面板"
     },
     "library": {
-        "library": "Library",
+        "library": "庫",
         "openLibrary": "打開庫...",
         "saveToLibrary": "保存到庫...",
         "typeLibrary": "__type__型別程式庫",
         "unnamedType": "無名__type__",
-        "exportedToLibrary": "Nodes exported to library",
+        "exportedToLibrary": "節點導出到庫",
         "dialogSaveOverwrite": "一個叫做__libraryName__的__libraryType__已經存在，您需要覆蓋麼？",
         "invalidFilename": "無效的檔案名",
         "savedNodes": "保存的節點",
         "savedType": "已保存__type__",
         "saveFailed": "保存失敗: __message__",
         "types": {
-            "local": "Local",
-            "examples": "Examples"
+            "local": "本地",
+            "examples": "例子"
         },
         "exportToLibrary": "將節點匯出到庫",
         "filename": "檔案名",
@@ -387,7 +387,7 @@
         "noInfo": "無可用資訊",
         "filter": "過濾節點",
         "search": "搜索模組",
-        "addCategory": "Add new...",
+        "addCategory": "添加新的...",
         "label": {
             "subflows": "子流程",
             "input": "輸入",
@@ -399,8 +399,8 @@
             "advanced": "高級"
         },
         "actions": {
-            "collapse-all": "Collapse all categories",
-            "expand-all": "Expand all categories"
+            "collapse-all": "收起所有類別",
+            "expand-all": "展開所有類別"
         },
         "event": {
             "nodeAdded": "添加到面板中的節點:",
@@ -450,7 +450,7 @@
             "install": "安裝",
             "installed": "已安裝",
             "conflict": "conflict",
-            "conflictTip": "<p>This module cannot be installed as it includes a<br/>node type that has already been installed</p><p>Conflicts with <code>__module__</code></p>",
+            "conflictTip": "<p>無法安裝此模塊，因為它包含已安裝的<br/>節點類型</p><p>與<code>__module__</code>衝突</p>",
             "loading": "載入目錄...",
             "tab-nodes": "節點",
             "tab-install": "安裝",
@@ -459,7 +459,7 @@
             "sortRecent": "日期順序",
             "more": "增加__count__個",
             "errors": {
-                "catalogLoadFailed": "無法載入節點目錄。<br>查看流覽器控制台瞭解更多資訊",
+                "catalogLoadFailed": "無法載入節點目錄。<br>查看瀏覽器控制台瞭解更多資訊",
                 "installFailed": "無法安裝: __module__<br>__message__<br>查看日誌瞭解更多資訊",
                 "removeFailed": "無法刪除: __module__<br>__message__<br>查看日誌瞭解更多資訊",
                 "updateFailed": "無法更新: __module__<br>__message__<br>查看日誌瞭解更多資訊",
@@ -507,7 +507,7 @@
             "instances": "實例",
             "properties": "屬性",
             "info": "信息",
-            "desc": "Description",
+            "desc": "描述",
             "blank": "空白",
             "null": "空",
             "showMore": "展開",
@@ -534,16 +534,16 @@
             "filtered": "__count__ 個隱藏"
         },
         "context": {
-            "name": "Context Data",
-            "label": "context",
-            "none": "none selected",
-            "refresh": "refresh to load",
-            "empty": "empty",
-            "node": "Node",
-            "flow": "Flow",
-            "global": "Global",
-            "deleteConfirm": "Are you sure you want to delete this item?",
-            "autoRefresh": "Auto-refresh"
+            "name": "上下文數據",
+            "label": "上下文",
+            "none": "未選擇",
+            "refresh": "刷新以加載",
+            "empty": "空",
+            "node": "節點",
+            "flow": "流程",
+            "global": "全局的",
+            "deleteConfirm": "你確定要刪除這個項目嗎？",
+            "autoRefresh": "自動刷新"
         },
         "palette": {
             "name": "節點管理",
@@ -555,149 +555,149 @@
             "description": "描述",
             "dependencies": "依賴",
             "settings": "設置",
-            "noSummaryAvailable": "No summary available",
+            "noSummaryAvailable": "無可用摘要",
             "editDescription": "編輯專案描述",
             "editDependencies": "編輯項目依賴",
             "editReadme": "Edit README.md",
-            "showProjectSettings": "Show project settings",
+            "showProjectSettings": "顯示項目設置",
             "projectSettings": {
-                "title": "Project Settings",
-                "edit": "edit",
+                "title": "項目設定",
+                "edit": "編輯",
                 "none": "None",
-                "install": "install",
-                "removeFromProject": "remove from project",
-                "addToProject": "add to project",
-                "files": "Files",
-                "package": "Package",
-                "flow": "Flow",
-                "credentials": "Credentials",
-                "packageCreate": "File will be created when changes are saved",
-                "fileNotExist": "File does not exist",
-                "selectFile": "Select File",
-                "invalidEncryptionKey": "Invalid encryption key",
-                "encryptionEnabled": "Encryption enabled",
-                "encryptionDisabled": "Encryption disabled",
-                "setTheEncryptionKey": "Set the encryption key",
-                "resetTheEncryptionKey": "Reset the encryption key",
-                "changeTheEncryptionKey": "Change the encryption key",
-                "currentKey": "Current key",
-                "newKey": "New key",
-                "credentialsAlert": "This will delete all existing credentials",
-                "versionControl": "Version Control",
-                "branches": "Branches",
-                "noBranches": "No branches",
-                "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.",
-                "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?",
-                "deleteUnmergedBranch": "Delete unmerged branch",
-                "gitRemotes": "Git remotes",
-                "addRemote": "add remote",
-                "addRemote2": "Add remote",
-                "remoteName": "Remote name",
-                "nameRule": "Must contain only A-Z 0-9 _ -",
+                "install": "安裝",
+                "removeFromProject": "從項目中刪除",
+                "addToProject": "添加到項目",
+                "files": "文件",
+                "package": "包",
+                "flow": "流程",
+                "credentials": "證書",
+                "packageCreate": "保存更改後將創建文件",
+                "fileNotExist": "文件不存在",
+                "selectFile": "選擇文件",
+                "invalidEncryptionKey": "無效的加密密鑰",
+                "encryptionEnabled": "啟用加密",
+                "encryptionDisabled": "禁用加密",
+                "setTheEncryptionKey": "設置加密密鑰",
+                "resetTheEncryptionKey": "重置加密密鑰",
+                "changeTheEncryptionKey": "更改加密密鑰",
+                "currentKey": "當前密鑰",
+                "newKey": "新密鑰",
+                "credentialsAlert": "這將刪除所有現有證書",
+                "versionControl": "版本控制",
+                "branches": "分支",
+                "noBranches": "沒有分支",
+                "deleteConfirm": "您確定要刪除本地分支'__name__'嗎？這不能被撤消。",
+                "unmergedConfirm": "本地分支'__name__'具有未合併的更改，這些更改將丟失。你確定要刪除嗎？",
+                "deleteUnmergedBranch": "刪除未合併的分支",
+                "gitRemotes": "Git遠程倉庫",
+                "addRemote": "添加遠程倉庫",
+                "addRemote2": "添加遠程倉庫",
+                "remoteName": "遠程倉庫名",
+                "nameRule": "必須僅包含A-Z 0-9 _ -",
                 "url": "URL",
                 "urlRule": "https://, ssh:// or file://",
-                "urlRule2": "Do not include the username/password in the URL",
-                "noRemotes": "No remotes",
-                "deleteRemoteConfrim": "Are you sure you want to delete the remote '__name__'?",
-                "deleteRemote": "Delete remote"
+                "urlRule2": "網址中不要包含用戶名/密碼",
+                "noRemotes": "沒有遠程倉庫",
+                "deleteRemoteConfrim": "確定要刪除遠程倉庫'__name__'嗎？",
+                "deleteRemote": "刪除遠程倉庫"
             },
             "userSettings": {
-                "committerDetail": "Committer Details",
-                "committerTip": "Leave blank to use system default",
-                "userName": "Username",
-                "email": "Email",
-                "sshKeys": "SSH Keys",
-                "sshKeysTip": "Allows you to create secure connections to remote git repositories.",
-                "add": "add key",
-                "addSshKey": "Add SSH Key",
-                "addSshKeyTip": "Generate a new public/private key pair",
-                "name": "Name",
-                "nameRule": "Must contain only A-Z 0-9 _ -",
-                "passphrase": "Passphrase",
-                "passphraseShort": "Passphrase too short",
-                "optional": "Optional",
-                "cancel": "Cancel",
-                "generate": "Generate key",
-                "noSshKeys": "No SSH keys",
-                "copyPublicKey": "Copy public key to clipboard",
-                "delete": "Delete key",
-                "gitConfig": "Git config",
-                "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone."
+                "committerDetail": "提交者詳細信息",
+                "committerTip": "保留空白以使用系統默認值",
+                "userName": "用戶名",
+                "email": "電子郵件",
+                "sshKeys": "SSH密鑰",
+                "sshKeysTip": "允許您創建到遠程git存儲庫的安全連接。",
+                "add": "添加密鑰",
+                "addSshKey": "添加SSH密鑰",
+                "addSshKeyTip": "生成新的公鑰/私鑰對",
+                "name": "名字",
+                "nameRule": "必須僅包含A-Z 0-9 _ -",
+                "passphrase": "密碼短語",
+                "passphraseShort": "密碼短語太短",
+                "optional": "可選的",
+                "cancel": "取消",
+                "generate": "產生密鑰",
+                "noSshKeys": "沒有SSH密鑰",
+                "copyPublicKey": "將公鑰複製到剪貼板",
+                "delete": "刪除密鑰",
+                "gitConfig": "Git配置",
+                "deleteConfirm": "您確定要刪除SSH密鑰__name__嗎？ 這不能被撤消。"
             },
             "versionControl": {
-                "unstagedChanges": "Unstaged changes",
-                "stagedChanges": "Staged changes",
-                "unstageChange": "Unstage change",
-                "stageChange": "Stage change",
-                "unstageAllChange": "Unstage all changes",
-                "stageAllChange": "Stage all changes",
-                "commitChanges": "Commit changes",
-                "resolveConflicts": "Resolve conflicts",
+                "unstagedChanges": "未暫存的更改",
+                "stagedChanges": "已暫存的更改",
+                "unstageChange": "取消暫存更改",
+                "stageChange": "暫存更改",
+                "unstageAllChange": "取消暫存所有更改",
+                "stageAllChange": "暫存所有更改",
+                "commitChanges": "提交變更",
+                "resolveConflicts": "解決衝突",
                 "head": "HEAD",
-                "staged": "Staged",
-                "unstaged": "Unstaged",
-                "local": "Local",
-                "remote": "Remote",
-                "revert": "Are you sure you want to revert the changes to '__file__'? This cannot be undone.",
-                "revertChanges": "Revert changes",
-                "localChanges": "Local Changes",
+                "staged": "以暫存",
+                "unstaged": "未暫存",
+                "local": "本地的",
+                "remote": "遠程的",
+                "revert": "您確定要將更改恢復為'__file__'嗎？ 這不能被撤消。",
+                "revertChanges": "還原變更",
+                "localChanges": "當地變化",
                 "none": "None",
-                "conflictResolve": "All conflicts resolved. Commit the changes to complete the merge.",
-                "localFiles": "Local files",
-                "all": "all",
-                "unmergedChanges": "Unmerged changes",
-                "abortMerge": "abort merge",
-                "commit": "commit",
-                "changeToCommit": "Changes to commit",
-                "commitPlaceholder": "Enter your commit message",
-                "cancelCapital": "Cancel",
-                "commitCapital": "Commit",
-                "commitHistory": "Commit History",
-                "branch": "Branch:",
-                "moreCommits": " more commit(s)",
-                "changeLocalBranch": "Change local branch",
-                "createBranchPlaceholder": "Find or create a branch",
-                "upstream": "upstream",
-                "localOverwrite": "You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",
-                "manageRemoteBranch": "Manage remote branch",
-                "unableToAccess": "Unable to access remote repository",
-                "retry": "Retry",
-                "setUpstreamBranch": "Set as upstream branch",
-                "createRemoteBranchPlaceholder": "Find or create a remote branch",
-                "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.",
-                "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.",
-                "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.",
+                "conflictResolve": "解決所有衝突。 提交更改以完成合併。",
+                "localFiles": "本地文件",
+                "all": "所有的",
+                "unmergedChanges": "未合併的更改",
+                "abortMerge": "合併中止",
+                "commit": "提交",
+                "changeToCommit": "提交變更",
+                "commitPlaceholder": "輸入您的提交信息",
+                "cancelCapital": "取消",
+                "commitCapital": "提交",
+                "commitHistory": "提交歷史",
+                "branch": "分支：",
+                "moreCommits": "更多提交",
+                "changeLocalBranch": "變更當地分支",
+                "createBranchPlaceholder": "查找或創建分支",
+                "upstream": "上游的",
+                "localOverwrite": "您有可通过切换分支覆盖的本地更改。您必须先提交或撤销那些更改。",
+                "manageRemoteBranch": "管理遠程分支",
+                "unableToAccess": "無法訪問遠程存儲庫",
+                "retry": "重試",
+                "setUpstreamBranch": "設置為上游分支",
+                "createRemoteBranchPlaceholder": "查找或創建遠程分支",
+                "trackedUpstreamBranch": "創建的分支將被設置為跟踪的上游分支。",
+                "selectUpstreamBranch": "分支將被創建。 在下面選擇以將其設置為被跟踪的上游分支。",
+                "pushFailed": "Push失敗，因為遠程具有更多的最新提交。請先進行pull與merge，然後再嘗試push。",
                 "push": "push",
                 "pull": "pull",
-                "unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>",
-                "showUnstagedChanges": "Show unstaged changes",
-                "connectionFailed": "Could not connect to remote repository: ",
-                "pullUnrelatedHistory": "<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",
-                "pullChanges": "Pull changes",
-                "history": "history",
-                "projectHistory": "Project History",
-                "daysAgo": "__count__ day ago",
-                "daysAgo_plural": "__count__ days ago",
-                "hoursAgo": "__count__ hour ago",
-                "hoursAgo_plural": "__count__ hours ago",
-                "minsAgo": "__count__ min ago",
-                "minsAgo_plural": "__count__ mins ago",
-                "secondsAgo": "Seconds ago",
-                "notTracking": "Your local branch is not currently tracking a remote branch.",
-                "statusUnmergedChanged": "Your repository has unmerged changes. You need to fix the conflicts and commit the result.",
-                "repositoryUpToDate": "Your repository is up to date.",
-                "commitsAhead": "Your repository is __count__ commit ahead of the remote. You can push this commit now.",
-                "commitsAhead_plural": "Your repository is __count__ commits ahead of the remote. You can push these commits now.",
-                "commitsBehind": "Your repository is __count__ commit behind of the remote. You can pull this commit now.",
-                "commitsBehind_plural": "Your repository is __count__ commits behind of the remote. You can pull these commits now.",
-                "commitsAheadAndBehind1": "Your repository is __count__ commit behind and ",
-                "commitsAheadAndBehind1_plural": "Your repository is __count__ commits behind and ",
-                "commitsAheadAndBehind2": "__count__ commit ahead of the remote. ",
-                "commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ",
-                "commitsAheadAndBehind3": "You must pull the remote commit down before pushing.",
-                "commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing.",
-                "refreshCommitHistory": "Refresh commit history",
-                "refreshChanges": "Refresh changes"
+                "unablePull": "<p>無法提取遠程更改；您未進行的暫存本地更改將被覆蓋。</p><p>提交更改，然後重試。</p>",
+                "showUnstagedChanges": "顯示未分階段的更改",
+                "connectionFailed": "無法連接到遠程存儲庫：",
+                "pullUnrelatedHistory": "<p>遠程服務器具有不相關的提交歷史記錄。</p><p>您確定要將更改保存到本地存儲庫中嗎？</p>",
+                "pullChanges": "Pull變更",
+                "history": "歷史",
+                "projectHistory": "項目歷史",
+                "daysAgo": "__count__天前",
+                "daysAgo_plural": "__count__天前",
+                "hoursAgo": "__count__小時前",
+                "hoursAgo_plural": "__count__小時前",
+                "minsAgo": "__count__分鐘前",
+                "minsAgo_plural": "__count__分鐘前",
+                "secondsAgo": "秒前",
+                "notTracking": "您的本地分支當前未跟踪遠程分支。",
+                "statusUnmergedChanged": "您的存儲庫中有未合併的更改。您需要解決衝突並提交結果。",
+                "repositoryUpToDate": "您的存儲庫是最新的。",
+                "commitsAhead": "您的倉庫領先遠程倉庫__count__次提交。您現在可以push這些提交。",
+                "commitsAhead_plural": "您的倉庫領先遠程倉庫__count__次提交。您現在可以push這些提交。",
+                "commitsBehind": "您的倉庫落後遠程倉庫__count__次提交。您現在可以pull這些提交。",
+                "commitsBehind_plural": "您的倉庫落後遠程倉庫__count__次提交。您現在可以pull這些提交。",
+                "commitsAheadAndBehind1": "您的倉庫落後遠程倉庫__count__次提交",
+                "commitsAheadAndBehind1_plural": "您的倉庫落後遠程倉庫__count__次提交",
+                "commitsAheadAndBehind2": "領先遠程倉庫__count__次提交。",
+                "commitsAheadAndBehind2_plural": "領先遠程倉庫__count__次提交。",
+                "commitsAheadAndBehind3": "您必須先pull遠程提交，然後再進行push。",
+                "commitsAheadAndBehind3_plural": "您必須先pull遠程提交，然後再進行push。",
+                "refreshCommitHistory": "刷新提交歷史",
+                "refreshChanges": "刷新更改"
             }
         }
     },
@@ -773,173 +773,173 @@
         "modeDesc": "<h3>緩衝區編輯器</h3><p>緩衝區類型被存儲為位元組值的JSON陣列。編輯器將嘗試將輸入的數值解析為JSON陣列。如果它不是有效的JSON，它將被視為UTF-8字串，並被轉換為單個字元代碼點的陣列。</p><p>例如，<code>Hello World</code>的值會被轉換為JSON陣列：<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
     },
     "projects": {
-        "config-git": "Configure Git client",
+        "config-git": "配置Git客戶端",
         "welcome": {
-            "hello": "Hello! We have introduced 'projects' to Node-RED.",
-            "desc0": "This is a new way for you to manage your flow files and includes version control of your flows.",
-            "desc1": "To get started you can create your first project or clone an existing project from a git repository.",
-            "desc2": "If you are not sure, you can skip this for now. You will still be able to create your first project from the 'Projects' menu at any time.",
-            "create": "Create Project",
-            "clone": "Clone Repository",
-            "openExistingProject": "Open existing project",
-            "not-right-now": "Not right now"
+            "hello": "你好！ 我們已經將“項目”引入了Node-RED。",
+            "desc0": "這是一種用於管理流程文件的新方法，並且包括對流程的版本控制。",
+            "desc1": "首先，您可以創建您的第一個項目或從git存儲庫克隆現有項目。",
+            "desc2": "如果不確定，可以暫時跳過此步驟。 您仍然可以隨時通過“項目”菜單創建第一個項目。",
+            "create": "創建項目",
+            "clone": "克隆存儲庫",
+            "openExistingProject": "打開現有項目",
+            "not-right-now": "不是現在"
         },
         "git-config": {
-            "setup": "Setup your version control client",
-            "desc0": "Node-RED uses the open source tool Git for version control. It tracks changes to your project files and lets you push them to remote repositories.",
-            "desc1": "When you commit a set of changes, Git records who made the changes with a username and email address. The Username can be anything you want - it does not need to be your real name.",
-            "desc2": "Your Git client is already configured with the details below.",
-            "desc3": "You can change these settings later under the 'Git config' tab of the settings dialog.",
-            "username": "Username",
-            "email": "Email"
+            "setup": "設置您的版本控制客戶端",
+            "desc0": "Node-RED使用開源工具Git進行版本控制。 它跟踪對項目文件的更改，並允許您將其推送到遠程存儲庫。",
+            "desc1": "提交一組更改時，Git會使用用戶名和電子郵件地址記錄誰進行了更改。 用戶名可以是您想要的任何名稱-不必是您的真實姓名。",
+            "desc2": "您的Git客戶端已經配置了以下詳細信息。",
+            "desc3": "您可以稍後在設置對話框的“ Git config”標籤下更改這些設置。",
+            "username": "用戶名",
+            "email": "電子郵件"
         },
         "project-details": {
-            "create": "Create your project",
-            "desc0": "A project is maintained as a Git repository. It makes it much easier to share your flows with others and to collaborate on them.",
-            "desc1": "You can create multiple projects and quickly switch between them from the editor.",
-            "desc2": "To begin, your project needs a name and an optional description.",
-            "already-exists": "Project already exists",
-            "must-contain": "Must contain only A-Z 0-9 _ -",
-            "project-name": "Project name",
+            "create": "創建您的項目",
+            "desc0": "項目被維護為Git存儲庫。 與他人共享您的流程並進行協作更容易。",
+            "desc1": "您可以創建多個項目，並通過編輯器在它們之間快速切換。",
+            "desc2": "首先，您的項目需要一個名稱和一個可選的描述。",
+            "already-exists": "項目已存在",
+            "must-contain": "必須僅包含A-Z 0-9 _ -",
+            "project-name": "項目名",
             "desc": "描述",
-            "opt": "Optional"
+            "opt": "可選的"
         },
         "clone-project": {
-            "clone": "Clone a project",
-            "desc0": "If you already have a git repository containing a project, you can clone it to get started.",
-            "already-exists": "Project already exists",
-            "must-contain": "Must contain only A-Z 0-9 _ -",
-            "project-name": "Project name",
-            "no-info-in-url": "Do not include the username/password in the url",
-            "git-url": "Git repository URL",
+            "clone": "克隆項目",
+            "desc0": "如果您已經有一個包含項目的git存儲庫，則可以對其進行克隆以開始使用。",
+            "already-exists": "項目已經存在",
+            "must-contain": "必須僅包含A-Z 0-9 _ -",
+            "project-name": "項目名",
+            "no-info-in-url": "網址中不要包含用戶名/密碼",
+            "git-url": "Git存儲庫URL",
             "protocols": "https://, ssh:// or file://",
-            "auth-failed": "Authentication failed",
-            "username": "Username",
-            "passwd": "Password",
-            "ssh-key": "SSH Key",
-            "passphrase": "Passphrase",
-            "ssh-key-desc": "Before you can clone a repository over ssh you must add an SSH key to access it.",
-            "ssh-key-add": "Add an ssh key",
-            "credential-key": "Credentials encryption key",
-            "cant-get-ssh-key": "Error! Can't get selected SSH key path.",
-            "already-exists2": "already exists",
-            "git-error": "git error",
-            "connection-failed": "Connection failed",
-            "not-git-repo": "Not a git repository",
-            "repo-not-found": "Repository not found"
+            "auth-failed": "驗證失敗",
+            "username": "用戶名",
+            "passwd": "密碼",
+            "ssh-key": "SSH密鑰",
+            "passphrase": "密碼短語",
+            "ssh-key-desc": "在通過ssh克隆存儲庫之前，必須添加SSH密鑰才能訪問它。",
+            "ssh-key-add": "添加一個ssh密鑰",
+            "credential-key": "證書加密密鑰",
+            "cant-get-ssh-key": "錯誤！ 無法獲取所選的SSH密鑰路徑。",
+            "already-exists2": "已存在",
+            "git-error": "git錯誤",
+            "connection-failed": "連接失敗",
+            "not-git-repo": "不是一個git倉庫",
+            "repo-not-found": "未發現倉庫"
         },
         "default-files": {
-            "create": "Create your project files",
-            "desc0": "A project contains your flow files, a README file and a package.json file.",
-            "desc1": "It can contain any other files you want to maintain in the Git repository.",
-            "desc2": "Your existing flow and credential files will be copied into the project.",
-            "flow-file": "Flow file",
-            "credentials-file": "Credentials file"
+            "create": "創建您的項目文件",
+            "desc0": "一個項目包含您的流程文件，自述文件和package.json文件。",
+            "desc1": "它可以包含您要在Git存儲庫中維護的任何其他文件。",
+            "desc2": "您現有的流程和證書文件將被複製到項目中。",
+            "flow-file": "流文件",
+            "credentials-file": "證書文件"
         },
         "encryption-config": {
-            "setup": "Setup encryption of your credentials file",
-            "desc0": "Your flow credentials file can be encrypted to keep its contents secure.",
-            "desc1": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
-            "desc2": "Your flow credentials file is not currently encrypted.",
-            "desc3": "That means its contents, such as passwords and access tokens, can be read by anyone with access to the file.",
-            "desc4": "If you want to store these credentials in a public Git repository, you must encrypt them by providing a secret key phrase.",
-            "desc5": "Your flow credentials file is currently encrypted using the credentialSecret property from your settings file as the key.",
-            "desc6": "Your flow credentials file is currently encrypted using a system-generated key. You should provide a new secret key for this project.",
-            "desc7": "The key will be stored separately from your project files. You will need to provide the key to use this project in another instance of Node-RED.",
-            "credentials": "Credentials",
-            "enable": "Enable encryption",
-            "disable": "Disable encryption",
-            "disabled": "disabled",
-            "copy": "Copy over existing key",
-            "use-custom": "Use custom key",
-            "desc8": "The credentials file will not be encrypted and its contents easily read",
-            "create-project-files": "Create project files",
-            "create-project": "Create project",
-            "already-exists": "already exists",
-            "git-error": "git error",
-            "git-auth-error": "git auth error"
+            "setup": "設置證書文件的加密",
+            "desc0": "您的流程證書文件可以被加密以確保其內容安全。",
+            "desc1": "如果要將這些證書存儲在公共Git存儲庫中，則必須通過提供密鑰短語來對它們進行加密。",
+            "desc2": "您的流程證書文件當前未加密。",
+            "desc3": "這意味著任何有權訪問該文件的人都可以讀取其內容，例如密碼和訪問令牌。",
+            "desc4": "如果要將這些證書存儲在公共Git存儲庫中，則必須通過提供密鑰短語來對它們進行加密。",
+            "desc5": "當前，使用設置文件中的credentialSecret屬性作為密鑰來加密流憑據文件。",
+            "desc6": "您的流程證書文件當前使用系統生成的密鑰加密。 您應該為此項目提供一個新的密鑰。",
+            "desc7": "密鑰將與項目文件分開存儲。 您將需要提供在另一個Node-RED實例中使用該項目的密鑰。",
+            "credentials": "證書",
+            "enable": "啟用加密",
+            "disable": "禁用加密",
+            "disabled": "禁用的",
+            "copy": "複製現有密鑰",
+            "use-custom": "使用自定義密鑰",
+            "desc8": "憑證文件不會被加密，其內容很容易閱讀",
+            "create-project-files": "創建項目文件",
+            "create-project": "創建項目",
+            "already-exists": "已存在",
+            "git-error": "git錯誤",
+            "git-auth-error": "git認證錯誤"
         },
         "create-success": {
-            "success": "You have successfully created your first project!",
-            "desc0": "You can now continue to use Node-RED just as you always have.",
-            "desc1": "The 'info' tab in the sidebar shows you what your current active project is. The button next to the name can be used to access the project settings view.",
-            "desc2": "The 'history' tab in the sidebar can be used to view files that have changed in your project and to commit them. It shows you a complete history of your commits and allows you to push your changes to a remote repository."
+            "success": "您已經成功創建了第一個項目！",
+            "desc0": "現在，您可以像往常一樣繼續使用Node-RED。",
+            "desc1": "側欄中的“信息”標籤顯示了您當前的活動項目。名稱旁邊的按鈕可用於訪問項目設置視圖。",
+            "desc2": "側欄中的“歷史記錄”標籤可用於查看項目中已更改的文件並提交。 它向您顯示了提交的完整歷史記錄，並允許您將更改推送到遠程存儲庫。"
         },
         "create": {
-            "projects": "Projects",
-            "already-exists": "Project already exists",
-            "must-contain": "Must contain only A-Z 0-9 _ -",
-            "no-info-in-url": "Do not include the username/password in the url",
-            "open": "Open Project",
-            "create": "Create Project",
-            "clone": "Clone Repository",
-            "project-name": "Project name",
+            "projects": "項目",
+            "already-exists": "項目已存在",
+            "must-contain": "必須僅包含A-Z 0-9 _ -",
+            "no-info-in-url": "網址中不要包含用戶名/密碼",
+            "open": "打開項目",
+            "create": "創建項目",
+            "clone": "克隆倉庫",
+            "project-name": "項目名",
             "desc": "描述",
-            "opt": "Optional",
-            "flow-file": "Flow file",
-            "credentials": "Credentials",
-            "enable-encryption": "Enable encryption",
-            "disable-encryption": "Disable encryption",
-            "encryption-key": "Encryption key",
-            "desc0": "A phrase to secure your credentials with",
-            "desc1": "The credentials file will not be encrypted and its contents easily read",
-            "git-url": "Git repository URL",
+            "opt": "可選的",
+            "flow-file": "流程文件",
+            "credentials": "證書",
+            "enable-encryption": "啟用加密",
+            "disable-encryption": "禁用加密",
+            "encryption-key": "加密的密鑰",
+            "desc0": "用來保護您的憑證的短語",
+            "desc1": "憑證文件不會被加密，其內容很容易閱讀",
+            "git-url": "Git倉庫的URL",
             "protocols": "https://, ssh:// or file://",
-            "auth-failed": "Authentication failed",
-            "username": "Username",
-            "password": "Password",
-            "ssh-key": "SSH Key",
-            "passphrase": "Passphrase",
-            "desc2": "Before you can clone a repository over ssh you must add an SSH key to access it.",
-            "add-ssh-key": "Add an ssh key",
-            "credentials-encryption-key": "Credentials encryption key",
-            "already-exists-2": "already exists",
-            "git-error": "git error",
-            "con-failed": "Connection failed",
-            "not-git": "Not a git repository",
-            "no-resource": "Repository not found",
-            "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
-            "unexpected_error": "unexpected_error"
+            "auth-failed": "驗證失敗",
+            "username": "用戶名",
+            "password": "密碼",
+            "ssh-key": "SSH密鑰",
+            "passphrase": "密碼短語",
+            "desc2": "在通過ssh克隆存儲庫之前，必須添加SSH密鑰才能訪問它。",
+            "add-ssh-key": "添加一個ssh密鑰",
+            "credentials-encryption-key": "憑證加密密鑰",
+            "already-exists-2": "已存在",
+            "git-error": "git錯誤",
+            "con-failed": "連接失敗",
+            "not-git": "不是git倉庫",
+            "no-resource": "找不到存儲庫",
+            "cant-get-ssh-key-path": "錯誤！ 無法獲取所選的SSH密鑰路徑。",
+            "unexpected_error": "意外的錯誤"
         },
         "delete": {
-            "confirm": "Are you sure you want to delete this project?"
+            "confirm": "您確定要刪除此項目嗎？"
         },
         "create-project-list": {
-            "search": "search your projects",
-            "current": "current"
+            "search": "搜索您的項目",
+            "current": "當前的"
         },
         "require-clean": {
-            "confirm": "<p>You have undeployed changes that will be lost.</p><p>Do you want to continue?</p>"
+            "confirm": "<p>您有未部署的更改，這些更改將丟失。</p><p>您要繼續嗎？</p>"
         },
         "send-req": {
-            "auth-req": "Authentication required for repository",
-            "username": "Username",
-            "password": "Password",
-            "passphrase": "Passphrase",
-            "retry": "Retry",
-            "update-failed": "Failed to update auth",
-            "unhandled": "Unhandled error response"
+            "auth-req": "存儲庫需要認證",
+            "username": "用戶名",
+            "password": "密碼",
+            "passphrase": "密碼短語",
+            "retry": "重試",
+            "update-failed": "無法更新身份驗證",
+            "unhandled": "未處理的錯誤響應"
         },
         "create-branch-list": {
-            "invalid": "Invalid branch",
-            "create": "Create branch",
-            "current": "current"
+            "invalid": "無效的分支",
+            "create": "創建分支",
+            "current": "當前的"
         },
         "create-default-file-set": {
-            "no-active": "Cannot create default file set without an active project",
-            "no-empty": "Cannot create default file set on a non-empty project",
+            "no-active": "沒有活動項目就無法創建默認文件集",
+            "no-empty": "無法在非空項目上創建默認文件集",
             "git-error": "git error"
         },
         "errors": {
-            "no-username-email": "Your Git client is not configured with a username/email.",
-            "unexpected": "An unexpected error occurred",
-            "code": "code"
+            "no-username-email": "您的Git客戶端未配置用戶名/電子郵件。",
+            "unexpected": "發生了一個意料之外的問題",
+            "code": "代碼"
         }
     },
     "editor-tab": {
-        "properties": "Properties",
+        "properties": "屬性",
         "description": "描述",
-        "appearance": "Appearance",
-        "env": "Environment Variables"
+        "appearance": "外觀",
+        "env": "環境變量"
     }
-}
\ No newline at end of file
+}

From 7ffd37d9cb0d1e9ad7a49dcc2a111cca8085f8f4 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Tue, 28 Jan 2020 13:39:41 +0900
Subject: [PATCH 281/305] add zn-CN translation for
 nodes:common,function,storage

---
 .../nodes/locales/zh-CN/common/20-inject.html | 34 +++++++++
 .../nodes/locales/zh-CN/common/21-debug.html  | 25 +++++++
 .../locales/zh-CN/common/24-complete.html     | 24 ++++++
 .../nodes/locales/zh-CN/common/25-catch.html  | 36 +++++++++
 .../nodes/locales/zh-CN/common/25-status.html | 33 +++++++++
 .../nodes/locales/zh-CN/common/60-link.html   | 31 ++++++++
 .../locales/zh-CN/common/90-comment.html      | 21 ++++++
 .../locales/zh-CN/common/98-unknown.html      | 24 ++++++
 .../locales/zh-CN/function/10-function.html   | 51 +++++++++++++
 .../locales/zh-CN/function/10-switch.html     | 37 ++++++++++
 .../locales/zh-CN/function/15-change.html     | 33 +++++++++
 .../locales/zh-CN/function/16-range.html      | 40 ++++++++++
 .../locales/zh-CN/function/80-template.html   | 46 ++++++++++++
 .../locales/zh-CN/function/89-delay.html      | 32 ++++++++
 .../locales/zh-CN/function/89-trigger.html    | 33 +++++++++
 .../nodes/locales/zh-CN/function/90-exec.html | 74 +++++++++++++++++++
 .../nodes/locales/zh-CN/storage/10-file.html  | 59 +++++++++++++++
 .../nodes/locales/zh-CN/storage/23-watch.html | 25 +++++++
 18 files changed, 658 insertions(+)
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/24-complete.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-catch.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/60-link.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/90-comment.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/common/98-unknown.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-switch.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/15-change.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/80-template.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-delay.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/storage/23-watch.html

diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
new file mode 100644
index 000000000..142b362fa
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
@@ -0,0 +1,34 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="inject">
+<p>手动或定期得将消息注入流中。消息的payload可以为多种类型，包括字符串，JavaScript对象或当前时间。</p>
+<h3>输出</h3>
+<dl class="message-properties">
+    <dt>payload<span class="property-type">various</span></dt>
+    <dd>指定的消息的payload。</dd>
+    <dt class="optional">topic <span class="property-type">字符串</span></dt>
+    <dd>可以在节点中配置的可选属性。</dd>
+</dl>
+<h3>详细</h3>
+<p>通过使用特定的payload值，注入节点可以启动流。默认payload是当前时间的时间戳（以毫秒为单位，自1970年1月1日起）。</p>
+<p>该节点还支持注入字符串，数字，布尔值，JavaScript对象或流/全局上下文值。</p>
+<p>默认情况下，节点可以通过在编辑器中单击节点按钮来手动触发。同时也可以被设置为定期或按计划注入。</p>
+<p>另一个可选的设置是在每次启动流时注入一次。</p>
+<p>可以指定的最大<i>间隔</i>约为596小时/24天。 但是，如果对于间隔超过一天的那些间隔，建议您使用scheduler节点来应对断电或重启。</p>
+<p><b>注意</b>：选项<i>“时间间隔” </i>和<i>“特定时间” </i>使用了标准cron系统。这意味着因此“20分钟”并不表示在此之后20分钟，而是每小时的20分钟，40分钟。如果您希望设定为从现在开始的每20分钟，那么请使用<i>“间隔” </i>选项。</p>
+<p><b>注意</b>: 如果您想在字符串中包含换行符，必须使用“功能”节点创建payload。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
new file mode 100644
index 000000000..f96c74f6d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
@@ -0,0 +1,25 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="debug">
+    <p>在“调试”侧边栏选项卡和运行时日志中显示选定的消息属性。 默认情况下，它会显示<code> msg.payload </code>，但也可以设置成显示任意属性，完整消息或JSONata表达式的结果。</p>
+    <h3>详细</h3>
+    <p>调试侧边栏会提供已发消息的结构化视图，方便您查询消息的结构。</p>
+    <p>JavaScript对象和数组可以根据需要来折叠或扩展。缓冲区对象可以显示为原始数据，也可以显示为字符串。</p>
+    <p>对任意条消息，调试侧边栏还会显示接收消息的时间，发送消息的节点以及消息类型等信息。单击源节点ID将在工作区中显示该节点。</p>
+    <p>节点上的按钮可用于启用或禁用其输出。建议禁用或删除所有未使用的调试节点。</p>
+    <p>还可以通过配置节点，将所有消息发送到运行时日志，或将简短的数据（32个字符内）在调试节点下的状态文本上显示。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/24-complete.html
new file mode 100644
index 000000000..e69ebc6a0
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/24-complete.html
@@ -0,0 +1,24 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="complete">
+    <p>当另一个节点完成对消息的处理时触发流。</p>
+    <h3>详细</h3>
+    <p>如果一个节点通知运行时它已完成消息的处理，该节点可用于触发第二个流。</p>
+    <p>这个节点可以与没有输出端口的节点一起使用，例如在使用电子邮件发送节点来发送邮件后触发一个流。</p>
+    <p>此节点只能被设置为处理流中某个所选节点的事件。与Catch节点不同，您不能指定“所有节点”模式并以流中的所有节点为目标。</p>
+    <p>并非所有节点都会触发此事件。这取决于它们是否支持于Node-RED 1.0中引入的此功能。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-catch.html
new file mode 100644
index 000000000..5b2b4c3b2
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-catch.html
@@ -0,0 +1,36 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="catch">
+    <p>捕获由同一标签页上的节点引发的错误。</p>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>error.message <span class="property-type">字符串</span></dt>
+        <dd>错误消息。</dd>
+        <dt>error.source.id <span class="property-type">字符串</span></dt>
+        <dd>引发错误的节点的ID。</dd>
+        <dt>error.source.type <span class="property-type">字符串</span></dt>
+        <dd>引发错误的节点的类型。</dd>
+        <dt>error.source.name <span class="property-type">字符串</span></dt>
+        <dd>引发错误的节点的名称。（如果已设置）</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>如果节点在处理消息时抛出错误，则流程通常会停止。该节点可用于捕获那些错误并通过专用流程进行处理。</p>
+    <p>默认情况下，该节点将捕获同一标签页上任何节点抛出的错误。或者，它可以针对特定节点，或配置为仅捕获另一个“目标”捕获节点尚未捕获的错误。</p>
+    <p>当错误发生时，所有匹配的catch节点都会收到错误消息。</p>
+    <p>如果在子流中发送了错误，则该错误将由子流中的任意捕获节点处理。如果子流中不存在捕获节点，则那错误将被传播到子流实例所在的标签页。</p>
+    <p>如果消息已经具有<code>error</code>属性，则将该<code>error</code>复制为<code>_error</code>。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
new file mode 100644
index 000000000..133bc93d5
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
@@ -0,0 +1,33 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="status">
+    <p>获取在同一标签页上的其他节点的状态消息。</p>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>status.text <span class="property-type">字符串</span></dt>
+        <dd>状态文本。</dd>
+        <dt>status.source.type <span class="property-type">字符串</span></dt>
+        <dd>报告状态的节点的类型。</dd>
+        <dt>status.source.id <span class="property-type">字符串</span></dt>
+        <dd>报告状态的节点的ID。</dd>
+        <dt>status.source.name <span class="property-type">字符串</span></dt>
+        <dd>报告状态的节点的名称（如果已设置）。</dd>
+    </dl>
+    <h3>详细</h3>
+   <p>该节点不包含<code>payload</code>。</p>
+   <p>默认情况下，节点会获取同一工作空间标签页上报告所有节点的状态。可以通过配置来设定目标节点。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/60-link.html
new file mode 100644
index 000000000..6f2bc5f99
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/60-link.html
@@ -0,0 +1,31 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="link in">
+    <p>在流之间创建虚拟连线。</p>
+    <h3>详细</h3>
+    <p>该节点可以连接到任何标签页上存在的任何<code>link out</code>节点。连接后，它们的行为就像连接在一起。</p>
+    <p>仅当选择链接节点时，才会显示链接节点之间的链接。如果有指向另一个选项卡的链接，则显示一个虚拟节点。单击该虚拟节点将带您到相应的选项卡。</p>
+    <p><b>注意：</b>无法创建进入或离开子流的链接。</p>
+</script>
+
+<script type="text/x-red" data-help-name="link out">
+    <p>在流之间创建虚拟连线。</p>
+    <h3>详细</h3>
+    <p>该节点可以连接到任何标签页上存在的任何<code>link in</code>节点。连接后，它们的行为就像连接在一起。</p>
+    <p>仅当选择链接节点时，才会显示链接节点之间的链接。如果有指向另一个选项卡的链接，则显示一个虚拟节点。单击该虚拟节点将带您到相应的选项卡。</p>
+    <p><b>注意：</b>无法创建进入或离开子流的链接。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/90-comment.html
new file mode 100644
index 000000000..f98577ff4
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/90-comment.html
@@ -0,0 +1,21 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="comment">
+    <p>可用于向流添加注释的节点。</p>
+    <h3>详细</h3>
+    <p>编辑面板接受Markdown语法。输入的文本将在信息侧面板中显示。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/98-unknown.html
new file mode 100644
index 000000000..108e19228
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/98-unknown.html
@@ -0,0 +1,24 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="unknown">
+    <p>您安装的Node-RED无法识别该节点的类型。</p>
+    <h3>详细</h3>
+    <p><i>如果在此状态下部署节点，其配置会被保存。但是在安装缺少的类型之前，流不会开始。</i></p>
+    <p>使用<code> Menu-Manage Palette </code>选项来搜索并安装节点，或者使用<b>npm install &lt;module&gt;</b>来安装所有缺少的节点，并重新启动Node-Red来导入这些节点。</p>
+    <p>另一种可能是，您已经安装了此节点类型，但是缺少必须的依赖项。您应检查Node-RED的启动日志中是否有与缺少节点有关的错误消息。</p>
+    <p>以上方法都不适用时，您可以联系该流的作者以获取缺少的节点类型的副本。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html
new file mode 100644
index 000000000..035ccc81f
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html
@@ -0,0 +1,51 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="function">
+    <p>定义对接收到的消息进行处理的JavaScript代码（函数的主体）。</p>
+    <p>输入消息在名为<code>msg</code>的JavaScript对象中传递。</p>
+    <p>通常，<code>msg</code>对象将消息正文保留在<code>msg.payload</code>属性中。</p>
+    <p>该函数一般会返回一个消息对象（或多个消息对象），但也可以为了停止流而什么都不返回。</p>
+    <h3>详细</h3>
+    <p>请参见<a target="_blank" href="http://nodered.org/docs/writing-functions.html">在线文档</a>来获得更多有关编写函数的信息。</p>
+    <h4>传送消息</h4>
+    <p>要将消息传递到流中的下一个节点，请返回消息或调用<code>node.send(messages)</code>。</p>
+    <p>它将返回/send:</p>
+    <ul>
+      <li>单个消息对象 - 传递给连接到第一个输出的节点</li>
+      <li>消息对象数组，传递给连接到相应输出的节点</li>
+    </ul>
+    <p>如果数组元素是数组，则将多个消息发送到相应的输出。</p>
+    <p>无论return方法是单个值还是数组元素，如果返回值为null，则不会发送任何消息。</p>
+    <h4>日志输出和错误处理</h4>
+    <p>使用以下功能输出日志信息和输出错误：</p>
+      <ul>
+          <li><code>node.log("Log message")</code></li>
+          <li><code>node.warn("Warning")</code></li>
+          <li><code>node.error("Error")</code></li>
+      </ul>
+    </p>
+    <p>使用catch节点可以进行错误处理。 要由catch节点处理，请将<code>msg</code>作为<code>node.error</code>的第二个参数传递：</p>
+    <pre>node.error("Error",msg);</pre>
+    <h4>访问节点信息</h4>
+    <p>您可以使用以下属性来在代码中引用节点ID和名称：</p>
+    <ul>
+        <li><code>node.id</code> - 节点的ID</li>
+        <li><code>node.name</code> - 节点的名称</li>
+    </ul>
+    <h4>使用环境变量</h4>
+    <p>环境变量可以通过<code>env.get("MY_ENV_VAR")</code>来进行访问。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-switch.html
new file mode 100644
index 000000000..7ad25c24f
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-switch.html
@@ -0,0 +1,37 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="switch">
+    <p>按属性值来分配消息的传送路线。</p>
+    <h3>详细</h3>
+    <p>根据接收到的消息评估指定的规则，然后将消息发送到与匹配的规则相对应的输出端口。</p>
+    <p>可以将节点设置为一旦发现一个匹配的规则，则停止后续的匹配。</p>
+    <p>对于评估规则，可以使用消息属性，流上下文/全局上下文属性，环境变量和JSONata表达式的评估结果。</p>
+    <h4>规则</h4>
+    <p>有四种规则：</p>
+    <ol>
+        <li><b>值</b>根据配置的属性评估规则</li>
+        <li><b>顺序</b>可用于消息序列的规则，例如由“拆分”节点生成的规则</li>
+        <li><b>JSONata表达式</b>评估整个消息，如果结果为真，则匹配。</li>
+        <li><b>其他</b>上述规则都不匹配时适用</li>
+    </ol>
+    <h4>注释</h4>
+    <p><code>is true/false</code>与<code>is null</code> 规则将对类型进行严格的匹配。匹配之前的类型转化不会发生。</p>
+    <p><code>is empty</code>规则与零字节的字符串，数组，缓冲区或没有属性的对象相匹配。与<code>null</code>或者<code>undefined</code>等不匹配。</p>
+    <h4>处理消息序列</h4>
+    <p>默认情况下，节点不会修改<code>msg.parts</code>属性。</p>
+    <p>可以启用<b>重建消息序列</b>选项来为每条匹配的规则生成新的消息序列。在这种模式下，节点将在发送新序列之前对整个传入序列进行缓存。运行时的设定<code>nodeMessageBufferMaxLength</code>可以用来限制可缓存的消息数目。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/15-change.html
new file mode 100644
index 000000000..fcba3fed4
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/15-change.html
@@ -0,0 +1,33 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="change">
+    <p>设置，更改，删除或移动消息，流上下文或全局上下文的属性。</p>
+    <p>如果指定了多个规则，则将按定义的顺序来应用它们。</p>
+    <h3>详细</h3>
+    <p>可用的操作有：</p>
+    <dl class="message-properties">
+    <dt>设置</dt>
+    <dd>设置一个属性。该值可以是多种不同类型，也可以从现有消息或上下文属性中获取。</dd>
+    <dt>置换</dt>
+    <dd>搜索并替换属性。 如果启用了正则表达式，则可以为“replace with”属性指定捕获组，例如<code>$1</code>。 在替换过程中，仅当规则完全匹配时才能更改属性类型。</dd>
+    <dt>删除</dt>
+    <dd>删除一个属性</dd>
+    <dt>移动</dt>
+    <dd>移动或者重命名一个属性</dd>
+    </dl>
+    <p>类型"expression"使用<a href="http://jsonata.org/" target="_new">JSONata</a>语言。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
new file mode 100644
index 000000000..efda1d5a2
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
@@ -0,0 +1,40 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="range">
+    <p>将数值映射为另一个区间的数值</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">数值</span></dt>
+        <dd>payload<i>一定</i>得是一个数值. 否则则会映射失败。</dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">数值</span></dt>
+        <dd>被映射到新区间的数值。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>该节点将线性缩放所接收到的数值。在默认情况下，结果不限于节点中定义的范围。</p>
+    <p><i>缩放并限制到目标范围</i>表示结果永远不会超出目标范围内指定的范围。</p>
+    <p><i>在目标范围内缩放并折叠</i>表示结果将会被限制（折叠）在目标范围内。</p>
+    <p>例如，输入0-10映射到0-100。</p>
+    <table style="outline-width:#888 solid thin">
+        <tr><th width="80px">模式</th><th width="80px">输入</th><th width="80px">输出</th></tr>
+        <tr><td><center>scale</center></td><td><center>12</center></td><td><center>120</center></td></tr>
+        <tr><td><center>limit</center></td><td><center>12</center></td><td><center>100</center></td></tr>
+        <tr><td><center>wrap</center></td><td><center>12</center></td><td><center>20</center></td></tr>
+    </table>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/80-template.html
new file mode 100644
index 000000000..938a77818
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/80-template.html
@@ -0,0 +1,46 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="template">
+    <p>根据提供的模板设置属性。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>msg <span class="property-type">object</span></dt>
+        <dd>一个msg对象，其中包含着用于填充模板的信息。</dd>
+        <dt class="optional">template <span class="property-type">string</span></dt>
+        <dd>由<code>msg.payload</code>填充的模板。如果未在编辑面板中配置，则可以将设为msg的属性。</dd>
+    </dl>
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>msg <span class="property-type">object</span></dt>
+        <dd>由来自传入msg的属性来填充已配置的模板后输出的带有属性的msg。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>默认情况下使用<i><a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache</a></i>格式。如有需要也可以切换其他格式。</p>
+    <p>例如:
+    <pre>Hello {{payload.name}}. Today is {{date}}</pre>
+    <p>receives a message containing:
+    <pre>{
+  date: "Monday",
+  payload: {
+    name: "Fred"
+  }
+}</pre>
+    <p>输出的消息将会是:
+    <pre>Hello Fred. Today is Monday</pre>
+    <p>也可以使用流上下文或全局上下文中的属性：<code>{{flow.name}}</code>或者<code>{{global.name}}</code>，或者为了持久储存<code>store</code>，可以使用<code>{{flow[store].name}}</code>或<code>{{global[store].name}}</code>。
+    <p><b>注意：</b>默认情况下，<i>mustache</i>将在其替换的值中转义任何非字母数字或HTML实体。为了防止这种情况，请使用<code>{{{triple}}}</code>大括号。
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-delay.html
new file mode 100644
index 000000000..690bddaea
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-delay.html
@@ -0,0 +1,32 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="delay">
+    <p>对通过节点的消息进行延迟发送或限制。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">delay <span class="property-type">数值</span></dt>
+        <dd>设置要应用于消息的延迟（以毫秒为单位）。仅当节点配置为允许消息去覆盖配置的默认延迟间隔时，此选项才适用。</dd>
+        <dt class="optional">reset</dt>
+        <dd>如果接收到的消息将此属性设置为任何值，则将清空该节点保留的所有的未发送消息。</dd>
+        <dt class="optional">flush</dt>
+        <dd>如果接收到的消息的此属性设置为任何值，则将立即发送该节点保留的所有未发送消息。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>当配置为延迟发送消息时，延迟间隔可以是一个固定值，一个范围内的随机值或为每个消息动态设置。</p>
+    <p>当配置为对消息进行限制时，它们的传递将分散在配置的时间段内。状态显示队列中当前的消息数。可以选择在中间消息到达时丢弃它们。</p>
+    <p>速率限制可以应用于所有消息，也可以根据<code>msg.topic</code>的值来进行分组。分组时，中间消息将会被自动删除。在每个时间间隔，节点可以释放所有主题的最新消息，或释放下一个主题的最新消息。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
new file mode 100644
index 000000000..606a08c2f
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
@@ -0,0 +1,33 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="trigger">
+    <p>触发后，将会发送一条消息。如果被拓展或重置，则可以选择发送第二条消息。</p>
+
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">reset</dt>
+        <dd>如果收到带有此属性的消息，则将清除当前正在进行的任何超时或重复，且不会触发任何消息。</dd>
+    </dl>
+
+    <h3>详细</h3>
+    <p>该节点可用于在流中创建一个超时。 默认情况下，当它收到一条消息时，它将发送一条带有<code>1</code>的payload的消息。然后它将等待250毫秒，再发送第二条消息，其payload为<code>0</code>。这可以用于使连接到Raspberry Pi GPIO引脚的LED闪烁等例子上。</p>
+    <p>可以将发送的每个消息的payload配置为各种值，包括不发送任何内容的选项。例如，将初始消息设置为<i>nothing</i>，然后选择将计时器与每个收到的消息一起扩展的选项，则该节点将充当看门狗计时器；仅在设置的间隔内未收到任何消息时才发送消息。</p>
+    <p>如果设置为<i>字符串</i>类型，则该节点支持<i>mustache</i>模板语法。</p>
+    <p>如果节点收到具有<code>reset</code>属性或与节点中配置的匹配的<code>payload</code>的消息，则将清除当前正在进行的任何超时或重复，并且不会触发任何消息。</p>
+    <p>可以将节点配置为以固定的时间间隔重新发送消息，直到被收到的消息重置为止。</p>
+    <p>（可选）可以将节点配置为将带有<code>msg.topic</code>的消息视为独立的流。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
new file mode 100644
index 000000000..ba5951a12
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
@@ -0,0 +1,74 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="exec">
+    <p>运行系统命令并返回其输出。</p>
+    <p>可以将节点配置为等待命令完成，或者在命令生成时发送其输出。</p>
+    <p>运行的命令可以在节点中配置，也可以由收到的消息提供。</p>
+
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">payload <span class="property-type">字符串</span></dt>
+        <dd>如果这样配置，则将被附加到执行命令中。</dd>
+        <dt class="optional">kill <span class="property-type">字符串</span></dt>
+        <dd>指定发送到现有的exec节点进程的kill信号类型。</dd>
+        <dt class="optional">pid <span class="property-type">数值|字符串</span></dt>
+        <dd>要杀死的现有exec节点进程的进程ID</dd>
+    </dl>
+
+    <h3>输出</h3>
+    <ol class="node-ports">
+        <li>标准输出(stdout)
+            <dl class="message-properties">
+                <dt>payload <span class="property-type">字符串</span></dt>
+                <dd>命令的标准输出。</dd>
+            </dl>
+            <dl class="message-properties">
+                <dt>rc <span class="property-type">object</span></dt>
+                <dd>（仅执行模式）一个返回代码对象的副本（在端口3上也可用）</dd>
+            </dl>
+        </li>
+        <li>标准error输出(stderr)
+            <dl class="message-properties">
+                <dt>payload <span class="property-type">字符串</span></dt>
+                <dd>命令的标准错误输出。</dd>
+            </dl>
+            <dl class="message-properties">
+                <dt>rc <span class="property-type">object</span></dt>
+                <dd>（仅执行模式）一个返回代码对象的副本（在端口3上也可用）</dd>
+            </dl>
+        </li>
+        <li>返回代码
+            <dl class="message-properties">
+                <dt>payload <span class="property-type">object</span></dt>
+                <dd>一个包含返回代码以及<code>message</code>，<code>signal</code>属性的对象。</dd>
+            </dl>
+        </li>
+    </ol>
+    <h3>详细</h3>
+    <p>默认情况下，使用<code>exec</code>系统调用来调用命令，等待命令完成，然后返回输出。例如，成功的命令的返回码应为<code>{code：0}</code>。</p>
+    <p>（可选）可以选择使用<code>spawn</code>代替，它会在命令运行时从stdout和stderr返回输出，通常一次一行。完成后，它将在第三个端口上返回一个对象。例如，成功的命令应返回<code>{code：0}</code>。</p>
+    <p>错误可能会在第三个端口<code>msg.payload</code>上返回额外的信息，例如<code>message</code>字符串，<code>signal</code>字符串。</p>
+    <p>运行的命令是在节点内定义的，带有附加<code>msg.payload</code>的选项和另外一组参数。</p>
+    <p>带空格的命令或参数应该用引号引起来：<code>“这是一个参数”</code></p>
+    <p>返回的<code>payload</code>通常是<i>字符串</i>类型，除非检测到非UTF8字符，在这种情况下，它会是<i>buffer</i>类型。</p>
+    <p>节点处于活动状态时，该节点的状态图标和PID将可见。对此更改可以通过<code>Status</code>节点读取。</p>
+    <h4>杀死进程</h4>
+    <p>发送<code>msg.kill</code>将杀死一个活动进程。<code>msg.kill</code>应该是包含要发送的信号类型的字符串，例如<code>SIGINT</code>，<code>SIGQUIT</code>或<code>SIGHUP</code>。如果设置为空字符串，则默认为<code>SIGTERM</code>。</p>
+    <p>如果节点有多个进程在运行，则还必须设置<code>msg.pid</code>并设置要杀死的PID的值。</p>
+    <p>如果<code>Timeout</code>字段提供了一个值，则如果在指定的秒数过去后进程尚未完成，则该进程将自动终止。</p>
+    <p>提示：如果运行Python应用程序，则可能需要使用<code>-u</code>参数来停止对输出进行缓存。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
new file mode 100644
index 000000000..7db958d94
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
@@ -0,0 +1,59 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="file">
+    <p>将<code>msg.payload</code>写入文件，添加到末尾或替换现有内容。或者，它也可以删除文件。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">filename<span class="property-type">字符串</span></dt>
+        <dd>如果未在节点中配置，则此可选属性可以设置文件名。</dd>
+    </dl>
+    <h3>输出</h3>
+    <p>写入完成后，输入消息将发送到输出端口。</p>
+    <h3>详细</h3>
+    <p>每个消息payload将添加到文件的末尾，可以选择在每个消息之间添加一个换行符（\n）。</p>
+    <p>如果使用<code>msg.filename</code>，则每次写入后文件都会关闭。为了获得最佳体验，请使用固定的文件名。</p>
+    <p>可以将其配置为覆盖整个文件，而不是在文件后添加段落。例如，在将二进制数据写入文件（例如图像）时，应使用此选项，并且应禁用添加换行符的选项。</p>
+    <p>可以从编码列表中指定写入文件的数据的编码。</p>
+    <p>您可以将此节点配置为删除文件。</p>
+</script>
+
+<script type="text/x-red" data-help-name="file in">
+    <p>以字符串或二进制缓冲区的形式读取文件的内容。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">filename<span class="property-type">字符串</span></dt>
+        <dd>如果未在节点配置中设置，该属性可以选择要读取的文件名。</dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">字符串 | buffer</span></dt>
+        <dd>文件的内容可以是字符串，也可以是二进制的buffer。</dd>
+        <dt class="optional">filename <span class="property-type">字符串</span></dt>
+        <dd>如果未在节点配置中设置，该属性可以选择要读取的文件名。</dd>
+        <dt class="optional">error <span class="property-type">object</span></dt>
+        <dd><i>已不推荐使用</i>: 如果在节点中启用，则当节点在读取文件时遇到错误时，它将发送一条没有<code>payload</code>的消息，且将消息的<code>error</code>属性设置为错误的详细信息。在默认情况下，此行为模式已弃用且未启用。 请参阅下面的详细信息。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>文件名应该是绝对路径，否则将相对于Node-RED进程的工作目录。</p>
+    <p>在Windows上，可能需要使用转义路径分隔符，例如：<code>\\Users\\myUser</code>。</p>
+    <p>可以选择将文本文件拆分为几行，每行输出一条消息，或者将二进制文件拆分为较小的buffer块-块大小取决于操作系统，但通常为64k（Linux/Mac）或41k（Windows）。</p>
+    <p>当拆分为多条消息时，每条消息将具有<code>parts</code>属性集，从而形成完整的消息序列。</p>
+    <p>如果输出格式为字符串，则可以从编码列表中指定输入数据的编码。</p>
+    <h4>旧版的错误处理</h4>
+    <p>在Node-RED 0.17之前，如果此节点在读取文件时遇到错误，它将发送一条不包含<code>msg.payload</code>，但包含<code>msg.error</code>的消息。在<code>msg.error</code>中记录详细的错误内容。但这是模式已被弃用，默认未启用。如有需要，您可以在节点配置中重新启用该模式。</p>
+    <p>应该使用Catch节点来捕获并处理错误。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/23-watch.html
new file mode 100644
index 000000000..eec611429
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/23-watch.html
@@ -0,0 +1,25 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="watch">
+    <p>监视目录或文件中的更改。</p>
+    <p>您可以输入用逗号分隔的目录和/或文件的列表。您需要在所有带有空格的地方加上引号“...”。</p>
+    <p>在Windows上，必须在任何目录名称中使用双反斜杠<code>\\</code>。</p>
+    <p>实际更改的文件的完整文件名将放入<code>msg.payload</code>和<code>msg.filename</code>中，而监视列表的字符串化版本将在<code>msg.topic</code>中返回。</p>
+    <p><code>msg.file</code>仅包含已更改文件的短文件名。<code>msg.type</code>更改了事物的类型，通常是<i>file</i>或<i>directory</i>，而<code>msg.size</code>保留了文件的大小（以字节为单位）。</p>
+    <p>当然，在Linux中，<i>everything</i>也是一个文件，因此可以监视</p>
+    <p><b>注意：</b>该目录或文件必须存在才能被监视。如果文件或目录被删除，即使重新创建它也可能不再被监视。</p>
+</script>

From 6d3eb7bb4b63b2e6f0474ff9d941b1b127041635 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Wed, 29 Jan 2020 19:21:50 +0900
Subject: [PATCH 282/305] fix translated doc according to comments

---
 .../@node-red/nodes/locales/zh-CN/common/20-inject.html   | 8 ++++----
 .../@node-red/nodes/locales/zh-CN/common/21-debug.html    | 4 ++--
 .../@node-red/nodes/locales/zh-CN/common/25-status.html   | 2 +-
 .../@node-red/nodes/locales/zh-CN/function/16-range.html  | 2 +-
 .../nodes/locales/zh-CN/function/89-trigger.html          | 6 +++---
 .../@node-red/nodes/locales/zh-CN/function/90-exec.html   | 4 ++--
 .../@node-red/nodes/locales/zh-CN/storage/10-file.html    | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
index 142b362fa..78b218083 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/20-inject.html
@@ -15,20 +15,20 @@
 -->
 
 <script type="text/x-red" data-help-name="inject">
-<p>手动或定期得将消息注入流中。消息的payload可以为多种类型，包括字符串，JavaScript对象或当前时间。</p>
+<p>手动或定期得将消息注入流中。消息的有效荷载可以为多种类型，包括字符串，JavaScript对象或当前时间。</p>
 <h3>输出</h3>
 <dl class="message-properties">
     <dt>payload<span class="property-type">various</span></dt>
-    <dd>指定的消息的payload。</dd>
+    <dd>指定的消息的有效荷载。</dd>
     <dt class="optional">topic <span class="property-type">字符串</span></dt>
     <dd>可以在节点中配置的可选属性。</dd>
 </dl>
 <h3>详细</h3>
-<p>通过使用特定的payload值，注入节点可以启动流。默认payload是当前时间的时间戳（以毫秒为单位，自1970年1月1日起）。</p>
+<p>通过使用特定的有效荷载，注入节点可以启动流。默认有效荷载是当前时间的时间戳（以毫秒为单位，自1970年1月1日起）。</p>
 <p>该节点还支持注入字符串，数字，布尔值，JavaScript对象或流/全局上下文值。</p>
 <p>默认情况下，节点可以通过在编辑器中单击节点按钮来手动触发。同时也可以被设置为定期或按计划注入。</p>
 <p>另一个可选的设置是在每次启动流时注入一次。</p>
 <p>可以指定的最大<i>间隔</i>约为596小时/24天。 但是，如果对于间隔超过一天的那些间隔，建议您使用scheduler节点来应对断电或重启。</p>
 <p><b>注意</b>：选项<i>“时间间隔” </i>和<i>“特定时间” </i>使用了标准cron系统。这意味着因此“20分钟”并不表示在此之后20分钟，而是每小时的20分钟，40分钟。如果您希望设定为从现在开始的每20分钟，那么请使用<i>“间隔” </i>选项。</p>
-<p><b>注意</b>: 如果您想在字符串中包含换行符，必须使用“功能”节点创建payload。</p>
+<p><b>注意</b>: 如果您想在字符串中包含换行符，必须使用“功能”节点创建有效荷载。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
index f96c74f6d..e3137c50d 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/21-debug.html
@@ -15,11 +15,11 @@
 -->
 
 <script type="text/x-red" data-help-name="debug">
-    <p>在“调试”侧边栏选项卡和运行时日志中显示选定的消息属性。 默认情况下，它会显示<code> msg.payload </code>，但也可以设置成显示任意属性，完整消息或JSONata表达式的结果。</p>
+    <p>在“调试”侧边栏选项卡和运行时日志中显示选定的消息属性。 默认情况下，它会显示<code>msg.payload</code>的值，但您也可以将其设置成显示任意属性，完整消息或JSONata表达式的结果。</p>
     <h3>详细</h3>
     <p>调试侧边栏会提供已发消息的结构化视图，方便您查询消息的结构。</p>
     <p>JavaScript对象和数组可以根据需要来折叠或扩展。缓冲区对象可以显示为原始数据，也可以显示为字符串。</p>
     <p>对任意条消息，调试侧边栏还会显示接收消息的时间，发送消息的节点以及消息类型等信息。单击源节点ID将在工作区中显示该节点。</p>
     <p>节点上的按钮可用于启用或禁用其输出。建议禁用或删除所有未使用的调试节点。</p>
-    <p>还可以通过配置节点，将所有消息发送到运行时日志，或将简短的数据（32个字符内）在调试节点下的状态文本上显示。</p>
+    <p>还可以通过配置节点，将所有消息发送到运行时的日志，或将简短的数据（32个字符内）在调试节点下的状态文本上显示。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
index 133bc93d5..7d9504c9f 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/common/25-status.html
@@ -28,6 +28,6 @@
         <dd>报告状态的节点的名称（如果已设置）。</dd>
     </dl>
     <h3>详细</h3>
-   <p>该节点不包含<code>payload</code>。</p>
+   <p>该节点不包含<code>有效荷载</code>。</p>
    <p>默认情况下，节点会获取同一工作空间标签页上报告所有节点的状态。可以通过配置来设定目标节点。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
index efda1d5a2..b5d2d033f 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/16-range.html
@@ -19,7 +19,7 @@
     <h3>输入</h3>
     <dl class="message-properties">
         <dt>payload<span class="property-type">数值</span></dt>
-        <dd>payload<i>一定</i>得是一个数值. 否则则会映射失败。</dd>
+        <dd>有效荷载<i>一定</i>得是一个数值. 否则则会映射失败。</dd>
     </dl>
     <h3>输出</h3>
     <dl class="message-properties">
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
index 606a08c2f..5f27a5002 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/89-trigger.html
@@ -24,10 +24,10 @@
     </dl>
 
     <h3>详细</h3>
-    <p>该节点可用于在流中创建一个超时。 默认情况下，当它收到一条消息时，它将发送一条带有<code>1</code>的payload的消息。然后它将等待250毫秒，再发送第二条消息，其payload为<code>0</code>。这可以用于使连接到Raspberry Pi GPIO引脚的LED闪烁等例子上。</p>
-    <p>可以将发送的每个消息的payload配置为各种值，包括不发送任何内容的选项。例如，将初始消息设置为<i>nothing</i>，然后选择将计时器与每个收到的消息一起扩展的选项，则该节点将充当看门狗计时器；仅在设置的间隔内未收到任何消息时才发送消息。</p>
+    <p>该节点可用于在流中创建一个超时。 默认情况下，当它收到一条消息时，它将发送一条带有<code>1</code>的有效荷载的消息。然后它将等待250毫秒，再发送第二条消息，其有效荷载为<code>0</code>。这可以用于使连接到Raspberry Pi GPIO引脚的LED闪烁等例子上。</p>
+    <p>可以将发送的每个消息的有效荷载配置为各种值，包括不发送任何内容的选项。例如，将初始消息设置为<i>nothing</i>，然后选择将计时器与每个收到的消息一起扩展的选项，则该节点将充当看门狗计时器；仅在设置的间隔内未收到任何消息时才发送消息。</p>
     <p>如果设置为<i>字符串</i>类型，则该节点支持<i>mustache</i>模板语法。</p>
-    <p>如果节点收到具有<code>reset</code>属性或与节点中配置的匹配的<code>payload</code>的消息，则将清除当前正在进行的任何超时或重复，并且不会触发任何消息。</p>
+    <p>如果节点收到具有<code>reset</code>属性或与节点中配置的匹配的<code>有效荷载</code>的消息，则将清除当前正在进行的任何超时或重复，并且不会触发任何消息。</p>
     <p>可以将节点配置为以固定的时间间隔重新发送消息，直到被收到的消息重置为止。</p>
     <p>（可选）可以将节点配置为将带有<code>msg.topic</code>的消息视为独立的流。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
index ba5951a12..27c421160 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/90-exec.html
@@ -64,11 +64,11 @@
     <p>错误可能会在第三个端口<code>msg.payload</code>上返回额外的信息，例如<code>message</code>字符串，<code>signal</code>字符串。</p>
     <p>运行的命令是在节点内定义的，带有附加<code>msg.payload</code>的选项和另外一组参数。</p>
     <p>带空格的命令或参数应该用引号引起来：<code>“这是一个参数”</code></p>
-    <p>返回的<code>payload</code>通常是<i>字符串</i>类型，除非检测到非UTF8字符，在这种情况下，它会是<i>buffer</i>类型。</p>
+    <p>返回的<code>有效荷载</code>通常是<i>字符串</i>类型，除非检测到非UTF8字符，在这种情况下，它会是<i>buffer</i>类型。</p>
     <p>节点处于活动状态时，该节点的状态图标和PID将可见。对此更改可以通过<code>Status</code>节点读取。</p>
     <h4>杀死进程</h4>
     <p>发送<code>msg.kill</code>将杀死一个活动进程。<code>msg.kill</code>应该是包含要发送的信号类型的字符串，例如<code>SIGINT</code>，<code>SIGQUIT</code>或<code>SIGHUP</code>。如果设置为空字符串，则默认为<code>SIGTERM</code>。</p>
     <p>如果节点有多个进程在运行，则还必须设置<code>msg.pid</code>并设置要杀死的PID的值。</p>
-    <p>如果<code>Timeout</code>字段提供了一个值，则如果在指定的秒数过去后进程尚未完成，则该进程将自动终止。</p>
+    <p>如果<code>超时</code>字段提供了一个值，则如果在指定的秒数过去后进程尚未完成，则该进程将自动终止。</p>
     <p>提示：如果运行Python应用程序，则可能需要使用<code>-u</code>参数来停止对输出进行缓存。</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
index 7db958d94..4ec78cdb4 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/storage/10-file.html
@@ -24,7 +24,7 @@
     <h3>输出</h3>
     <p>写入完成后，输入消息将发送到输出端口。</p>
     <h3>详细</h3>
-    <p>每个消息payload将添加到文件的末尾，可以选择在每个消息之间添加一个换行符（\n）。</p>
+    <p>每个消息的有效荷载将添加到文件的末尾，可以选择在每个消息之间添加一个换行符（\n）。</p>
     <p>如果使用<code>msg.filename</code>，则每次写入后文件都会关闭。为了获得最佳体验，请使用固定的文件名。</p>
     <p>可以将其配置为覆盖整个文件，而不是在文件后添加段落。例如，在将二进制数据写入文件（例如图像）时，应使用此选项，并且应禁用添加换行符的选项。</p>
     <p>可以从编码列表中指定写入文件的数据的编码。</p>
@@ -45,7 +45,7 @@
         <dt class="optional">filename <span class="property-type">字符串</span></dt>
         <dd>如果未在节点配置中设置，该属性可以选择要读取的文件名。</dd>
         <dt class="optional">error <span class="property-type">object</span></dt>
-        <dd><i>已不推荐使用</i>: 如果在节点中启用，则当节点在读取文件时遇到错误时，它将发送一条没有<code>payload</code>的消息，且将消息的<code>error</code>属性设置为错误的详细信息。在默认情况下，此行为模式已弃用且未启用。 请参阅下面的详细信息。</dd>
+        <dd><i>已不推荐使用</i>: 如果在节点中启用，则当节点在读取文件时遇到错误时，它将发送一条没有<code>有效荷载</code>的消息，且将消息的<code>error</code>属性设置为错误的详细信息。在默认情况下，此行为模式已弃用且未启用。 请参阅下面的详细信息。</dd>
     </dl>
     <h3>详细</h3>
     <p>文件名应该是绝对路径，否则将相对于Node-RED进程的工作目录。</p>

From c03abdb5e756dd1d3df5bb0cf501707d2dd79ab2 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Fri, 31 Jan 2020 11:10:04 +0900
Subject: [PATCH 283/305] add zn-CN translation for nodes: network, parsers,
 sequence

---
 .../nodes/locales/zh-CN/network/05-tls.html   |  19 +++
 .../locales/zh-CN/network/06-httpproxy.html   |  22 +++
 .../nodes/locales/zh-CN/network/10-mqtt.html  |  71 ++++++++++
 .../locales/zh-CN/network/21-httpin.html      |  81 +++++++++++
 .../locales/zh-CN/network/21-httprequest.html |  78 ++++++++++
 .../locales/zh-CN/network/22-websocket.html   |  35 +++++
 .../nodes/locales/zh-CN/network/31-tcpin.html |  35 +++++
 .../nodes/locales/zh-CN/network/32-udp.html   |  28 ++++
 .../nodes/locales/zh-CN/parsers/70-CSV.html   |  43 ++++++
 .../nodes/locales/zh-CN/parsers/70-HTML.html  |  33 +++++
 .../nodes/locales/zh-CN/parsers/70-JSON.html  |  43 ++++++
 .../nodes/locales/zh-CN/parsers/70-XML.html   |  48 +++++++
 .../nodes/locales/zh-CN/parsers/70-YAML.html  |  34 +++++
 .../locales/zh-CN/sequence/17-split.html      | 133 ++++++++++++++++++
 .../nodes/locales/zh-CN/sequence/18-sort.html |  41 ++++++
 .../locales/zh-CN/sequence/19-batch.html      |  34 +++++
 16 files changed, 778 insertions(+)
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/05-tls.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/06-httpproxy.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/10-mqtt.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httpin.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httprequest.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/22-websocket.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/31-tcpin.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/network/32-udp.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-CSV.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-HTML.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-JSON.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-XML.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-YAML.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/17-split.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/18-sort.html
 create mode 100644 packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/19-batch.html

diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/05-tls.html
new file mode 100644
index 000000000..5a9603946
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/05-tls.html
@@ -0,0 +1,19 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="tls-config">
+    <p>TLS连接的配置选项。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/06-httpproxy.html
new file mode 100644
index 000000000..e84971973
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/06-httpproxy.html
@@ -0,0 +1,22 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="http proxy">
+    <p>HTTP代理的配置选项。</p>
+
+    <h3>详细</h3>
+    <p>访问代理例外列表中的主机时，将不使用任何代理。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/10-mqtt.html
new file mode 100644
index 000000000..520d7f4ef
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/10-mqtt.html
@@ -0,0 +1,71 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="mqtt in">
+<p>连接到MQTT代理并订阅来自指定主题的消息。</p>
+    <h3>输出</h3>
+    <dl class="message-properties">
+       <dt>payload <span class="property-type">字符串 | buffer</span></dt>
+       <dd>如果不是二进制buffer的话就是字符串</dd>
+       <dt>topic <span class="property-type">字符串</span></dt>
+       <dd>MQTT主题，使用<code>/</code>作为层次结构分隔符。</dd>
+       <dt>qos <span class="property-type">数值</span> </dt>
+       <dd>QoS服务质量：0, 最多一次； 1, 最少一次； 2, 只一次。</dd>
+       <dt>retain <span class="property-type">布尔值</span></dt>
+       <dd>值为true时表示消息已保留且可能是旧的。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>订阅主题可以包括MQTT通配符（+：一个级别，＃：多个级别）。</p>
+    <p>使用该节点您首先需要建立与MQTT代理的连接。通过单击铅笔图标来进行配置。</p>
+    <p>如有需要，几个MQTT节点（输入或输出）可以共享相同的代理连接。</p>
+</script>
+
+<script type="text/x-red" data-help-name="mqtt out">
+    <p>连接到MQTT代理并发布消息。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+       <dt>payload <span class="property-type">字符串 | buffer</span></dt>
+       <dd>要发布的有效负载。如果未设置此属性，则不会发送任何消息。要发送空白消息，请将此属性设置为空字符串。</dd>
+
+       <dt class="optional">topic <span class="property-type">字符串</span></dt>
+       <dd>要发布的MQTT主题。</dd>
+
+       <dt class="optional">qos <span class="property-type">number</span></dt>
+       <dd>QoS服务质量：0, 最多一次； 1, 最少一次； 2, 只一次。默认值为0。</dd>
+
+       <dt class="optional">retain <span class="property-type">布尔值</span></dt>
+       <dd>设置为<code>true</code>来将消息保留在代理上。默认值为<code>false</code>。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p><code>msg.payload</code>用作已发布消息的有效载荷。如果包含Object，则会在发送之前将其转换为JSON字符串。如果它包含二进制buffer，则消息将按原样发布。</p>
+    <p>可以在节点中配置所使用的主题，或者如果留为空白，则可以通过<code>msg.topic</code>进行设置。</p>
+    <p>同样，可以在节点中配置QoS和保留值，或者如果保留空白，则分别由<code>msg.qos</code>和<code>msg.retain</code>设置。要清除先前存储在代理中的主题，请设置保留标志并向该主题发布空消息。</p>
+    <p>该节点需要与要配置的MQTT代理的连接。通过单击铅笔图标进行配置。</p>
+    <p>如果需要，几个MQTT节点（输入或输出）可以共享相同的代理连接。</p>
+</script>
+
+<script type="text/x-red" data-help-name="mqtt-broker">
+    <p>与MQTT代理的连接设置。</p>
+    <p>创建与代理的连接设置。可以在<code>MQTT In</code>和<code>MQTT Out</code>节点中重复利用这些设置。</p>
+    <p>如果未为该节点设置客户端ID，并且设置了会话初始化，则将生成一个随机客户端ID。设置客户端ID时，请确保它对于连接目标处的代理是唯一的。</p>
+    <h4>Birth Message</h4>
+    <p>建立连接后发布在以配置主题中的消息。</p>
+    <h4>Close Message</h4>
+    <p>在连接正常结束之前重新部署或者关闭了节点时，发布在以配置主题中的消息。</p>
+    <h4>Will Message</h4>
+    <p>当节点意外丢失连接时由代理发布的消息</p>
+    <h4>WebSockets</h4>
+    <p>可以将节点配置成使用WebSocket连接。使用WebSocket时，请在服务器字段中以完整格式描述连接目标的URI。 例如：</p>
+    <pre>ws://example.com:4000/mqtt</pre>
+
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httpin.html
new file mode 100644
index 000000000..0fb52efd1
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httpin.html
@@ -0,0 +1,81 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="http in">
+    <p>创建用于创建Web服务的HTTP端点。</p>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload</dt>
+        <dd>GET请求包含任何查询字符串参数的对象。或者包含HTTP请求正文。</dd>
+        <dt>req<span class="property-type">object</span></dt>
+        <dd>HTTP请求对象。该对象包含有关请求信息的多个属性。
+            <ul>
+             <li><code>body</code> - 传入请求的正文。格式将取决于请求。</li>
+             <li><code>headers</code> - 包含HTTP请求标头的对象。</li>
+             <li><code>query</code> - 包含任何查询字符串参数的对象。</li>
+             <li><code>params</code> - 包含任何路由参数的对象。</li>
+             <li><code>cookies</code> - 包含请求cookie的对象。</li>
+             <li><code>files</code> - 如果节点启用了文件上传，则为包含了上传的文件的对象。</li>
+            </ul>
+        </dd>
+        <dt>res<span class="property-type">object</span></dt>
+        <dd>HTTP响应对象。此属性不应直接使用；<code>HTTP Response</code>节点记录了如何响应请求。该属性必须保留在传递给响应节点的消息上。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>节点将在配置的路径上监听特定类型的请求。路径可以完全指定，例如<code>/user</code>，或包括可以接受任何值的命名参数，例如<code>/user/:name</code>。 使用命名参数时，可以在<code>msg.req.params</code>下访问其在请求中的实际值。</p>
+    <p>对于包含正文的请求（例如POST或PUT），请求的内容将作为<code>msg.payload</code>提供。</p>
+    <p>如果可以确定请求的内容类型，则正文将被解析为任何适当的类型。例如，<code>application/json</code>将被解析为其JavaScript对象表示。</p>
+    <p><b>注意：</b>该节点不发送对请求的任何响应。该流必须包含HTTP响应节点才能完成请求。</p>
+</script>
+
+<script type="text/x-red" data-help-name="http response">
+    <p>将响应发送回从HTTP输入节点接收的请求。</p>
+
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">string</span></dt>
+        <dd>响应的正文。</dd>
+        <dt class="optional">statusCode <span class="property-type">数值</span></dt>
+        <dd>如果设置，则用作响应状态代码。默认值：200。</dd>
+        <dt class="optional">headers <span class="property-type">object</span></dt>
+        <dd>如果设置，则提供HTTP头以包含在响应中。</dd>
+        <dt class="optional">cookies <span class="property-type">object</span></dt>
+        <dd>如果设置，则可用于设置或删除cookie。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>还可以在节点本身内设置<code>statusCode</code>和<code>headers</code>。如果在节点内设置了属性，则不能被相应的message属性覆盖。</p>
+    <h4>Cookie处理</h4>
+    <p><code>cookies</code>属性必须是名称/值对的对象。该值可以是使用默认选项设置cookie值的字符串，也可以是options对象。<p>
+    <p>下面的示例设置两个cookie-一个名为<code>name</code>的值为<code>nick</code>，另一个名为<code>session</code>的值为<code>1234</code>，并且有效期设置为15分钟。</p>
+    <pre>
+msg.cookies = {
+    name: 'nick',
+    session: {
+        value: '1234',
+        maxAge: 900000
+    }
+}</pre>
+    <p>有效选项包括：</p>
+    <ul>
+    <li><code>domain</code> - (字符串) Cookie的域名</li>
+    <li><code>expires</code> - (日期) GMT标准时间的到期日。如果未指定或设置为0，则创建会话cookie</li>
+    <li><code>maxAge</code> - (字符串) 相对于当前时间的到期日期（以毫秒为单位）</li>
+    <li><code>path</code> - (字符串) Cookie的路径。默认为/</li>
+    <li><code>value</code> - (字符串) Cookie使用的值</li>
+    </ul>
+    <p>要删除Cookie，请将其<code>value</code>设置为<code>null</code>。</p>
+
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httprequest.html
new file mode 100644
index 000000000..3c7b163e2
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/21-httprequest.html
@@ -0,0 +1,78 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="http request">
+    <p>发送HTTP请求并返回响应。</p>
+
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">url <span class="property-type">字符串</span></dt>
+        <dd>如果未在节点中配置，则此可选属性设置请求的url。</dd>
+        <dt class="optional">method <span class="property-type">字符串</span></dt>
+        <dd>如果未在节点中配置，则此可选属性设置请求的HTTP方法。必须是<code>GET</code>,<code>PUT</code>,<code>POST</code>,<code>PATCH</code>或<code>DELETE</code>之一。</dd>
+        <dt class="optional">headers <span class="property-type">object</span></dt>
+        <dd>设置请求的HTTP头。</dd>
+        <dt class="optional">cookies <span class="property-type">object</span></dt>
+        <dd>如果设置，则可用于发送带有请求的cookie。</dd>
+        <dt class="optional">payload</dt>
+        <dd>发送为请求的正文。</dd>
+        <dt class="optional">rejectUnauthorized</dt>
+        <dd>如果设置为<code>false</code>，则允许对使用自签名证书的https站点进行请求。</dd>
+        <dt class="optional">followRedirects</dt>
+        <dd>如果设置为<code>false</code>，则阻止遵循重定向（HTTP 301）。默认情况下为<code>true</code></dd>
+        <dt class="optional">requestTimeout</dt>
+        <dd>如果设置为正数毫秒，将覆盖全局设置的<code>httpRequestTimeout</code>参数。</dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">字符串 | object | buffer</span></dt>
+        <dd>响应的正文。可以将节点配置为以字符串形式返回主体，尝试将其解析为JSON字符串或将其保留为二进制buffer。</dd>
+        <dt>statusCode <span class="property-type">数值</span></dt>
+        <dd>响应的状态码，如果请求无法完成，则返回错误码。</dd>
+        <dt>headers <span class="property-type">object</span></dt>
+        <dd>包含响应头的对象。</dd>
+        <dt>responseUrl <span class="property-type">字符串</span></dt>
+        <dd>如果在处理请求时发生任何重定向，则此属性为最终重定向的URL。否则则为原始请求的URL。</dd>
+        <dt>responseCookies <span class="property-type">object</span></dt>
+        <dd>如果响应包含cookie，则此属性是每个cookie的‘名称/值’键值对的对象。</dd>
+        <dt>redirectList <span class="property-type">数组</span></dt>
+        <dd>如果请求被重定向了一次或多次，则累积的信息将被添加到此属性。“location”是下一个重定向目标。cookie是从重定向源返回的cookie。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>在节点内配置后，URL属性可以包含<a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache样式</a>标签。 这些标签允许使用传入消息的值来构造url。例如，如果url设置为<code>example.com/{{{{topic}}}</code>，它将自动插入<code>msg.topic</code>的值。使用{{{...}}}可以防止mustache转义/ &等字符。</p>
+    <p>节点可以选择自动将<code>msg.payload</code>编码为GET请求的查询字符串参数，在这种情况下，<code>msg.payload</code>必须是一个对象。</p>
+    <p><b>注意：</b>如果使用了代理，则应设置<code>http_proxy=...</code>环境变量并重新启动Node-RED，或使用“代理配置”。如果设置了代理配置，则配置优先于环境变量。</p>
+    <h4>使用多个HTTP请求节点</h4>
+    <p>为了在一个流程中多次使用该节点，必须要注意<code>msg.headers</code>属性的处理。通常在第一个节点在响应头中设置此属性，而不期望在下一个节点的请求头中使用此属性。如果节点之间的<code>msg.headers</code>属性保持不变，则第二个节点将忽略它。要设置自定义标题，首先应删除<code>msg.headers</code>或将其重置为空对象：<code>{}</code>。</p>
+    <h4>Cookie处理</h4>
+    <p>传递给节点的<code>cookies</code>属性必须是‘名称/值’键值对的对象。该值可以是设置cookie值的字符串，也可以是具有单个<code>value</code>属性的对象。</p>
+    <p>请求返回的所有cookie都将在<code>responseCookies</code>属性下传递回去。</p>
+    <h4>内容类型处理</h4>
+    <p>如果<code>msg.payload</code>是一个对象，则节点将自动将请求的内容类型设置为<code>application/json</code>并对其进行编码。</p>
+    <p>要将请求编码为表单数据，应将<code>msg.headers[“content-type”]</code>设置为<code>application/x-www-form-urlencoded</code>。</p>
+    <h4>文件上传</h4>
+    <p>要执行文件上传，应将<code>msg.headers["content-type"]</code>设置为<code>multipart/form-data</code>和<code>msg.payload</code>传递给节点的必须是具有以下结构的对象：</p>
+    <pre><code>{
+    "KEY": {
+        "value": FILE_CONTENTS,
+        "options": {
+            "filename": "FILENAME"
+        }
+    }
+}</code></pre>
+    <p><code>KEY</code>,<code>FILE_CONTENTS</code>和<code>FILENAME</code>的值应设置为适当的值。</p>
+    
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/22-websocket.html
new file mode 100644
index 000000000..d2ee29dfa
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/22-websocket.html
@@ -0,0 +1,35 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="websocket in">
+    <p>WebSocket输入节点。</p>
+    <p>默认情况下，从WebSocket接收的数据将位于<code>msg.payload</code>中。可以将套接字配置为期望格式正确的JSON字符串，在这种情况下，它将解析JSON并将结果对象作为整个消息发送。</p>
+</script>
+
+<script type="text/x-red" data-help-name="websocket out">
+    <p>WebSocket输出节点。</p>
+    <p>默认情况下，<code>msg.payload</code>将通过WebSocket发送。可以将套接字配置为将整个<code>msg</code>对象编码为JSON字符串，然后通过WebSocket发送。</p>
+    <p>如果到达此节点的消息是从WebSocket In节点开始的，则该消息将发送回触发流程的客户端。否则，消息将广播给所有连接的客户端。</p>
+    <p>如果要广播从“WebSocket输入”节点开始的消息，则可以应该删除流中的<code>msg._session</code>属性。</p>
+</script>
+
+<script type="text/x-red" data-help-name="websocket-listener">
+   <p>此配置节点使用指定的路径创建WebSocket服务器端点。</p>
+</script>
+
+<script type="text/x-red" data-help-name="websocket-client">
+   <p>此配置节点将WebSocket客户端连接到指定的URL。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/31-tcpin.html
new file mode 100644
index 000000000..2f00ed5f5
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/31-tcpin.html
@@ -0,0 +1,35 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="tcp in">
+    <p>提供TCP输入选择。可以连接到远程TCP端口，或接受传入连接。</p>
+    <p><b>注意：</b>在某些系统上，您可能需要root或管理员权限来访问低于1024的端口。</p>
+</script>
+
+<script type="text/x-red" data-help-name="tcp out">
+    <p>提供TCP输出的选择。可以连接到远程TCP端口，接受传入的连接，或回复从TCP In节点收到的消息。</p>
+    <p>仅发送<code>msg.payload</code>。</p>
+    <p>如果<code>msg.payload</code>是包含二进制数据的Base64编码的字符串，则Base64解码选项将导致它在发送之前先转换回二进制。</p>
+    <p>如果不存在<code>msg._session</code>，则有效负载将发送到<b>所有</b>连接的客户端。</p>
+    <p><b>注意：</b>在某些系统上，您可能需要root或管理员权限来访问低于1024的端口。</p>
+</script>
+
+<script type="text/x-red" data-help-name="tcp request">
+    <p>一个简单的TCP请求节点。将<code>msg.payload</code>发送到服务器tcp端口，并期望得到响应。</p>
+    <p>连接到服务器，发送“请求”并接收“响应”。 可以从固定数量的字符，与指定字符匹配的字符中选择操作，从第一个答复到达起等待指定的时间，等待数据到达，发送数据并立即取消连接而无需等待答复等操作中进行选择。</p>
+    <p>响应将在<code>msg.payload</code>中作为buffer输出，因此您可能需要对它进行<code>.toString()</code>操作。</p>
+    <p>如果将tcp主机或端口留空，则必须使用<code>msg.host</code>和<code>msg.port</code>属性进行设置。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/32-udp.html
new file mode 100644
index 000000000..1e01aa0a3
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/network/32-udp.html
@@ -0,0 +1,28 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="udp in">
+    <p>UDP输入节点。在<code>msg.payload</code>中生成Buffer，字符串或Base64编码的字符串。支持组播。</p>
+    <p>在<code>msg.ip</code>和<code>msg.port</code>中设置接收到的消息的IP地址和端口。</p>
+    <p><b>注意：</b>在某些系统上，您可能需要root或管理员权限才能使用低于1024的端口或广播。</p>
+</script>
+
+<script type="text/x-red" data-help-name="udp out">
+    <p>该节点将<code>msg.payload</code>发送到指定的UDP主机和端口。支持组播。</p>
+    <p>您也可以使用<code>msg.ip</code>和<code>msg.port</code>设置目标值，但是静态配置的值具有优先权。</p>
+    <p>如果选择广播，则将地址设置为本地广播IP地址。或者也可以尝试使用全局广播地址255.255.255.255。</p>
+    <p><b>注意：</b>在某些系统上，您可能需要root或管理员权限才能使用低于1024的端口或广播。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-CSV.html
new file mode 100644
index 000000000..5657f4cd3
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-CSV.html
@@ -0,0 +1,43 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="csv">
+    <p>在CSV格式的字符串及其JavaScript对象表示形式之间进行相互转换。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 数组 | 字符串</span></dt>
+        <dd>JavaScript对象，数组或CSV字符串。</dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 数组 | 字符串</span></dt>
+        <dd>
+        <ul>
+            <li>如果输入是字符串，它将尝试将其解析为CSV，并为每行创建键/值对的JavaScript对象。然后该节点将为每行发送一条消息，或者发送一条包含对象数组的消息。</li>
+            <li>如果输入是JavaScript对象，它将尝试构建CSV字符串。</li>
+            <li>如果输入是简单值的数组，则将构建单行CSV字符串。</li>
+            <li>如果输入是数组数组或对象数组，则会创建多行CSV字符串。</li>
+        </ul>
+        </dd>
+    </dl>
+    <h3>详细</h3>
+    <p>列模板可以包含列名称的有序列表。将CSV转换为对象时，列名将用作属性名称。或者也可以从CSV的第一行中获取列名称。</p>
+    <p>转换为CSV时，列模板用于标识从对象中提取的属性以及提取的顺序。</p>
+    <p>如果输入是数组，则列模板仅用于有选择地生成一行列标题。</p>
+    <p>只要正确设置<code>parts</code>属性，该节点就可以接受多部分输入。</p>
+    <p>如果输出多个消息，则将设置其<code>parts</code>属性并形成完整的消息序列。</p>
+    <p><b>注意：</b>列模板必须用逗号分隔，即使数据中已有了其他分隔符。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-HTML.html
new file mode 100644
index 000000000..73b365600
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-HTML.html
@@ -0,0 +1,33 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="html">
+    <p>使用CSS选择器从<code>msg.payload</code>中保存的html文档中提取元素。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+    <dt>payload <span class="property-type">字符串</span></dt>
+    <dd>从中提取元素的html字符串。</dd>
+    <dt class="optional">select <span class="property-type">字符串</span></dt>
+    <dd>如果未在编辑面板中配置，则可以将选择器设置为msg的属性。</dd>
+</dl>
+    <h3>Output</h3>
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">数组 | 字符串</span></dt>
+        <dd>结果可以是有效载荷中包含匹配元素的数组的单个消息；也可以是多条消息，每条消息都包含匹配元素。发送多条消息时，需要为消息设置<code>parts</code>。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>该节点支持CSS和jQuery选择器的组合。查看<a href="https://github.com/fb55/CSSselect#user-content-supported-selectors" target="_blank">css-select documentation</a> 来获得更多信息。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-JSON.html
new file mode 100644
index 000000000..2e574a0bf
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-JSON.html
@@ -0,0 +1,43 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="json">
+    <p>在JSON字符串及其JavaScript对象表示形式之间相互转换。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>JavaScript对象或JSON字符串。</dd>
+        <dt>schema<span class="property-type">object</span></dt>
+        <dd>可选的JSON Schema对象用于验证有效负载。在将<code>msg</code>发送到下一个节点之前，将删除该属性。</dd>
+    </dl>
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>
+            <ul>
+                <li>如果输入是JSON字符串，它将尝试将其解析为JavaScript对象。</li>
+                <li>如果输入是JavaScript对象，它将创建一个JSON字符串。并可以选择对此JSON字符串进行整形。</li>
+            </ul>
+        </dd>
+        <dt>schemaError<span class="property-type">数组</span></dt>
+        <dd>如果JSON模式验证失败，则catch节点将具有包含错误数组的<code>schemaError</code>属性。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>默认的转换目标是<code>msg.payload</code>，但是也可以转换消息的其它属性。</p>
+    <p>您可以将其设置为仅执行特定的转换，而不是自动选择双向转换。例如，即使对<code>HTTP In</code>节点的请求未正确设置‘content-type’，也可以使用它来确保JSON节点的转换结果是JavaScript对象</p>
+    <p>如果指定了转换为JSON字符串，则不会对收到的字符串进行进一步的检查。也就是说，即使指定了格式化选项，它也不会检查字符串是否正确为JSON或对JSON执行整形。</p>
+    <p>有关JSON模式的更多详细信息，请查阅<a href="http://json-schema.org/latest/json-schema-validation.html">规范</a>.</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-XML.html
new file mode 100644
index 000000000..04a7783ef
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-XML.html
@@ -0,0 +1,48 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="xml">
+    <p>在XML字符串及其JavaScript对象表示形式之间进行相互转换。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>JavaScript对象或XML字符串。</dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>
+            <ul>
+                <li>如果输入是字符串，它将尝试将其解析为XML并创建一个JavaScript对象。</li>
+                <li>如果输入是JavaScript对象，它将尝试构建XML字符串。</li>
+            </ul>
+        </dd>
+        <dt class="optional">options <span class="property-type">object</span></dt>
+        <dd>可以将选项传递给内部使用的XML转换库。请参见<a href="https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md#options" target="_blank"> xml2js文档</a> 来获取更多信息。</dd>
+    </dl>
+    <h3>详细</h3>
+    <p>在XML和对象之间进行转换时，默认情况下XML属性会添加到名为<code>$</code>的属性中。将文本内容添加到名为<code>_</code>的属性中。这些属性名称可以在节点设置中更改。</p>
+    <p>例如，将如下所示转换以下XML：</p>
+    <pre>&lt;p class="tag"&gt;Hello World&lt;/p&gt;</pre>
+    <pre>{
+  "p": {
+    "$": {
+      "class": "tag"
+    },
+    "_": "Hello World"
+  }
+}</pre>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-YAML.html
new file mode 100644
index 000000000..e65d1b87d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/parsers/70-YAML.html
@@ -0,0 +1,34 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="yaml">
+    <p>在YAML格式的字符串及其JavaScript对象表示形式之间相互转换。</p>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>JavaScript对象或YAML字符串。</dd>
+    </dl>
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串</span></dt>
+        <dd>
+            <ul>
+                <li>如果输入是YAML字符串，它将尝试将其解析为JavaScript对象。</li>
+                <li>如果输入是JavaScript对象，它将创建一个YAML字符串。</li>
+            </ul>
+        </dd>
+    </dl>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/17-split.html
new file mode 100644
index 000000000..22f01832a
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/17-split.html
@@ -0,0 +1,133 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="split">
+    <p>将一条消息拆分为一系列消息。</p>
+
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt>payload<span class="property-type">object | 字符串 | 数组 | buffer</span></dt>
+        <dd>节点的行为由<code>msg.payload</code>的类型决定:
+            <ul>
+                <li><b>字符串</b>/<b>buffer</b> - 使用指定的字符（默认值：<code>\n</code>），缓冲区序列或固定长度将消息拆分。</li>
+                <li><b>数组</b> - 消息被拆分为单个数组元素或固定长度的数组。</li>
+                <li><b>object</b> - 将为对象的每个键/值对发送一条消息。</li>
+            </ul>
+        </dd>
+    </dl>
+    <h3>输出</h3>
+    <dl class="message-properties">
+        <dt>parts<span class="property-type">object</span></dt>
+        <dd>此属性包含有关如何将消息与原始消息分开的信息。如果传递给<b>join</b>节点，则可以将序列重组为单个消息。该属性具有以下属性：
+        <ul>
+            <li><code>id</code> - 一组消息的标识符</li>
+            <li><code>index</code> - 组中的位置</li>
+            <li><code>count</code> - 如果已知组中的邮件总数。请参阅下面的“流媒体模式”</li>
+            <li><code>type</code> - 消息的类型-字符串/数组/对象/buffer</li>
+            <li><code>ch</code> - 对于字符串或buffer，用于将消息拆分为字符串或字节数组的数据</li>
+            <li><code>key</code> - 对于对象，创建此消息的属性的键。可以将节点配置为也将此值复制到另一个消息属性，例如<code>msg.topic</code></li>
+            <li><code>len</code> - 使用固定长度值拆分消息时，每段子消息的长度</li>
+        </ul>
+        </dd>
+    </dl>
+    <h3>详细</h3>
+    <p>在使用<b>join</b>节点将序列重新组合为单个消息之前，推荐使用此节点来轻松地创建跨消息序列，执行通用操作的流。</p>
+    <p>它使用<code>msg.parts</code>属性跟踪序列的各个部分。</p>
+    <h4>流媒体模式</h4>
+    <p>该节点还可以用于重排消息流。例如，发送换行符终止命令的串行设备可能会传递一条消息，并在其末尾带有部分命令。 在“流模式”下，此节点将拆分一条消息并发送每个完整的段。如果末尾有部分片段，则该节点将保留该片段，并将其添加到收到的下一条消息之前。</p>
+    <p>在此模式下运行时，该节点将不会设置<code>msg.parts.count</code>属性，因为流中期望的消息数还是未知的。这意味着它不能在自动模式下与<b>join</b>节点一起使用。</p>
+</script>
+
+<script type="text/x-red" data-help-name="join">
+    <p>将消息序列合并为一条消息.</p>
+    <p>共有三种模式：</p>
+    <dl>
+        <dt>自动模式</dt>
+        <dd>与<b>split</b>节点配对时，它将自动将已被拆分的消息进行合并。</dd>
+        <dt>手动模式</dt>
+        <dd>手动地以各种方式合并消息序列。</dd>
+        <dt>列聚合模式</dt>
+        <dd>对消息列中的所有消息应用表达式以将其简化为单个消息。</dd>
+    </dl>
+    <h3>输入</h3>
+    <dl class="message-properties">
+        <dt class="optional">parts<span class="property-type">object</span></dt>
+        <dd>使用自动模式时，所有的消息都应包含此属性。<b>split</b>节点会生成此属性，但也可以手动进行设置。该属性具有以下属性：
+        <ul>
+            <li><code>id</code> - 消息组的标识符</li>
+            <li><code>index</code> - 组中的位置</li>
+            <li><code>count</code> - 如果已知组中的邮件总数。请参阅下面的“流媒体模式”</li>
+            <li><code>type</code> - 消息的类型-字符串/数组/对象/buffer</li>
+            <li><code>ch</code> - 对于字符串或buffer，用于将消息拆分为字符串或字节数组的数据</li>
+            <li><code>key</code> - 对于对象，创建此消息的属性的键。可以将节点配置为也将此值复制到另一个消息属性，例如<code>msg.topic</code>/li>
+            <li><code>len</code> - 使用固定长度值拆分消息时，每段子消息的长度</li>
+        </ul>
+        </dd>
+        <dt class="optional">complete</dt>
+        <dd>如果设置，则节点将以其当前状态发送其输出消息。</dd>
+    </dl>
+    <h3>详细</h3>
+
+    <h4>自动模式</h4>
+    <p>自动模式使用传入消息的<code>parts</code>属性来确定应如何连接序列。这使它可以自动逆转<b>split</b>节点的操作。</p>
+
+    <h4>手动模式</h4>
+    <p>设置为以手动模式时，该节点能以各种不同的方法来处理消息：</p>
+    <ul>
+        <li><b>字符串</b>或<b>缓冲区</b>-通过将每条消息的选定属性与指定的连接字符或缓冲区连接起来。</li>
+        <li><b>数组</b> - 通过将每个选定的属性或整个消息添加到输出数组</li>
+        <li><b>键/值对象</b> - 通过使用每个消息的属性来确定存储所需值的键。</li>
+        <li><b>merged object</b> - 通过将每个消息的属性合并到一个对象下。</li>
+    </ul>
+    <p>输出消息的其他属性都取自发送结果前的最后一条消息。</p>
+    <p>可以用<i>计数</i>来确定应接收多少条消息来进行合并。对于对象输出，可以设置为达到此计数后的每条后续消息都发送一条输出。</p>
+    <p>可以用<i>超时</i>来设置发送新消息之前的等待时间。</p>
+    <p>如果收到设置了<b>msg.complete</b>属性的消息时发送输出消息并重置消息列数。</p>
+    <p>如果收到设置了<b>msg.reset</b>属性的消息，则部分收到的消息将被删除而不发送，同时重置消息列数。</p>
+
+    <h4>列聚合模式</h4>
+    <p>选择列聚合模式时，将表达式应用于组成消息列的每条消息，并使用聚合值组成一条消息。</p>
+
+    <dl class="message-properties">
+        <dt>初始值</dt>
+        <dd>累积值的初始值(<code>$A</code>)。</dd>
+        <dt>聚合表达式</dt>
+        <dd>序列中的每个消息调用的JSONata表达式。结果将作为累加值传递到表达式的下一个调用。在表达式中，可以使用以下特殊变量：
+            <ul>
+                <li><code>$A</code>: 累计值 </li>
+                <li><code>$I</code>: 消息在序列中的索引</li>
+                <li><code>$N</code>: 序列中的消息数</li>
+            </ul>
+        </dd>
+        <dt>最终调整式子</dt>
+        <dd>可选的JSONata表达式，在将聚合表达式应用于序列中的所有消息之后应用。在表达式中，可以使用以下特殊变量：
+            <ul>
+                <li><code>$A</code>: 累计值</li>
+                <li><code>$N</code>: 消息在序列中的索引</li>
+            </ul>
+        </dd>
+        <p>默认情况下，按顺序从序列的第一条消息到最后一条消息应用聚合表达式。也可以选择以相反的顺序应用聚合表达式。</p>
+    </dl>
+    <p><b>例子：</b>给定一系列数字值，以下设置将计算平均值：
+        <ul>
+            <li><b>聚合表达式</b>: <code>$A+payload</code></li>
+            <li><b>初始值</b>: <code>0</code></li>
+            <li><b>最终调整式</b>: <code>$A/$N</code></li>
+        </ul>
+    </p>
+    <h4>储存讯息</h4>
+    <p>该节点将在内部缓存消息，以便跨序列工作。运行时设置<code>nodeMessageBufferMaxLength</code>可用于设定缓存的消息数。</p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/18-sort.html
new file mode 100644
index 000000000..226355a8c
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/18-sort.html
@@ -0,0 +1,41 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="sort">
+    <p>对消息属性或消息序列进行排序的函数。</p>
+    <p>当配置为对消息属性进行排序时，节点将对指定消息属性所指向的数组数据进行排序。</p>
+    <p>当配置为对消息序列排序时，它将对消息重新排序。</p>
+    <p>排序顺序可以是：</p>
+    <ul>
+        <li><b>升序</b></li>
+        <li><b>降序</b></li>
+    </ul>
+    <p>对于数字，可以通过复选框指定数字顺序。</p>
+    <p>排序键可以是元素值，也可以是JSONata表达式来对属性值进行排序，还可以是message属性或JSONata表达式来对消息序列进行排序。<p>
+    <p>在对消息序列进行排序时，排序节点依赖于接收到的消息来设置<code>msg.parts</code>。拆分节点将生成此属性，但也可以手动创建。它具有以下属性：</p>
+    <p>
+        <ul>
+            <li><code>id</code> - 消息组的标识符</li>
+            <li><code>index</code> - 组中的位置</li>
+            <li><code>count</code> - 群组中的邮件总数</li>
+        </ul>
+    </p>
+    <p><b>注意：</b>在此节点的处理中，消息在内部存储。通过指定要累积的最大消息数，可以防止意外的高内存使用。默认设置是不限制消息数量。
+        <ul>
+            <li><code>nodeMessageBufferMaxLength</code>属性在<b>settings.js</b>中设置。</li>
+        </ul>
+    </p>
+</script>
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/19-batch.html
new file mode 100644
index 000000000..012f20816
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/sequence/19-batch.html
@@ -0,0 +1,34 @@
+<!--
+  Copyright JS Foundation and other contributors, http://js.foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-help-name="batch">
+    <p>根据各种规则创建消息序列。</p>
+    <h3>详细</h3>
+    <p>有三种创建消息序列的模式：</p>
+    <dl>
+        <dt>讯息数</dt>
+        <dd>将消息分组为给定长度的序列。 <b>overlap</b>（重叠）选项指定在一个序列的末尾应重复多少消息。</dd>
+
+        <dt>时间间隔</dt>
+        <dd>对在指定时间间隔内到达的邮件进行分组。如果在该时间间隔内没有消息到达，则该节点可以选择发送空消息。</dd>
+
+        <dt>串联序列</dt>
+        <dd>通过串联输入序列来创建消息序列。每条消息必须具有<code>msg.topic</code>属性和标识其序列的<code>msg.parts</code>属性。该节点配置有<code>topic</code>值列表，以标识所连接的顺序序列。
+        </dd>
+    </dl>
+    <h4>储存讯息</h4>
+    <p>该节点将在内部缓冲消息，以便跨序列工作。运行时设置<code>nodeMessageBufferMaxLength</code>可用于限制节点将缓存多少消息。</p>
+</script>

From 663ed9833ac644a80977d4136be2739fbdc86453 Mon Sep 17 00:00:00 2001
From: Tscherno <tscherno@gmail.com>
Date: Sat, 1 Feb 2020 17:21:33 +0100
Subject: [PATCH 284/305] Add HEAD as Method

---
 .../@node-red/nodes/core/network/21-httprequest.html             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index cb97c68a5..03106dc61 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -22,6 +22,7 @@
         <option value="POST">POST</option>
         <option value="PUT">PUT</option>
         <option value="DELETE">DELETE</option>
+        <option value="HEAD">HEAD</option>
         <option value="use" data-i18n="httpin.setby"></option>
         </select>
     </div>

From 36bf2a3c3897430021a9b134d1dddf5c6fbced27 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 3 Feb 2020 12:59:12 +0900
Subject: [PATCH 285/305] add support for examples of core nodes

---
 .../node_modules/@node-red/registry/lib/localfilesystem.js    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index 947972031..c66d7d080 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -286,6 +286,10 @@ function getNodeFiles(disableNodePathScan) {
     nodeFiles.forEach(function(node) {
         nodeList["node-red"].nodes[node.name] = node;
     });
+    if (settings.coreNodesDir) {
+        var examplesDir = path.join(settings.coreNodesDir,"examples");
+        nodeList["node-red"].examples = {path: examplesDir};
+    }
 
     if (!disableNodePathScan) {
         var moduleFiles = scanTreeForNodesModules();

From 272fbc0cb0f3646f0294ad24bc549a32976f501f Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 4 Feb 2020 09:45:23 +0900
Subject: [PATCH 286/305] add examples of batch node

---
 .../@node-red/nodes/examples/batch/1_number-mode.json            | 1 +
 .../node_modules/@node-red/nodes/examples/batch/2_time-mode.json | 1 +
 .../@node-red/nodes/examples/batch/3_concatenate-mode.json       | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 packages/node_modules/@node-red/nodes/examples/batch/1_number-mode.json
 create mode 100644 packages/node_modules/@node-red/nodes/examples/batch/2_time-mode.json
 create mode 100644 packages/node_modules/@node-red/nodes/examples/batch/3_concatenate-mode.json

diff --git a/packages/node_modules/@node-red/nodes/examples/batch/1_number-mode.json b/packages/node_modules/@node-red/nodes/examples/batch/1_number-mode.json
new file mode 100644
index 000000000..b7b919c9e
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/batch/1_number-mode.json
@@ -0,0 +1 @@
+[{"id":"bf16276d.2f1758","type":"tab","label":"Example: Number-based Group Mode","disabled":false,"info":"*Number-based Group mode* of batch node can be used to create new message sequences from incoming messages. Recently received *N*-messages are grouped to a sequence. Creating message sequences that has overwrap with adjacent message group is possible.\n"},{"id":"f5a82278.78d6c","type":"batch","z":"bf16276d.2f1758","name":"","mode":"count","count":"5","overlap":0,"interval":"5","allowEmptySequence":false,"topics":[],"x":370,"y":232,"wires":[["b1e514ed.44f328"]]},{"id":"43720065.2891d","type":"comment","z":"bf16276d.2f1758","name":"Group 5 consecutive messages","info":"","x":170,"y":60,"wires":[]},{"id":"b1e514ed.44f328","type":"join","z":"bf16276d.2f1758","name":"","mode":"auto","build":"string","property":"payload","propertyType":"msg","key":"topic","joiner":"\\n","joinerType":"str","accumulate":"false","timeout":"","count":"","reduceRight":false,"x":510,"y":232,"wires":[["457e5970.8ceaa8"]]},{"id":"457e5970.8ceaa8","type":"debug","z":"bf16276d.2f1758","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":670,"y":232,"wires":[]},{"id":"8e3d3ceb.bd0fe","type":"comment","z":"bf16276d.2f1758","name":"↑ create message sequence with 5 messages","info":"","x":490,"y":272,"wires":[]},{"id":"fbe20ae3.cbb6f8","type":"comment","z":"bf16276d.2f1758","name":"↓ join sequence to array","info":"","x":560,"y":192,"wires":[]},{"id":"7ebafe58.2a112","type":"inject","z":"bf16276d.2f1758","name":"","topic":"","payload":"","payloadType":"date","repeat":"","crontab":"","once":false,"onceDelay":0.1,"x":140,"y":152,"wires":[["589603c4.1cb5fc"]]},{"id":"589603c4.1cb5fc","type":"function","z":"bf16276d.2f1758","name":"send: 0-49","func":"for(var x = 0; x < 50; x++) {\n    node.send({payload: x});\n}","outputs":1,"noerr":0,"x":310,"y":152,"wires":[["f5a82278.78d6c"]]},{"id":"9b59b72c.fcd8f8","type":"comment","z":"bf16276d.2f1758","name":"↓ send sequence: 0-49","info":"","x":340,"y":112,"wires":[]},{"id":"6421756f.6abd5c","type":"batch","z":"bf16276d.2f1758","name":"","mode":"count","count":"5","overlap":"1","interval":"5","allowEmptySequence":false,"topics":[],"x":370,"y":500,"wires":[["199cf232.743e7e"]]},{"id":"657b6a53.2a1fc4","type":"comment","z":"bf16276d.2f1758","name":"Group 5 consecutive messages with overlap of 1 msg","info":"","x":240,"y":328,"wires":[]},{"id":"199cf232.743e7e","type":"join","z":"bf16276d.2f1758","name":"","mode":"auto","build":"string","property":"payload","propertyType":"msg","key":"topic","joiner":"\\n","joinerType":"str","accumulate":"false","timeout":"","count":"","reduceRight":false,"x":510,"y":500,"wires":[["91d29dda.d8a4f"]]},{"id":"91d29dda.d8a4f","type":"debug","z":"bf16276d.2f1758","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":670,"y":500,"wires":[]},{"id":"8bd4d407.aa2af8","type":"comment","z":"bf16276d.2f1758","name":"↑ create message sequence with 5 messages with overlap of 1 msg","info":"","x":560,"y":540,"wires":[]},{"id":"a49ea57d.8d2458","type":"comment","z":"bf16276d.2f1758","name":"↓ join sequence to array","info":"","x":560,"y":460,"wires":[]},{"id":"f689d1b3.90e4b","type":"inject","z":"bf16276d.2f1758","name":"","topic":"","payload":"","payloadType":"date","repeat":"","crontab":"","once":false,"onceDelay":0.1,"x":140,"y":420,"wires":[["c021cf24.ad03e"]]},{"id":"c021cf24.ad03e","type":"function","z":"bf16276d.2f1758","name":"send: 0-49","func":"for(var x = 0; x < 50; x++) {\n    node.send({payload: x});\n}","outputs":1,"noerr":0,"x":310,"y":420,"wires":[["6421756f.6abd5c"]]},{"id":"8da6e576.901a18","type":"comment","z":"bf16276d.2f1758","name":"↓ send sequence: 0-49","info":"","x":340,"y":380,"wires":[]}]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/batch/2_time-mode.json b/packages/node_modules/@node-red/nodes/examples/batch/2_time-mode.json
new file mode 100644
index 000000000..87fe70f0a
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/batch/2_time-mode.json
@@ -0,0 +1 @@
+[{"id":"82a01f29.86de","type":"tab","label":"Example: Time-based Group Mode","disabled":false,"info":"*Time-based Group mode* of batch node can be used to create new message sequences from incoming messages received within specified time range. \n"},{"id":"9a7f6539.6e36d8","type":"batch","z":"82a01f29.86de","name":"","mode":"interval","count":10,"overlap":0,"interval":"5","allowEmptySequence":false,"topics":[],"x":350,"y":260,"wires":[["e54a3b57.3677f8"]]},{"id":"71dc607e.98aab","type":"comment","z":"82a01f29.86de","name":"Group messages received within 5s","info":"","x":180,"y":80,"wires":[]},{"id":"e54a3b57.3677f8","type":"join","z":"82a01f29.86de","name":"","mode":"auto","build":"string","property":"payload","propertyType":"msg","key":"topic","joiner":"\\n","joinerType":"str","accumulate":"false","timeout":"","count":"","reduceRight":false,"x":490,"y":260,"wires":[["1e263cac.6641f3"]]},{"id":"1e263cac.6641f3","type":"debug","z":"82a01f29.86de","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":650,"y":260,"wires":[]},{"id":"324c7b93.0db734","type":"comment","z":"82a01f29.86de","name":"↑ create message sequence received within 5s","info":"","x":480,"y":300,"wires":[]},{"id":"fb112bae.fbe428","type":"comment","z":"82a01f29.86de","name":"↓ join sequence to array","info":"","x":540,"y":220,"wires":[]},{"id":"34f8dda5.2864c2","type":"inject","z":"82a01f29.86de","name":"","topic":"","payload":"","payloadType":"date","repeat":"","crontab":"","once":false,"onceDelay":0.1,"x":140,"y":160,"wires":[["c9e23ee4.ce535"]]},{"id":"c9e23ee4.ce535","type":"function","z":"82a01f29.86de","name":"send: 0-49","func":"for(var x = 0; x < 100; x++) {\n    node.send({payload: x});\n}","outputs":1,"noerr":0,"x":310,"y":160,"wires":[["7026e0cc.4e3c3"]]},{"id":"7026e0cc.4e3c3","type":"delay","z":"82a01f29.86de","name":"","pauseType":"rate","timeout":"1","timeoutUnits":"seconds","rate":"1","nbRateUnits":"1","rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"x":490,"y":160,"wires":[["9a7f6539.6e36d8"]]},{"id":"40f8c766.6ed198","type":"comment","z":"82a01f29.86de","name":"↓ send sequence: 0-49","info":"","x":340,"y":120,"wires":[]}]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/batch/3_concatenate-mode.json b/packages/node_modules/@node-red/nodes/examples/batch/3_concatenate-mode.json
new file mode 100644
index 000000000..819ae7966
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/batch/3_concatenate-mode.json
@@ -0,0 +1 @@
+[{"id":"845b226d.a4b18","type":"tab","label":"Example: Concatenate Mode","disabled":false,"info":"*Concatenate mode* of batch node can be used to combine input message sequences to create a new message sequence. Order of the sequences can be specified using message topic assigned to each message in a sequence.  Message sequence can be specified multiple times.\n"},{"id":"72afe7b0.38b9d8","type":"inject","z":"845b226d.a4b18","name":"","topic":"SEQ","payload":"[1,2,3,4,5]","payloadType":"json","repeat":"","crontab":"","once":false,"onceDelay":0.1,"x":160,"y":100,"wires":[["6dea90dd.c442c"]]},{"id":"6dea90dd.c442c","type":"split","z":"845b226d.a4b18","name":"","splt":"\\n","spltType":"str","arraySplt":1,"arraySpltType":"len","stream":false,"addname":"","x":330,"y":100,"wires":[["3ac93a4b.ddbbc6"]]},{"id":"3ac93a4b.ddbbc6","type":"batch","z":"845b226d.a4b18","name":"","mode":"concat","count":10,"overlap":0,"interval":10,"allowEmptySequence":false,"topics":[{"topic":"SEQ"},{"topic":"SEQ"}],"x":470,"y":100,"wires":[["48ec7040.56f5f"]]},{"id":"48ec7040.56f5f","type":"join","z":"845b226d.a4b18","name":"","mode":"auto","build":"string","property":"payload","propertyType":"msg","key":"topic","joiner":"\\n","joinerType":"str","accumulate":"false","timeout":"","count":"","reduceRight":false,"x":610,"y":100,"wires":[["902613c4.769b5"]]},{"id":"902613c4.769b5","type":"debug","z":"845b226d.a4b18","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":770,"y":100,"wires":[]},{"id":"a84cf2e1.65adc","type":"comment","z":"845b226d.a4b18","name":"Duplicate","info":"","x":100,"y":60,"wires":[]},{"id":"3256f015.45c36","type":"inject","z":"845b226d.a4b18","name":"","topic":"SEQ","payload":"[1,-6,-8,7,2,-3]","payloadType":"json","repeat":"","crontab":"","once":false,"onceDelay":0.1,"x":160,"y":220,"wires":[["c308dcb2.621da"]]},{"id":"c308dcb2.621da","type":"split","z":"845b226d.a4b18","name":"","splt":"\\n","spltType":"str","arraySplt":1,"arraySpltType":"len","stream":false,"addname":"","x":330,"y":220,"wires":[["2222098b.7fd036"]]},{"id":"247a5fab.239cc","type":"comment","z":"845b226d.a4b18","name":"Filter & Concat","info":"","x":120,"y":180,"wires":[]},{"id":"2222098b.7fd036","type":"switch","z":"845b226d.a4b18","name":"","property":"payload","propertyType":"msg","rules":[{"t":"gt","v":"0","vt":"num"},{"t":"else"}],"checkall":"true","repair":true,"outputs":2,"x":390,"y":280,"wires":[["56e3a974.2bfde8"],["86a1b43a.ff4cb8"]]},{"id":"cd00a796.e4e478","type":"comment","z":"845b226d.a4b18","name":"↑ Duplicate SEQ","info":"","x":500,"y":140,"wires":[]},{"id":"56e3a974.2bfde8","type":"change","z":"845b226d.a4b18","name":"Topic←POS","rules":[{"t":"set","p":"topic","pt":"msg","to":"POS","tot":"str"}],"action":"","property":"","from":"","to":"","reg":false,"x":550,"y":240,"wires":[["fe90d65d.a6b548"]]},{"id":"86a1b43a.ff4cb8","type":"change","z":"845b226d.a4b18","name":"Topic←NEG","rules":[{"t":"set","p":"topic","pt":"msg","to":"NEG","tot":"str"}],"action":"","property":"","from":"","to":"","reg":false,"x":550,"y":300,"wires":[["fe90d65d.a6b548"]]},{"id":"fe90d65d.a6b548","type":"batch","z":"845b226d.a4b18","name":"","mode":"concat","count":10,"overlap":0,"interval":10,"allowEmptySequence":false,"topics":[{"topic":"NEG"},{"topic":"POS"}],"x":710,"y":280,"wires":[["5b089f16.62b96"]]},{"id":"2f46c0af.bff71","type":"debug","z":"845b226d.a4b18","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":930,"y":220,"wires":[]},{"id":"5b089f16.62b96","type":"join","z":"845b226d.a4b18","name":"","mode":"auto","build":"string","property":"payload","propertyType":"msg","key":"topic","joiner":"\\n","joinerType":"str","accumulate":"false","timeout":"","count":"","reduceRight":false,"x":770,"y":220,"wires":[["2f46c0af.bff71"]]},{"id":"e069eb28.6eb358","type":"comment","z":"845b226d.a4b18","name":"↑ Order sequence: negative→positive","info":"","x":810,"y":320,"wires":[]},{"id":"aeae162b.efd118","type":"comment","z":"845b226d.a4b18","name":"Filter pos/neg and make separate sequence↑ (but not a simple sort) ","info":"","x":320,"y":340,"wires":[]}]
\ No newline at end of file

From 5897045f24fa8cf5ed28d86c9380a8b802e27af0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 5 Feb 2020 14:26:55 +0000
Subject: [PATCH 287/305] Ignore disabled nodes when checking for invalid
 configs on deploy Closes #2430

---
 .../node_modules/@node-red/editor-client/src/js/ui/deploy.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
index cdf84d02f..9e91410a9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -334,8 +334,7 @@ RED.deploy = (function() {
                 var invalidNodes = [];
 
                 RED.nodes.eachNode(function(node) {
-                    hasInvalid = hasInvalid || !node.valid;
-                    if (!node.valid) {
+                    if (!node.valid && !node.d) {
                         invalidNodes.push(getNodeInfo(node));
                     }
                     if (node.type === "unknown") {
@@ -345,6 +344,7 @@ RED.deploy = (function() {
                     }
                 });
                 hasUnknown = unknownNodes.length > 0;
+                hasInvalid = invalidNodes.length > 0;
 
                 var unusedConfigNodes = [];
                 RED.nodes.eachConfig(function(node) {

From 3d9945b60cdeb86a43d8e3005e61ff5e5f165276 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 5 Feb 2020 14:44:39 +0000
Subject: [PATCH 288/305] Update to JSONata 1.8

---
 package.json                                                  | 2 +-
 .../@node-red/editor-client/locales/en-US/jsonata.json        | 4 ++++
 .../@node-red/editor-client/src/vendor/jsonata/formatter.js   | 1 +
 packages/node_modules/@node-red/util/package.json             | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9aaeb8f9e..a6c4c5091 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.7.0",
+        "jsonata": "1.8.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
index 8f516a289..d777d1919 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -262,5 +262,9 @@
     "$distinct": {
         "args": "array",
         "desc": "Returns an array with duplicate values removed from `array`"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Returns the type of `value` as a string. If `value` is undefined, this will return `undefined`"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
index 0cc69715a..382537be3 100644
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -171,6 +171,7 @@
         '$sum':{ args:[ 'array' ]},
         '$toMillis':{args:['timestamp']}, // <-------------
         '$trim':{ args:[ 'str' ]},
+        '$type':{ args:['value']},
         '$uppercase':{ args:[ 'str' ]},
         '$zip':{ args:[ 'array1' ]}
     }
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 174db5bfd..411c35a7c 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -18,7 +18,7 @@
         "clone": "2.1.2",
         "i18next": "15.1.2",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.7.0",
+        "jsonata": "1.8.0",
         "when": "3.7.8"
     }
 }

From d771527f776a4d9282eafbcc97753123076f277b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 5 Feb 2020 15:11:18 +0000
Subject: [PATCH 289/305] Add some auto-complete snippets to the nrjavascript
 mode Close #2438

---
 .../editor-client/src/ace/bin/snippets/nrjavascript.js         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js b/packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js
index d11f3fc6a..c0f5c2e0d 100644
--- a/packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js
+++ b/packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js
@@ -1,4 +1,4 @@
-ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText=undefined,t.scope="nrjavascript"});
+ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText='# Prototype\nsnippet proto\n	${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {\n		${4:// body...}\n	};\n# Function\nsnippet fun\n	function ${1?:function_name}(${2:argument}) {\n		${3:// body...}\n	}\n# Anonymous Function\nregex /((=)\\s*|(:)\\s*|(\\()|\\b)/f/(\\))?/\nsnippet f\n	function${M1?: ${1:functionName}}($2) {\n		${0:$TM_SELECTED_TEXT}\n	}${M2?;}${M3?,}${M4?)}\n# Immediate function\ntrigger \\(?f\\(\nendTrigger \\)?\nsnippet f(\n	(function(${1}) {\n		${0:${TM_SELECTED_TEXT:/* code */}}\n	}(${1}));\n# if\nsnippet if\n	if (${1:true}) {\n		${0}\n	}\n# if ... else\nsnippet ife\n	if (${1:true}) {\n		${2}\n	} else {\n		${0}\n	}\n# tertiary conditional\nsnippet ter\n	${1:/* condition */} ? ${2:a} : ${3:b}\n# switch\nsnippet switch\n	switch (${1:expression}) {\n		case \'${3:case}\':\n			${4:// code}\n			break;\n		${5}\n		default:\n			${2:// code}\n	}\n# case\nsnippet case\n	case \'${1:case}\':\n		${2:// code}\n		break;\n	${3}\n\n# while (...) {...}\nsnippet wh\n	while (${1:/* condition */}) {\n		${0:/* code */}\n	}\n# try\nsnippet try\n	try {\n		${0:/* code */}\n	} catch (e) {}\n# do...while\nsnippet do\n	do {\n		${2:/* code */}\n	} while (${1:/* condition */});\n# Object Method\nsnippet :f\nregex /([,{[])|^\\s*/:f/\n	${1:method_name}: function(${2:attribute}) {\n		${0}\n	}${3:,}\n# setTimeout function\nsnippet setTimeout\nregex /\\b/st|timeout|setTimeo?u?t?/\n	setTimeout(function() {${3:$TM_SELECTED_TEXT}}, ${1:10});\n# console.log (Firebug)\nsnippet cl\n	console.log(${1});\n# return\nsnippet ret\n	return ${1:result}\n# for (property in object ) { ... }\nsnippet fori\n	for (var ${1:prop} in ${2:Things}) {\n		${0:$2[$1]}\n	}\n# hasOwnProperty\nsnippet has\n	hasOwnProperty(${1})\n# docstring\nsnippet /**\n	/**\n	 * ${1:description}\n	 *\n	 */\nsnippet @par\nregex /^\\s*\\*\\s*/@(para?m?)?/\n	@param {${1:type}} ${2:name} ${3:description}\nsnippet @ret\n	@return {${1:type}} ${2:description}\n# JSON.parse\nsnippet jsonp\n	JSON.parse(${1:jstr});\n# JSON.stringify\nsnippet jsons\n	JSON.stringify(${1:object});\n# self-defining function\nsnippet sdf\n	var ${1:function_name} = function(${2:argument}) {\n		${3:// initial code ...}\n\n		$1 = function($2) {\n			${4:// main code}\n		};\n	}\n# \nsnippet for-\n	for (var ${1:i} = ${2:Things}.length; ${1:i}--; ) {\n		${0:${2:Things}[${1:i}];}\n	}\n# for (...) {...}\nsnippet for\n	for (var ${1:i} = 0; $1 < ${2:Things}.length; $1++) {\n		${3:$2[$1]}$0\n	}\n# for (...) {...} (Improved Native For-Loop)\nsnippet forr\n	for (var ${1:i} = ${2:Things}.length - 1; $1 >= 0; $1--) {\n		${3:$2[$1]}$0\n	}\n# Node-RED Specific Funcs\nsnippet nodes\n	node.send(${1:msg})\nsnippet clone\n	RED.util.cloneMessage(${1:msg})\nsnippet nodel\n	node.log($1)\nsnippet nodew\n	node.warn($1)\nsnippet nodee\n	node.error($1)\nsnippet noded\n	node.debug($1)\nsnippet done\n	node.done($1)\nsnippet flowg\n	flow.get($1)\nsnippet flows\n	flow.set($1, $2)\nsnippet globalg\n	global.get($1)\nsnippet globals\n	global.set($1, $2)\n',t.scope="nrjavascript"});
                 (function() {
                     ace.require(["ace/snippets/nrjavascript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
@@ -6,4 +6,3 @@ ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippet
                         }
                     });
                 })();
-            
\ No newline at end of file

From b6702a0c3b7f86b63b756fb681dcb0b7c7bd768a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 5 Feb 2020 19:45:57 +0000
Subject: [PATCH 290/305] Modify history sidebar button positioning to handle
 long labels Fixes #2338

---
 .../editor-client/src/js/ui/projects/tab-versionControl.js  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
index 7069be6b7..e367e9c95 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
@@ -336,7 +336,7 @@ RED.sidebar.versionControl = (function() {
 
         var unstagedContent = $('<div class="red-ui-sidebar-vc-change-container"></div>').appendTo(localChanges.content);
         var header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.localFiles")+'</div>').appendTo(unstagedContent);
-        stageAllButton = $('<button class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-plus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
+        stageAllButton = $('<button class="red-ui-button red-ui-button-small" style="position: absolute; right: 5px; top: 5px;"><i class="fa fa-plus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
             .appendTo(header)
             .on("click", function(evt) {
                 evt.preventDefault();
@@ -368,7 +368,7 @@ RED.sidebar.versionControl = (function() {
         unmergedContent = $('<div class="red-ui-sidebar-vc-change-container"></div>').appendTo(localChanges.content);
 
         header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.unmergedChanges")+'</div>').appendTo(unmergedContent);
-        bg = $('<div style="float: right"></div>').appendTo(header);
+        bg = $('<div style="position: absolute; right: 5px; top: 5px;"></div>').appendTo(header);
         var abortMergeButton = $('<button class="red-ui-button red-ui-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.abortMerge")+'</button>')
             .appendTo(bg)
             .on("click", function(evt) {
@@ -433,7 +433,7 @@ RED.sidebar.versionControl = (function() {
 
         header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.changeToCommit")+'</div>').appendTo(stagedContent);
 
-        bg = $('<div style="float: right"></div>').appendTo(header);
+        bg = $('<div style="position: absolute; right: 5px; top: 5px;"></div>').appendTo(header);
         var showCommitBox = function() {
             commitMessage.val("");
             submitCommitButton.prop("disabled",true);

From 0bb77bfa7f2645f32cc8ad4a2a109d039e35d91c Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 6 Feb 2020 16:14:09 +0900
Subject: [PATCH 291/305] Add Japanese translations for i18n

---
 .../@node-red/editor-client/locales/en-US/editor.json    | 3 ++-
 .../@node-red/editor-client/locales/ja/editor.json       | 9 +++++----
 .../@node-red/editor-client/locales/ja/jsonata.json      | 8 ++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 72af1d38b..a5f232aa6 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -1008,6 +1008,7 @@
         "en-US": "English",
         "ja": "Japanese",
         "ko": "Korean",
-        "zh-CN": "Chinese(Simplified)"
+        "zh-CN": "Chinese(Simplified)",
+        "zh-TW": "Chinese(Traditional)"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 8290ca1c1..cf04ced1d 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -803,9 +803,9 @@
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
         "duplicate": "複製",
-	"error": {
-	    "invalidJSON": "不正なJSON: "
-	}
+        "error": {
+            "invalidJSON": "不正なJSON: "
+        }
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
@@ -1007,6 +1007,7 @@
         "en-US": "英語",
         "ja": "日本語",
         "ko": "韓国語",
-        "zh-CN": "中国語(簡体)"
+        "zh-CN": "中国語(簡体)",
+        "zh-TW": "中国語(繁体)"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
index ba873c448..659cf66df 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
@@ -245,11 +245,11 @@
     },
     "$encodeUrl": {
         "args": "str",
-        "desc": "Uniform Resource Locator (URL)を構成する文字を1、２、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+        "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
     "$encodeUrlComponent": {
         "args": "str",
-        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、２、３、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
     "$decodeUrl": {
         "args": "str",
@@ -262,5 +262,9 @@
     "$distinct": {
         "args": "array",
         "desc": "配列`array`から重複要素を削除した配列を返します。"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "`value` の型を文字列として返します。もし `value` が未定義の場合、 `undefined` が返されます。"
     }
 }

From 0f1ca1c7cf200d436e0cb0feb6a308c6f4a56c03 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 6 Feb 2020 10:04:55 +0000
Subject: [PATCH 292/305] cloneMessage should handle undefined without throwing
 err Fixes #2399

---
 .../node_modules/@node-red/util/lib/util.js   | 33 ++++++++++---------
 test/unit/@node-red/util/lib/util_spec.js     | 14 +++++---
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index ef43739e6..45a33be14 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -81,22 +81,25 @@ function ensureBuffer(o) {
  * @memberof @node-red/util_util
  */
 function cloneMessage(msg) {
-    // Temporary fix for #97
-    // TODO: remove this http-node-specific fix somehow
-    var req = msg.req;
-    var res = msg.res;
-    delete msg.req;
-    delete msg.res;
-    var m = clone(msg);
-    if (req) {
-        m.req = req;
-        msg.req = req;
+    if (typeof msg !== "undefined") {
+        // Temporary fix for #97
+        // TODO: remove this http-node-specific fix somehow
+        var req = msg.req;
+        var res = msg.res;
+        delete msg.req;
+        delete msg.res;
+        var m = clone(msg);
+        if (req) {
+            m.req = req;
+            msg.req = req;
+        }
+        if (res) {
+            m.res = res;
+            msg.res = res;
+        }
+        return m;
     }
-    if (res) {
-        m.res = res;
-        msg.res = res;
-    }
-    return m;
+    return msg;
 }
 
 /**
diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js
index cf59df55e..261dbc531 100644
--- a/test/unit/@node-red/util/lib/util_spec.js
+++ b/test/unit/@node-red/util/lib/util_spec.js
@@ -143,6 +143,10 @@ describe("@node-red/util/util", function() {
             cloned.req.should.equal(msg.req);
             cloned.res.should.equal(msg.res);
         });
+        it('handles undefined values without throwing an error', function() {
+            var result = util.cloneMessage(undefined);
+            should.not.exist(result);
+        })
     });
     describe('getObjectProperty', function() {
         it('gets a property beginning with "msg."', function() {
@@ -840,11 +844,11 @@ describe("@node-red/util/util", function() {
                         },
                     }
                 };
-                
+
                 for (var i = 0; i < 1000; i++) {
                     msg.msg.obj.big += 'some more string ';
                 }
-                
+
                 var result = util.encodeObject(msg);
                 result.format.should.eql("error");
                 var resultJson = JSON.parse(result.msg);
@@ -862,7 +866,7 @@ describe("@node-red/util/util", function() {
                     throw new Error('Exception in toString - should have been caught');
                 }
                 msg.msg.constructor = { name: "strangeobj" };
-                
+
                 var result = util.encodeObject(msg);
                 var success = (result.msg.indexOf('[Type not printable]') >= 0);
                 success.should.eql(true);
@@ -872,11 +876,11 @@ describe("@node-red/util/util", function() {
                 var msg = {
                     msg: {
                         mystrangeobj:"hello",
-                        constructor: { 
+                        constructor: {
                             get name(){
                                 throw new Error('Exception in constructor name');
                             }
-                        }                      
+                        }
                     },
                 };
                 var result = util.encodeObject(msg);

From bbd471ad937d3c922d63d2ba2b8e23cf13f04370 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 6 Feb 2020 15:36:23 +0000
Subject: [PATCH 293/305] Trick chrome into autofilling dummy username/password
 inputs Fixes #2445

Continuing the arms race against Chrome's war on developers getting
to choose if a form should be autocompleted or not.

The honey-pot username/password fields we already had were being
ignored. This is because they were hidden.

This fix does three things:

 - unhides the honey-pot inputs, but moves them offscreen so they won't be seen
 - gives them dummy id's so Chrome thinks they are username/password fields
 - updates our autocomplete setting to be the standards-compliant 'off' for all
  the other browsers who adhere to the standard
---
 .../@node-red/editor-client/src/js/ui/editor.js          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 5f8379aa1..9fb29833a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -582,11 +582,12 @@ RED.editor = (function() {
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
         // cases, and also prevent browser auto-fill of password
-        // Add in reverse order as they are prepended...
-        $('<input type="password" style="display: none;" />').prependTo(dialogForm);
-        $('<input type="text" style="display: none;" />').prependTo(dialogForm);
+        //  - the elements cannot be hidden otherwise Chrome will ignore them.
+        //  - the elements need to have id's that imply password/username
+        $('<div style="position: absolute; top: -2000px;"><input id="red-ui-trap-password" type="password"/></div>').prependTo(dialogForm);
+        $('<div style="position: absolute; top: -2000px;"><input id="red-ui-trap-username"  type="text"/></div>').prependTo(dialogForm);
         dialogForm.on("submit", function(e) { e.preventDefault();});
-        dialogForm.find('input').attr("autocomplete","disable");
+        dialogForm.find('input').attr("autocomplete","off");
         return dialogForm;
     }
 

From cd552ab2022d004132ad01233e6f21e74447f6e3 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Fri, 7 Feb 2020 17:57:37 +0900
Subject: [PATCH 294/305] wrap up ch-ZN translation for editor-client files

---
 .../editor-client/locales/zh-CN/editor.json   | 608 +++++++++++++++++-
 .../editor-client/locales/zh-CN/jsonata.json  |  48 ++
 2 files changed, 633 insertions(+), 23 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
index a45f37f66..3695eb263 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@@ -10,7 +10,22 @@
             "load": "读取",
             "save": "保存",
             "import": "导入",
-            "export": "导出"
+            "export": "导出",
+            "back": "后退",
+            "next": "下一个",
+            "clone": "克隆项目",
+            "cont": "继续"
+        },
+        "type": {
+            "string": "字符串",
+            "number": "数字",
+            "boolean": "布尔值",
+            "array": "数组",
+            "buffer": "buffer",
+            "object": "对象",
+            "jsonString": "JSON字符串",
+            "undefined": "为定义",
+            "null": "空"
         }
     },
     "workspace": {
@@ -19,10 +34,13 @@
         "confirmDelete": "确认删除",
         "delete": "你确定想删除 '__label__'?",
         "dropFlowHere": "把流程放到这里",
+        "addFlow": "添加流程",
+        "listFlows": "流程一览",
         "status": "状态",
         "enabled": "有效",
         "disabled": "无效",
-        "info": "详细描述"
+        "info": "详细描述",
+        "selectNodes": "点击节点来选择"
     },
     "menu": {
         "label": {
@@ -36,11 +54,16 @@
                 "defaultDir": "默认方向",
                 "ltr": "从左到右",
                 "rtl": "从右到左",
-                "auto": "上下文"
+                "auto": "上下文",
+                "language": "语言",
+                "browserDefault": "浏览器默认"
             },
             "sidebar": {
                 "show": "显示侧边栏"
             },
+            "palette": {
+                "show": "显示控制板"
+            },
             "settings": "设置",
             "userSettings": "用户设置",
             "nodes": "节点",
@@ -60,11 +83,23 @@
             "keyboardShortcuts": "键盘快捷方式",
             "login": "登陆",
             "logout": "退出",
-            "editPalette":"节点管理",
+            "editPalette": "节点管理",
             "other": "其他",
-            "showTips": "显示小提示"
+            "showTips": "显示小提示",
+            "help": "Node-RED网页",
+            "projects": "项目",
+            "projects-new": "新建",
+            "projects-open": "打开",
+            "projects-settings": "项目设定",
+            "showNodeLabelDefault": "显示新添加的节点的标签"
         }
     },
+    "actions": {
+        "toggle-navigator": "切换导航器",
+        "zoom-out": "缩小",
+        "zoom-reset": "重设缩放",
+        "zoom-in": "放大"
+    },
     "user": {
         "loggedInAs": "作为__name__登陆",
         "username": "账号",
@@ -82,29 +117,73 @@
         "warning": "<strong>警告</strong>: __message__",
         "warnings": {
             "undeployedChanges": "节点中存在未部署的更改",
+            "nodeActionDisabled": "节点操作已禁用",
             "nodeActionDisabledSubflow": "节点动作在子流程中被禁用",
             "missing-types": "流程由于缺少节点类型而停止。请检查日志的详细信息",
-            "restartRequired": "Node-RED必须重新启动，以启用升级的模块"
+            "safe-mode": "<p>流程以安全模式停止。</p><p>您可以修改流程并部署更改以重新启动。</p>",
+            "restartRequired": "Node-RED必须重新启动，以启用升级的模块",
+            "credentials_load_failed": "<p>由于无法解密凭据，因此流程停止。</p><p>流程凭据文件已加密，但是项目的加密密钥丢失或无效。</p>",
+            "credentials_load_failed_reset": "<p>凭据无法解密</p><p>流凭据文件已加密，但是项目的加密密钥丢失或无效。</p><p>流凭据文件将在下一次部署时重置。任何现有的流凭证将被清除。</p>",
+            "missing_flow_file": "<p>找不到项目流程文件。</p><p>该项目未配置流程文件。</p>",
+            "missing_package_file": "<p>找不到项目包文件。</p><p>项目缺少package.json文件。</p>",
+            "project_empty": "<p>该项目为空。</p><p>是否要创建一组默认的项目文件？<br/>否则，您将必须在编辑器外部手动将文件添加到项目中。</p>",
+            "project_not_found": "<p>未找到项目'__project__'。</p>",
+            "git_merge_conflict": "<p>自动合并更改失败。</p><p>修复未合并的冲突，然后提交结果。</p>"
         },
-        "error": "<strong>Error</strong>: __message__",
+        "error": "<strong>错误</strong>: __message__",
         "errors": {
             "lostConnection": "丢失与服务器的连接，重新连接...",
             "lostConnectionReconnect": "丢失与服务器的连接，__time__秒后重新连接",
             "lostConnectionTry": "现在尝试",
             "cannotAddSubflowToItself": "无法向其自身添加子流程",
             "cannotAddCircularReference": "无法添加子流程 - 循环引用",
-            "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>请升级到最新版本的Node.js LTS"
+            "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>请升级到最新版本的Node.js LTS",
+            "failedToAppendNode": "<p>'__module__'加载失败</p><p>__error__</p>"
+        },
+        "project": {
+            "change-branch": "转到本地分支'__project__'",
+            "merge-abort": "Git合并中止",
+            "loaded": "项目'__project__'已加载",
+            "updated": "项目'__project__'已更新",
+            "pull": "项目'__project__'已重新加载",
+            "revert": "项目 '__project__'已还原",
+            "merge-complete": "Git合并完成",
+            "setupCredentials": "设定证书",
+            "setupProjectFiles": "设置项目文件",
+            "no": "不了，谢谢",
+            "createDefault": "创建默认项目文件",
+            "mergeConflict": "显示合并冲突"
+        },
+        "label": {
+            "manage-project-dep": "管理项目依赖性",
+            "setup-cred": "设定证书",
+            "setup-project": "设置项目文件",
+            "create-default-package": "创建默认的包文件",
+            "no-thanks": "不了，谢谢",
+            "create-default-project": "创建默认项目文件",
+            "show-merge-conflicts": "显示合并冲突"
         }
     },
     "clipboard": {
         "clipboard": "剪贴板",
         "nodes": "节点",
+        "node": "__count__节点",
+        "node_plural": "__count__节点",
+        "configNode": "__count__配置节点",
+        "configNode_plural": "__count__配置节点",
+        "flow": "__count__流程",
+        "flow_plural": "__count__流程",
+        "subflow": "__count__子流程",
+        "subflow_plural": "__count__子流程",
         "pasteNodes": "在这里粘贴节点",
+        "selectFile": "选择要导入的文件",
         "importNodes": "导入节点",
         "exportNodes": "导出节点至剪贴板",
+        "download": "下载",
         "importUnrecognised": "导入了无法识别的类型:",
         "importUnrecognised_plural": "导入了无法识别的类型:",
         "nodesExported": "节点导出到了剪贴板",
+        "nodesImported": "导入：",
         "nodeCopied": "已复制__count__个节点",
         "nodeCopied_plural": "已复制__count__个节点",
         "invalidFlow": "无效的流程: __message__",
@@ -114,11 +193,21 @@
             "all": "所有流程",
             "compact": "紧凑",
             "formatted": "已格式化",
-            "copy": "导出到剪贴板"
+            "copy": "导出到剪贴板",
+            "export": "到处到库",
+            "exportAs": "导出为",
+            "overwrite": "替换",
+            "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"
         },
         "import": {
             "import": "导入到",
-            "newFlow": "新流程"
+            "newFlow": "新流程",
+            "errors": {
+                "notArray": "输入的不是JSON数组",
+                "itemNotObject": "输入的流无效 - 项目__index__不是节点对象",
+                "missingId": "输入的流无效-项 __index__ 缺少'id'属性",
+                "missingType": "输入的流程无效-项__index__缺少'类型'属性"
+            }
         },
         "copyMessagePath": "已复制路径",
         "copyMessageValue": "已复制数值",
@@ -132,7 +221,10 @@
         "modifiedFlowsDesc": "只部署包含已更改节点的流",
         "modifiedNodes": "已更改的节点",
         "modifiedNodesDesc": "只部署已经更改的节点",
+        "restartFlows": "重启流程",
+        "restartFlowsDesc": "重新启动当前部署的流程",
         "successfulDeploy": "部署成功",
+        "successfulRestart": "成功重启流程",
         "deployFailed": "部署失败: __message__",
         "unusedConfigNodes": "您有一些未使用的配置节点",
         "unusedConfigNodesLink": "点击此处查看它们",
@@ -152,16 +244,24 @@
             "improperlyConfigured": "工作区包含一些未正确配置的节点:",
             "unknown": "工作区包含一些未知的节点类型:",
             "confirm": "你确定要部署吗?",
+            "doNotWarn": "不要再对此发出警告",
             "conflict": "服务器正在运行较新的一组流程。",
             "backgroundUpdate": "服务器上的流程已更新。",
             "conflictChecking": "检查是否可以自动合并更改",
             "conflictAutoMerge": "此更改不包括冲突，可以自动合并",
-            "conflictManualMerge": "这些更改包括了在部署之前必须解决的冲突。"
+            "conflictManualMerge": "这些更改包括了在部署之前必须解决的冲突。",
+            "plusNMore": "+ __count__更多"
         }
     },
+    "eventLog": {
+        "title": "事件记录日志",
+        "view": "查看日志"
+    },
     "diff": {
         "unresolvedCount": "__count__个未解决的冲突",
         "unresolvedCount_plural": "__count__个未解决的冲突",
+        "globalNodes": "全局节点",
+        "flowProperties": "流程属性",
         "type": {
             "added": "已添加",
             "changed": "已更改",
@@ -175,9 +275,19 @@
         "nodeCount": "__count__个节点",
         "nodeCount_plural": "__count__个节点",
         "local": "本地",
-        "remote": "远程"
+        "remote": "远程",
+        "reviewChanges": "查看变更",
+        "noBinaryFileShowed": "无法显示二进制文件内容",
+        "viewCommitDiff": "查看提交更改",
+        "compareChanges": "比较变更",
+        "saveConflict": "保存冲突解决",
+        "conflictHeader": "已解决<span>__unresolved__</span>中的<span>__resolved__</span>个冲突",
+        "commonVersionError": "通用版本不包含有效的JSON：",
+        "oldVersionError": "旧版本不包含有效的JSON：",
+        "newVersionError": "新版本不包含有效的JSON："
     },
     "subflow": {
+        "editSubflowInstance": "编辑子流实例：__name__",
         "editSubflow": "编辑流程模板: __name__",
         "edit": "编辑流程模板",
         "subflowInstances": "这个子流程模板有__count__个实例",
@@ -185,8 +295,14 @@
         "editSubflowProperties": "编辑属性",
         "input": "输入:",
         "output": "输出:",
+        "status": "状态节点",
         "deleteSubflow": "删除子流程",
         "info": "详细描述",
+        "category": "类别",
+        "env": {
+            "restore": "恢复为默认子流",
+            "remove": "删除环境变量"
+        },
         "errors": {
             "noNodesSelected": "<strong>无法创建子流程</strong>: 未选择节点",
             "multipleInputsToSelection": "<strong>无法创建子流程</strong>: 多个输入到了选择"
@@ -204,18 +320,68 @@
         "editConfig": "编辑__type__配置",
         "addNewType": "添加新的__type__节点",
         "nodeProperties": "节点属性",
+        "label": "标签",
+        "color": "颜色",
         "portLabels": "端口标签",
         "labelInputs": "输入",
         "labelOutputs": "输出",
+        "settingIcon": "图标",
+        "default": "默认",
         "noDefaultLabel": "无",
         "defaultLabel": "使用默认标签",
+        "searchIcons": "搜索图标",
+        "useDefault": "使用默认",
+        "description": "描述",
+        "show": "显示",
+        "hide": "隐藏",
+        "locale": "选择界面语言",
+        "icon": "图标",
+        "inputType": "输入类型",
+        "inputs": {
+            "input": "输入",
+            "select": "选择",
+            "checkbox": "复选框",
+            "spinner": "微调器",
+            "none": "空",
+            "hidden": "隐藏属性"
+        },
+        "types": {
+            "str": "字符串",
+            "num": "数字",
+            "bool": "布尔",
+            "json": "JSON",
+            "bin": "buffer",
+            "env": "环境变量"
+        },
+        "menu": {
+            "input": "输入",
+            "select": "选择",
+            "checkbox": "复选框",
+            "spinner": "微调器",
+            "hidden": "仅标签"
+        },
+        "select": {
+            "label": "标签",
+            "value": "值"
+        },
+        "spinner": {
+            "min": "最小值",
+            "max": "最大值"
+        },
         "errors": {
-            "scopeChange": "更改范围将使其他流中的节点无法使用"
+            "scopeChange": "更改范围将使其他流中的节点无法使用",
+            "invalidProperties": "无效的属性："
         }
     },
     "keyboard": {
         "title": "键盘快捷键",
+        "keyboard": "键盘",
+        "filterActions": "筛选动作",
+        "shortcut": "快捷键",
+        "scope": "范围",
         "unassigned": "未分配",
+        "global": "全局",
+        "workspace": "工作组",
         "selectAll": "选择所有节点",
         "selectAllConnected": "选择所有连接的节点",
         "addRemoveNode": "从选择中添加/删除节点",
@@ -226,12 +392,14 @@
         "nudgeNode": "移动所选节点(1px)",
         "moveNode": "移动所选节点(20px)",
         "toggleSidebar": "切换侧边栏",
+        "togglePalette": "切换控制板",
         "copyNode": "复制所选节点",
         "cutNode": "剪切所选节点",
         "pasteNode": "粘贴节点",
         "undoChange": "撤消上次执行的更改",
         "searchBox": "打开搜索框",
-        "managePalette": "管理面板"
+        "managePalette": "管理面板",
+        "actionList": "动作列表"
     },
     "library": {
         "library": "库",
@@ -239,30 +407,42 @@
         "saveToLibrary": "保存到库...",
         "typeLibrary": "__type__类型库",
         "unnamedType": "无名__type__",
-        "exportToLibrary": "将节点导出到库",
+        "exportedToLibrary": "节点导出到库",
         "dialogSaveOverwrite": "一个叫做__libraryName__的__libraryType__已经存在，您需要覆盖么？",
         "invalidFilename": "无效的文件名",
         "savedNodes": "保存的节点",
         "savedType": "已保存__type__",
         "saveFailed": "保存失败: __message__",
+        "newFolder": "新文件夹",
         "types": {
+            "local": "本地的",
             "examples": "例子"
-        }
+        },
+        "exportToLibrary": "将节点导出到库"
     },
     "palette": {
         "noInfo": "无可用信息",
         "filter": "过滤节点",
         "search": "搜索模块",
+        "addCategory": "添加新的...",
         "label": {
             "subflows": "子流程",
+            "network": "网络",
+            "common": "共通",
             "input": "输入",
             "output": "输出",
             "function": "功能",
+            "sequence": "序列",
+            "parser": "解析",
             "social": "社交",
             "storage": "存储",
             "analysis": "分析",
             "advanced": "高级"
         },
+        "actions": {
+            "collapse-all": "收起所有类别",
+            "expand-all": "展开所有类别"
+        },
         "event": {
             "nodeAdded": "添加到面板中的节点:",
             "nodeAdded_plural": "添加到面板中的多个节点",
@@ -276,6 +456,7 @@
         },
         "editor": {
             "title": "面板管理",
+            "palette": "控制板",
             "times": {
                 "seconds": "秒前",
                 "minutes": "分前",
@@ -309,6 +490,8 @@
             "updated": "已更新",
             "install": "安装",
             "installed": "已安装",
+            "conflict": "冲突",
+            "conflictTip": "<p>无法安装此模块，因为它包含已安装的<br/>节点类型</p><p>与<code>__module__</code>冲突</p>",
             "loading": "加载目录...",
             "tab-nodes": "节点",
             "tab-install": "安装",
@@ -356,6 +539,7 @@
             "label": "信息",
             "node": "节点",
             "type": "类型",
+            "module": "模组",
             "id": "ID",
             "status": "状态",
             "enabled": "启用",
@@ -364,17 +548,18 @@
             "instances": "实例",
             "properties": "属性",
             "info": "信息",
+            "desc": "描述",
             "blank": "空白",
             "null": "空",
             "showMore": "展开",
             "showLess": "收起",
             "flow": "流程",
-            "selection":"选择",
-            "nodes":"__count__ 个节点",
+            "selection": "选择",
+            "nodes": "__count__ 个节点",
             "flowDesc": "流程描述",
             "subflowDesc": "子流程描述",
             "nodeHelp": "节点帮助",
-            "none":"无",
+            "none": "无",
             "arrayItems": "__count__个项目",
             "showTips": "您可以从设置面板启用提示信息"
         },
@@ -386,9 +571,25 @@
             "subflows": "子流程",
             "flows": "流程",
             "filterAll": "所有",
+            "showAllConfigNodes": "显示所有配置节点",
             "filterUnused": "未使用",
+            "showAllUnusedConfigNodes": "显示所有未使用的配置节点",
             "filtered": "__count__ 个隐藏"
         },
+        "context": {
+            "name": "上下文数据",
+            "label": "上下午",
+            "none": "未选择",
+            "refresh": "刷新以加载",
+            "empty": "空",
+            "node": "节点",
+            "flow": "流程",
+            "global": "全局",
+            "deleteConfirm": "你确定要删除这个项目吗？",
+            "autoRefresh": "刷新选择更改",
+            "refrsh": "刷新",
+            "delete": "删除"
+        },
         "palette": {
             "name": "节点管理",
             "label": "节点"
@@ -399,8 +600,151 @@
             "description": "描述",
             "dependencies": "依赖",
             "settings": "设置",
+            "noSummaryAvailable": "无可用摘要",
             "editDescription": "编辑项目描述",
-            "editDependencies": "编辑项目依赖"
+            "editDependencies": "编辑项目依赖",
+            "noDescriptionAvailable": "没有可用的描述",
+            "editReadme": "编辑README.md",
+            "showProjectSettings": "显示项目设置",
+            "projectSettings": {
+                "title": "项目设置",
+                "edit": "编辑",
+                "none": "空",
+                "install": "安装",
+                "removeFromProject": "从项目中删除",
+                "addToProject": "添加到项目",
+                "files": "文件",
+                "package": "包",
+                "flow": "流程",
+                "credentials": "证书",
+                "packageCreate": "保存更改后将创建文件",
+                "fileNotExist": "文件不存在",
+                "selectFile": "选择文件",
+                "invalidEncryptionKey": "无效的加密密钥",
+                "encryptionEnabled": "启用加密",
+                "encryptionDisabled": "加密已禁用",
+                "setTheEncryptionKey": "设置加密密钥",
+                "resetTheEncryptionKey": "重置加密密钥",
+                "changeTheEncryptionKey": "更改加密密钥",
+                "currentKey": "当前密钥",
+                "newKey": "新密钥",
+                "credentialsAlert": "这将删除所有现有凭证",
+                "versionControl": "版本控制",
+                "branches": "分支",
+                "noBranches": "没有分支",
+                "deleteConfirm": "您确定要删除本地分支'__name__'吗？ 这不能被撤消。",
+                "unmergedConfirm": "本地分支'__name__'具有未合并的更改，这些更改将丢失。你确定要删除吗？",
+                "deleteUnmergedBranch": "删除未合并的分支",
+                "gitRemotes": "Git远程仓库",
+                "addRemote": "添加远程仓库",
+                "addRemote2": "添加远程仓库",
+                "remoteName": "远程仓库名",
+                "nameRule": "只能包含A-Z 0-9 _ -",
+                "url": "URL",
+                "urlRule": "https://, ssh:// or file://",
+                "urlRule2": "网址中不能包含用户名/密码",
+                "noRemotes": "没有远程仓库",
+                "deleteRemoteConfrim": "您确定要删除远程仓库'__name__'吗？",
+                "deleteRemote": "删除远程仓库"
+            },
+            "userSettings": {
+                "committerDetail": "提交者详细信息",
+                "committerTip": "保留空白以使用系统默认值",
+                "userName": "用户名",
+                "email": "电子邮件",
+                "sshKeys": "SSH密钥",
+                "sshKeysTip": "允许您创建到远程git存储库的安全连接。",
+                "add": "添加密钥",
+                "addSshKey": "添加SSH密钥",
+                "addSshKeyTip": "生成新的公钥/私钥对",
+                "name": "名字",
+                "nameRule": "只能包含A-Z 0-9 _ -",
+                "passphrase": "密码短语",
+                "passphraseShort": "密码短语过短",
+                "optional": "可选的",
+                "cancel": "取消",
+                "generate": "生成密钥",
+                "noSshKeys": "没有SSH密钥",
+                "copyPublicKey": "将公钥复制到剪贴板",
+                "delete": "删除密钥",
+                "gitConfig": "Git配置",
+                "deleteConfirm": "您确定要删除SSH密钥__name__吗？这不能被撤消。"
+            },
+            "versionControl": {
+                "unstagedChanges": "未暂存的变更",
+                "stagedChanges": "暂存的变更",
+                "unstageChange": "取消变更的暂存",
+                "stageChange": "暂存变更",
+                "unstageAllChange": "取消所有变更的暂存",
+                "stageAllChange": "暂存所有变更",
+                "commitChanges": "提交变更",
+                "resolveConflicts": "解决冲突",
+                "head": "HEAD",
+                "staged": "暂存的",
+                "unstaged": "未暂存的",
+                "local": "本地的",
+                "remote": "远程的",
+                "revert": "您确定要将更改恢复为'__file__'吗？这不能被撤消。",
+                "revertChanges": "还原变更",
+                "localChanges": "本地变更",
+                "none": "None",
+                "conflictResolve": "解决所有冲突。提交更改以完成合并。",
+                "localFiles": "本地文件",
+                "all": "所有的",
+                "unmergedChanges": "未合并的更改",
+                "abortMerge": "中止合并",
+                "commit": "提交",
+                "changeToCommit": "提交变更",
+                "commitPlaceholder": "输入您的提交信息",
+                "cancelCapital": "取消",
+                "commitCapital": "提交",
+                "commitHistory": "提交历史",
+                "branch": "分支:",
+                "moreCommits": "更多提交",
+                "changeLocalBranch": "变更本地分支",
+                "createBranchPlaceholder": "查找或创建分支",
+                "upstream": "上游",
+                "localOverwrite": "切换分支会覆盖您现有的本地更改。您必须先提交或撤消那些更改。",
+                "manageRemoteBranch": "管理远程分支",
+                "unableToAccess": "无法访问远程存储库",
+                "retry": "重试",
+                "setUpstreamBranch": "设置为上游分支",
+                "createRemoteBranchPlaceholder": "查找或创建远程分支",
+                "trackedUpstreamBranch": "创建的分支将被设置为跟踪的上游分支。",
+                "selectUpstreamBranch": "分支将被创建。 在下面选择以将其设置为被跟踪的上游分支。",
+                "pushFailed": "推送失败，因为远程具有更多的最新提交。请先拉取并合并，然后再尝试推送。",
+                "push": "推送",
+                "pull": "拉取",
+                "unablePull": "<p>无法提取远程更改；您未暂存的本地更改将被覆盖。</p><p>请先提交更改，然后重试。</p>",
+                "showUnstagedChanges": "显示未暂存的更改",
+                "connectionFailed": "无法连接到远程存储库：",
+                "pullUnrelatedHistory": "<p>远程有无关的提交历史</p><p>您确定要将这些更改拉入本地仓库吗？</p>",
+                "pullChanges": "拉取更改",
+                "history": "历史",
+                "projectHistory": "项目历史",
+                "daysAgo": "__count__天前",
+                "daysAgo_plural": "__count__天前",
+                "hoursAgo": "__count__小时前",
+                "hoursAgo_plural": "__count__小时前",
+                "minsAgo": "__count__分钟前",
+                "minsAgo_plural": "__count__分钟前",
+                "secondsAgo": "秒前",
+                "notTracking": "您的本地分支当前未跟踪一个远程分支。",
+                "statusUnmergedChanged": "您的仓库中有未合并的更改。您需要解决冲突并提交结果。",
+                "repositoryUpToDate": "您的仓库是最新的。",
+                "commitsAhead": "您的存储库领先远程仓库__count__次提交。您现在可以推送这些提交。",
+                "commitsAhead_plural": "您的存储库领先远程仓库__count__次提交。您现在可以推送这些提交。",
+                "commitsBehind": "您的存储库落后远程仓库__count__次提交。您现在可以拉取这些提交。",
+                "commitsBehind_plural": "您的存储库落后远程仓库__count__次提交。您现在可以拉取这些提交。",
+                "commitsAheadAndBehind1": "您的存储库落后远程仓库__count__次提交",
+                "commitsAheadAndBehind1_plural": "您的存储库落后远程仓库__count__次提交",
+                "commitsAheadAndBehind2": "领先远程仓库__count__次提交。",
+                "commitsAheadAndBehind2_plural": "领先远程仓库__count__次提交。",
+                "commitsAheadAndBehind3": "您必须先拉取远程提交，然后才能进行推送。",
+                "commitsAheadAndBehind3_plural": "您必须先拉取远程提交，然后才能进行推送。",
+                "refreshCommitHistory": "刷新提交历史",
+                "refreshChanges": "刷新更改"
+            }
         }
     },
     "typedInput": {
@@ -408,10 +752,12 @@
             "str": "文字列",
             "num": "数字",
             "re": "正则表达式",
-            "bool": "布尔",
+            "bool": "布尔值",
             "json": "JSON",
             "bin": "二进制流",
-            "date": "时间戳"
+            "date": "时间戳",
+            "jsonata": "表达式",
+            "env": "环境变量"
         }
     },
     "editableList": {
@@ -423,8 +769,10 @@
     },
     "expressionEditor": {
         "functions": "功能",
+        "functionReference": "功能reference",
         "insert": "插入",
         "title": "JSONata表达式编辑器",
+        "test": "测试",
         "data": "示例消息",
         "result": "结果",
         "format": "格式表达方法",
@@ -438,14 +786,228 @@
             "eval": "评估表达式错误:\n  __message__"
         }
     },
+    "jsEditor": {
+        "title": "JavaScript编辑器"
+    },
+    "textEditor": {
+        "title": "文本编辑器"
+    },
     "jsonEditor": {
         "title": "JSON编辑器",
-        "format": "格式化JSON"
+        "format": "格式化JSON",
+        "rawMode": "编辑 JSON",
+        "uiMode": "Visual编辑器",
+        "insertAbove": "在上方插入",
+        "insertBelow": "在下方插入",
+        "addItem": "添加项目",
+        "copyPath": "复制路径到项目",
+        "expandItems": "展开项目",
+        "collapseItems": "收合项目",
+        "duplicate": "重复",
+        "error": {
+            "invalidJSON": "无效的JSON: "
+        }
+    },
+    "markdownEditor": {
+        "title": "Markdown编辑器",
+        "expand": "展开",
+        "format": "格式化为markdown",
+        "heading1": "标题 1",
+        "heading2": "标题 2",
+        "heading3": "标题 3",
+        "bold": "粗体",
+        "italic": "斜体",
+        "code": "代码",
+        "ordered-list": "排序的列表",
+        "unordered-list": "非排序的列表",
+        "quote": "引用",
+        "link": "链接",
+        "horizontal-rule": "水平线",
+        "toggle-preview": "切换预览"
     },
     "bufferEditor": {
         "title": "缓冲区编辑器",
         "modeString": "作为UTF-8字符串处理",
         "modeArray": "作为JSON数组处理",
         "modeDesc": "<h3>缓冲区编辑器</h3><p>缓冲区类型被存储为字节值的JSON数组。编辑器将尝试将输入的数值解析为JSON数组。如果它不是有效的JSON，它将被视为UTF-8字符串，并被转换为单个字符代码点的数组。</p><p>例如，<code>Hello World</code>的值会被转换为JSON数组：<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+    },
+    "projects": {
+        "config-git": "配置Git客户端",
+        "welcome": {
+            "hello": "你好！ 我们已经将“项目”引入了Node-RED。",
+            "desc0": "这是一种用于管理流程文件的新方法，并且包括对流程的版本控制。",
+            "desc1": "首先，您可以创建您的第一个项目或从git存储库克隆现有项目。",
+            "desc2": "如果不确定，可以暂时跳过此步骤。您仍然可以随时通过“项目”菜单创建第一个项目。",
+            "create": "建立专案",
+            "clone": "克隆仓库",
+            "openExistingProject": "打开现有项目",
+            "not-right-now": "不是现在"
+        },
+        "git-config": {
+            "setup": "设置您的版本控制客户端",
+            "desc0": "Node-RED使用开源工具Git进行版本控制。它跟踪对项目文件的更改，并允许您将其推送到远程存储库。",
+            "desc1": "提交一组更改时，Git会使用用户名和电子邮件地址记录谁进行了更改。用户名可以是您想要的任何名称-不必是您的真实姓名。",
+            "desc2": "您的Git客户端已经配置了以下详细信息。",
+            "desc3": "您可以稍后在设置对话框的'Git config'标签下更改这些设置。",
+            "username": "用户名",
+            "email": "电子邮件"
+        },
+        "project-details": {
+            "create": "创建你的项目",
+            "desc0": "项目被维护为Git仓库。与他人一起共享您的流程",
+            "desc1": "您可以创建多个项目，并通过编辑器在它们之间快速切换。",
+            "desc2": "首先，您的项目需要一个名称和一个可选的描述。",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "project-name": "项目名",
+            "desc": "描述",
+            "opt": "可选的"
+        },
+        "clone-project": {
+            "clone": "克隆一个项目",
+            "desc0": "如果您已经有一个包含项目的git仓库，则可以对其进行克隆以开始使用。",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "project-name": "项目名",
+            "no-info-in-url": "网址中不要包含用户名/密码",
+            "git-url": "Git仓库的url",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "认证失败",
+            "username": "用户名",
+            "passwd": "秘密啊",
+            "ssh-key": "SSH密钥",
+            "passphrase": "密码短语",
+            "ssh-key-desc": "在通过ssh克隆仓库之前，必须添加SSH密钥才能访问它。",
+            "ssh-key-add": "添加一个ssh密钥",
+            "credential-key": "证书加密密钥",
+            "cant-get-ssh-key": "错误！ 无法获取所选的SSH密钥路径。",
+            "already-exists2": "已存在",
+            "git-error": "git错误",
+            "connection-failed": "连接失败",
+            "not-git-repo": "不是一个git仓库",
+            "repo-not-found": "未发现仓库"
+        },
+        "default-files": {
+            "create": "创建您的项目文件",
+            "desc0": "一个包含您的流程文件，Readme文件和package.json文件的项目。",
+            "desc1": "它可以包含您要在Git仓库中维护的任何其他文件。",
+            "desc2": "您现有的流程和凭证文件将被复制到项目中。",
+            "flow-file": "流程文件",
+            "credentials-file": "证书文件"
+        },
+        "encryption-config": {
+            "setup": "设置证书文件的加密",
+            "desc0": "您的流程证书文件可以被加密以确保其内容安全。",
+            "desc1": "如果要将这些证书存储在公共Git存储库中，则必须通过提供密钥短语来对它们进行加密。",
+            "desc2": "您的流程证书文件当前未加密。",
+            "desc3": "这意味着任何有权访问该文件的人都可以读取其内容，例如密码和访问令牌。",
+            "desc4": "如果要将这些证书存储在公共Git仓库中，则必须通过提供密钥短语来对它们进行加密。",
+            "desc5": "当前，使用设置文件中的credentialSecret属性作为密钥来加密流程证书文件。",
+            "desc6": "您的流程证书文件当前使用系统生成的密钥加密。您应该为此项目提供一个新的密钥。",
+            "desc7": "密钥将与项目文件分开存储。您将需要提供在另一个Node-RED实例中使用该项目的密钥。",
+            "credentials": "证书",
+            "enable": "启用加密",
+            "disable": "禁用加密",
+            "disabled": "禁用的",
+            "copy": "复制现有密钥",
+            "use-custom": "使用自定义密钥",
+            "desc8": "证书文件不会被加密，其内容很容易阅读",
+            "create-project-files": "创建项目文件",
+            "create-project": "创建项目",
+            "already-exists": "已存在",
+            "git-error": "git错误",
+            "git-auth-error": "git认证错误"
+        },
+        "create-success": {
+            "success": "您已经成功创建了第一个项目！",
+            "desc0": "现在，您可以像往常一样继续使用Node-RED。",
+            "desc1": "侧栏中的“信息”标签显示了您当前的活动项目。名称旁边的按钮可用于访问项目设置视图。",
+            "desc2": "侧栏中的“历史记录”标签可用于查看项目中已更改的文件并提交。它向您显示了提交的完整历史记录，并允许您将更改推送到远程存储库。"
+        },
+        "create": {
+            "projects": "项目",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "no-info-in-url": "网址中不要包含用户名/密码",
+            "open": "打开项目",
+            "create": "创建项目",
+            "clone": "克隆仓库",
+            "project-name": "项目名",
+            "desc": "描述",
+            "opt": "可选的",
+            "flow-file": "流程文件",
+            "credentials": "证书",
+            "enable-encryption": "启用加密",
+            "disable-encryption": "禁用加密",
+            "encryption-key": "加密密钥",
+            "desc0": "用来保护您的凭证的短语",
+            "desc1": "凭证文件不会被加密，其内容很容易阅读",
+            "git-url": "Git存储库URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "验证失败",
+            "username": "用户名",
+            "password": "密码",
+            "ssh-key": "SSH密钥",
+            "passphrase": "密码短语",
+            "desc2": "在通过ssh克隆存储库之前，必须添加SSH密钥才能访问它。",
+            "add-ssh-key": "添加一个ssh密钥",
+            "credentials-encryption-key": "证书加密密钥",
+            "already-exists-2": "已存在",
+            "git-error": "git错误",
+            "con-failed": "连接失败",
+            "not-git": "不是git仓库",
+            "no-resource": "找不到存储库",
+            "cant-get-ssh-key-path": "错误！无法获取所选的SSH密钥路径。",
+            "unexpected_error": "意外的错误"
+        },
+        "delete": {
+            "confirm": "您确定要删除此项目吗？"
+        },
+        "create-project-list": {
+            "search": "搜索您的项目",
+            "current": "当前的"
+        },
+        "require-clean": {
+            "confirm": "<p>您有未部署的更改，这些更改将丢失。</p><p>您要继续吗？</p>"
+        },
+        "send-req": {
+            "auth-req": "存储库需要认证",
+            "username": "用户名",
+            "password": "秘密",
+            "passphrase": "密码短语",
+            "retry": "重试",
+            "update-failed": "无法更新身份验证",
+            "unhandled": "未处理的错误响应"
+        },
+        "create-branch-list": {
+            "invalid": "无效的分支",
+            "create": "创建分支",
+            "current": "当前的"
+        },
+        "create-default-file-set": {
+            "no-active": "没有活动项目就无法创建默认文件集",
+            "no-empty": "无法在非空项目上创建默认文件集",
+            "git-error": "git错误"
+        },
+        "errors": {
+            "no-username-email": "您的Git客户端未配置用户名/电子邮件。",
+            "unexpected": "发生了一个意料之外的问题",
+            "code": "代码"
+        }
+    },
+    "editor-tab": {
+        "properties": "属性",
+        "envProperties": "环境变量",
+        "description": "描述",
+        "appearance": "外观",
+        "preview": "UI预览",
+        "defaultValue": "默认值"
+    },
+    "languages": {
+        "de": "德语",
+        "en-US": "英文",
+        "ja": "日语",
+        "ko": "韩文",
+        "zh-CN": "简体中文"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
index 669a7683a..56ede1b4e 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
@@ -214,5 +214,53 @@
     "$toMillis": {
         "args": "timestamp",
         "desc": "将ISO 8601格式的字符串`timestamp`转换为从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。如果该字符串的格式不正确，则抛出错误。"
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "返回环境变量的值。\n\n这是Node-RED定义的函数。"
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "使用当前上下文来作为评估依据，分析并评估字符串`expr`，其中包含文字JSON或JSONata表达式。"
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "将“数字”转换为字符串，并将其格式化为“图片”字符串指定的整数表示形式。图片字符串参数定义了数字的格式，并具有与XPath F&O 3.1 规范中的fn：format-integer相同的语法。"
+    },
+    "$parseInteger": {
+        "args": "string, picture",
+        "desc": "使用“图片”字符串指定的格式将“字符串”参数的内容解析为整数（作为JSON数字）。图片字符串参数与$formatInteger格式相同。."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "引发错误并显示一条消息。 可选的`str`将替代$error()函数评估的默认消息。"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "如果`arg`为真，则该函数返回。 如果arg为假，则抛出带有str的异常作为异常消息。"
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数：`function（value [，index [，array []]]）`其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）进行编码。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "解码先前由encodeUrl创建的统一资源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "返回一个数组，其中重复的值已从`数组`中删除"
     }
 }

From ad6104baeb0d68c098f89180227a9c8c10a12fe0 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Fri, 7 Feb 2020 17:58:20 +0900
Subject: [PATCH 295/305] wrap up ch-ZN translation for nodes message.json

---
 .../nodes/locales/zh-CN/messages.json         | 179 ++++++++++++++----
 1 file changed, 140 insertions(+), 39 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
index 9202bb3a7..46560d181 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
@@ -6,7 +6,9 @@
             "name": "名称",
             "username": "用户名",
             "password": "密码",
-            "property": "属性"
+            "property": "属性",
+            "selectNodes": "选择节点...",
+            "expand": "扩展"
         },
         "status": {
             "connected": "已连接",
@@ -35,7 +37,22 @@
         "stopped": "停止",
         "failed": "注入失败: __error__",
         "label": {
-            "repeat": "重复"
+            "repeat": "重复",
+            "flow": "流上下午",
+            "global": "全局上下文",
+            "str": "字符串",
+            "num": "数值",
+            "bool": "布尔值",
+            "json": "JSON对象",
+            "bin": "buffer",
+            "date": "时间戳",
+            "env": "环境变量",
+            "object": "对象",
+            "string": "字符串",
+            "boolean": "布尔值",
+            "number": "数值",
+            "Array": "数组",
+            "invalid": "无效的JSON对象"
         },
         "timestamp": "时间戳",
         "none": "无",
@@ -70,15 +87,13 @@
         }
     },
     "catch": {
-        "catch": "监测所有节点",
-        "catchNodes": "监测__number__个节点",
+        "catch": "捕获：所有节点",
+        "catchNodes": "捕获：__number__个节点",
+        "catchUncaught": "捕获：未捕获",
         "label": {
-            "source": "监测范围",
-            "node": "节点",
-            "type": "类型",
+            "source": "捕获范围",
             "selectAll": "全选",
-            "sortByLabel": "按名称排序",
-            "sortByType": "按类型排序"
+            "uncaught": "忽略其他捕获节点处理的错误"
         },
         "scope": {
             "all": "所有节点",
@@ -90,10 +105,6 @@
         "statusNodes": "报告__number__个节点状态",
         "label": {
             "source": "报告状态范围",
-            "node": "节点",
-            "type": "类型",
-            "selectAll": "全选",
-            "sortByLabel": "按名称排序",
             "sortByType": "按类型排序"
         },
         "scope": {
@@ -101,8 +112,13 @@
             "selected": "指定节点"
         }
     },
+    "complete": {
+        "completeNodes": "完成: __number__个节点"
+    },
     "debug": {
         "output": "输出",
+        "none": "None",
+        "invalid-exp": "无效的JSONata表达式: __error__",
         "msgprop": "信息属性",
         "msgobj": "完整信息",
         "to": "目标",
@@ -124,7 +140,11 @@
             "filterCurrent": "当前流程",
             "debugNodes": "调试节点",
             "clearLog": "清空日志",
-            "openWindow": "在新窗口打开"
+            "filterLog": "过滤日志",
+            "openWindow": "在新窗口打开",
+            "copyPath": "复制路径",
+            "copyPayload": "复制值",
+            "pinPath": "固定展开"
         },
         "messageMenu": {
             "collapseAll": "折叠所有路径",
@@ -146,26 +166,33 @@
             "key": "私钥",
             "passphrase": "密码",
             "ca": "CA证书",
-            "verify-server-cert":"验证服务器证书"
+            "verify-server-cert":"验证服务器证书",
+            "servername": "服务器名"
         },
         "placeholder": {
             "cert":"证书路径 (PEM 格式)",
             "key":"私钥路径 (PEM 格式)",
             "ca":"CA证书路径 (PEM 格式)",
-            "passphrase":"私钥密码 (可选)"
+            "passphrase":"私钥密码 (可选)",
+            "servername":"用于SNI"
         },
         "error": {
             "missing-file": "未提供证书/密钥文件"
         }
     },
     "exec": {
+        "exec": "exec",
+        "spawn": "spawn",
         "label": {
             "command": "命令",
             "append": "追加",
             "timeout": "超时",
             "timeoutplace": "可选填",
             "return": "输出",
-            "seconds": "秒"
+            "seconds": "秒",
+            "stdout": "标准输出",
+            "stderr": "标准错误输出",
+            "retcode": "返回码"
         },
         "placeholder": {
             "extraparams": "额外的输入参数"
@@ -177,6 +204,7 @@
         "oldrc": "使用旧式输出 (兼容模式)"
     },
     "function": {
+        "function": "函数",
         "label": {
             "function": "函数",
             "outputs": "输出"
@@ -187,6 +215,7 @@
         }
     },
     "template": {
+        "template": "模板",
         "label": {
             "template": "模版",
             "property": "属性",
@@ -199,7 +228,7 @@
             "yaml": "YAML",
             "none": "无"
         },
-        "templatevalue": "This is the payload: {{payload}} !"
+        "templatevalue": "这是有效载荷: {{payload}} !"
     },
     "delay": {
         "action": "行为设置",
@@ -272,6 +301,9 @@
         "wait-reset": "等待被重置",
         "wait-for": "等待",
         "wait-loop": "周期性重发",
+        "for": "处理",
+        "bytopics": "每个msg.topic",
+        "alltopics": "所有消息",
         "duration": {
             "ms": "毫秒",
             "s": "秒",
@@ -290,6 +322,7 @@
         }
     },
     "comment": {
+        "comment": "注释"
     },
     "unknown": {
         "label": {
@@ -300,9 +333,10 @@
     "mqtt": {
         "label": {
             "broker": "服务端",
-            "example": "e.g. localhost",
+            "example": "比如：本地主机",
             "output": "输出",
             "qos": "QoS",
+            "retain": "保持",
             "clientid": "客户端ID",
             "port": "端口",
             "keepalive": "Keepalive计时(秒)",
@@ -312,17 +346,22 @@
             "verify-server-cert":"验证服务器证书",
             "compatmode": "使用旧式MQTT 3.1支持"
         },
+        "sections-label":{
+            "birth-message": "连接时发送的消息（出生消息）",
+            "will-message":"意外断开连接时的发送消息（Will消息）",
+            "close-message":"断开连接前发送的消息（关闭消息）"
+        },
         "tabs-label": {
             "connection": "连接",
             "security": "安全",
-            "will": "Will信息",
-            "birth": "Birth信息"
+            "messages": "消息"
         },
         "placeholder": {
             "clientid": "留白则自动生成",
             "clientid-nonclean":"如非新会话，必须设置客户端ID",
             "will-topic": "留白将禁止Will信息",
-            "birth-topic": "留白将禁止Birth信息"
+            "birth-topic": "留白将禁止Birth信息",
+            "close-topic": "留白以禁用关闭消息"
         },
         "state": {
             "connected": "已连接到服务端: __broker__",
@@ -333,7 +372,9 @@
         "output": {
             "buffer": "Buffer",
             "string": "字符串",
-            "base64": "Base64编码字符串"
+            "base64": "Base64编码字符串",
+            "auto": "自动检测 (字符串或buffer)",
+            "json": "解析的JSON对象"
         },
         "true": "是",
         "false": "否",
@@ -342,7 +383,9 @@
             "not-defined": "主题未设置",
             "missing-config": "未设置服务端",
             "invalid-topic": "主题无效",
-            "nonclean-missingclientid": "客户端ID未设定，使用新会话"
+            "nonclean-missingclientid": "客户端ID未设定，使用新会话",
+            "invalid-json-string": "无效的JSON字符串",
+            "invalid-json-parse": "无法解析JSON字符串"
         }
     },
     "httpin": {
@@ -353,13 +396,27 @@
             "return": "返回",
             "upload": "接受文件上传?",
             "status": "状态码",
-            "headers": "Header",
-            "other": "其他"
+            "headers": "头",
+            "other": "其他",
+            "paytoqs" : "将msg.payload附加为查询字符串参数",
+            "utf8String": "UTF8格式的字符串",
+            "binaryBuffer": "二进制buffer",
+            "jsonObject": "解析的JSON对象",
+            "authType": "类型",
+            "bearerToken": "Token"
         },
         "setby": "- 用 msg.method 设定 -",
         "basicauth": "基本认证",
         "use-tls": "使用安全连接 (SSL/TLS) ",
         "tls-config":"TLS 设置",
+        "basic": "基本认证",
+        "digest": "摘要认证",
+        "bearer": "bearer认证",
+        "use-proxy": "使用代理服务器",
+        "persist": "对连接启用keep-alive",
+        "proxy-config": "代理服务器设置",
+        "use-proxyauth": "使用代理身份验证",
+        "noproxy-hosts": "代理例外",
         "utf8": "UTF-8 字符串",
         "binary": "二进制数据",
         "json": "JSON对象",
@@ -376,7 +433,10 @@
             "json-error": "JSON 解析错误",
             "no-url": "未设定 URL",
             "deprecated-call":"__method__方法已弃用",
-            "invalid-transport":"非HTTP传输请求"
+            "invalid-transport":"非HTTP传输请求",
+            "timeout-isnan": "超时值不是有效数字，忽略",
+            "timeout-isnegative": "超时值为负，忽略",
+            "invalid-payload": "无效的有效载荷"
         },
         "status": {
             "requesting": "请求中"
@@ -399,13 +459,19 @@
             "url1": "URL 应该使用ws:&#47;&#47;或者wss:&#47;&#47;方案并指向现有的websocket侦听器.",
             "url2": "默认情况下，<code>payload</code> 将包含要发送或从Websocket接收的数据。可以将客户端配置为以JSON格式的字符串发送或接收整个消息对象."
         },
+        "status": {
+            "connected": "连接数 __count__",
+            "connected_plural": "连接数 __count__"
+        },
         "errors": {
             "connect-error": "ws连接发生了错误: ",
             "send-error": "发送时发生了错误: ",
-            "missing-conf": "未设置服务器"
+            "missing-conf": "未设置服务器",
+            "duplicate-path": "同一路径上不能有两个WebSocket侦听器: __path__"
         }
     },
     "watch": {
+        "watch": "watch",
         "label": {
             "files": "文件",
             "recursive": "递归所有子文件夹"
@@ -421,7 +487,7 @@
             "output": "输出",
             "port": "端口",
             "host": "主机地址",
-            "payload": "的有效载荷",
+            "payload": "有效载荷",
             "delimited": "分隔符号",
             "close-connection": "是否在成功发送每条信息后断开连接?",
             "decode-base64": "用 Base64 解码信息?",
@@ -480,7 +546,6 @@
             "output": "输出",
             "group": "组",
             "interface": "本地IP",
-            "interfaceprompt": "（可选）本地 IP 绑定到",
             "send": "发送一个",
             "toport": "到端口",
             "address": "地址",
@@ -488,6 +553,7 @@
         },
         "placeholder": {
             "interface": "（可选）eth0的IP地址",
+            "interfaceprompt": "(可选) 要绑定的本地接口或地址",
             "address": "目标IP地址"
         },
         "udpmsgs": "udp信息",
@@ -529,15 +595,18 @@
             "ip-notset": "udp: IP地址未设定",
             "port-notset": "udp: 端口未设定",
             "port-invalid": "udp: 无效端口号码",
-            "alreadyused": "udp: 端口已被占用"
+            "alreadyused": "udp: 端口已被占用",
+            "ifnotfound": "udp: 接口 __iface__ 未发现"
         }
     },
     "switch": {
+        "switch": "switch",
         "label": {
             "property": "属性",
             "rule": "规则",
             "repair" : "重建信息队列"
         },
+        "previous": "先前值",
         "and": "与",
         "checkall": "全选所有规则",
         "stopfirst": "接受第一条匹配信息后停止",
@@ -550,11 +619,15 @@
             "false":"为假",
             "null":"为空",
             "nnull":"非空",
-            "head":"head",
-            "tail":"tail",
-            "index":"index between",
+            "istype": "类型是",
+            "empty": "为空",
+            "nempty": "非空",
+            "head":"头",
+            "tail":"尾",
+            "index":"索引在..中间",
             "exp":"JSONata表达式",
-            "else":"除此以外"
+            "else":"除此以外",
+            "hask": "拥有键"
         },
         "errors": {
             "invalid-expr": "无效的JSONata表达式: __error__",
@@ -588,6 +661,7 @@
         }
     },
     "range": {
+        "range": "range",
         "label": {
             "action": "操作",
             "inputrange": "映射输入数据",
@@ -623,7 +697,8 @@
             "firstrow": "第一行包含列名",
             "output": "输出",
             "includerow": "包含列名行",
-            "newline": "换行符"
+            "newline": "换行符",
+            "usestrings": "parse numerical values"
         },
         "placeholder": {
             "columns": "用逗号分割列名"
@@ -654,7 +729,8 @@
     "html": {
         "label": {
             "select": "选取项",
-            "output": "输出"
+            "output": "输出",
+            "in": "in"
         },
         "output": {
             "html": "选定元素的html内容",
@@ -670,7 +746,9 @@
         "errors": {
             "dropped-object": "忽略非对象格式的有效负载",
             "dropped": "忽略不支持格式的有效负载类型",
-            "dropped-error": "转换有效负载失败"
+            "dropped-error": "转换有效负载失败",
+            "schema-error": "JSON架构错误",
+            "schema-error-compile": "JSON架构错误: 未能编译架构"
         },
         "label": {
             "o2j": "对象至JSON",
@@ -713,7 +791,10 @@
             "breaklines": "分拆成行",
             "filelabel": "文件",
             "sendError": "发生错误时发送消息（传统模式）",
-            "deletelabel": "删除 __file__"
+            "deletelabel": "删除 __file__",
+            "encoding": "编码",
+            "utf8String": "UTF8字符串",
+            "binaryBuffer": "二进制buffer"
         },
         "action": {
             "append": "追加至文件",
@@ -731,6 +812,21 @@
             "deletedfile": "删除文件: __file__",
             "appendedfile": "追加至文件: __file__"
         },
+        "encoding": {
+            "none": "默认",
+            "native": "Native",
+            "unicode": "Unicode",
+            "japanese": "日本",
+            "chinese": "中国",
+            "korean": "韩国",
+            "taiwan": "台湾/香港",
+            "windows": "Windows代码页",
+            "iso": "ISO代码页",
+            "ibm": "IBM代码页",
+            "mac": "Mac代码页",
+            "koi8": "KOI8代码页",
+            "misc": "其它"
+        },
         "errors": {
             "nofilename": "未指定文件名",
             "invaliddelete": "警告：无效删除。请在配置对话框中使用特定的删除选项",
@@ -742,6 +838,7 @@
         "tip": "提示: 文件名应该是绝对路径，否则它将相对于Node-RED进程的工作目录。"
     },
     "split": {
+        "split": "split",
         "intro":"基于以下类型拆分<code>msg.payload</code>:",
         "object":"<b>对象</b>",
         "objectSend":"每个键值对作为单个消息发送",
@@ -753,6 +850,7 @@
         "addname":" 复制键到 "
     },
     "join":{
+        "join": "join",
         "mode":{
             "mode":"模式",
             "auto":"自动",
@@ -761,6 +859,7 @@
             "custom":"手动"
         },
         "combine":"合并每个",
+        "completeMessage": "完整的消息",
         "create":"输出为",
         "type":{
             "string":"字符串",
@@ -799,6 +898,7 @@
         }
     },
     "sort" : {
+        "sort": "sort",
         "target" : "排序属性",
         "seq" : "信息队列",
         "key" : "键值",
@@ -812,6 +912,7 @@
         "clear" : "清空sort节点中的待定信息"
     },
     "batch" : {
+        "batch": "batch",
         "mode": {
             "label" : "模式",
             "num-msgs" : "按指定数量分组",

From 00eb474e0230159cc5335979261537b66fd47774 Mon Sep 17 00:00:00 2001
From: JIYE YU <jiye.yu.kb@hitachi.com>
Date: Fri, 7 Feb 2020 18:27:06 +0900
Subject: [PATCH 296/305] new zh-CN translation for runtime

---
 .../runtime/locales/zh-CN/runtime.json        | 174 ++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 packages/node_modules/@node-red/runtime/locales/zh-CN/runtime.json

diff --git a/packages/node_modules/@node-red/runtime/locales/zh-CN/runtime.json b/packages/node_modules/@node-red/runtime/locales/zh-CN/runtime.json
new file mode 100644
index 000000000..d0813f476
--- /dev/null
+++ b/packages/node_modules/@node-red/runtime/locales/zh-CN/runtime.json
@@ -0,0 +1,174 @@
+{
+    "runtime": {
+        "welcome": "欢迎使用Node-RED",
+        "version": "__component__ 版本： __version__",
+        "unsupported_version": "__component__的不受支持的版本。要求: __requires__ 找到: __version__",
+        "paths": {
+            "settings": "设置文件  : __path__",
+            "httpStatic": "HTTP Static    : __path__"
+        }
+    },
+
+    "server": {
+        "loading": "加载控制板节点",
+        "palette-editor": {
+            "disabled": "控制板编辑器已禁用：用户设置",
+            "npm-not-found": "控制板编辑器已禁用：找不到npm命令",
+            "npm-too-old": "控制板编辑器已禁用： npm版本太旧。需要版本npm >= 3.x"
+        },
+        "errors": "无法注册__count__节点类型",
+        "errors_plural": "无法注册__count__个节点类型",
+        "errors-help": "使用-v运行以获取详细信息",
+        "missing-modules": "缺少节点模块：",
+        "node-version-mismatch": "无法在此版本上加载节点模块。要求：__ version__",
+        "type-already-registered": "'__type__'已由模块__module__注册",
+        "removing-modules": "从配置中删除模块",
+        "added-types": "添加的节点类型：",
+        "removed-types": "删除的节点类型：",
+        "install": {
+            "invalid": "无效的模块名称",
+            "installing": "安装模块：__ name__，版本：__ version__",
+            "installed": "已安装的模块：__ name__",
+            "install-failed": "安装失败",
+            "install-failed-long": "模块__name__安装失败：",
+            "install-failed-not-found": "$t(server.install.install-failed-long) 模块未发现",
+            "upgrading": "更新模块: __name__ 至版本: __version__",
+            "upgraded": "更新模块: __name__。 重新启动Node-RED以使用新版本",
+            "upgrade-failed-not-found": "$t(server.install.install-failed-long) 未发现版本",
+            "uninstalling": "卸载模块: __name__",
+            "uninstall-failed": "卸载失败",
+            "uninstall-failed-long": "卸载模块__name__失败:",
+            "uninstalled": "卸载模块: __name__"
+        },
+        "unable-to-listen": "无法在__listenpath__上收听",
+        "port-in-use": "错误: 端口正在使用中",
+        "uncaught-exception": "未捕获的异常：",
+        "admin-ui-disabled": "管理员界面已禁用",
+        "now-running": "服务器现在在__listenpath__上运行",
+        "failed-to-start": "无法启动服务器：",
+        "headless-mode": "在headless模式下运行",
+        "httpadminauth-deprecated": "不建议使用httpAdminAuth。请改用adminAuth"
+    },
+
+    "api": {
+        "flows": {
+            "error-save": "保存流程错误: __message__",
+            "error-reload": "重载流程错误: __message__"
+        },
+        "library": {
+            "error-load-entry": "加载库条目'__path__'时出错：__message__",
+            "error-save-entry": "保存库条目'__path__'时出错：__ message__",
+            "error-load-flow": "加载流程'__path__'时出错：__ message__",
+            "error-save-flow": "保存流'__path__'时出错：__ message__"
+        },
+        "nodes": {
+            "enabled": "启用的节点类型:",
+            "disabled": "禁用的节点类型:",
+            "error-enable": "无法启用节点:"
+        }
+    },
+
+    "comms": {
+        "error": "通讯渠道错误：__ message__",
+        "error-server": "通信服务器错误：__ message__",
+        "error-send": "通讯发送错误：__ message__"
+    },
+
+    "settings": {
+        "user-not-available": "无法保存用户设置：__ message__",
+        "not-available": "设置不可用",
+        "property-read-only": "属性“ __prop__”是只读的"
+    },
+
+    "nodes": {
+        "credentials": {
+            "error":"加载证书时出错：__ message__",
+            "error-saving":"保存证书时出错：__ message__",
+            "not-registered": "证书类型'__type__'未注册",
+            "system-key-warning": "\n\n---------------------------------------------------------------------\n您的流程证书文件是使用系统生成的密钥加密的。\n\n如果系统生成的密钥由于任何原因丢失，则您的证书文件将无法恢复，您将必须删除它并重新输入您的证书。\n\n您应该使用您的设置文件中的'credentialSecret'选项设置自己的密钥。然后，下次部署更改时，Node-RED将使用选择的密钥重新加密您的证书文件。\n---------------------------------------------------------------------\n"
+        },
+        "flows": {
+            "safe-mode": "流程在安全模式下停止。部署开始。",
+            "registered-missing": "缺少注册的类型：__ type__",
+            "error": "错误加载流程：__ message__",
+            "starting-modified-nodes": "启动修改的节点",
+            "starting-modified-flows": "启动修改的流程",
+            "starting-flows": "启动流程",
+            "started-modified-nodes": "修改的节点已启动",
+            "started-modified-flows": "修改的流程已启动",
+            "started-flows": "流程已启动",
+            "stopping-modified-nodes": "停止修改的节点",
+            "stopping-modified-flows": "停止修改的流程",
+            "stopping-flows": "停止流程",
+            "stopped-modified-nodes": "修改的节点已停止",
+            "stopped-modified-flows": "修改的流程已停止",
+            "stopped-flows": "流程已停止",
+            "stopped": "已停止",
+            "stopping-error": "错误停止节点：__ message__",
+            "added-flow": "流程已添加: __label__",
+            "updated-flow": "流程已更新: __label__",
+            "removed-flow": "流程已移除: __label__",
+            "missing-types": "等待缺少的类型被注册：",
+            "missing-type-provided": " - __type__ (由npm模块__module__提供)",
+            "missing-type-install-1": "要安装所有缺少的模块，请运行：",
+            "missing-type-install-2": "在目录中："
+        },
+        "flow": {
+            "unknown-type": "未知类型: __type__",
+            "missing-types": "缺少类型",
+            "error-loop": "邮件已超过最大捕获数"
+        },
+        "index": {
+            "unrecognised-id": "无法识别的ID: __id__",
+            "type-in-use": "使用中的类型: __msg__",
+            "unrecognised-module": "无法识别的模块: __module__"
+        },
+        "registry": {
+            "localfilesystem": {
+                "module-not-found": "找不到模块:'__module__'"
+            }
+        }
+    },
+
+    "storage": {
+        "index": {
+            "forbidden-flow-name": "禁止流程名称"
+        },
+        "localfilesystem": {
+            "user-dir": "用户目录: __path__",
+            "flows-file": "流程文件: __path__",
+            "create": "创建新__type__文件",
+            "empty": "现有__type__文件为空",
+            "invalid": "现有__type__文件为无效json",
+            "restore": "恢复__type__文件备份：__path__",
+            "restore-fail": "恢复__type__文件备份失败：__ message__",
+            "fsync-fail": "将文件__path__刷新到磁盘失败：__message__",
+            "projects": {
+                "changing-project": "设置活动项目：__ project__",
+                "active-project": "活动项目：__ project__",
+                "project-not-found": "找不到项目：__ project__",
+                "no-active-project": "没有活动的项目：使用默认流文件",
+                "disabled": "项目已禁用：editorTheme.projects.enabled = false",
+                "disabledNoFlag": "项目已禁用：设置editorTheme.projects.enabled = true来启用",
+                "git-not-found": "项目已禁用：找不到git命令",
+                "git-version-old": "项目已禁用：不支持的git __version__。 需要的git版本为2.x",
+                "summary": "一个Node-RED项目",
+                "readme": "### 关于\n\n这是您项目的README.md文件。它可以帮助用户了解您的项目，如何使用它以及他们可能需要知道的其他任何信息。"
+            }
+        }
+    },
+
+    "context": {
+        "log-store-init": "上下文储存: '__name__' [__info__]",
+        "error-loading-module": "加载上下文存储时出错： __message__",
+        "error-loading-module2": "加载上下文存储时出错 '__module__': __message__",
+        "error-module-not-defined": "上下文存储库'__storage__'缺少“模块”选项",
+        "error-invalid-module-name": "无效的上下文存储名称：'__ name__'",
+        "error-invalid-default-module": "无效的默认的上下文存储库： '__storage__'",
+        "unknown-store": "指定了未知的上下文存储库'__name__'。 使用默认存储库。",
+        "localfilesystem": {
+            "error-circular": "上下文__scope__包含无法保留的循环引用",
+            "error-write": "编写上下文时出错：__ message__"
+        }
+    }
+}

From 797da3bc8e616e42b52f00722b198189a0f01cb5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 7 Feb 2020 10:45:45 +0000
Subject: [PATCH 297/305] Fix duplicating array item in visual json editor

---
 .../@node-red/editor-client/src/js/ui/editors/json.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 3b83e3089..67b5850c4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -106,7 +106,7 @@
             options.push({id:"red-ui-editor-type-json-menu-duplicate", icon:"fa fa-copy", label:RED._("jsonEditor.duplicate"),onselect:function(){
                 var newKey = item.key;
                 if (item.parent.type === 'array') {
-                    newKey = parent.children.length;
+                    newKey = item.parent.children.length;
                 } else {
                     var m = /^(.*?)(-(\d+))?$/.exec(newKey);
                     var usedKeys = {};

From 3db5f928eed13dca7ad749b2ecf38fdb0c997902 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 7 Feb 2020 13:59:08 +0000
Subject: [PATCH 298/305] Wrap long context values when displaying in sidebar
 Fixes #2400

---
 .../@node-red/editor-client/src/sass/debug.scss     |  1 +
 .../editor-client/src/sass/tab-context.scss         | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
index d767aaed3..c92c43320 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
@@ -160,6 +160,7 @@
 .red-ui-debug-msg-element {
     color: $debug-message-text-color;
     line-height: 1.3em;
+    overflow-wrap: break-word;
 }
 .red-ui-debug-msg-object-key {
     color: $debug-message-text-color-object-key;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
index 46b09de43..4be9761f7 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
@@ -27,9 +27,22 @@
             display: none;
         }
     }
+
+    .red-ui-info-table {
+        table-layout: fixed;
+    }
+
+    table.red-ui-info-table tr:not(.blank) td:first-child {
+        width: 30%;
+    }
+    table.red-ui-info-table tr:not(.blank) td:last-child {
+        vertical-align: top;
+    }
+
 }
 
 .red-ui-sidebar-context-property {
+    overflow-wrap: break-word;
     position: relative;
     .red-ui-debug-msg-tools {
         right: 0px;

From 7d3263613376e40a5a76f3c2e2bb2f7df4c904ec Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 7 Feb 2020 14:26:30 +0000
Subject: [PATCH 299/305] Improve file store error when cache disabled and sync
 api used Closes #2406

---
 .../@node-red/runtime/lib/nodes/context/localfilesystem.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
index 0f83573e8..cf1769700 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/localfilesystem.js
@@ -245,7 +245,7 @@ LocalFileSystem.prototype.get = function(scope, key, callback) {
         return this.cache.get(scope,key,callback);
     }
     if(typeof callback !== "function"){
-        throw new Error("Callback must be a function");
+        throw new Error("File Store cache disabled - only asynchronous access supported");
     }
     var storagePath = getStoragePath(this.storageBaseDir ,scope);
     loadFile(storagePath + ".json").then(function(data){
@@ -304,7 +304,7 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) {
             }, this.flushInterval);
         }
     } else if (callback && typeof callback !== 'function') {
-        throw new Error("Callback must be a function");
+        throw new Error("File Store cache disabled - only asynchronous access supported");
     } else {
         self.writePromise = self.writePromise.then(function() { return loadFile(storagePath + ".json") }).then(function(data){
             var obj = data ? JSON.parse(data) : {}

From a05589c5a66292c04fa4debdf6be427df90b4aca Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 7 Feb 2020 16:31:59 +0000
Subject: [PATCH 300/305] Filter palette using raw label not html formatted
 label Fixes #2409

---
 .../@node-red/editor-client/src/js/ui/palette.js             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 9961cbf2b..967a61f51 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -92,8 +92,11 @@ RED.palette = (function() {
         var lineHeight = 20;
         var portHeight = 10;
 
+        el.attr("data-palette-label",label);
+
         label = RED.utils.sanitize(label);
 
+
         var words = label.split(/[ -]/);
 
         var displayLines = [];
@@ -469,7 +472,7 @@ RED.palette = (function() {
     function filterChange(val) {
         var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i');
         $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) {
-            var currentLabel = $(el).find(".red-ui-palette-label").text();
+            var currentLabel = $(el).attr("data-palette-label");
             var type = $(el).attr("data-palette-type");
             if (val === "" || re.test(type) || re.test(currentLabel)) {
                 $(this).show();

From d08e77cf36361f4c3747dd2ffc79bebb5a6a69da Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Nov 2019 14:13:36 +0000
Subject: [PATCH 301/305] Add credential type to TypedInput

---
 .../editor-client/locales/en-US/editor.json   |  3 +-
 .../src/js/ui/common/typedInput.js            | 82 ++++++++++++++++++-
 .../src/sass/ui/common/typedInput.scss        |  7 +-
 3 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index a5f232aa6..7977a5752 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -757,7 +757,8 @@
             "bin": "buffer",
             "date": "timestamp",
             "jsonata": "expression",
-            "env": "env variable"
+            "env": "env variable",
+            "cred": "credential"
         }
     },
     "editableList": {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index cb4de12d2..8ca601ec3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -164,6 +164,77 @@
                     }
                 })
             }
+        },
+        cred:{
+            value:"cred",
+            label:"credential",
+            icon:"fa fa-lock",
+            inputType: "password",
+            valueLabel: function(container,value) {
+                var that = this;
+                container.css("pointer-events","none");
+                var buttons = $('<div>').css({
+                    position: "absolute",
+                    right:"6px",
+                    top: "6px",
+                    "pointer-events":"all"
+                }).appendTo(container);
+                var eyeButton = $('<button type="button" class="red-ui-button red-ui-button-small"></button>').css({
+                    width:"20px"
+                }).appendTo(buttons).on("click", function(evt) {
+                    evt.preventDefault();
+                    var currentType = that.input.attr("type");
+                    if (currentType === "text") {
+                        that.input.attr("type","password");
+                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
+                    } else {
+                        that.input.attr("type","text");
+                        eyeCon.removeClass("fa-eye").addClass("fa-eye-slash");
+                    }
+                }).hide();
+                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-1px").appendTo(eyeButton);
+
+                if (value === "__PWRD__") {
+                    var innerContainer = $('<div><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i></div>').css({
+                        padding:"6px 6px",
+                        borderRadius:"4px"
+                    }).addClass("red-ui-typedInput-value-label-inactive").appendTo(container);
+                    var editButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-pencil"></i></button>').appendTo(buttons).on("click", function(evt) {
+                        evt.preventDefault();
+                        innerContainer.hide();
+                        container.css("background","none");
+                        container.css("pointer-events","none");
+                        that.input.val("");
+                        that.element.val("");
+                        that.elementDiv.show();
+                        editButton.hide();
+                        cancelButton.show();
+                        eyeButton.show();
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
+                    });
+                    var cancelButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').css("margin-left","3px").appendTo(buttons).on("click", function(evt) {
+                        evt.preventDefault();
+                        innerContainer.show();
+                        container.css("background","");
+                        that.input.val("__PWRD__");
+                        that.element.val("__PWRD__");
+                        that.elementDiv.hide();
+                        editButton.show();
+                        cancelButton.hide();
+                        eyeButton.hide();
+                        that.input.attr("type","password");
+                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
+
+                    }).hide();
+                } else {
+                    container.css("background","none");
+                    container.css("pointer-events","none");
+                    this.elementDiv.show();
+                    eyeButton.show();
+                }
+            }
         }
     };
     var nlsd = false;
@@ -220,6 +291,8 @@
                 that.input.attr(d,m);
             });
 
+            this.defaultInputType = this.input.attr('type');
+
             this.uiSelect.addClass("red-ui-typedInput-container");
 
             this.element.attr('type','hidden');
@@ -687,7 +760,7 @@
                             $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                         }
                         else {
-                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
+                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon,style:"min-width: 13px; margin-right: 4px;"}).prependTo(this.selectLabel);
                         }
                     }
                     if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
@@ -822,6 +895,11 @@
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.hide();
                         }
+                        if (opt.inputType) {
+                            this.input.attr('type',opt.inputType)
+                        } else {
+                            this.input.attr('type',this.defaultInputType)
+                        }
                         if (opt.hasValue === false) {
                             this.oldValue = this.input.val();
                             this.input.val("");
@@ -830,8 +908,8 @@
                         } else if (opt.valueLabel) {
                             this.valueLabelContainer.show();
                             this.valueLabelContainer.empty();
-                            opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                             this.elementDiv.hide();
+                            opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                         } else {
                             if (this.oldValue !== undefined) {
                                 this.input.val(this.oldValue);
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
index be2d50674..f6c2c1dd7 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
@@ -56,7 +56,10 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-
+        .red-ui-typedInput-value-label-inactive {
+            backgroundColor: $secondary-background-disabled;
+            color: $secondary-text-color-disabled;
+        }
     }
 }
 .red-ui-typedInput-options {
@@ -123,7 +126,7 @@ button.red-ui-typedInput-option-trigger
     }
     &.disabled {
         cursor: default;
-        i.red-ui-typedInput-icon {
+        > i.red-ui-typedInput-icon {
             color: $secondary-text-color-disabled;
         }
     }

From 33cbb2ada81f56259533f7da0938e7a6e71248b5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Nov 2019 15:06:27 +0000
Subject: [PATCH 302/305] Fixup typedInput cred css

---
 .../@node-red/editor-client/src/js/ui/common/typedInput.js      | 1 +
 .../@node-red/editor-client/src/sass/ui/common/typedInput.scss  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index 8ca601ec3..dc8d8e387 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -173,6 +173,7 @@
             valueLabel: function(container,value) {
                 var that = this;
                 container.css("pointer-events","none");
+                this.elementDiv.hide();
                 var buttons = $('<div>').css({
                     position: "absolute",
                     right:"6px",
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
index f6c2c1dd7..598d4e7f9 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
@@ -57,7 +57,7 @@
         overflow: hidden;
         text-overflow: ellipsis;
         .red-ui-typedInput-value-label-inactive {
-            backgroundColor: $secondary-background-disabled;
+            background: $secondary-background-disabled;
             color: $secondary-text-color-disabled;
         }
     }

From bffcaa1c17ab92f745b912eb9cc805123a8a74a1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 10 Feb 2020 11:16:19 +0000
Subject: [PATCH 303/305] Refocus credential typedInput when hide/show button
 clicked

---
 .../@node-red/editor-client/src/js/ui/common/typedInput.js  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index dc8d8e387..a3f066223 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -188,9 +188,15 @@
                     if (currentType === "text") {
                         that.input.attr("type","password");
                         eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
                     } else {
                         that.input.attr("type","text");
                         eyeCon.removeClass("fa-eye").addClass("fa-eye-slash");
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
                     }
                 }).hide();
                 var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-1px").appendTo(eyeButton);

From cd210d9fbf1aeefc5544ea61902f5c71d759cb5e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Nov 2019 14:14:48 +0000
Subject: [PATCH 304/305] Add support for credential-stored env var in subflow

---
 .../@node-red/editor-client/src/js/nodes.js   |  59 +-
 .../editor-client/src/js/ui/editor.js         |  67 +-
 .../editor-client/src/js/ui/subflow.js        | 758 ++++++++++--------
 .../@node-red/runtime/lib/api/flows.js        |  26 +-
 .../runtime/lib/nodes/credentials.js          |  69 +-
 .../runtime/lib/nodes/flows/Subflow.js        |  23 +-
 6 files changed, 606 insertions(+), 396 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 5c0778fba..76dc4d194 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -398,6 +398,10 @@ RED.nodes = (function() {
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
+            oneditprepare: function() {
+                RED.subflow.buildEditForm("subflow",this);
+                RED.subflow.buildPropertiesForm(this);
+            },
             oneditresize: function(size) {
                 // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
                 var height = size.height;
@@ -505,19 +509,33 @@ RED.nodes = (function() {
                     node[d] = n[d];
                 }
             }
-            if(exportCreds && n.credentials) {
+            if (exportCreds) {
                 var credentialSet = {};
-                node.credentials = {};
-                for (var cred in n._def.credentials) {
-                    if (n._def.credentials.hasOwnProperty(cred)) {
-                        if (n._def.credentials[cred].type == 'password') {
+                if (/^subflow:/.test(node.type) && n.credentials) {
+                    // A subflow instance node can have arbitrary creds
+                    for (var sfCred in n.credentials) {
+                        if (n.credentials.hasOwnProperty(sfCred)) {
                             if (!n.credentials._ ||
-                                n.credentials["has_"+cred] != n.credentials._["has_"+cred] ||
-                                (n.credentials["has_"+cred] && n.credentials[cred])) {
+                                n.credentials["has_"+sfCred] != n.credentials._["has_"+sfCred] ||
+                                (n.credentials["has_"+sfCred] && n.credentials[sfCred])) {
+                                credentialSet[sfCred] = n.credentials[sfCred];
+                            }
+                        }
+                    }
+                } else if (n.credentials) {
+                    node.credentials = {};
+                    // All other nodes have a well-defined list of possible credentials
+                    for (var cred in n._def.credentials) {
+                        if (n._def.credentials.hasOwnProperty(cred)) {
+                            if (n._def.credentials[cred].type == 'password') {
+                                if (!n.credentials._ ||
+                                    n.credentials["has_"+cred] != n.credentials._["has_"+cred] ||
+                                    (n.credentials["has_"+cred] && n.credentials[cred])) {
+                                    credentialSet[cred] = n.credentials[cred];
+                                }
+                            } else if (n.credentials[cred] != null && (!n.credentials._ || n.credentials[cred] != n.credentials._[cred])) {
                                 credentialSet[cred] = n.credentials[cred];
                             }
-                        } else if (n.credentials[cred] != null && (!n.credentials._ || n.credentials[cred] != n.credentials._[cred])) {
-                            credentialSet[cred] = n.credentials[cred];
                         }
                     }
                 }
@@ -568,7 +586,8 @@ RED.nodes = (function() {
         return node;
     }
 
-    function convertSubflow(n) {
+    function convertSubflow(n, exportCreds) {
+        exportCreds = true;
         var node = {};
         node.id = n.id;
         node.type = n.type;
@@ -578,6 +597,24 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+
+        if (exportCreds) {
+            var credentialSet = {};
+            // A subflow node can have arbitrary creds
+            for (var sfCred in n.credentials) {
+                if (n.credentials.hasOwnProperty(sfCred)) {
+                    if (!n.credentials._ ||
+                        n.credentials["has_"+sfCred] != n.credentials._["has_"+sfCred] ||
+                        (n.credentials["has_"+sfCred] && n.credentials[sfCred])) {
+                        credentialSet[sfCred] = n.credentials[sfCred];
+                    }
+                }
+            }
+            if (Object.keys(credentialSet).length > 0) {
+                node.credentials = credentialSet;
+            }
+        }
+
         node.color = n.color;
 
         n.in.forEach(function(p) {
@@ -693,7 +730,7 @@ RED.nodes = (function() {
         }
         for (i in subflows) {
             if (subflows.hasOwnProperty(i)) {
-                nns.push(convertSubflow(subflows[i]));
+                nns.push(convertSubflow(subflows[i], exportCredentials));
             }
         }
         for (i in configNodes) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 9fb29833a..2f5c4fe11 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -490,8 +490,7 @@ RED.editor = (function() {
                 done();
             }
         }
-
-        if (definition.credentials) {
+        if (definition.credentials || /^subflow:/.test(definition.type)) {
             if (node.credentials) {
                 populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
                 completePrepare();
@@ -499,7 +498,9 @@ RED.editor = (function() {
                 $.getJSON(getCredentialsURL(node.type, node.id), function (data) {
                     node.credentials = data;
                     node.credentials._ = $.extend(true,{},data);
-                    populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                    if (!/^subflow:/.test(definition.type)) {
+                        populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                    }
                     completePrepare();
                 });
             }
@@ -576,8 +577,11 @@ RED.editor = (function() {
             $(this).attr("data-i18n",keys.join(";"));
         });
 
-        if (type === "subflow-template" || type === "subflow") {
-            RED.subflow.buildEditForm(dialogForm,type,node);
+        if (type === "subflow-template") {
+            // This is the 'edit properties' dialog for a subflow template
+            // TODO: this needs to happen later in the dialog open sequence
+            //       so that credentials can be loaded prior to building the form
+            RED.subflow.buildEditForm(type,node);
         }
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
@@ -1471,6 +1475,19 @@ RED.editor = (function() {
                         if (type === "subflow") {
                             var old_env = editing_node.env;
                             var new_env = RED.subflow.exportSubflowInstanceEnv(editing_node);
+                            if (new_env && new_env.length > 0) {
+                                new_env.forEach(function(prop) {
+                                    if (prop.type === "cred") {
+                                        editing_node.credentials = editing_node.credentials || {_:{}};
+                                        editing_node.credentials[prop.name] = prop.value;
+                                        editing_node.credentials['has_'+prop.name] = (prop.value !== "");
+                                        if (prop.value !== '__PWRD__') {
+                                            changed = true;
+                                        }
+                                        delete prop.value;
+                                    }
+                                });
+                            }
                             if (!isSameObj(old_env, new_env)) {
                                 editing_node.env = new_env;
                                 changes.env = editing_node.env;
@@ -1599,12 +1616,13 @@ RED.editor = (function() {
                         id: "editor-subflow-envProperties",
                         label: RED._("editor-tab.envProperties"),
                         name: RED._("editor-tab.envProperties"),
-                        content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                        content: $('<div>', {id:"editor-subflow-envProperties-content",class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
                         iconClass: "fa fa-list"
                     };
-
-                    RED.subflow.buildPropertiesForm(subflowPropertiesTab.content,node);
                     editorTabs.addTab(subflowPropertiesTab);
+                    // This tab is populated by the oneditprepare function of this
+                    // subflow. That ensures it is done *after* any credentials
+                    // have been loaded for the instance.
                 }
 
                 if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
@@ -2252,6 +2270,21 @@ RED.editor = (function() {
 
                         var old_env = editing_node.env;
                         var new_env = RED.subflow.exportSubflowTemplateEnv($("#node-input-env-container").editableList("items"));
+
+                        if (new_env && new_env.length > 0) {
+                            new_env.forEach(function(prop) {
+                                if (prop.type === "cred") {
+                                    editing_node.credentials = editing_node.credentials || {_:{}};
+                                    editing_node.credentials[prop.name] = prop.value;
+                                    editing_node.credentials['has_'+prop.name] = (prop.value !== "");
+                                    if (prop.value !== '__PWRD__') {
+                                        changed = true;
+                                    }
+                                    delete prop.value;
+                                }
+                            });
+                        }
+
                         if (!isSameObj(old_env, new_env)) {
                             editing_node.env = new_env;
                             changes.env = editing_node.env;
@@ -2311,7 +2344,7 @@ RED.editor = (function() {
                     $("#node-input-env-container").editableList('height',height-95);
                 }
             },
-            open: function(tray) {
+            open: function(tray, done) {
                 var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayFooterLeft = $("<div/>", {
                     class: "red-ui-tray-footer-left"
@@ -2362,7 +2395,6 @@ RED.editor = (function() {
                     content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
                     iconClass: "fa fa-cog"
                 };
-                buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
                 editorTabs.addTab(nodePropertiesTab);
 
                 var descriptionTab = {
@@ -2391,11 +2423,18 @@ RED.editor = (function() {
                 buildAppearanceForm(appearanceTab.content,editing_node);
                 editorTabs.addTab(appearanceTab);
 
-                $("#subflow-input-name").val(subflow.name);
-                RED.text.bidi.prepareInput($("#subflow-input-name"));
+                $.getJSON(getCredentialsURL("subflow", subflow.id), function (data) {
+                    subflow.credentials = data;
+                    subflow.credentials._ = $.extend(true,{},data);
 
-                trayBody.i18n();
-                finishedBuilding = true;
+                    buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
+                    $("#subflow-input-name").val(subflow.name);
+                    RED.text.bidi.prepareInput($("#subflow-input-name"));
+
+                    trayBody.i18n();
+                    finishedBuilding = true;
+                    done();
+                });
             },
             close: function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 9f1e7f3e0..01356c3f6 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -770,7 +770,7 @@ RED.subflow = (function() {
     /**
      * Create interface for controlling env var UI definition
      */
-    function buildEnvControl(envList) {
+    function buildEnvControl(envList,node) {
 
         var tabs = RED.tabs.create({
             id: "subflow-env-tabs",
@@ -779,7 +779,7 @@ RED.subflow = (function() {
                     var inputContainer = $("#subflow-input-ui");
                     var list = envList.editableList("items");
                     var exportedEnv = exportEnvList(list, true);
-                    buildEnvUI(inputContainer, exportedEnv);
+                    buildEnvUI(inputContainer, exportedEnv,node);
                 }
                 $("#subflow-env-tabs-content").children().hide();
                 $("#" + tab.id).show();
@@ -831,6 +831,9 @@ RED.subflow = (function() {
         });
     }
 
+    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];
+
     /**
      * Create env var edit interface
      * @param container - container
@@ -841,7 +844,7 @@ RED.subflow = (function() {
         var isTemplateNode = (node.type === "subflow");
 
         if (isTemplateNode) {
-            buildEnvControl(envContainer);
+            buildEnvControl(envContainer, node);
         }
         envContainer
             .css({
@@ -851,6 +854,9 @@ RED.subflow = (function() {
             .editableList({
                 header: isTemplateNode?$('<div><div><div></div><div data-i18n="common.label.name"></div><div data-i18n="editor-tab.defaultValue"></div><div></div></div></div>'):undefined,
                 addItem: function(container, i, opt) {
+                    // If this is an instance node, these are properties unique to
+                    // this instance - ie opt.parent will not be defined.
+
                     if (isTemplateNode) {
                         container.addClass("red-ui-editor-subflow-env-editable")
                     }
@@ -859,52 +865,64 @@ RED.subflow = (function() {
                     var nameField = null;
                     var valueField = null;
 
-                    // if (opt.parent) {
-                    //     buildEnvUIRow(envRow,opt,opt.parent.ui||{})
-                    // } else {
-                        nameField = $('<input/>', {
-                            class: "node-input-env-name",
-                            type: "text",
-                            placeholder: RED._("common.label.name")
-                        }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
-                        valueField = $('<input/>',{
-                            style: "width:100%",
-                            class: "node-input-env-value",
-                            type: "text",
-                        }).attr("autocomplete","disable").appendTo(envRow)
-                        valueField.typedInput({default:'str',types:['str','num','bool','json','bin','env']});
-                        valueField.typedInput('type', opt.parent?(opt.type||opt.parent.type):opt.type);
-                        valueField.typedInput('value', opt.parent?((opt.value !== undefined)?opt.value:opt.parent.value):opt.value);
-                    // }
+                    nameField = $('<input/>', {
+                        class: "node-input-env-name",
+                        type: "text",
+                        placeholder: RED._("common.label.name")
+                    }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
+                    valueField = $('<input/>',{
+                        style: "width:100%",
+                        class: "node-input-env-value",
+                        type: "text",
+                    }).attr("autocomplete","disable").appendTo(envRow)
+                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
+                    valueField.typedInput('type', opt.type);
+                    if (opt.type === "cred") {
+                        if (opt.value) {
+                            valueField.typedInput('value', opt.value);
+                        } else if (node.credentials && node.credentials[opt.name]) {
+                            valueField.typedInput('value', node.credentials[opt.name]);
+                        } else if (node.credentials && node.credentials['has_'+opt.name]) {
+                            valueField.typedInput('value', "__PWRD__");
+                        } else {
+                            valueField.typedInput('value', "");
+                        }
+                    } else {
+                        valueField.typedInput('value', opt.value);
+                    }
 
 
                     opt.nameField = nameField;
                     opt.valueField = valueField;
 
-                    if (!opt.parent) {
-                        var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
-                        $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
-                        var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            removeTip.close();
-                            container.parent().addClass("red-ui-editableList-item-deleting")
-                            container.fadeOut(300, function() {
-                                envContainer.editableList('removeItem',opt);
-                            });
+                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
+                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
+                    var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
+                    actionButton.on("click", function(evt) {
+                        evt.preventDefault();
+                        removeTip.close();
+                        container.parent().addClass("red-ui-editableList-item-deleting")
+                        container.fadeOut(300, function() {
+                            envContainer.editableList('removeItem',opt);
                         });
-                    }
+                    });
 
                     if (isTemplateNode) {
                         // Add the UI customisation row
                         // if `opt.ui` does not exist, then apply defaults. If these
                         // defaults do not change then they will get stripped off
                         // before saving.
-                        opt.ui = opt.ui || {
-                            icon: "",
-                            label: {},
-                            type: "input",
-                            opts: {types:['str','num','bool','json','bin','env']}
+                        if (opt.type === 'cred') {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "cred"
+                            }
+                        } else {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "input",
+                                opts: {types:DEFAULT_ENV_TYPE_LIST}
+                            }
                         }
                         opt.ui.label = opt.ui.label || {};
                         opt.ui.type = opt.ui.type || "input";
@@ -995,11 +1013,11 @@ RED.subflow = (function() {
 
          var row = $('<div></div>').appendTo(container);
          $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
-
          var typeOptions = {
-             'input': {types:['str','num','bool','json','bin','env']},
+             'input': {types:DEFAULT_ENV_TYPE_LIST},
              'select': {opts:[]},
-             'spinner': {}
+             'spinner': {},
+             'cred': {}
          };
          if (ui.opts) {
              typeOptions[ui.type] = ui.opts;
@@ -1054,7 +1072,7 @@ RED.subflow = (function() {
              }
              langs.forEach(function(l) {
                  var row = $('<div>').appendTo(content);
-                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row); 
+                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row);
                  $('<span>').text(ui.label[l]||"").appendTo(row);
              });
              return content;
@@ -1062,314 +1080,341 @@ RED.subflow = (function() {
 
          nameField.on('change',function(evt) {
             labelInput.attr("placeholder",$(this).val())
-         });
+        });
 
-         var inputCell = $('<div></div>').appendTo(row);
-         var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
-         if (ui.type === "input") {
-             inputCellInput.val(ui.opts.types.join(","));
-         }
-         var checkbox;
-         var selectBox;
+        var inputCell = $('<div></div>').appendTo(row);
+        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+        if (ui.type === "input") {
+            inputCellInput.val(ui.opts.types.join(","));
+        }
+        var checkbox;
+        var selectBox;
 
-         inputCellInput.typedInput({
-             types: [
-                 {
-                     value:"input",
-                     label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
-                         {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
-                         {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
-                         {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
-                         {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
-                         {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
-                         {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"}
-                     ],
-                     default: ['str','num','bool','json','bin','env'],
-                     valueLabel: function(container,value) {
-                         container.css("padding",0);
-                         var innerContainer = $('<div>').css({
-                             "background":"white",
-                             "height":"100%",
-                             "box-sizing": "border-box"
-                         }).appendTo(container);
+        inputCellInput.typedInput({
+            types: [
+                {
+                    value:"input",
+                    label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
+                        {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
+                        {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
+                        {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
+                        {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
+                        {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
+                        {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"},
+                        {value: "cred",label: RED._("editor.types.cred"),icon: "fa fa-lock"}
+                    ],
+                    default: DEFAULT_ENV_TYPE_LIST,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div>').css({
+                            "background":"white",
+                            "height":"100%",
+                            "box-sizing": "border-box"
+                        }).appendTo(container);
 
-                         var input = $('<div class="placeholder-input">').appendTo(innerContainer);
-                         $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
-                         if (value.length) {
-                             value.forEach(function(v) {
-                                 $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 3px"}).appendTo(input);
-                             })
-                         } else {
-                             $("<span>").css({
-                                 "color":"#aaa",
-                                 "padding-left": "4px"
-                             }).text("select types...").appendTo(input);
-                         }
-                     }
-                 },
-                 {
-                     value:"select",
-                     label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
-                     valueLabel: function(container,value) {
-                         container.css("padding","0");
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
+                        if (value.length) {
+                            value.forEach(function(v) {
+                                if (!/^fa /.test(v.icon)) {
+                                    $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                } else {
+                                    var s = $('<span>',{style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                    $("<i>",{class: v.icon}).appendTo(s);
+                                }
+                            })
+                        } else {
+                            $("<span>").css({
+                                "color":"#aaa",
+                                "padding-left": "4px"
+                            }).text("select types...").appendTo(input);
+                        }
+                    }
+                },
+                {
+                    value: "cred",
+                    label: RED._("typedInput.type.cred"), icon:"fa fa-lock", showLabel: false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div>').css({
+                            "background":"white",
+                            "height":"100%",
+                            "box-sizing": "border-box",
+                            "border-top-right-radius": "4px",
+                            "border-bottom-right-radius": "4px"
+                        }).appendTo(container);
+                        $('<div class="placeholder-input">').html("&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;").appendTo(innerContainer);
+                    }
+                },
+                {
+                    value:"select",
+                    label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding","0");
 
-                         selectBox = $('<select></select>').appendTo(container);
-                         if (ui.opts && Array.isArray(ui.opts.opts)) {
-                             ui.opts.opts.forEach(function(o) {
-                                 var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
-                                 // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
-                                 $('<option>').val(o.v).text(label).appendTo(selectBox);
-                             })
-                         }
-                         selectBox.on('change', function(evt) {
-                             var v = selectBox.val();
-                             // var parts = v.split(":");
-                             // var t = parts.shift();
-                             // v = parts.join(":");
-                             //
-                             // valueField.typedInput("type",'str')
-                             valueField.typedInput("value",v)
-                         });
-                         selectBox.val(valueField.typedInput("value"));
-                         // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
-                     },
-                     expand: {
-                         icon: "fa-caret-down",
-                         minWidth: 400,
-                         content: function(container) {
-                             var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
-                             var optList = $('<ol>').appendTo(content).editableList({
-                                 header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
-                                 addItem: function(row,index,itemData) {
-                                     var labelDiv = $('<div>').appendTo(row);
-                                     var label = lookupLabel(itemData.l, "", currentLocale);
-                                     itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
-                                     itemData.label.on('keydown', function(evt) {
-                                         if (evt.keyCode === 13) {
-                                             itemData.input.focus();
-                                             evt.preventDefault();
-                                         }
-                                     });
-                                     var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
-                                     RED.popover.tooltip(labelIcon,function() {
-                                         return currentLocale;
-                                     })
-                                     itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
+                        selectBox = $('<select></select>').appendTo(container);
+                        if (ui.opts && Array.isArray(ui.opts.opts)) {
+                            ui.opts.opts.forEach(function(o) {
+                                var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
+                                // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
+                                $('<option>').val(o.v).text(label).appendTo(selectBox);
+                            })
+                        }
+                        selectBox.on('change', function(evt) {
+                            var v = selectBox.val();
+                            // var parts = v.split(":");
+                            // var t = parts.shift();
+                            // v = parts.join(":");
+                            //
+                            // valueField.typedInput("type",'str')
+                            valueField.typedInput("value",v)
+                        });
+                        selectBox.val(valueField.typedInput("value"));
+                        // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        minWidth: 400,
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            var optList = $('<ol>').appendTo(content).editableList({
+                                header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
+                                addItem: function(row,index,itemData) {
+                                    var labelDiv = $('<div>').appendTo(row);
+                                    var label = lookupLabel(itemData.l, "", currentLocale);
+                                    itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
+                                    itemData.label.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            itemData.input.focus();
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                    var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
+                                    RED.popover.tooltip(labelIcon,function() {
+                                        return currentLocale;
+                                    })
+                                    itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
 
-                                     // Problem using a TI here:
-                                     //  - this is in a popout panel
-                                     //  - clicking the expand button in the TI will close the parent edit tray
-                                     //    and open the type editor.
-                                     //  - but it leaves the popout panel over the top.
-                                     //  - there is no way to get back to the popout panel after closing the type editor
-                                     //.typedInput({default:itemData.t||'str', types:['str','num','bool','json','bin','env']});
-                                     itemData.input.on('keydown', function(evt) {
-                                         if (evt.keyCode === 13) {
-                                             // Enter or Tab
-                                             var index = optList.editableList('indexOf',itemData);
-                                             var length = optList.editableList('length');
-                                             if (index + 1 === length) {
-                                                 var newItem = {};
-                                                 optList.editableList('addItem',newItem);
-                                                 setTimeout(function() {
-                                                     if (newItem.label) {
-                                                         newItem.label.focus();
-                                                     }
-                                                 },100)
-                                             } else {
-                                                 var nextItem = optList.editableList('getItemAt',index+1);
-                                                 if (nextItem.label) {
-                                                     nextItem.label.focus()
-                                                 }
-                                             }
-                                             evt.preventDefault();
-                                         }
-                                     });
-                                 },
-                                 sortable: true,
-                                 removable: true,
-                                 height: 160
-                             })
-                             if (ui.opts.opts.length > 0) {
-                                 ui.opts.opts.forEach(function(o) {
-                                     optList.editableList('addItem',$.extend(true,{},o))
-                                 })
-                             } else {
-                                 optList.editableList('addItem',{})
-                             }
-                             return {
-                                 onclose: function() {
-                                     var items = optList.editableList('items');
-                                     var vals = [];
-                                     items.each(function (i,el) {
-                                         var data = el.data('data');
-                                         var l = data.label.val().trim();
-                                         var v = data.input.val();
-                                         // var t = data.input.typedInput('type');
-                                         // var v = data.input.typedInput('value');
-                                         if (l.length > 0) {
-                                             data.l = data.l || {};
-                                             data.l[currentLocale] = l;
-                                         }
-                                         data.v = v;
+                                    // Problem using a TI here:
+                                    //  - this is in a popout panel
+                                    //  - clicking the expand button in the TI will close the parent edit tray
+                                    //    and open the type editor.
+                                    //  - but it leaves the popout panel over the top.
+                                    //  - there is no way to get back to the popout panel after closing the type editor
+                                    //.typedInput({default:itemData.t||'str', types:DEFAULT_ENV_TYPE_LIST});
+                                    itemData.input.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            // Enter or Tab
+                                            var index = optList.editableList('indexOf',itemData);
+                                            var length = optList.editableList('length');
+                                            if (index + 1 === length) {
+                                                var newItem = {};
+                                                optList.editableList('addItem',newItem);
+                                                setTimeout(function() {
+                                                    if (newItem.label) {
+                                                        newItem.label.focus();
+                                                    }
+                                                },100)
+                                            } else {
+                                                var nextItem = optList.editableList('getItemAt',index+1);
+                                                if (nextItem.label) {
+                                                    nextItem.label.focus()
+                                                }
+                                            }
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                },
+                                sortable: true,
+                                removable: true,
+                                height: 160
+                            })
+                            if (ui.opts.opts.length > 0) {
+                                ui.opts.opts.forEach(function(o) {
+                                    optList.editableList('addItem',$.extend(true,{},o))
+                                })
+                            } else {
+                                optList.editableList('addItem',{})
+                            }
+                            return {
+                                onclose: function() {
+                                    var items = optList.editableList('items');
+                                    var vals = [];
+                                    items.each(function (i,el) {
+                                        var data = el.data('data');
+                                        var l = data.label.val().trim();
+                                        var v = data.input.val();
+                                        // var t = data.input.typedInput('type');
+                                        // var v = data.input.typedInput('value');
+                                        if (l.length > 0) {
+                                            data.l = data.l || {};
+                                            data.l[currentLocale] = l;
+                                        }
+                                        data.v = v;
 
-                                         if (l.length > 0 || v.length > 0) {
-                                             var val = {l:data.l,v:data.v};
-                                             // if (t !== 'str') {
-                                             //     val.t = t;
-                                             // }
-                                             vals.push(val);
-                                         }
-                                     });
-                                     ui.opts.opts = vals;
-                                     inputCellInput.typedInput('value',Date.now())
-                                 }
-                             }
-                         }
-                     }
-                 },
-                 {
-                     value:"checkbox",
-                     label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
-                     valueLabel: function(container,value) {
-                         container.css("padding",0);
-                         checkbox = $('<input type="checkbox">').appendTo(container);
-                         checkbox.on('change', function(evt) {
-                             valueField.typedInput('value',$(this).prop('checked')?"true":"false");
-                         })
-                         checkbox.prop('checked',valueField.typedInput('value')==="true");
-                     }
-                 },
-                 {
-                     value:"spinner",
-                     label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
-                     valueLabel: function(container,value) {
-                         container.css("padding",0);
-                         var innerContainer = $('<div>').css({
-                             "background":"white",
-                             "height":"100%",
-                             "box-sizing": "border-box"
-                         }).appendTo(container);
+                                        if (l.length > 0 || v.length > 0) {
+                                            var val = {l:data.l,v:data.v};
+                                            // if (t !== 'str') {
+                                            //     val.t = t;
+                                            // }
+                                            vals.push(val);
+                                        }
+                                    });
+                                    ui.opts.opts = vals;
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"checkbox",
+                    label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        checkbox = $('<input type="checkbox">').appendTo(container);
+                        checkbox.on('change', function(evt) {
+                            valueField.typedInput('value',$(this).prop('checked')?"true":"false");
+                        })
+                        checkbox.prop('checked',valueField.typedInput('value')==="true");
+                    }
+                },
+                {
+                    value:"spinner",
+                    label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div>').css({
+                            "background":"white",
+                            "height":"100%",
+                            "box-sizing": "border-box"
+                        }).appendTo(container);
 
-                         var input = $('<div class="placeholder-input">').appendTo(innerContainer);
-                         $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
 
-                         var min = ui.opts && ui.opts.min;
-                         var max = ui.opts && ui.opts.max;
-                         var label = "";
-                         if (min !== undefined && max !== undefined) {
-                             label = Math.min(min,max)+" - "+Math.max(min,max);
-                         } else if (min !== undefined) {
-                             label = "> "+min;
-                         } else if (max !== undefined) {
-                             label = "< "+max;
-                         }
-                         $('<span>').css("margin-left","15px").text(label).appendTo(input);
-                     },
-                     expand: {
-                         icon: "fa-caret-down",
-                         content: function(container) {
-                             var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
-                             content.css("padding","8px 5px")
-                             var min = ui.opts.min;
-                             var max = ui.opts.max;
-                             var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
-                             minInput.val(min);
-                             var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
-                             maxInput.val(max);
-                             $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
-                             $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
-                             return {
-                                 onclose: function() {
-                                     var min = minInput.val().trim();
-                                     var max = maxInput.val().trim();
-                                     if (min !== "") {
-                                         ui.opts.min = parseInt(min);
-                                     } else {
-                                         delete ui.opts.min;
-                                     }
-                                     if (max !== "") {
-                                         ui.opts.max = parseInt(max);
-                                     } else {
-                                         delete ui.opts.max;
-                                     }
-                                     inputCellInput.typedInput('value',Date.now())
-                                 }
-                             }
-                         }
-                     }
-                 },
-                 {
-                     value:"none",
-                     label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
-                 },
-                 {
-                     value:"hide",
-                     label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
-                 }
-             ],
-             default: 'none'
-         }).on("typedinputtypechange", function(evt,type) {
-             ui.type = $(this).typedInput("type");
-             ui.opts = typeOptions[ui.type];
-             if (ui.type === 'input') {
-                 // In the case of 'input' type, the typedInput uses the multiple-option
-                 // mode. Its value needs to be set to a comma-separately list of the
-                 // selected options.
-                 inputCellInput.typedInput('value',ui.opts.types.join(","))
-             } else {
-                 // No other type cares about `value`, but doing this will
-                 // force a refresh of the label now that `ui.opts` has
-                 // been updated.
-                 inputCellInput.typedInput('value',Date.now())
-             }
+                        var min = ui.opts && ui.opts.min;
+                        var max = ui.opts && ui.opts.max;
+                        var label = "";
+                        if (min !== undefined && max !== undefined) {
+                            label = Math.min(min,max)+" - "+Math.max(min,max);
+                        } else if (min !== undefined) {
+                            label = "> "+min;
+                        } else if (max !== undefined) {
+                            label = "< "+max;
+                        }
+                        $('<span>').css("margin-left","15px").text(label).appendTo(input);
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            content.css("padding","8px 5px")
+                            var min = ui.opts.min;
+                            var max = ui.opts.max;
+                            var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            minInput.val(min);
+                            var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            maxInput.val(max);
+                            $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
+                            $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
+                            return {
+                                onclose: function() {
+                                    var min = minInput.val().trim();
+                                    var max = maxInput.val().trim();
+                                    if (min !== "") {
+                                        ui.opts.min = parseInt(min);
+                                    } else {
+                                        delete ui.opts.min;
+                                    }
+                                    if (max !== "") {
+                                        ui.opts.max = parseInt(max);
+                                    } else {
+                                        delete ui.opts.max;
+                                    }
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"none",
+                    label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
+                },
+                {
+                    value:"hide",
+                    label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
+                }
+            ],
+            default: 'none'
+        }).on("typedinputtypechange", function(evt,type) {
+            ui.type = $(this).typedInput("type");
+            ui.opts = typeOptions[ui.type];
+            if (ui.type === 'input') {
+                // In the case of 'input' type, the typedInput uses the multiple-option
+                // mode. Its value needs to be set to a comma-separately list of the
+                // selected options.
+                inputCellInput.typedInput('value',ui.opts.types.join(","))
+            } else {
+                // No other type cares about `value`, but doing this will
+                // force a refresh of the label now that `ui.opts` has
+                // been updated.
+                inputCellInput.typedInput('value',Date.now())
+            }
 
-             switch (ui.type) {
-                 case 'input':
+            switch (ui.type) {
+                case 'input':
                     valueField.typedInput('types',ui.opts.types);
                     break;
                 case 'select':
-                   valueField.typedInput('types',['str']);
-                   break;
-                 case 'checkbox':
+                    valueField.typedInput('types',['str']);
+                    break;
+                case 'checkbox':
                     valueField.typedInput('types',['bool']);
                     break;
                 case 'spinner':
-                    valueField.typedInput('types',['num'])
+                    valueField.typedInput('types',['num']);
+                    break;
+                case 'cred':
+                    valueField.typedInput('types',['cred']);
                     break;
                 default:
-                    valueField.typedInput('types',['str','num','bool','json','bin','env'])
-             }
-             if (ui.type === 'checkbox') {
-                 valueField.typedInput('type','bool');
-             } else if (ui.type === 'spinner') {
-                 valueField.typedInput('type','num');
-             }
-             if (ui.type !== 'checkbox') {
-                 checkbox = null;
-             }
+                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
+            }
+            if (ui.type === 'checkbox') {
+                valueField.typedInput('type','bool');
+            } else if (ui.type === 'spinner') {
+                valueField.typedInput('type','num');
+            }
+            if (ui.type !== 'checkbox') {
+                checkbox = null;
+            }
 
-         }).on("change", function(evt,type) {
-             if (ui.type === 'input') {
-                 ui.opts.types = inputCellInput.typedInput('value').split(",");
-                 valueField.typedInput('types',ui.opts.types);
-             }
-         });
-         valueField.on("change", function(evt) {
-             if (checkbox) {
-                 checkbox.prop('checked',$(this).typedInput('value')==="true")
-             }
-         })
-         // Set the input to the right type. This will trigger the 'typedinputtypechange'
-         // event handler (just above ^^) to update the value if needed
-         inputCellInput.typedInput('type',ui.type)
+        }).on("change", function(evt,type) {
+            if (ui.type === 'input') {
+                ui.opts.types = inputCellInput.typedInput('value').split(",");
+                valueField.typedInput('types',ui.opts.types);
+            }
+        });
+        valueField.on("change", function(evt) {
+            if (checkbox) {
+                checkbox.prop('checked',$(this).typedInput('value')==="true")
+            }
+        })
+        // Set the input to the right type. This will trigger the 'typedinputtypechange'
+        // event handler (just above ^^) to update the value if needed
+        inputCellInput.typedInput('type',ui.type)
     }
 
-    function buildEnvUIRow(row, tenv, ui) {
+    function buildEnvUIRow(row, tenv, ui, node) {
         ui.label = ui.label||{};
-        if (!ui.type) {
+        if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
+            ui.type = "cred";
+            ui.opts = {};
+        } else if (!ui.type) {
             ui.type = "input";
-            ui.opts = {types:['str','num','bool','json','bin','env']}
+            ui.opts = {types:DEFAULT_ENV_TYPE_LIST}
         } else {
             if (!ui.opts) {
                 ui.opts = (ui.type === "select") ? {opts:[]} : {};
@@ -1467,6 +1512,24 @@ RED.subflow = (function() {
                 input.spinner(spinnerOpts).parent().width('70%');
                 input.val(val.value);
                 break;
+            case "cred":
+                input = $('<input type="password">').css('width','70%').appendTo(row);
+                if (node.credentials) {
+                    if (node.credentials[tenv.name]) {
+                        input.val(node.credentials[tenv.name]);
+                    } else if (node.credentials['has_'+tenv.name]) {
+                        input.val("__PWRD__")
+                    } else {
+                        input.val("");
+                    }
+                } else {
+                    input.val("");
+                }
+                input.typedInput({
+                    types: ['cred'],
+                    default: 'cred'
+                })
+                break;
         }
         if (input) {
             input.attr('id',getSubflowEnvPropertyName(tenv.name))
@@ -1478,7 +1541,7 @@ RED.subflow = (function() {
      * @param uiContainer - container for UI
      * @param envList - env var definitions of template
      */
-    function buildEnvUI(uiContainer, envList) {
+    function buildEnvUI(uiContainer, envList,node) {
         uiContainer.empty();
         var elementID = 0;
         for (var i = 0; i < envList.length; i++) {
@@ -1487,7 +1550,7 @@ RED.subflow = (function() {
                 continue;
             }
             var row = $("<div/>", { class: "form-row" }).appendTo(uiContainer);
-            buildEnvUIRow(row,tenv, tenv.ui || {});
+            buildEnvUIRow(row,tenv, tenv.ui || {}, node);
 
             // console.log(ui);
         }
@@ -1525,7 +1588,7 @@ RED.subflow = (function() {
                             //     icon: "",
                             //     label: {},
                             //     type: "input",
-                            //     opts: {types:['str','num','bool','json','bin','env']}
+                            //     opts: {types:DEFAULT_ENV_TYPE_LIST}
                             // }
                             if (!ui.icon) {
                                 delete ui.icon;
@@ -1535,13 +1598,19 @@ RED.subflow = (function() {
                             }
                             switch (ui.type) {
                                 case "input":
-                                    if (JSON.stringify(ui.opts) === JSON.stringify({types:['str','num','bool','json','bin','env']})) {
+                                    if (JSON.stringify(ui.opts) === JSON.stringify({types:DEFAULT_ENV_TYPE_LIST})) {
                                         // This is the default input config. Delete it as it will
                                         // be applied automatically
                                         delete ui.type;
                                         delete ui.opts;
                                     }
                                     break;
+                                case "cred":
+                                    if (envItem.type === "cred") {
+                                        delete ui.type;
+                                    }
+                                    delete ui.opts;
+                                    break;
                                 case "select":
                                     if (ui.opts && $.isEmptyObject(ui.opts.opts)) {
                                         // This is the default select config.
@@ -1585,7 +1654,7 @@ RED.subflow = (function() {
                             type: env.type,
                             value: env.value
                         },
-                        ui: env.ui
+                        ui: $.extend(true,{},env.ui)
                     }
                     envList.push(item);
                     parentEnv[env.name] = item;
@@ -1621,13 +1690,17 @@ RED.subflow = (function() {
             var item;
             var ui = data.ui || {};
             if (!ui.type) {
-                ui.type = "input";
-                ui.opts = {types:['str','num','bool','json','bin','env']}
+                if (data.parent && data.parent.type === "cred") {
+                    ui.type = "cred";
+                } else {
+                    ui.type = "input";
+                    ui.opts = {types:DEFAULT_ENV_TYPE_LIST}
+                }
             } else {
                 ui.opts = ui.opts || {};
             }
             var input = $("#"+getSubflowEnvPropertyName(data.name));
-            if (input.length) {
+            if (input.length || ui.type === "cred") {
                 item = { name: data.name };
                 switch(ui.type) {
                     case "input":
@@ -1639,6 +1712,10 @@ RED.subflow = (function() {
                             item.type = 'str';
                         }
                         break;
+                    case "cred":
+                        item.value = input.val();
+                        item.type = 'cred';
+                        break;
                     case "spinner":
                         item.value = input.val();
                         item.type = 'num';
@@ -1652,7 +1729,7 @@ RED.subflow = (function() {
                         item.value = ""+input.prop("checked");
                         break;
                 }
-                if (item.type !== data.parent.type || item.value !== data.parent.value) {
+                if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) {
                     env.push(item);
                 }
             }
@@ -1702,14 +1779,17 @@ RED.subflow = (function() {
         return defaultLabel;
     }
 
-    function buildEditForm(container,type,node) {
+    function buildEditForm(type,node) {
         if (type === "subflow-template") {
             buildPropertiesList($('#node-input-env-container'), node);
         } else  if (type === "subflow") {
-            buildEnvUI($("#subflow-input-ui"), getSubflowInstanceParentEnv(node));
+            // This gets called by the subflow type `oneditprepare` function
+            // registered in nodes.js#addSubflow()
+            buildEnvUI($("#subflow-input-ui"), getSubflowInstanceParentEnv(node), node);
         }
     }
-    function buildPropertiesForm(container, node) {
+    function buildPropertiesForm(node) {
+        var container = $('#editor-subflow-envProperties-content');
         var form = $('<form class="dialog-form form-horizontal"></form>').appendTo(container);
         var listContainer = $('<div class="form-row node-input-env-container-row"></div>').appendTo(form);
         var list = $('<ol id="red-ui-editor-subflow-env-list" class="red-ui-editor-subflow-env-list"></ol>').appendTo(listContainer);
diff --git a/packages/node_modules/@node-red/runtime/lib/api/flows.js b/packages/node_modules/@node-red/runtime/lib/api/flows.js
index 1e6e72dc7..76e645b92 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/flows.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/flows.js
@@ -238,17 +238,25 @@ var api = module.exports = {
             if (!credentials) {
                 return resolve({});
             }
-            var definition = runtime.nodes.getCredentialDefinition(opts.type) || {};
-
             var sendCredentials = {};
-            for (var cred in definition) {
-                if (definition.hasOwnProperty(cred)) {
-                    if (definition[cred].type == "password") {
-                        var key = 'has_' + cred;
-                        sendCredentials[key] = credentials[cred] != null && credentials[cred] !== '';
-                        continue;
+            var cred;
+            if (/^subflow(:|$)/.test(opts.type)) {
+                for (cred in credentials) {
+                    if (credentials.hasOwnProperty(cred)) {
+                        sendCredentials['has_'+cred] = credentials[cred] != null && credentials[cred] !== '';
+                    }
+                }
+            } else {
+                var definition = runtime.nodes.getCredentialDefinition(opts.type) || {};
+                for (cred in definition) {
+                    if (definition.hasOwnProperty(cred)) {
+                        if (definition[cred].type == "password") {
+                            var key = 'has_' + cred;
+                            sendCredentials[key] = credentials[cred] != null && credentials[cred] !== '';
+                            continue;
+                        }
+                        sendCredentials[cred] = credentials[cred] || '';
                     }
-                    sendCredentials[cred] = credentials[cred] || '';
                 }
             }
             resolve(sendCredentials);
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
index 355bd9bc5..153ef4b06 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
@@ -341,33 +341,62 @@ var api = module.exports = {
     extract: function(node) {
         var nodeID = node.id;
         var nodeType = node.type;
+        var cred;
         var newCreds = node.credentials;
         if (newCreds) {
             delete node.credentials;
             var savedCredentials = credentialCache[nodeID] || {};
-            var dashedType = nodeType.replace(/\s+/g, '-');
-            var definition = credentialsDef[dashedType];
-            if (!definition) {
-                log.warn(log._("nodes.credentials.not-registered",{type:nodeType}));
-                return;
-            }
+            if (/^subflow(:|$)/.test(nodeType)) {
+                for (cred in newCreds) {
+                    if (newCreds.hasOwnProperty(cred)) {
+                        if (newCreds[cred] === "__PWRD__") {
+                            continue;
+                        }
+                        if (0 === newCreds[cred].length || /^\s*$/.test(newCreds[cred])) {
+                            delete savedCredentials[cred];
+                            dirty = true;
+                            continue;
+                        }
+                        if (!savedCredentials.hasOwnProperty(cred) || JSON.stringify(savedCredentials[cred]) !== JSON.stringify(newCreds[cred])) {
+                            savedCredentials[cred] = newCreds[cred];
+                            dirty = true;
+                        }
 
-            for (var cred in definition) {
-                if (definition.hasOwnProperty(cred)) {
-                    if (newCreds[cred] === undefined) {
-                        continue;
                     }
-                    if (definition[cred].type == "password" && newCreds[cred] == '__PWRD__') {
-                        continue;
+                }
+                for (cred in savedCredentials) {
+                    if (savedCredentials.hasOwnProperty(cred)) {
+                        if (!newCreds.hasOwnProperty(cred)) {
+                            delete savedCredentials[cred];
+                            dirty = true;
+                        }
                     }
-                    if (0 === newCreds[cred].length || /^\s*$/.test(newCreds[cred])) {
-                        delete savedCredentials[cred];
-                        dirty = true;
-                        continue;
-                    }
-                    if (!savedCredentials.hasOwnProperty(cred) || JSON.stringify(savedCredentials[cred]) !== JSON.stringify(newCreds[cred])) {
-                        savedCredentials[cred] = newCreds[cred];
-                        dirty = true;
+                }
+            } else {
+                var dashedType = nodeType.replace(/\s+/g, '-');
+                var definition = credentialsDef[dashedType];
+                if (!definition) {
+                    log.warn(log._("nodes.credentials.not-registered",{type:nodeType}));
+                    return;
+                }
+
+                for (cred in definition) {
+                    if (definition.hasOwnProperty(cred)) {
+                        if (newCreds[cred] === undefined) {
+                            continue;
+                        }
+                        if (definition[cred].type == "password" && newCreds[cred] == '__PWRD__') {
+                            continue;
+                        }
+                        if (0 === newCreds[cred].length || /^\s*$/.test(newCreds[cred])) {
+                            delete savedCredentials[cred];
+                            dirty = true;
+                            continue;
+                        }
+                        if (!savedCredentials.hasOwnProperty(cred) || JSON.stringify(savedCredentials[cred]) !== JSON.stringify(newCreds[cred])) {
+                            savedCredentials[cred] = newCreds[cred];
+                            dirty = true;
+                        }
                     }
                 }
             }
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
index a7bec1234..c0bc63dd2 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
@@ -22,6 +22,9 @@ const util = require("util");
 const redUtil = require("@node-red/util").util;
 const flowUtil = require("./util");
 
+
+const credentials = require("../credentials");
+
 var Log;
 
 /**
@@ -38,6 +41,9 @@ function evaluateInputValue(value, type, node) {
     if (type === "bool") {
         return (value === "true") || (value === true);
     }
+    if (type === "cred") {
+        return value;
+    }
     return redUtil.evaluateNodeProperty(value, type, node, null, null);
 }
 
@@ -142,10 +148,16 @@ class Subflow extends Flow {
         this.node_map = node_map;
         this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id);
 
+        this.templateCredentials = credentials.get(subflowDef.id);
+        this.instanceCredentials = credentials.get(this.id);
+
         var env = [];
         if (this.subflowDef.env) {
             this.subflowDef.env.forEach(e => {
                 env[e.name] = e;
+                if (e.type === "cred") {
+                    e.value = this.templateCredentials[e.name];
+                }
             });
         }
         if (this.subflowInstance.env) {
@@ -154,7 +166,14 @@ class Subflow extends Flow {
                 var ui = old ? old.ui : null;
                 env[e.name] = e;
                 if (ui) {
-                    env[e.name].ui = ui; 
+                    env[e.name].ui = ui;
+                }
+                if (e.type === "cred") {
+                    if (!old || this.instanceCredentials.hasOwnProperty(e.name) ) {
+                        e.value = this.instanceCredentials[e.name];
+                    } else if (old) {
+                        e.value = this.templateCredentials[e.name];
+                    }
                 }
             });
         }
@@ -324,7 +343,6 @@ class Subflow extends Flow {
      * @return {Object}  val    value of env var
      */
     getSetting(name) {
-        this.trace("getSetting:"+name);
         if (!/^\$parent\./.test(name)) {
             var env = this.env;
             var is_info = name.endsWith("_info");
@@ -333,7 +351,6 @@ class Subflow extends Flow {
 
             if (env && env.hasOwnProperty(ename)) {
                 var val = env[ename];
-
                 if (is_type) {
                     return val ? val.type : undefined;
                 }

From cc177533e8dd0d99e991e9b962c4c1f854aa4156 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Nov 2019 15:12:29 +0000
Subject: [PATCH 305/305] Dont export subflow template creds by default

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 76dc4d194..cdf2c8796 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -587,7 +587,6 @@ RED.nodes = (function() {
     }
 
     function convertSubflow(n, exportCreds) {
-        exportCreds = true;
         var node = {};
         node.id = n.id;
         node.type = n.type;