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 01/65] 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 02/65] 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 03/65] 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 04/65] 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 05/65] 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 06/65] 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 07/65] 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 08/65] 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 09/65] 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 10/65] 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 11/65] 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 12/65] 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 13/65] 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 14/65] 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 15/65] 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 16/65] 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 17/65] 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 18/65] 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 19/65] 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 20/65] =?UTF-8?q?Using=20the=20=E2=80=98a=20msg=20per=20li?=
 =?UTF-8?q?ne=E2=80=99=20the=20last=20line=20does=20not=20get=20msg.topic?=
 =?UTF-8?q?=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 21/65] 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 22/65] 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 23/65] 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 24/65] 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 25/65] 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 26/65] 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 27/65] 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 28/65] 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 29/65] 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 30/65] 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 31/65] 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 32/65] 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 33/65] 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 34/65] 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 35/65] 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 36/65] 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 37/65] 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 38/65] 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 39/65] 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 40/65] 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 41/65] 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 42/65] 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 43/65] 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 44/65] 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 45/65] 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 46/65] 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 47/65] 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 48/65] 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 49/65] 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 50/65] 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 51/65] 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 52/65] 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 53/65] 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 54/65] 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 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 55/65] 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 56/65] 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 57/65] 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 58/65] 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 59/65] 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 60/65] 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 61/65] 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 62/65] 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 63/65] 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 64/65] 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 65/65] 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"
     }
 }