Fix for narrrowbandEq mode start condition failure

And add test
As discussed https://discourse.nodered.org/t/the-filter-node-or-the-old-rbe-node/56371

CHANGELOG.md

@@ -1,3 +1,37 @@
+#### 2.1.4: Maintenance Release
+
+Runtime
+
+ - fix env var access using $parent for groups (#3278) @HiroyasuNishiyama
+ - Add proper error handling for 404 errors when serving debug files (#3277) @knolleary
+ - Add Japanese translations for Node-RED v2.1.0-beta.1 (#3179) @kazuhitoyokoi
+ - Include full user object on login audit events (#3269) @knolleary
+ - Remove styling from de locale files (#3237) @knolleary
+
+Editor
+
+ - Change tab hide button icon to an eye and add search option (#3282) @knolleary
+ - Fix i18n handling of namespaces with spaces in (#3281) @knolleary
+ - Trigger change event when autoComplete fills in input (#3280) @knolleary
+ - Apply CN i18n fix (#3279) @knolleary
+ - fix select menu label of config node to use paletteLabel (#3273) @HiroyasuNishiyama
+ - fix removed tab not to cause node conflict (#3275) @HiroyasuNishiyama
+ - Group diff fix (#3239) @knolleary
+ - Only toggle disabled workspace flag if on activeWorkspace (#3252) @knolleary
+ - Do not show status for disabled nodes (#3253) @knolleary
+ - Set dimension value for tour guide (#3265) @kazuhitoyokoi
+ - Avoid redundant initialisation of TypedInput type (#3263) @knolleary
+ - Don't let themes change flow port label color (#3270) @bonanitech
+ - Fix treeList gutter calculation to handle floating gutters (#3238) @knolleary
+
+Nodes
+
+- Debug: Handle RegExp types in Debug sidebar (#3251) @knolleary
+- Delay: fix 2nd output when in rate limit per topic modes (#3261) @dceejay
+- Link: fix to show link target when selected (#3267) @HiroyasuNishiyama
+- Inject: Do not modify inject node props in oneditprepare (#3242) @knolleary
+- HTTP Request: HTTP Basic Auth should always add : between username and password even if empty (#3236) @hardillb
+
 #### 2.1.3: Maintenance Release
 
 Runtime

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -26,9 +26,9 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.5.0",
+        "acorn": "8.6.0",
         "acorn-walk": "8.2.0",
-        "ajv": "8.6.3",
+        "ajv": "8.8.2",
         "async-mutex": "0.3.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
@@ -37,7 +37,7 @@
         "clone": "2.1.2",
         "content-type": "1.0.4",
         "cookie": "0.4.1",
-        "cookie-parser": "1.4.5",
+        "cookie-parser": "1.4.6",
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.0.1",
@@ -46,11 +46,11 @@
         "form-data": "4.0.0",
         "fs-extra": "10.0.0",
         "fs.notify": "0.0.4",
-        "got": "11.8.2",
+        "got": "11.8.3",
         "hash-sum": "2.0.0",
         "hpagent": "0.1.2",
         "https-proxy-agent": "5.0.0",
-        "i18next": "21.3.1",
+        "i18next": "21.5.4",
         "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
         "js-yaml": "3.14.1",
@@ -60,22 +60,22 @@
         "media-typer": "1.1.0",
         "memorystore": "1.6.6",
         "mime": "2.5.2",
-        "moment-timezone": "0.5.33",
+        "moment-timezone": "0.5.34",
         "mqtt": "4.2.8",
         "multer": "1.4.3",
         "mustache": "4.2.0",
         "node-red-admin": "^2.2.1",
         "nopt": "5.0.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
         "on-headers": "1.0.2",
         "passport": "0.5.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.1",
+        "raw-body": "2.4.2",
         "semver": "7.3.5",
         "tar": "6.1.11",
         "tough-cookie": "4.0.0",
-        "uglify-js": "3.14.2",
+        "uglify-js": "3.14.4",
         "uuid": "8.3.2",
         "ws": "7.5.1",
         "xml2js": "0.4.23"
@@ -109,11 +109,11 @@
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "marked": "3.0.7",
         "minami": "1.2.3",
-        "mocha": "9.1.2",
+        "mocha": "9.1.3",
         "node-red-node-test-helper": "^0.2.7",
-        "nodemon": "2.0.13",
+        "nodemon": "2.0.15",
         "proxy": "^1.0.2",
-        "sass": "1.43.2",
+        "sass": "1.44.0",
         "should": "13.2.3",
         "sinon": "11.1.2",
         "stoppable": "^1.1.0",

packages/node_modules/@node-red/editor-api/lib/auth/index.js

@@ -141,7 +141,7 @@ function completeVerify(profile,done) {
     Users.authenticate(profile).then(function(user) {
         if (user) {
             Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) {
-                log.audit({event: "auth.login",username:user.username,scope:user.permissions});
+                log.audit({event: "auth.login",user,username:user.username,scope:user.permissions});
                 user.tokens = tokens;
                 done(null,user);
             });

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -93,7 +93,7 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                     return logEntry.user !== username;
                 });
                 Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",username:username,client:client.id,scope:scope});
+                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
                     done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
                 });
             } else {

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.3",
-        "@node-red/editor-client": "2.1.3",
+        "@node-red/util": "2.1.4",
+        "@node-red/editor-client": "2.1.4",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
@@ -28,7 +28,7 @@
         "mime": "2.5.2",
         "multer": "1.4.3",
         "mustache": "4.2.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "passport": "0.5.0",

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -59,6 +59,8 @@
         "hideOtherFlows": "Hide other flows",
         "showAllFlows": "Show all flows",
         "hideAllFlows": "Hide all flows",
+        "hiddenFlows": "List __count__ hidden flow",
+        "hiddenFlows_plural": "List __count__ hidden flows",
         "showLastHiddenFlow": "Show last hidden flow",
         "listFlows": "List flows",
         "listSubflows": "List subflows",
@@ -90,6 +92,7 @@
             "palette": {
                 "show": "Show palette"
             },
+            "edit": "Edit",
             "settings": "Settings",
             "userSettings": "User Settings",
             "nodes": "Nodes",
@@ -668,7 +671,8 @@
                 "unusedConfigNodes": "Unused configuration nodes",
                 "invalidNodes": "Invalid nodes",
                 "uknownNodes": "Unknown nodes",
-                "unusedSubflows": "Unused subflows"
+                "unusedSubflows": "Unused subflows",
+                "hiddenFlows": "Hidden flows"
             }
         },
         "help": {
@@ -1135,6 +1139,7 @@
         "defaultValue": "Default value"
     },
     "tourGuide": {
+        "takeATour": "Take a tour",
         "start": "Start",
         "next": "Next"
     },

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -54,7 +54,16 @@
         "delete": "本当に '__label__' を削除しますか？",
         "dropFlowHere": "ここにフローをドロップしてください",
         "addFlow": "フローの追加",
+        "addFlowToRight": "右側にフローを追加",
+        "hideFlow": "フローを非表示",
+        "hideOtherFlows": "他のフローを非表示",
+        "showAllFlows": "全てのフローを表示",
+        "hideAllFlows": "全てのフローを非表示",
+        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
+        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
+        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
         "listFlows": "フロー一覧",
+        "listSubflows": "サブフロー一覧",
         "status": "状態",
         "enabled": "有効",
         "disabled": "無効",
@@ -83,6 +92,7 @@
             "palette": {
                 "show": "パレットを表示"
             },
+            "edit": "編集",
             "settings": "設定",
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
@@ -105,6 +115,7 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
+            "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
             "projects-new": "新規",
@@ -116,7 +127,20 @@
             "groupSelection": "選択部分をグループ化",
             "ungroupSelection": "選択部分をグループ解除",
             "groupMergeSelection": "選択部分をマージ",
-            "groupRemoveSelection": "グループから削除"
+            "groupRemoveSelection": "グループから削除",
+            "arrange": "配置",
+            "alignLeft": "左揃え",
+            "alignCenter": "左右中央揃え",
+            "alignRight": "右揃え",
+            "alignTop": "上揃え",
+            "alignMiddle": "上下中央揃え",
+            "alignBottom": "下揃え",
+            "distributeHorizontally": "左右に整列",
+            "distributeVertically": "上下に整列",
+            "moveToBack": "最背面へ移動",
+            "moveToFront": "最前面へ移動",
+            "moveBackwards": "背面へ移動",
+            "moveForwards": "前面へ移動"
         }
     },
     "actions": {
@@ -451,7 +475,8 @@
         "global": "グローバル",
         "workspace": "ワークスペース",
         "selectAll": "全てのノードを選択",
-        "selectAllConnected": "接続された全てのノードを選択",
+        "selectNone": "選択を外す",
+        "selectAllConnected": "接続されたノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
         "deleteSelected": "選択したノードや接続を削除",
@@ -461,10 +486,13 @@
         "moveNode": "選択したノードを移動(移動量大)",
         "toggleSidebar": "サイドバーの表示/非表示",
         "togglePalette": "パレットの表示/非表示",
-        "copyNode": "選択したノードをコピー",
-        "cutNode": "選択したノードを切り取り",
+        "copyNode": "ノードをコピー",
+        "cutNode": "ノードを切り取り",
         "pasteNode": "ノードを貼り付け",
+        "copyGroupStyle": "グループ様式をコピー",
+        "pasteGroupStyle": "グループ様式を貼り付け",
         "undoChange": "変更操作を戻す",
+        "redoChange": "変更操作をやり直し",
         "searchBox": "ノードを検索",
         "managePalette": "パレットの管理",
         "actionList": "動作一覧"
@@ -519,7 +547,8 @@
             "nodeEnabled_plural": "ノードを有効化しました:",
             "nodeDisabled": "ノードを無効化しました:",
             "nodeDisabled_plural": "ノードを無効化しました:",
-            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました"
+            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました",
+            "unknownNodeRegistered": "ノードの読み込みエラー: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "パレットの管理",
@@ -642,7 +671,8 @@
                 "unusedConfigNodes": "未使用の設定ノード",
                 "invalidNodes": "不正なノード",
                 "uknownNodes": "未知のノード",
-                "unusedSubflows": "未使用のサブフロー"
+                "unusedSubflows": "未使用のサブフロー",
+                "hiddenFlows": "非表示のフロー"
             }
         },
         "help": {
@@ -1108,6 +1138,11 @@
         "preview": "UIプレビュー",
         "defaultValue": "デフォルト値"
     },
+    "tourGuide": {
+        "takeATour": "ツアーを開始",
+        "start": "開始",
+        "next": "次へ"
+    },
     "languages": {
         "de": "ドイツ語",
         "en-US": "英語",

packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json

@@ -225,7 +225,7 @@
             "compact": "紧凑",
             "formatted": "已格式化",
             "copy": "导出到剪贴板",
-            "export": "到处到库",
+            "export": "导出到库",
             "exportAs": "导出为",
             "overwrite": "替换",
             "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/editor-client/src/js/i18n.js

@@ -38,6 +38,8 @@ RED.i18n = (function() {
                 defaultNS: "editor",
                 fallbackLng: ['en-US'],
                 returnObjects: true,
+                keySeparator: ".",
+                nsSeparator: ":",
                 interpolation: {
                     unescapeSuffix: 'HTML',
                     escapeValue: false,

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -805,7 +805,6 @@ RED.nodes = (function() {
         var removedGroups = [];
         if (ws) {
             delete workspaces[id];
-            allNodes.removeTab(id);
             delete linkTabMap[id];
             workspacesOrder.splice(workspacesOrder.indexOf(id),1);
             var i;
@@ -843,6 +842,7 @@ RED.nodes = (function() {
             for (i=removedGroups.length-1; i>=0; i--) {
                 removeGroup(removedGroups[i]);
             }
+            allNodes.removeTab(id);
             RED.events.emit('flows:remove',ws);
         }
         return {nodes:removedNodes,links:removedLinks, groups: removedGroups};
@@ -1097,6 +1097,11 @@ RED.nodes = (function() {
             // Until we know how that can happen, add a filter here to remove them
             node.nodes = node.nodes.filter(function(n) { return !!n }).map(function(n) { return n.id });
         }
+        if (n.type === "tab" || n.type === "group") {
+            if (node.env && node.env.length === 0) {
+                delete node.env;
+            }
+        }
         if (n._def.category != "config") {
             node.x = n.x;
             node.y = n.y;

packages/node_modules/@node-red/editor-client/src/js/red.js

@@ -590,7 +590,7 @@ var RED = (function() {
                 {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
             ]});
         }
-        menuOptions.push({id:"menu-item-edit-menu", label:"Edit", options: [
+        menuOptions.push({id:"menu-item-edit-menu", label:RED._("menu.label.edit"), options: [
             {id: "menu-item-edit-undo", label:RED._("keyboard.undoChange"), disabled: true, onselect: "core:undo"},
             {id: "menu-item-edit-redo", label:RED._("keyboard.redoChange"), disabled: true, onselect: "core:redo"},
             null,

packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js

@@ -71,6 +71,7 @@ RED.clipboard = (function() {
                         text: RED._("common.label.cancel"),
                         click: function() {
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-download
@@ -81,6 +82,7 @@ RED.clipboard = (function() {
                             var data = $("#red-ui-clipboard-dialog-export-text").val();
                             downloadData("flows.json", data);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-export
@@ -95,6 +97,7 @@ RED.clipboard = (function() {
                                 $( this ).dialog( "close" );
                                 copyText(flowData);
                                 RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+                                RED.view.focus();
                             } else {
                                 var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
                                 var selectedPath = activeLibraries[activeTab].getSelected();
@@ -110,6 +113,7 @@ RED.clipboard = (function() {
                                         contentType: "application/json; charset=utf-8"
                                     }).done(function() {
                                         $(dialog).dialog( "close" );
+                                        RED.view.focus();
                                         RED.notify(RED._("library.exportedToLibrary"),"success");
                                     }).fail(function(xhr,textStatus,err) {
                                         if (xhr.status === 401) {
@@ -171,6 +175,7 @@ RED.clipboard = (function() {
                                 }
                             }
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-import-conflict
@@ -203,6 +208,7 @@ RED.clipboard = (function() {
                             // console.table(pendingImportConfig.importNodes.map(function(n) { return {id:n.id,type:n.type,result:importMap[n.id]}}))
                             RED.view.importNodes(newNodes, pendingImportConfig.importOptions);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     }
                 ],

packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js

@@ -21,7 +21,7 @@
  *      value: String : the value to insert if selected
  *      label: String|DOM Element : the label to display in the dropdown.
  *  }
- * 
+ *
  */
 
     $.widget( "nodered.autoComplete", {
@@ -62,7 +62,7 @@
                 maxHeight: 200,
                 class: "red-ui-autoComplete-container",
                 options: completions,
-                onselect: (opt) => { this.element.val(opt.value); this.element.focus() },
+                onselect: (opt) => { this.element.val(opt.value); this.element.focus(); this.element.trigger("change") },
                 onclose: () => { this.completionMenuShown = false; delete this.menu; this.element.focus()}
             });
             this.menu.show({

packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js

@@ -117,6 +117,8 @@ RED.tabs = (function() {
                     menuOptions = options.menu()
                 } else if (Array.isArray(options.menu)) {
                     menuOptions = options.menu;
+                } else if (typeof options.menu === 'function') {
+                    menuOptions = options.menu();
                 }
                 menu = RED.menu.init({options: menuOptions});
                 menu.attr("id",options.id+"-menu");
@@ -576,7 +578,7 @@ RED.tabs = (function() {
 
         function findPreviousVisibleTab(li) {
             if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
             }
             var previous = li.prev();
             while(previous.length > 0 && previous.hasClass("hide-tab")) {
@@ -586,9 +588,9 @@ RED.tabs = (function() {
         }
         function findNextVisibleTab(li) {
             if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
             }
-            var next = ul.find("li.active").next();
+            var next = li.next();
             while(next.length > 0 && next.hasClass("hide-tab")) {
                 next = next.next();
             }
@@ -809,15 +811,18 @@ RED.tabs = (function() {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
                 if (tab.hideable) {
                     li.addClass("red-ui-tabs-closeable")
-                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close"}).appendTo(li);
-                    closeLink.append('<i class="fa fa-times" />');
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
                     closeLink.on("click",function(event) {
                         event.preventDefault();
                         hideTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
 
                 var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
@@ -826,7 +831,8 @@ RED.tabs = (function() {
                     $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                 }
 
-                link.attr("title",tab.label);
+                // link.attr("title",tab.label);
+                RED.popover.tooltip(link,function() { return tab.label})
 
                 if (options.onadd) {
                     options.onadd(tab);
@@ -945,7 +951,6 @@ RED.tabs = (function() {
             renameTab: function(id,label) {
                 tabs[id].label = label;
                 var tab = ul.find("a[href='#"+id+"']");
-                tab.attr("title",label);
                 tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                 updateTabWidths();
             },

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -556,7 +556,7 @@
             this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
             this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
 
-            this.type(this.options.default||this.typeList[0].value);
+            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
             this.typeChanged = !!this.options.default;
         }catch(err) {
             console.log(err.stack);
@@ -805,6 +805,7 @@
             var that = this;
             var currentType = this.type();
             this.typeMap = {};
+            var firstCall = (this.typeList === undefined);
             this.typeList = types.map(function(opt) {
                 var result;
                 if (typeof opt === 'string') {
@@ -829,10 +830,14 @@
             }
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                this.type(this.typeList[0].value);
+                if (!firstCall) {
+                    this.type(this.typeList[0].value);
+                }
             } else {
                 this.propertyType = null;
-                this.type(currentType);
+                if (!firstCall) {
+                    this.type(currentType);
+                }
             }
             if (this.typeList.length === 1 && !this.typeList[0].icon && (!this.typeList[0].label || this.typeList[0].showLabel === false)) {
                 this.selectTrigger.hide()

packages/node_modules/@node-red/editor-client/src/js/ui/diff.js

@@ -554,6 +554,8 @@ RED.diff = (function() {
                     color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
+            } else if (node.type === "group") {
+                def = RED.group.def;
             } else {
                 def = {};
             }
@@ -763,16 +765,15 @@ RED.diff = (function() {
             }
         }
 
-
         if (node.hasOwnProperty('x')) {
             if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y) {
+                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
                     localChanged = true;
                     localChanges++;
                 }
             }
             if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
                     remoteChanged = true;
                     remoteChanges++;
                 }
@@ -790,7 +791,12 @@ RED.diff = (function() {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                 $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                 element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
-                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
+                var localPosition = {x:localNode.x,y:localNode.y};
+                if (localNode.hasOwnProperty('w')) {
+                    localPosition.w = localNode.w;
+                    localPosition.h = localNode.h;
+                }
+                propertyElements['local.position'] = RED.utils.createObjectElement(localPosition,
                     {
                         path: "position",
                         exposeApi: true,
@@ -811,7 +817,12 @@ RED.diff = (function() {
                 if (remoteNode) {
                     $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                     element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
-                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
+                    var remotePosition = {x:remoteNode.x,y:remoteNode.y};
+                    if (remoteNode.hasOwnProperty('w')) {
+                        remotePosition.w = remoteNode.w;
+                        remotePosition.h = remoteNode.h;
+                    }
+                    propertyElements['remote.position'] = RED.utils.createObjectElement(remotePosition,
                         {
                             path: "position",
                             exposeApi: true,
@@ -883,11 +894,11 @@ RED.diff = (function() {
                 }
             }
         }
-        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='w'&&p!=='h'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
         if (def.defaults) {
             properties = properties.concat(Object.keys(def.defaults));
         }
-        if (node.type !== 'tab') {
+        if (node.type !== 'tab' && node.type !== "group") {
             properties = properties.concat(['inputLabels','outputLabels']);
         }
         if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&

packages/node_modules/@node-red/editor-client/src/js/ui/editor.js

@@ -744,7 +744,16 @@ RED.editor = (function() {
                     delete cn.__label__;
                 });
 
-                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:type})+'</option>');
+                var label = type;
+                if (typeof node_def.paletteLabel !== "undefined") {
+                    try {
+                        label = RED.utils.sanitize((typeof node_def.paletteLabel === "function" ? node_def.paletteLabel.call(node_def) : node_def.paletteLabel)||type);
+                    } catch(err) {
+                        console.log("Definition error: "+type+".paletteLabel",err);
+                    }
+                }
+
+                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
                 window.setTimeout(function() { select.trigger("change");},50);
             }
         }

packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js

@@ -81,7 +81,8 @@
                             clearTimeout: true,
                             setInterval: true,
                             clearInterval: true
-                        }
+                        },
+                        extraLibs: options.extraLibs
                     });
                     if (options.cursor) {
                         expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);

packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js

@@ -55,9 +55,15 @@
                         }
                     });
                 }
-                if (!isSameObj(old_env, new_env)) {
-                    node.env = new_env;
+                if (!old_env && new_env.length === 0) {
+                    delete node.env;
+                } else if (!isSameObj(old_env, new_env)) {
                     editState.changes.env = node.env;
+                    if (new_env.length === 0) {
+                        delete node.env;
+                    } else {
+                        node.env = new_env;
+                    }
                     editState.changed = true;
                 }
             }

packages/node_modules/@node-red/editor-client/src/js/ui/search.js

@@ -105,6 +105,7 @@ RED.search = (function() {
         val = extractFlag(val,"unused",flags);
         val = extractFlag(val,"config",flags);
         val = extractFlag(val,"subflow",flags);
+        val = extractFlag(val,"hidden",flags);
         // uses:<node-id>
         val = extractValue(val,"uses",flags);
 
@@ -150,7 +151,15 @@ RED.search = (function() {
                                 continue;
                             }
                         }
-
+                        if (flags.hasOwnProperty("hidden")) {
+                            // Only tabs can be hidden
+                            if (node.node.type !== 'tab') {
+                                continue
+                            }
+                            if (!RED.workspaces.isHidden(node.node.id)) {
+                                continue
+                            }
+                        }
                         if (flags.hasOwnProperty("unused")) {
                             var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
                                            (isConfigNode && node.node.users.length === 0)

packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js

@@ -379,7 +379,7 @@ RED.sidebar.help = (function() {
                     var currentVersionParts = RED.settings.version.split(".");
                     var tourVersionParts = tour.version.split(".");
                     if (tourVersionParts[0] === currentVersionParts[0] && tourVersionParts[1] === currentVersionParts[1]) {
-                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">Take a tour</button></div>'
+                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">' + RED._("tourGuide.takeATour") + '</button></div>';
                     }
                 }
                 var aboutHeader = '<div style="text-align:center;">'+tourHeader+'</div>'

packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js

@@ -175,6 +175,7 @@ RED.sidebar.info.outliner = (function() {
                                     n.d = true;
                                 }
                                 n.dirty = true;
+                                n.dirtyStatus = true;
                                 n.changed = true;
                                 RED.events.emit("nodes:change",n);
                                 groupHistoryEvent.events.push(historyEvent);
@@ -203,6 +204,7 @@ RED.sidebar.info.outliner = (function() {
                         n.d = true;
                     }
                     n.dirty = true;
+                    n.dirtyStatus = true;
                     n.changed = true;
                     RED.events.emit("nodes:change",n);
                     RED.history.push(historyEvent);
@@ -272,6 +274,7 @@ RED.sidebar.info.outliner = (function() {
                 {label:RED._("sidebar.info.search.invalidNodes"), value: "is:invalid"},
                 {label:RED._("sidebar.info.search.uknownNodes"), value: "type:unknown"},
                 {label:RED._("sidebar.info.search.unusedSubflows"), value:"is:subflow is:unused"},
+                {label:RED._("sidebar.info.search.hiddenFlows"), value:"is:hidden"},
             ]
         });
 

packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js

@@ -364,6 +364,8 @@ RED.tourGuide = (function() {
             if (step.fallback) {
                 focus.one("mouseenter", function(evt) {
                     setTimeout(function() {
+                        var pos = targetElement[0].getBoundingClientRect();
+                        var dimension = Math.max(50, Math.max(pos.width,pos.height)*1.5);
                         focus.css({
                             width: (4*dimension)+"px",
                             height: (4*dimension)+"px"

packages/node_modules/@node-red/editor-client/src/js/ui/utils.js

@@ -142,6 +142,8 @@ RED.utils = (function() {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('function');
             } else if (value.hasOwnProperty('type') && (value.type === 'number' || value.type === 'bigint')) {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-number"></span>').text(value.data);
+            } else if (value.hasOwnProperty('type') && value.type === 'regexp') {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-string"></span>').text(value.data);
             } else {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta">object</span>');
             }
@@ -440,6 +442,8 @@ RED.utils = (function() {
             $('<span class="red-ui-debug-msg-type-null">undefined</span>').appendTo(entryObj);
         } else if (obj.__enc__ && (obj.type === 'number' || obj.type === 'bigint')) {
             e = $('<span class="red-ui-debug-msg-type-number red-ui-debug-msg-object-header"></span>').text(obj.data).appendTo(entryObj);
+        } else if (typeHint === "regexp" || (obj.__enc__ && obj.type === 'regexp')) {
+            e = $('<span class="red-ui-debug-msg-type-string red-ui-debug-msg-object-header"></span>').text((typeof obj === "string")?obj:obj.data).appendTo(entryObj);
         } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
             e = $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-header"></span>').text("function").appendTo(entryObj);
         } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -46,7 +46,6 @@ RED.view = (function() {
     var workspaceScrollPositions = {};
 
     var gridSize = 20;
-    var widthSize = 20;
     var snapGrid = false;
 
     var activeSpliceLink;
@@ -3676,7 +3675,11 @@ RED.view = (function() {
             nodeEl = document.getElementById(d.id);
         }
         if (nodeEl) {
-            if (!showStatus || !d.status) {
+            // Do not show node status if:
+            // - global flag set
+            // - node has no status
+            // - node is disabled
+            if (!showStatus || !d.status || d.d === true) {
                 nodeEl.__statusGroup__.style.display = "none";
             } else {
                 nodeEl.__statusGroup__.style.display = "inline";
@@ -4026,7 +4029,7 @@ RED.view = (function() {
                         if (hideLabel) {
                             d.w = node_height;
                         } else {
-                            d.w = Math.max(node_width,widthSize*(Math.ceil((labelParts.width+50+(d._def.inputs>0?7:0))/widthSize)) );
+                            d.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(d._def.inputs>0?7:0))/20)) );
                         }
                         if (ow !== undefined) {
                             d.x += (d.w-ow)/2;
@@ -4422,6 +4425,9 @@ RED.view = (function() {
                             n.selected = true;
                             n.dirty = true;
                             movingSet.add(n);
+                            if (targets.length === 1) {
+                                RED.view.reveal(n.id);
+                            }
                         });
                         updateSelection();
                         redraw();
@@ -4573,9 +4579,9 @@ RED.view = (function() {
                             d.nodes.forEach(function(n) {
                                 groupOpCount++
                                 if (n.type !== "group") {
-                                    minX = Math.min(minX,n.x-n.w/2-margin-((n._def.button && n._def.align!=="right")?widthSize:0));
+                                    minX = Math.min(minX,n.x-n.w/2-margin-((n._def.button && n._def.align!=="right")?20:0));
                                     minY = Math.min(minY,n.y-n.h/2-margin);
-                                    maxX = Math.max(maxX,n.x+n.w/2+margin+((n._def.button && n._def.align=="right")?widthSize:0));
+                                    maxX = Math.max(maxX,n.x+n.w/2+margin+((n._def.button && n._def.align=="right")?20:0));
                                     maxY = Math.max(maxY,n.y+n.h/2+margin);
                                 } else {
                                     minX = Math.min(minX,n.x-margin)
@@ -5030,6 +5036,7 @@ RED.view = (function() {
                             delete node.d;
                         }
                         node.dirty = true;
+                        node.dirtyStatus = true;
                         node.changed = true;
                         RED.events.emit("nodes:change",node);
                     }
@@ -5085,23 +5092,23 @@ RED.view = (function() {
     function calculateNodeDimensions(node) {
         var result = [node_width,node_height];
         try {
-            var isLink = (node.type === "link in" || node.type === "link out")
-            var hideLabel = node.hasOwnProperty('l')?!node.l : isLink;
-            var label = RED.utils.getNodeLabel(node, node.type);
-            var labelParts = getLabelParts(label, "red-ui-flow-node-label");
-            if (hideLabel) {
-                result[1] = Math.max(node_height,(node.outputs || 0) * 15);
-            } else {
-                result[1] = Math.max(6+24*labelParts.lines.length,(node.outputs || 0) * 15, 30);
-            }
-            if (hideLabel) {
-                result[0] = node_height;
-            } else {
-                result[0] = Math.max(node_width,widthSize*(Math.ceil((labelParts.width+50+(node._def.inputs>0?7:0))/widthSize)) );
-            }
-        } catch(err) {
-            console.log("Error",node);
+        var isLink = (node.type === "link in" || node.type === "link out")
+        var hideLabel = node.hasOwnProperty('l')?!node.l : isLink;
+        var label = RED.utils.getNodeLabel(node, node.type);
+        var labelParts = getLabelParts(label, "red-ui-flow-node-label");
+        if (hideLabel) {
+            result[1] = Math.max(node_height,(node.outputs || 0) * 15);
+        } else {
+            result[1] = Math.max(6+24*labelParts.lines.length,(node.outputs || 0) * 15, 30);
         }
+        if (hideLabel) {
+            result[0] = node_height;
+        } else {
+            result[0] = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(node._def.inputs>0?7:0))/20)) );
+        }
+    }catch(err) {
+        console.log("Error",node);
+    }
         return result;
     }
 
@@ -5242,8 +5249,6 @@ RED.view = (function() {
                 return gridSize;
             } else {
                 gridSize = Math.max(5,v);
-                widthSize = gridSize;
-                while (widthSize > 50) { widthSize = Math.round(widthSize/2); }
                 updateGrid();
             }
         },

packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js

@@ -208,65 +208,84 @@ RED.workspaces = (function() {
             },
             onhide: function(tab) {
                 hideStack.push(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                hiddenTabs[tab.id] = true;
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                 RED.events.emit("workspace:hide",{workspace: tab.id})
             },
             onshow: function(tab) {
                 removeFromHideStack(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                delete hiddenTabs[tab.id];
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                 RED.events.emit("workspace:show",{workspace: tab.id})
             },
             minimumActiveTabWidth: 150,
             scrollable: true,
             addButton: "core:add-flow",
             addButtonCaption: RED._("workspace.addFlow"),
-            menu: [
-                {
-                    id:"red-ui-tabs-menu-option-search-flows",
-                    label: RED._("workspace.listFlows"),
-                    onselect: "core:list-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-search-subflows",
-                    label: RED._("workspace.listSubflows"),
-                    onselect: "core:list-subflows"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-flow",
-                    label: RED._("workspace.addFlow"),
-                    onselect: "core:add-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-flow-right",
-                    label: RED._("workspace.addFlowToRight"),
-                    onselect: "core:add-flow-to-right"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-flows",
-                    label: RED._("workspace.hideFlow"),
-                    onselect: "core:hide-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-other-flows",
-                    label: RED._("workspace.hideOtherFlows"),
-                    onselect: "core:hide-other-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-all-flows",
-                    label: RED._("workspace.showAllFlows"),
-                    onselect: "core:show-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-all-flows",
-                    label: RED._("workspace.hideAllFlows"),
-                    onselect: "core:hide-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-last-flow",
-                    label: RED._("workspace.showLastHiddenFlow"),
-                    onselect: "core:show-last-hidden-flow"
+            menu: function() {
+                var menuItems = [
+                    {
+                        id:"red-ui-tabs-menu-option-search-flows",
+                        label: RED._("workspace.listFlows"),
+                        onselect: "core:list-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-search-subflows",
+                        label: RED._("workspace.listSubflows"),
+                        onselect: "core:list-subflows"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow",
+                        label: RED._("workspace.addFlow"),
+                        onselect: "core:add-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        onselect: "core:add-flow-to-right"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-flows",
+                        label: RED._("workspace.hideFlow"),
+                        onselect: "core:hide-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-other-flows",
+                        label: RED._("workspace.hideOtherFlows"),
+                        onselect: "core:hide-other-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-all-flows",
+                        label: RED._("workspace.showAllFlows"),
+                        onselect: "core:show-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-all-flows",
+                        label: RED._("workspace.hideAllFlows"),
+                        onselect: "core:hide-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-last-flow",
+                        label: RED._("workspace.showLastHiddenFlow"),
+                        onselect: "core:show-last-hidden-flow"
+                    }
+                ]
+                if (hideStack.length > 0) {
+                    menuItems.unshift({
+                        label: RED._("workspace.hiddenFlows",{count: hideStack.length}),
+                        onselect: "core:list-hidden-flows"
+                    })
                 }
-            ]
+                return menuItems;
+            }
         });
         workspaceTabCount = 0;
     }
@@ -406,7 +425,9 @@ RED.workspaces = (function() {
                 }
             }
         })
-
+        RED.actions.add("core:list-hidden-flows",function() {
+            RED.actions.invoke("core:search","is:hidden ");
+        })
         RED.actions.add("core:list-flows",function() {
             RED.actions.invoke("core:search","type:tab ");
         })
@@ -450,7 +471,7 @@ RED.workspaces = (function() {
             var changes = { disabled: workspace.disabled };
             workspace.disabled = disabled;
             $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-            if (id || activeWorkspace) {
+            if (!id || (id === activeWorkspace)) {
                 $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
             }
             var historyEvent = {
@@ -531,11 +552,11 @@ RED.workspaces = (function() {
             }
             if (workspace_tabs.contains(id)) {
                 workspace_tabs.hideTab(id);
-                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-                hiddenTabs[id] = true;
-                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
             }
         },
+        isHidden: function(id) {
+            return hideStack.includes(id)
+        },
         show: function(id,skipStack,unhideOnly) {
             if (!workspace_tabs.contains(id)) {
                 var sf = RED.nodes.subflow(id);
@@ -558,9 +579,6 @@ RED.workspaces = (function() {
                 }
                 workspace_tabs.activateTab(id);
             }
-            var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-            delete hiddenTabs[id];
-            RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
         },
         refresh: function() {
             RED.nodes.eachWorkspace(function(ws) {

packages/node_modules/@node-red/editor-client/src/sass/colors.scss

@@ -197,6 +197,7 @@ $view-select-mode-background: $secondary-background-selected;
 $view-grid-color: #eee;
 
 $node-label-color: #333;
+$node-port-label-color: #888;
 $node-border: #999;
 $node-border-unknown: #f33;
 $node-border-placeholder: #aaa;

packages/node_modules/@node-red/editor-client/src/sass/flow.scss

@@ -47,7 +47,7 @@
 
 .red-ui-flow-port-label {
     stroke-width: 0;
-    fill: $secondary-text-color;
+    fill: $node-port-label-color;
     font-size: 16px;
     dominant-baseline: middle;
     text-anchor: middle;

packages/node_modules/@node-red/editor-client/src/sass/header.scss

@@ -187,7 +187,7 @@
     ul.red-ui-menu-dropdown {
         background: $header-menu-background;
         border: 1px solid $header-menu-background;
-        width: 250px !important;
+        width: 260px !important;
         margin-top: 0;
         li a {
             color: $header-menu-color;

packages/node_modules/@node-red/editor-client/src/sass/tabs.scss

@@ -389,7 +389,19 @@ i.red-ui-tab-icon {
     vertical-align: top;
 
 }
-
+.red-ui-tab-hide {
+    .fa-eye-slash {
+        display: none;
+    }
+    &:hover {
+        .fa-eye-slash {
+            display: inline
+        }
+        .fa-eye {
+            display: none
+        }
+    }
+}
 .red-ui-tab-close {
     display: none;
     background: $tab-background-inactive;

packages/node_modules/@node-red/editor-client/src/tours/first-flow.js

@@ -1,14 +1,23 @@
 export default {
     steps: [
         {
-            title: "Create your first flow",
+            title: {
+                'en-US': 'Create your first flow',
+                'ja': 'はじめてのフローを作成'
+            },
             width: 400,
-            description: 'This tutorial will guide you through creating your first flow',
+            description: {
+                'en-US': 'This tutorial will guide you through creating your first flow',
+                'ja': '本チュートリアルでは、はじめてのフローを作成する方法について説明します。'
+            },
             nextButton: 'start'
         },
         {
             element: "#red-ui-workspace .red-ui-tab-button.red-ui-tabs-add",
-            description: 'To add a new tab, click the <i class="fa fa-plus"></i> button',
+            description: {
+                'en-US': 'To add a new tab, click the <i class="fa fa-plus"></i> button',
+                'ja': '新しいタブを追加するため、 <i class="fa fa-plus"></i> ボタンをクリックします。'
+            },
             wait: {
                 type: "dom-event",
                 event: "click",
@@ -18,7 +27,10 @@ export default {
         {
             element: '.red-ui-palette-node[data-palette-type="inject"]',
             direction: 'right',
-            description: 'The palette lists all of the nodes available to use. Drag a new Inject node into the workspace.',
+            description: {
+                'en-US': 'The palette lists all of the nodes available to use. Drag a new Inject node into the workspace.',
+                'ja': 'パレットには、利用できる全てのノードが一覧表示されます。injectノードをワークスペースにドラッグします。'
+            },
             fallback: 'inset-bottom-right',
             wait: {
                 type: "nr-event",
@@ -38,7 +50,10 @@ export default {
         {
             element: '.red-ui-palette-node[data-palette-type="debug"]',
             direction: 'right',
-            description: 'Next, drag a new Debug node into the workspace.',
+            description: {
+                'en-US': 'Next, drag a new Debug node into the workspace.',
+                'ja': '次に、debugノードをワークスペースにドラッグします。'
+            },
             fallback: 'inset-bottom-right',
             wait: {
                 type: "nr-event",
@@ -57,7 +72,10 @@ export default {
         },
         {
             element: function() { return $("#"+this.injectNode.id+" .red-ui-flow-port") },
-            description: 'Add a wire from the output of the Inject node to the input of the Debug node',
+            description: {
+                'en-US': 'Add a wire from the output of the Inject node to the input of the Debug node',
+                'ja': 'injectノードの出力から、debugノードの入力へワイヤーで接続します。'
+            },
             fallback: 'inset-bottom-right',
             wait: {
                 type: "nr-event",
@@ -69,7 +87,10 @@ export default {
         },
         {
             element: "#red-ui-header-button-deploy",
-            description: 'Deploy your changes so the flow is active in the runtime',
+            description: {
+                'en-US': 'Deploy your changes so the flow is active in the runtime',
+                'ja': 'フローをランタイムで実行させるため、変更をデプロイします。'
+            },
             width: 200,
             wait: {
                 type: "dom-event",

packages/node_modules/@node-red/editor-client/src/tours/welcome.js

@@ -3,48 +3,79 @@ export default {
     steps: [
         {
             titleIcon: "fa fa-map-o",
-            title: { "en-US": "Welcome to Node-RED 2.1!" },
-            description: { "en-US": "Let's take a moment to discover the new features in this release." }
+            title: {
+                "en-US": "Welcome to Node-RED 2.1!",
+                "ja": "Node-RED 2.1へようこそ!"
+        },
+            description: {
+                "en-US": "Let's take a moment to discover the new features in this release.",
+                "ja": "本リリースの新機能を見つけてみましょう。"
+            }
         },
         {
-            title: { "en-US": "A new Tour Guide" },
-            description: { "en-US": "<p>First, as you've already found, we now have this tour of new features. We'll only show the tour the first time you open the editor for each new version of Node-RED.</p>"+
-                         "<p>You can choose not to see this tour in the future by disabling it under the View tab of User Settings.</p>" }
+            title: {
+                "en-US": "A new Tour Guide",
+                "ja": "新しいツアーガイド"
+            },
+            description: {
+                "en-US": "<p>First, as you've already found, we now have this tour of new features. We'll only show the tour the first time you open the editor for each new version of Node-RED.</p>" +
+                         "<p>You can choose not to see this tour in the future by disabling it under the View tab of User Settings.</p>",
+                "ja": "<p>最初に、既に見つけている様に、新機能の本ツアーがあります。本ツアーは、新バージョンのNode-REDフローエディタを初めて開いた時のみ表示されます。</p>" +
+                      "<p>ユーザ設定の表示タブの中で、この機能を無効化することで、本ツアーを表示しないようにすることもできます。</p>"
+            }
         },
         {
-            title: { "en-US": "New Edit menu" },
+            title: {
+                "en-US": "New Edit menu",
+                "ja": "新しい編集メニュー"
+            },
             prepare() {
                 $("#red-ui-header-button-sidemenu").trigger("click");
-                $("#menu-item-edit-menu").parent().addClass("open")
+                $("#menu-item-edit-menu").parent().addClass("open");
             },
             complete() {
-                $("#menu-item-edit-menu").parent().removeClass("open")
+                $("#menu-item-edit-menu").parent().removeClass("open");
             },
             element: "#menu-item-edit-menu-submenu",
             interactive: false,
             direction: "left",
-            description: { "en-US": "<p>The main menu has been updated with a new 'Edit' section. This includes all of the familar options, like cut/paste and undo/redo.</p>"+
-                         "<p>The menu now displays keyboard shortcuts for the options.</p>" }
-
+            description: {
+                "en-US": "<p>The main menu has been updated with a new 'Edit' section. This includes all of the familar options, like cut/paste and undo/redo.</p>" +
+                         "<p>The menu now displays keyboard shortcuts for the options.</p>",
+                "ja": "<p>メインメニューに「編集」セクションが追加されました。本セクションには、切り取り/貼り付けや、変更操作を戻す/やり直しの様な使い慣れたオプションが含まれています。</p>" +
+                      "<p>本メニューには、オプションのためのキーボードショートカットも表示されるようになりました。</p>"
+            }
         },
         {
-            title: { "en-US": "Arranging nodes" },
+            title: {
+                "en-US": "Arranging nodes",
+                "ja": "ノードの配置"
+            },
             prepare() {
                 $("#red-ui-header-button-sidemenu").trigger("click");
-                $("#menu-item-arrange-menu").parent().addClass("open")
+                $("#menu-item-arrange-menu").parent().addClass("open");
             },
             complete() {
-                $("#menu-item-arrange-menu").parent().removeClass("open")
+                $("#menu-item-arrange-menu").parent().removeClass("open");
             },
             element: "#menu-item-arrange-menu-submenu",
             interactive: false,
             direction: "left",
-            description: { "en-US": "<p>The new 'Arrange' section of the menu provides new options to help arrange your nodes. You can align them to a common edge, spread them out evenly or change their order.</p>" },
+            description: {
+                "en-US": "<p>The new 'Arrange' section of the menu provides new options to help arrange your nodes. You can align them to a common edge, spread them out evenly or change their order.</p>",
+                "ja": "<p>メニューの新しい「配置」セクションには、ノードの配置を助ける新しいオプションが提供されています。ノードの端を揃えたり、均等に配置したり、表示順序を変更したりできます。</p>"
+            }
         },
         {
-            title: { "en-US": "Hiding tabs" },
+            title: {
+                "en-US": "Hiding tabs",
+                "ja": "タブの非表示"
+            },
             element: "#red-ui-workspace-tabs > li.active",
-            description: { "en-US": '<p>Tabs can now be hidden by clicking their <i class="fa fa-times"></i> icon.</p><p>The Info Sidebar will still list all of your tabs, and tell you which ones are currently hidden.' },
+            description: {
+                "en-US": '<p>Tabs can now be hidden by clicking their <i class="fa fa-eye-slash"></i> icon.</p><p>The Info Sidebar will still list all of your tabs, and tell you which ones are currently hidden.',
+                "ja": '<p><i class="fa fa-eye-slash"></i> アイコンをクリックすることで、タブを非表示にできます。</p><p>情報サイドバーには、全てのタブが一覧表示されており、現在非表示になっているタブを確認できます。'
+            },
             interactive: false,
             prepare() {
                 $("#red-ui-workspace-tabs > li.active .red-ui-tab-close").css("display","block");
@@ -54,9 +85,15 @@ export default {
             }
         },
         {
-            title: { "en-US": "Tab menu" },
+            title: {
+                "en-US": "Tab menu",
+                "ja": "タブメニュー"
+            },
             element: "#red-ui-workspace-tabs-menu",
-            description: { "en-US": '<p>The new tab menu also provides lots of new options for your tabs.</p>' },
+            description: {
+                "en-US": "<p>The new tab menu also provides lots of new options for your tabs.</p>",
+                "ja": "<p>新しいタブメニューには、タブに関する沢山の新しいオプションが提供されています。</p>"
+            },
             interactive: false,
             direction: "left",
             prepare() {
@@ -67,10 +104,16 @@ export default {
             }
         },
         {
-            title: { "en-US": "Flow and Group level environment variables" },
+            title: {
+                "en-US": "Flow and Group level environment variables",
+                "ja": "フローとグループの環境変数"
+            },
             element: "#red-ui-workspace-tabs > li.active",
             interactive: false,
-            description: { "en-US": "<p>Flows and Groups can now have their own environment variables that can be referenced by nodes inside them.</p>" },
+            description: {
+                "en-US": "<p>Flows and Groups can now have their own environment variables that can be referenced by nodes inside them.</p>",
+                "ja": "<p>フローとグループには、内部のノードから参照できる環境変数を設定できるようになりました。</p>"
+            }
         },
         {
             prepare(done) {
@@ -78,20 +121,28 @@ export default {
                 setTimeout(done,700);
             },
             element: "#red-ui-tab-editor-tab-envProperties-link-button",
-            description: { "en-US": "<p>Their edit dialogs have a new Environment Variables section.</p>" },
+            description: {
+                "en-US": "<p>Their edit dialogs have a new Environment Variables section.</p>",
+                "ja": "<p>編集ダイアログに環境変数セクションが追加されました。</p>"
+            }
         },
         {
             element: ".node-input-env-container-row",
             direction: "left",
-            description: { "en-US": '<p>The environment variables are listed in this table and new ones can be added by clicking the <i class="fa fa-plus"></i> button.</p>' },
+            description: {
+                "en-US": '<p>The environment variables are listed in this table and new ones can be added by clicking the <i class="fa fa-plus"></i> button.</p>',
+                "ja": '<p>この表に環境変数が一覧表示されており、<i class="fa fa-plus"></i>ボタンをクリックすることで新しい変数を追加できます。</p>'
+            },
             complete(done) {
                 $("#node-dialog-cancel").trigger("click");
                 setTimeout(done,500);
             }
         },
-
         {
-            title: {"en-US":"Link Call node added"},
+            title: {
+                "en-US": "Link Call node added",
+                "ja": "Link Callノードを追加"
+            },
             prepare(done) {
                 this.paletteWasClosed = $("#red-ui-main-container").hasClass("red-ui-palette-closed");
                 RED.actions.invoke("core:toggle-palette",true)
@@ -100,22 +151,34 @@ export default {
             },
             element: '[data-palette-type="link call"]',
             direction: "right",
-            description: { "en-US": '<p>The <code>Link Call</code> node lets you call another flow that begins with a <code>Link In</code> node and get the result back when the message reaches a <code>Link Out</code> node.</p>' },
+            description: {
+                "en-US": "<p>The <code>Link Call</code> node lets you call another flow that begins with a <code>Link In</code> node and get the result back when the message reaches a <code>Link Out</code> node.</p>",
+                "ja": "<p><code>Link Call</code>ノードを用いることで、<code>Link In</code>ノードから始まるフローを呼び出し、<code>Link Out</code>ノードに到達した時に、結果を取得できます。</p>"
+            }
         },
         {
-            title: {"en-US":"MQTT nodes support dynamic connections"},
+            title: {
+              "en-US": "MQTT nodes support dynamic connections",
+              "ja": "MQTTノードが動的接続をサポート"
+            },
             prepare(done) {
                 $('[data-palette-type="mqtt out"]')[0].scrollIntoView({block:"center"})
                 setTimeout(done,100);
             },
             element: '[data-palette-type="mqtt out"]',
             direction: "right",
-            description: { "en-US": '<p>The <code>MQTT</code> nodes now support creating their connections and subscriptions dynamically.</p>' },
+            description: {
+              "en-US": '<p>The <code>MQTT</code> nodes now support creating their connections and subscriptions dynamically.</p>',
+              "ja": '<p><code>MQTT</code>ノードは、動的な接続や購読ができるようになりました。</p>'
+            },
         },
         {
-            title: {"en-US":"File nodes renamed"},
+            title: {
+                "en-US": "File nodes renamed",
+                "ja": "ファイルノードの名前変更"
+            },
             prepare(done) {
-                $('[data-palette-type="file"]')[0].scrollIntoView({block:"center"})
+                $('[data-palette-type="file"]')[0].scrollIntoView({block:"center"});
                 setTimeout(done,100);
             },
             complete() {
@@ -125,13 +188,19 @@ export default {
             },
             element: '[data-palette-type="file"]',
             direction: "right",
-            description: { "en-US": '<p>The file nodes have been renamed to make it clearer which node does what.</p>' },
+            description: {
+                "en-US": "<p>The file nodes have been renamed to make it clearer which node does what.</p>",
+                "ja": "<p>fileノードの名前が変更され、どのノードが何を行うかが明確になりました。</p>"
+            }
         },
         {
-            title: {"en-US":"Deep copy option on Change node"},
+            title: {
+                "en-US": "Deep copy option on Change node",
+                "ja": "Changeノードのディープコピーオプション"
+            },
             prepare(done) {
-                var def = RED.nodes.getType('change')
-                RED.editor.edit({id:"test",type:"change",rules:[{t:'set',p:'payload',pt:'msg', tot:'msg',to:"anotherProperty"}],_def:def, _:def._})
+                var def = RED.nodes.getType('change');
+                RED.editor.edit({id:"test",type:"change",rules:[{t:"set",p:"payload",pt:"msg", tot:"msg",to:"anotherProperty"}],_def:def, _:def._});
                 setTimeout(done,700);
             },
             complete(done) {
@@ -139,13 +208,22 @@ export default {
                 setTimeout(done,500);
             },
             element: function() {
-                return $(".node-input-rule-property-deepCopy").next()
+                return $(".node-input-rule-property-deepCopy").next();
             },
-            description: { "en-US": '<p>The Set rule has a new option to create a deep copy of the value. This ensures a complete copy is made, rather than using a reference.</p>' },
+            description: {
+                "en-US": "<p>The Set rule has a new option to create a deep copy of the value. This ensures a complete copy is made, rather than using a reference.</p>",
+                "ja": "<p>値を代入に、値のディープコピーを作成するオプションが追加されました。これによって参照ではなく、完全なコピーが作成されます。</p>"
+            }
         },
         {
-            title: { "en-US": "And that's not all..." },
-            description: { "en-US": "<p>There are many more smaller changes, including:</p><ul><li>Auto-complete suggestions in the <code>msg</code> TypedInput.</li><li>Support for <code>msg.resetTimeout</code> in the <code>Join</code> node.</li><li>Pushing messages to the front of the queue in the <code>Delay</code> node's rate limiting mode.</li><li>An optional second output on the <code>Delay</code> node for rate limited messages.</li></ul>" }
+            title: {
+                "en-US": "And that's not all...",
+                "ja": "これが全てではありません..."
+            },
+            description: {
+                "en-US": "<p>There are many more smaller changes, including:</p><ul><li>Auto-complete suggestions in the <code>msg</code> TypedInput.</li><li>Support for <code>msg.resetTimeout</code> in the <code>Join</code> node.</li><li>Pushing messages to the front of the queue in the <code>Delay</code> node's rate limiting mode.</li><li>An optional second output on the <code>Delay</code> node for rate limited messages.</li></ul>",
+                "ja": "<p>以下の様な小さな変更が沢山あります:</p><ul><li><code>msg</code> TypedInputの自動補完提案</li><li><code>Join</code>ノードで<code>msg.resetTimeout</code>のサポート</li><li><code>Delay</code>ノードの流量制御モードにおいて先頭メッセージをキューに追加</li><li><code>Delay</code>ノードで流量制限されたメッセージ向けの任意の2つ目の出力</li></ul>"
+            }
         }
     ]
 }

packages/node_modules/@node-red/nodes/core/common/20-inject.html

@@ -690,9 +690,9 @@
             this.topic = "";
             var result = getProps(items, true);
             this.props = result.props;
-            if(result.payloadType) { this.payloadType = result.payloadType; };
-            if(result.payload) { this.payload = result.payload; };
-            if(result.topic) { this.topic = result.topic; };
+            if(result.hasOwnProperty('payloadType')) { this.payloadType = result.payloadType; };
+            if(result.hasOwnProperty('payload')) { this.payload = result.payload; };
+            if(result.hasOwnProperty('topic')) { this.topic = result.topic; };
         },
         button: {
             enabled: function() {

packages/node_modules/@node-red/nodes/core/common/21-debug.js

@@ -280,6 +280,18 @@ module.exports = function(RED) {
             root: path.join(__dirname,"lib","debug"),
             dotfiles: 'deny'
         };
-        res.sendFile(req.params[0], options);
+        try {
+            res.sendFile(
+                req.params[0],
+                options,
+                 err => {
+                    if (err) {
+                        res.sendStatus(404);
+                    }
+                }
+            )
+        } catch(err) {
+            res.sendStatus(404);
+        }
     });
 };

packages/node_modules/@node-red/nodes/core/function/10-function.html

@@ -512,6 +512,7 @@
                 return function(e) {
                     e.preventDefault();
                     var value = editor.getValue();
+                    var extraLibs = that.libs || [];
                     RED.editor.editJavaScript({
                         value: value,
                         width: "Infinity",
@@ -523,7 +524,8 @@
                             setTimeout(function() {
                                 editor.focus();
                             },300);
-                        }
+                        },
+                        extraLibs: extraLibs
                     })
                 }
             }

packages/node_modules/@node-red/nodes/core/function/10-function.js

@@ -234,8 +234,7 @@ module.exports = function(RED) {
             },
             env: {
                 get: function(envVar) {
-                    var flow = node._flow;
-                    return flow.getSetting(envVar);
+                    return RED.util.getSetting(node, envVar);
                 }
             },
             setTimeout: function () {

packages/node_modules/@node-red/nodes/core/function/89-delay.js

@@ -372,6 +372,7 @@ module.exports = function(RED) {
                 hit = false;
                 for (var b in node.buffer) { // check if already in queue
                     if (msg.topic === node.buffer[b].msg.topic) {
+                        if (node.outputs === 2) { send([null,node.buffer[b].msg]) }
                         node.buffer[b].done();
                         node.buffer[b] = {msg, send, done}; // if so - replace existing entry
                         hit = true;

packages/node_modules/@node-red/nodes/core/function/rbe.js

@@ -58,7 +58,7 @@ module.exports = function(RED) {
                 else {
                     var n = parseFloat(value);
                     if (!isNaN(n)) {
-                        if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband")) {
+                        if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband" || this.func === "narrowbandEq")) {
                             if (node.start === '') { node.previous[t] = n; }
                             else { node.previous[t] = node.start; }
                         }

packages/node_modules/@node-red/nodes/core/network/21-httprequest.js

@@ -302,6 +302,8 @@ in your Node-RED user directory (${RED.settings.userDir}).
                     // var cred = ""
                     if (this.credentials.user || this.credentials.password) {
                         // cred = `${this.credentials.user}:${this.credentials.password}`;
+                        if (this.credentials.user === undefined) { this.credentials.user = ""}
+                        if (this.credentials.password === undefined) { this.credentials.password = ""}
                         opts.headers.Authorization = "Basic " + Buffer.from(`${this.credentials.user}:${this.credentials.password}`).toString("base64");
                     }
                     // build own basic auth header

packages/node_modules/@node-red/nodes/examples/storage/read file/01 - Read string from a file.json

@@ -2,7 +2,7 @@
     {
         "id": "84222b92.d65d18",
         "type": "inject",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "Hello, World!",
         "payloadType": "str",
-        "x": 230,
-        "y": 220,
+        "x": 190,
+        "y": 180,
         "wires": [
             [
                 "b4b9f603.739598"
@@ -31,25 +31,25 @@
     {
         "id": "7b014430.dfd94c",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "Write string to a file, then read from the file",
-        "info": "File-in node can read string from a file.",
-        "x": 260,
-        "y": 140,
+        "info": "Read file node can read string from a file.",
+        "x": 220,
+        "y": 100,
         "wires": []
     },
     {
         "id": "b4b9f603.739598",
         "type": "file",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 420,
-        "y": 220,
+        "x": 380,
+        "y": 180,
         "wires": [
             [
                 "6dc01cac.5c4bf4"
@@ -59,7 +59,7 @@
     {
         "id": "2587adb9.7e60f2",
         "type": "debug",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 810,
-        "y": 220,
+        "x": 770,
+        "y": 180,
         "wires": []
     },
     {
         "id": "6dc01cac.5c4bf4",
         "type": "file in",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 620,
-        "y": 220,
+        "x": 580,
+        "y": 180,
         "wires": [
             [
                 "2587adb9.7e60f2"
@@ -93,21 +93,21 @@
     {
         "id": "f4b4309a.3b78a",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↑read result from file",
         "info": "",
-        "x": 630,
-        "y": 260,
+        "x": 590,
+        "y": 220,
         "wires": []
     },
     {
         "id": "672d3693.3cabd8",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 440,
-        "y": 180,
+        "x": 400,
+        "y": 140,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/read file/02 - Read data in specified encoding.json

@@ -2,7 +2,7 @@
     {
         "id": "8997398f.c5d628",
         "type": "inject",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "😀",
         "payloadType": "str",
-        "x": 210,
-        "y": 480,
+        "x": 170,
+        "y": 260,
         "wires": [
             [
                 "56e32d23.050f44"
@@ -31,25 +31,25 @@
     {
         "id": "4e598e65.1799d",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "Read data in specified encoding",
-        "info": "File-in node can specify encoding of data read from a file.",
-        "x": 230,
-        "y": 400,
+        "info": "Read file node can specify encoding of data read from a file.",
+        "x": 190,
+        "y": 180,
         "wires": []
     },
     {
         "id": "56e32d23.050f44",
         "type": "file",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 380,
-        "y": 480,
+        "x": 340,
+        "y": 260,
         "wires": [
             [
                 "38fa0579.f2cd8a"
@@ -59,7 +59,7 @@
     {
         "id": "d28c8994.99c0a8",
         "type": "debug",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,23 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 770,
-        "y": 480,
+        "x": 730,
+        "y": 260,
         "wires": []
     },
     {
         "id": "38fa0579.f2cd8a",
         "type": "file in",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "base64",
-        "x": 580,
-        "y": 480,
+        "allProps": false,
+        "x": 540,
+        "y": 260,
         "wires": [
             [
                 "d28c8994.99c0a8"
@@ -93,21 +94,21 @@
     {
         "id": "fa22ca20.ae4528",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↑read data from file as base64 string",
         "info": "",
-        "x": 640,
-        "y": 520,
+        "x": 600,
+        "y": 300,
         "wires": []
     },
     {
         "id": "148e25ad.98891a",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 400,
-        "y": 440,
+        "x": 360,
+        "y": 220,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/read file/03 - Read data breaking lines into messages.json

@@ -2,7 +2,7 @@
     {
         "id": "6a0b1d03.d4cee4",
         "type": "inject",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 220,
-        "y": 740,
+        "x": 160,
+        "y": 220,
         "wires": [
             [
                 "d4b00cb7.a5a23"
@@ -31,25 +31,25 @@
     {
         "id": "f17ea1d1.8ecc3",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "Read data breaking lines into individual messages",
-        "info": "File-in node can break read text into messages with individual lines",
-        "x": 290,
-        "y": 660,
+        "info": "Read file node can break read text into messages with individual lines",
+        "x": 230,
+        "y": 140,
         "wires": []
     },
     {
         "id": "99ae7806.1d6428",
         "type": "file",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 540,
-        "y": 740,
+        "x": 480,
+        "y": 220,
         "wires": [
             [
                 "70d7892f.d27db8"
@@ -59,7 +59,7 @@
     {
         "id": "7ed8282c.92b338",
         "type": "debug",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 810,
-        "y": 800,
+        "x": 750,
+        "y": 280,
         "wires": []
     },
     {
         "id": "70d7892f.d27db8",
         "type": "file in",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "lines",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 620,
-        "y": 800,
+        "x": 560,
+        "y": 280,
         "wires": [
             [
                 "7ed8282c.92b338"
@@ -93,27 +93,27 @@
     {
         "id": "c1b7e05.1d94b2",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↑read data from file breaking lines into messages",
         "info": "",
-        "x": 720,
-        "y": 840,
+        "x": 660,
+        "y": 320,
         "wires": []
     },
     {
         "id": "a5f647b2.cf27a8",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 560,
-        "y": 700,
+        "x": 500,
+        "y": 180,
         "wires": []
     },
     {
         "id": "d4b00cb7.a5a23",
         "type": "template",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "data",
         "field": "payload",
         "fieldType": "msg",
@@ -121,8 +121,8 @@
         "syntax": "plain",
         "template": "one\ntwo\nthree!",
         "output": "str",
-        "x": 370,
-        "y": 740,
+        "x": 310,
+        "y": 220,
         "wires": [
             [
                 "99ae7806.1d6428"

packages/node_modules/@node-red/nodes/examples/storage/read file/04 - Create a message stream.json

@@ -2,7 +2,7 @@
     {
         "id": "bdd57acc.2edc48",
         "type": "inject",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 220,
-        "y": 1040,
+        "x": 180,
+        "y": 220,
         "wires": [
             [
                 "7a069b01.0c2324"
@@ -31,25 +31,25 @@
     {
         "id": "1fd12220.33953e",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "Creating a message stream from lines of data",
-        "info": "File-in node can break read text into messages with individual lines.  The messages creates a stream of messages.",
-        "x": 270,
-        "y": 960,
+        "info": "Read file node can break read text into messages with individual lines.  The messages creates a stream of messages.",
+        "x": 230,
+        "y": 140,
         "wires": []
     },
     {
         "id": "ab6eb213.2a08d",
         "type": "file",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 540,
-        "y": 1040,
+        "x": 500,
+        "y": 220,
         "wires": [
             [
                 "b7ed49b0.649fb8"
@@ -59,7 +59,7 @@
     {
         "id": "c48d8ae0.9ff3a8",
         "type": "debug",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 810,
-        "y": 1140,
+        "x": 770,
+        "y": 320,
         "wires": []
     },
     {
         "id": "b7ed49b0.649fb8",
         "type": "file in",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "lines",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 280,
-        "y": 1140,
+        "x": 240,
+        "y": 320,
         "wires": [
             [
                 "83073ebe.fcce4"
@@ -93,27 +93,27 @@
     {
         "id": "3c33e69f.6a04ba",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↑read data from file breaking lines into messages",
         "info": "",
-        "x": 380,
-        "y": 1180,
+        "x": 340,
+        "y": 360,
         "wires": []
     },
     {
         "id": "3598bf7d.5712a",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 560,
-        "y": 1000,
+        "x": 520,
+        "y": 180,
         "wires": []
     },
     {
         "id": "7a069b01.0c2324",
         "type": "template",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "data",
         "field": "payload",
         "fieldType": "msg",
@@ -121,8 +121,8 @@
         "syntax": "plain",
         "template": "Apple\nBanana\nGrape\nOrange",
         "output": "str",
-        "x": 370,
-        "y": 1040,
+        "x": 330,
+        "y": 220,
         "wires": [
             [
                 "ab6eb213.2a08d"
@@ -132,7 +132,7 @@
     {
         "id": "8d4ed1d0.821fe",
         "type": "join",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "",
         "mode": "auto",
         "build": "string",
@@ -145,8 +145,8 @@
         "timeout": "",
         "count": "",
         "reduceRight": false,
-        "x": 630,
-        "y": 1140,
+        "x": 590,
+        "y": 320,
         "wires": [
             [
                 "c48d8ae0.9ff3a8"
@@ -156,7 +156,7 @@
     {
         "id": "83073ebe.fcce4",
         "type": "switch",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "< D",
         "property": "payload",
         "propertyType": "msg",
@@ -170,8 +170,8 @@
         "checkall": "true",
         "repair": true,
         "outputs": 1,
-        "x": 470,
-        "y": 1140,
+        "x": 430,
+        "y": 320,
         "wires": [
             [
                 "8d4ed1d0.821fe"
@@ -181,21 +181,21 @@
     {
         "id": "2088e195.f7aebe",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↓filter data before \"D\"",
         "info": "",
-        "x": 520,
-        "y": 1100,
+        "x": 480,
+        "y": 280,
         "wires": []
     },
     {
         "id": "b848cdc7.61e06",
         "type": "comment",
-        "z": "194a3e4f.a92772",
+        "z": "6312c0588348b2d4",
         "name": "↑join to single string",
         "info": "",
-        "x": 670,
-        "y": 1180,
+        "x": 630,
+        "y": 360,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/write file/01 - Write string to a file.json

@@ -2,7 +2,7 @@
     {
         "id": "84222b92.d65d18",
         "type": "inject",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "Hello, World!",
         "payloadType": "str",
-        "x": 230,
-        "y": 200,
+        "x": 150,
+        "y": 220,
         "wires": [
             [
                 "b4b9f603.739598"
@@ -31,25 +31,25 @@
     {
         "id": "7b014430.dfd94c",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "Write string to a file, then read from the file",
-        "info": "File node can write string to a file.",
-        "x": 260,
-        "y": 120,
+        "info": "Write file node can write string from a file.",
+        "x": 180,
+        "y": 140,
         "wires": []
     },
     {
         "id": "b4b9f603.739598",
         "type": "file",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 420,
-        "y": 200,
+        "x": 340,
+        "y": 220,
         "wires": [
             [
                 "6dc01cac.5c4bf4"
@@ -59,7 +59,7 @@
     {
         "id": "2587adb9.7e60f2",
         "type": "debug",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 810,
-        "y": 200,
+        "x": 730,
+        "y": 220,
         "wires": []
     },
     {
         "id": "6dc01cac.5c4bf4",
         "type": "file in",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 620,
-        "y": 200,
+        "x": 540,
+        "y": 220,
         "wires": [
             [
                 "2587adb9.7e60f2"
@@ -93,21 +93,21 @@
     {
         "id": "f4b4309a.3b78a",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "↑read result from file",
         "info": "",
-        "x": 630,
-        "y": 240,
+        "x": 550,
+        "y": 260,
         "wires": []
     },
     {
         "id": "672d3693.3cabd8",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "5132b95f037524f9",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 440,
-        "y": 160,
+        "x": 360,
+        "y": 180,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/write file/02 - Write string to a file specified by property.json

@@ -2,7 +2,7 @@
     {
         "id": "704479e1.399388",
         "type": "inject",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -25,8 +25,8 @@
         "topic": "",
         "payload": "Hello, World!",
         "payloadType": "str",
-        "x": 230,
-        "y": 400,
+        "x": 190,
+        "y": 260,
         "wires": [
             [
                 "402f3b7e.988014"
@@ -36,25 +36,25 @@
     {
         "id": "8e876a75.e9beb8",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "Write string to a file specied by filename property, the read from the file",
-        "info": "File node can target file using `filename` property.",
-        "x": 350,
-        "y": 320,
+        "info": "Write file node can target file using `filename` property.",
+        "x": 310,
+        "y": 180,
         "wires": []
     },
     {
         "id": "402f3b7e.988014",
         "type": "file",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 390,
-        "y": 400,
+        "x": 350,
+        "y": 260,
         "wires": [
             [
                 "26e077d6.bbcd98"
@@ -64,7 +64,7 @@
     {
         "id": "97b6b6b2.a54b38",
         "type": "debug",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -73,22 +73,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 770,
-        "y": 400,
+        "x": 730,
+        "y": 260,
         "wires": []
     },
     {
         "id": "26e077d6.bbcd98",
         "type": "file in",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 580,
-        "y": 400,
+        "x": 540,
+        "y": 260,
         "wires": [
             [
                 "97b6b6b2.a54b38"
@@ -98,21 +98,21 @@
     {
         "id": "85062297.da79",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↑read result from file",
         "info": "",
-        "x": 590,
-        "y": 440,
+        "x": 550,
+        "y": 300,
         "wires": []
     },
     {
         "id": "7316c4fc.b1dcdc",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↓write to file specified by filename property",
         "info": "",
-        "x": 500,
-        "y": 360,
+        "x": 460,
+        "y": 220,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/write file/03 - Delete a file.json

@@ -2,7 +2,7 @@
     {
         "id": "4ac00fb0.d5f52",
         "type": "inject",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 220,
-        "y": 600,
+        "x": 180,
+        "y": 220,
         "wires": [
             [
                 "542cc2f4.92857c"
@@ -31,25 +31,25 @@
     {
         "id": "671f8295.0e6f6c",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "Delete a file",
-        "info": "File node can delete a file.",
-        "x": 170,
-        "y": 540,
+        "info": "Write file node can delete a file.",
+        "x": 130,
+        "y": 160,
         "wires": []
     },
     {
         "id": "542cc2f4.92857c",
         "type": "file",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "delete",
         "encoding": "none",
-        "x": 420,
-        "y": 600,
+        "x": 380,
+        "y": 220,
         "wires": [
             [
                 "a24da523.5babe8"
@@ -59,7 +59,7 @@
     {
         "id": "a24da523.5babe8",
         "type": "debug",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,18 +68,18 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 630,
-        "y": 600,
+        "x": 590,
+        "y": 220,
         "wires": []
     },
     {
         "id": "51157051.2f62",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↓delete a file",
         "info": "",
-        "x": 390,
-        "y": 560,
+        "x": 350,
+        "y": 180,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/examples/storage/write file/04 - Specify encoding of written data.json

@@ -2,8 +2,8 @@
     {
         "id": "e4ef1f5e.7cd82",
         "type": "inject",
-        "z": "4b63452d.672afc",
-        "name": "",
+        "z": "6312c0588348b2d4",
+        "name": "Base64 encoded string",
         "props": [
             {
                 "p": "payload"
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "8J+YgA==",
         "payloadType": "str",
-        "x": 220,
-        "y": 820,
+        "x": 200,
+        "y": 220,
         "wires": [
             [
                 "72b37cc8.177054"
@@ -31,25 +31,25 @@
     {
         "id": "f5997af4.5a9298",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "Specify encoding of written data",
-        "info": "File node can specify encoding of data.",
-        "x": 230,
-        "y": 740,
+        "info": "Write file node can specify encoding of data.",
+        "x": 170,
+        "y": 140,
         "wires": []
     },
     {
         "id": "72b37cc8.177054",
         "type": "file",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "base64",
-        "x": 400,
-        "y": 820,
+        "x": 420,
+        "y": 220,
         "wires": [
             [
                 "2da33ec.f45cac2"
@@ -59,7 +59,7 @@
     {
         "id": "2e814354.278c8c",
         "type": "debug",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 790,
-        "y": 820,
+        "x": 810,
+        "y": 220,
         "wires": []
     },
     {
         "id": "2da33ec.f45cac2",
         "type": "file in",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 600,
-        "y": 820,
+        "x": 620,
+        "y": 220,
         "wires": [
             [
                 "2e814354.278c8c"
@@ -93,21 +93,21 @@
     {
         "id": "ec754c99.84bfd",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↓write string with base64 encoding",
         "info": "",
-        "x": 460,
-        "y": 780,
+        "x": 480,
+        "y": 180,
         "wires": []
     },
     {
         "id": "3e6704ff.4ce25c",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↑read result from file",
         "info": "",
-        "x": 610,
-        "y": 860,
+        "x": 630,
+        "y": 260,
         "wires": []
     }
 ]

packages/node_modules/@node-red/nodes/locales/de/messages.json

@@ -851,7 +851,6 @@
             "outputas": "Ausgabe",
             "breakchunks": "In Chunks aufteilen",
             "breaklines": "In Linien aufteilen",
-            "filelabel": "file",
             "sendError": "Nachricht bei Fehler senden (herkömmlicher Modus)",
             "encoding": "Kodierung",
             "deletelabel": "lösche __file__",

packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html

@@ -21,7 +21,7 @@
         <dt>msg <span class="property-type">object</span></dt>
         <dd>A msg object containing information to populate the template.</dd>
         <dt class="optional">template <span class="property-type">string</span></dt>
-        <dd>A template to be populated from msg.payload. If not configured in the edit panel,
+        <dd>A template to be populated from <code>msg.payload</code>. If not configured in the edit panel,
          this can be set as a property of msg.</dd>
     </dl>
     <h3>Outputs</h3>

packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html

@@ -60,5 +60,5 @@
         for the next topic.
     </p>
     <p><b>Note</b>: In rate limit mode the maximum queue depth can be set by a property in your
-        <i>settings.js</i> file. For example <code>nodeMessageBufferMaxLength: 1000,</code>
+        <i>settings.js</i> file. For example <code>nodeMessageBufferMaxLength: 1000,</code></p>
 </script>

packages/node_modules/@node-red/nodes/locales/en-US/function/rbe.html

@@ -25,7 +25,7 @@
     <h3>Details</h3>
     <p>In RBE mode this node will block until the <code>msg.payload</code>,
        (or selected property) value is different to the previous one.
-       If required it can ignore the intial value, so as not to send anything at start.</p>
+       If required it can ignore the initial value, so as not to send anything at start.</p>
     <p>The <a href="https://en.wikipedia.org/wiki/Deadband" target="_blank">Deadband</a> modes will block the incoming value
        <i>unless</i> its change is greater or greater-equal than &plusmn; the band gap away from a previous value.</p>
     <p>The Narrowband modes will block the incoming value,
@@ -37,5 +37,5 @@
     ignoring any values out of range, or the previous input value, which resets the set point, thus allowing
     gradual drift (deadband), or a step change (narrowband).</p>
     <p><b>Note:</b> This works on a per <code>msg.topic</code> basis, though this can be changed to another property if desired.
-       This means that a single rbe node can handle multiple different topics at the same time.</p>
+       This means that a single filter node can handle multiple different topics at the same time.</p>
 </script>

packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html

@@ -52,7 +52,7 @@
        <dt class="optional">topic <span class="property-type">string|object|array</span></dt>
        <dd>For the <code>"subscribe"</code> and <code>"unsubscribe"</code> actions, this property
            provides the topic. It can be set as either:<ul>
-           <li>a String continaing the topic filter</li>
+           <li>a String containing the topic filter</li>
            <li>an Object containing <code>topic</code> and <code>qos</code> properties</li>
            <li>an array of either strings or objects to handle multiple topics in one</li>
             </ul>

packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html

@@ -52,7 +52,7 @@
         <dd>In case any redirects occurred while processing the request, this property is the final redirected url.
             Otherwise, the url of the original request.</dd>
         <dt>responseCookies <span class="property-type">object</span></dt>
-        <dd>If the response includes cookies, this propery is an object of name/value pairs for each cookie.</dd>
+        <dd>If the response includes cookies, this property is an object of name/value pairs for each cookie.</dd>
         <dt>redirectList <span class="property-type">array</span></dt>
         <dd>If the request was redirected one or more times, the accumulated information will be added to this property. `location` is the next redirect destination. `cookies` is the cookies returned from the redirect source.</dd>
     </dl>

packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html

@@ -60,7 +60,7 @@
     </p>
     <p>When operating in this mode, the node will not set the <code>msg.parts.count</code>
     property as it does not know how many messages to expect in the stream. This
-    means it cannot be used with the <b>join</b> node in its automatic mode</p>
+    means it cannot be used with the <b>join</b> node in its automatic mode.</p>
 </script>
 
 <script type="text/html" data-help-name="join">

packages/node_modules/@node-red/nodes/locales/ja/common/60-link.html

@@ -29,3 +29,12 @@
     <p>linkノード間のリンクはlinkノードを選択した場合にのみ表示されます。他のタブへのリンクがある場合には、仮想的なノードを表示します。この仮想的ノードをクリックすると、対応するタブに移動できます。</p>
     <p><b>注: </b>サブフローの外から中、もしくは、中から外へのリンクを作成することはできません。</p>
 </script>
+
+<script type="text/html" data-help-name="link call">
+    <p><code>link in</code> で始まり、応答を返すフローを呼び出します。</p>
+    <h3>詳細</h3>
+    <p>本ノードは、任意のタブ内に存在する <code>link in</code> ノードに接続できます。 接続先のフローは、`返却`モードが設定された <code>link out</code> ノードで終了する必要があります。</p>
+    <p>本ノードはメッセージを受信すると、メッセージを接続した <code>link in</code> ノードへ渡します。
+       その後、応答を待った後にメッセージを送信します。</o>
+    <p>もし、設定したタイムアウト(デフォルト30秒)以内に応答がない場合は、<code>catch</code> ノードを用いてエラーをログに記録することもできます。</p>
+</script>

packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html

@@ -46,4 +46,6 @@
     <code>{{global[store].名前}}</code>を用います。
 </p>
     <p><b>注: </b>デフォルトでは、<i>mustache</i>形式は置換対象のHTML要素をエスケープします。これを抑止するには<code>{{{三重}}}</code>括弧形式を使います。</p>
+    <p>もし、コンテンツの中で<code>{{ }}</code>を出力する必要がある場合は、テンプレートで使われる記号文字を変えることもできます。例えば、<code>[[ ]]</code>を代わりに用いるには、テンプレートの先頭に以下の行を追加します。</p>
+    <pre>{{=[[ ]]=}}</pre>
 </script>

packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html

@@ -25,11 +25,14 @@
         <dt class="optional">reset</dt>
         <dd>受信メッセージでこのプロパティを任意の値に設定すると、ノードが保持する全ての未送信メッセージをクリアします。</dd>
         <dt class="optional">flush</dt>
-        <dd>受信メッセージでこのプロパティを任意の値に設定すると、ノードが保持する全ての未送信メッセージを直ちに送信します。</dd>
+        <dd>本プロパティに数値が設定されたメッセージを受信すると、直ちに指定された数のメッセージを送信します。もし他の型(例えば真偽型)が設定されている場合は、ノードが保持している全ての未送信メッセージを直ちに送信します。</dd>
+        <dt class="optional">toFront</dt>
+        <dd>流量制御モードにおいて、本プロパティに真偽型<code>true</code>が設定されたメッセージを受け取ると、キューの先頭に追加され、その後に送信されます。<code>msg.flush=1</code>と組み合わせて用いると、すぐに再送信できます。</dd>
     </dl>
     <h3>詳細</h3>
-    <p>メッセージを遅延させるように設定する場合、遅延時間は固定値、範囲内の乱数値、メッセージ毎の動的な指定値のいずれかを指定できます。</p>
+    <p>メッセージを遅延させるように設定する場合、遅延時間は固定値、範囲内の乱数値、メッセージ毎の動的な指定値のいずれかを指定できます。各メッセージは、到着時刻に基づいて、他のメッセージとは独立して遅延されます。</p>
     <p>流量制御する場合、メッセージは指定した時間間隔内に分散して送信します。キューに残っているメッセージ数はノードのステータスに表示されます。受け取った中間メッセージを破棄することも可能です。</p>
     <p>流量値を上書きできるように設定されている場合、新しい流量値はすぐに適用されます。この流量値は、再度変更されるまで、本ノードがリセットされるまで、またはフローが再実行されるまで有効です。</p>
     <p>流量制御は全てのメッセージに適用することも、<code>msg.topic</code>値でグループ化して適用することも可能です。グループ化すると、中間メッセージは自動的に破棄されます。時間間隔毎に全てのトピックの最新メッセージを送信するか、次のトピックの最新メッセージを送信するかを指定できます。</p>
+    <p><b>注</b>: 流量制御モードでは、キューの大きさの最大値を<i>settings.js</i>ファイルのプロパティに設定できます。例えば、次の様な設定です。<code>nodeMessageBufferMaxLength: 1000,</code></p>
 </script>

packages/node_modules/@node-red/nodes/locales/ja/function/rbe.html

@@ -27,5 +27,5 @@
     <p>不感帯モードでは%による指定もサポートしています。入力と前の値の差分がX%より大きな場合に出力を行います。</p>
     <p>狭帯域(narrowband)モードでは、前の値に対する差分が一定値より大きな場合に入力ペイロードをブロックします。このモードは、故障したセンサから発生する外れ値を無視する時などに有用です。</p>
     <p>不感帯モードと狭帯域モードでは、以前の有効出力値、もしくは、以前の入力値との比較ができます。有効出力値を用いると範囲外の値を無視することが、入力値を用いると設定点がリセットされるため漸次的変化(不感帯モード)もしくは段階的変化(狭帯域モード)が可能です。</p>
-    <p><b>注:</b> このノードは<code>msg.topic</code>毎に動作します。そのため、ひとつのrbeノードで複数の異なるトピックを同時に扱うことができます。</p>
+    <p><b>注:</b> このノードは<code>msg.topic</code>毎に動作します。そのため、ひとつのfilterノードで複数の異なるトピックを同時に扱うことができます。</p>
 </script>

packages/node_modules/@node-red/nodes/locales/ja/messages.json

@@ -144,11 +144,16 @@
             "filterCurrent": "現在のフロー",
             "debugNodes": "debugノード",
             "clearLog": "ログを削除",
+            "clearFilteredLog": "選択したメッセージを削除",
             "filterLog": "ログのフィルタリング",
             "openWindow": "新しいウィンドウで開く",
             "copyPath": "パスをコピー",
             "copyPayload": "値をコピー",
-            "pinPath": "展開を固定"
+            "pinPath": "展開を固定",
+            "selectAll": "全てを選択",
+            "selectNone": "選択を外す",
+            "all": "全て",
+            "filtered": "選択したメッセージ"
         },
         "messageMenu": {
             "collapseAll": "全パスを折りたたむ",
@@ -159,7 +164,15 @@
     },
     "link": {
         "linkIn": "link in",
-        "linkOut": "link out"
+        "linkOut": "link out",
+        "linkCall": "link call",
+        "linkOutReturn": "link return",
+        "outMode": "モード",
+        "sendToAll": "接続された全てのlinkノードへ送信",
+        "returnToCaller": "link callノードへ返却",
+        "error": {
+            "missingReturn": "返却するノードの情報が存在しません"
+        }
     },
     "tls": {
         "tls": "TLS設定",
@@ -282,7 +295,9 @@
         "and": "回／",
         "rate": "流量",
         "msgper": "メッセージ／",
+        "queuemsg": "中間メッセージをキューに追加",
         "dropmsg": "中間メッセージを削除",
+        "sendmsg": "2番目の出力で中間メッセージを送信",
         "allowrate": "msg.rate(ミリ秒単位)で流量値を上書き",
         "label": {
             "delay": "delay",
@@ -401,7 +416,11 @@
             "maximumPacketSize": "最大パケット長",
             "receiveMaximum": "最大受信数",
             "session": "セッション",
-            "delay": "遅延"
+            "delay": "遅延",
+            "action": "動作",
+            "staticTopic": "1つのトピックを購読",
+            "dynamicTopic": "動的な購読",
+            "auto-connect": "自動接続"
         },
         "sections-label": {
             "birth-message": "接続時の送信メッセージ(Birthメッセージ)",
@@ -442,7 +461,10 @@
             "invalid-topic": "不正なトピックが設定されています",
             "nonclean-missingclientid": "「セッションの初期化」使用時に、クライアントIDが設定されていません",
             "invalid-json-string": "不正なJSON文字列",
-            "invalid-json-parse": "JSON文字列のパースに失敗しました"
+            "invalid-json-parse": "JSON文字列のパースに失敗しました",
+            "invalid-action-action": "指定された動作が不正です",
+            "invalid-action-alreadyconnected": "接続する前にブローカから切断してください",
+            "invalid-action-badsubscription": "msg.topicが存在しないか不正です"
         }
     },
     "httpin": {
@@ -478,6 +500,7 @@
         "proxy-config": "プロキシ設定",
         "use-proxyauth": "プロキシ認証を使用",
         "noproxy-hosts": "例外ホスト",
+        "senderr": "2xx以外の応答をcatchノードへ送信",
         "utf8": "UTF8文字列",
         "binary": "バイナリバッファ",
         "json": "JSONオブジェクト",
@@ -703,13 +726,15 @@
             "delete": "delete __property__",
             "move": "move __property__",
             "changeCount": "change: __count__ rules",
-            "regex": "正規表現を使用"
+            "regex": "正規表現を使用",
+            "deepCopy": "値のディープコピー"
         },
         "action": {
             "set": "値の代入",
             "change": "値の置換",
             "delete": "値の削除",
             "move": "値の移動",
+            "toValue": "対象の値",
             "to": "対象の値",
             "search": "検索する文字列",
             "replace": "置換後の文字列"
@@ -851,6 +876,8 @@
     },
     "file": {
         "label": {
+            "write": "write file",
+            "read": "read file",
             "filename": "ファイル名",
             "action": "動作",
             "addnewline": "メッセージの入力のたびに改行を追加",
@@ -858,7 +885,6 @@
             "outputas": "出力形式",
             "breakchunks": "チャンクへ分割",
             "breaklines": "行へ分割",
-            "filelabel": "file",
             "sendError": "エラーメッセージを送信(互換モード)",
             "encoding": "文字コード",
             "deletelabel": "delete __file__",

packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html

@@ -26,11 +26,46 @@
        <dd>0: 最大1度到着, 1: 一度以上到着, 2: 1度のみ到着</dd>
        <dt>retain <span class="property-type">真偽値</span></dt>
        <dd>真の場合、メッセージを保持。メッセージが古い値の場合があります。</dd>
+       <dt class="optional">responseTopic <span class="property-type">文字列</span></dt>
+       <dd><b>MQTTv5</b>: メッセージのMQTT応答トピック</dd>
+       <dt class="optional">correlationData <span class="property-type">バッファ</span></dt>
+       <dd><b>MQTTv5</b>: メッセージの相関データ</dd>
+       <dt class="optional">contentType <span class="property-type">文字列</span></dt>
+       <dd><b>MQTTv5</b>: ペイロードのコンテントタイプ</dd>
+       <dt class="optional">userProperties <span class="property-type">オブジェクト</span></dt>
+       <dd><b>MQTTv5</b>: メッセージのユーザプロパティ</dd>
+       <dt class="optional">messageExpiryInterval <span class="property-type">数値</span></dt>
+       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>
     </dl>
     <h3>詳細</h3>
     <p>購読トピックにはMQTTのワイルドカード(+: 1レベル, #: 複数レベル)を含めることができます。</p>
     <p>このノードの利用のためには、MQTTブローカへの接続設定が必要です。この設定は鉛筆アイコンをクリックすることで行えます。</p>
     <p>MQTT(inおよびout)ノードはブローカへの接続設定を必要に応じて共有できます。</p>
+    <h4>動的購読</h4>
+    本ノードは、MQTTの接続と購読を動的に制御するよう設定できます。有効にすると、本ノードの入力にメッセージを渡すことで制御できます。
+    <h3>入力</h3>
+    <p>これらは、動的購読が設定されている場合のみ適用されます。</p>
+    <dl class="message-properties">
+       <dt>action <span class="property-type">文字列</span></dt>
+       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>、<code>"disconnect"</code>、<code>"subscribe"</code>、<code>"unsubscribe"</code>です。</dd>
+       <dt class="optional">topic <span class="property-type">文字列|オブジェクト|配列</span></dt>
+       <dd><code>"subscribe"</code>と<code>"unsubscribe"</code>の動作に対して、本プロパティはトピックを提供します。次のいずれかを設定できます:<ul>
+           <li>トピックフィルターを含む文字列</li>
+           <li><code>topic</code>と<code>qos</code>プロパティを持つオブジェクト</li>
+           <li>複数のトピックを扱う文字列やオブジェクトの配列</li>
+            </ul>
+        </dd>
+       <dt class="optional">broker <span class="property-type">broker</span> </dt>
+       <dd><code>"connect"</code>の動作に対して、本プロパティは次の様な個々のブローカ設定を上書きします: <ul>
+               <li><code>broker</code></li>
+               <li><code>port</code></li>
+               <li><code>url</code> - 完全な接続URLを提供するために、brokerとportを上書き</li>
+               <li><code>username</code></li>
+               <li><code>password</code></li>
+           </ul>
+           <p>本プロパティが設定され既にブローカが接続されている場合、<code>force</code>プロパティを設定しない限り、エラーがログに記録されます。設定された場合はブローカから切断され、新しい設定を適用して再接続します。</p>
+       </dd>
+    </dl>
 </script>
 
 <script type="text/html" data-help-name="mqtt out">
@@ -39,15 +74,24 @@
     <dl class="message-properties">
        <dt>payload <span class="property-type">文字列 | バッファ</span></dt>
        <dd>発行するペイロード。プロパティが設定されていない場合には、メッセージは送信されません。空のメッセージを送信するには、プロパティに空文字列を設定します。</dd>
-
        <dt class="optional">topic <span class="property-type">文字列</span></dt>
        <dd>発行対象のMQTTトピック</dd>
-
        <dt class="optional">qos <span class="property-type">数値</span></dt>
        <dd>0: 最大一度到着, 1: 一度以上到着, 2: 一度のみ到着。デフォルトは0です。</dd>
-
        <dt class="optional">retain <span class="property-type">真偽値</span></dt>
        <dd>真の場合、メッセージをブローカに保持します。デフォルトは偽です。</dd>
+       <dt class="optional">responseTopic <span class="property-type">文字列</span></dt>
+       <dd><b>MQTTv5</b>: メッセージのMQTT応答トピック</dd>
+       <dt class="optional">correlationData <span class="property-type">バッファ</span></dt>
+       <dd><b>MQTTv5</b>: メッセージの相関データ</dd>
+       <dt class="optional">contentType <span class="property-type">文字列</span></dt>
+       <dd><b>MQTTv5</b>: ペイロードのコンテントタイプ</dd>
+       <dt class="optional">userProperties <span class="property-type">オブジェクト</span></dt>
+       <dd><b>MQTTv5</b>: メッセージのユーザプロパティ</dd>
+       <dt class="optional">messageExpiryInterval <span class="property-type">数値</span></dt>
+       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>   
+       <dt class="optional">topicAlias <span class="property-type">数値</span></dt>
+       <dd><b>MQTTv5</b>: 使用するMQTTトピックエイリアス</dd>
     </dl>
     <h3>詳細</h3>
     <p><code>msg.payload</code>を発行するメッセージのペイロードとして用います。ペイロードがオブジェクトの場合、送信の際にJSON文字列に変換します。ペイロードがバイナリバッファの場合、そのまま送信します。</p>
@@ -55,6 +99,24 @@
     <p>同様に、QoSとretainもノードの設定、もしくは、ノードの設定が空の場合には、それぞれ<code>msg.qos</code>および<code>msg.retain</code>で指定できます。以前ブローカに保存したトピックをクリアするには、retainフラグを設定して当該トピックに空のメッセージを発行します。</p>
     <p>このノードの利用のためには、MQTTブローカへの接続設定が必要です。この設定は鉛筆アイコンをクリックすることで行えます。</p>
     <p>MQTT(inおよびout)ノードはブローカへの接続設定を必要に応じて共有できます。</p>
+
+    <h4>動的制御</h4>
+    本ノードによって接続を動的に制御できます。本ノードが以下の制御メッセージのいずれかを受け取った際は、ペイロードと同じ様にパブリッシュされることはありません。
+    <h3>入力</h3>
+    <dl class="message-properties">
+       <dt>action <span class="property-type">文字列</span></dt>
+       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>、<code>"disconnect"</code>、<code>"subscribe"</code>、<code>"unsubscribe"</code>です。</dd>
+       <dt class="optional">broker <span class="property-type">broker</span> </dt>
+       <dd><code>"connect"</code>の動作に対して、本プロパティは次の様な個々のブローカ設定を上書きします: <ul>
+           <li><code>broker</code></li>
+           <li><code>port</code></li>
+           <li><code>url</code> - 完全な接続URLを提供するために、brokerとportを上書き</li>
+           <li><code>username</code></li>
+           <li><code>password</code></li>
+        </ul>
+        <p>本プロパティが設定され既にブローカが接続されている場合、<code>force</code>プロパティを設定しない限り、エラーがログに記録されます。設定された場合はブローカから切断され、新しい設定を適用して再接続します。</p>
+       </dd>
+    </dl>
 </script>
 
 <script type="text/html" data-help-name="mqtt-broker">
@@ -70,5 +132,4 @@
     <h4>WebSocket</h4>
     <p>WebSocketによる接続を行うように設定できます。WebSocketを利用するには、サーバフィールドに接続先のURIを完全な形式で記述します。以下に例を示します。</p>
     <pre>ws://example.com:4000/mqtt</pre>
-
 </script>

packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html

@@ -36,7 +36,7 @@
     <h3>詳細</h3>
     <p>「列名」にカラム名のリストを指定することができます。CSVからオブジェクトに変換を行う際、カラム名をプロパティ名として使用します。「列名」の代わりに、CSVデータの1行目にカラム名を含めることもできます。</p>
     <p>CSVへの変換を行う際には、オブジェクトから取り出すべきプロパティとその順序を「列名」を参照して決めます。</p>
-    <p>列名がない場合、本ノードは<code>msg.columns</code>プロパティの単純なコンマ区切りリストを使用して、何を抽出するかを決定します。もしそれが存在しない場合、すべてのオブジェクトプロパティを見つけた順序で出力します。</p>
+    <p>列名がない場合、本ノードは<code>msg.columns</code>プロパティの単純なコンマ区切りリストを使用して、何をどの順序で抽出するかを決定します。もし存在しない場合、すべてのオブジェクトプロパティを見つけた順序で出力します。</p>
     <p>入力が配列の場合には、「列名」はカラム名を表す行の出力指定がされた場合だけ用います。</p>
     <p>「数値を変換する」オプションがチェックされている場合、文字列型の数値が数値として返されます。つまり「1,"1.5",2」の真ん中の値が数値になります。</p>
     <p>「空の文字を含む」オプションがチェックされている場合、空の文字列が結果に返されます。つまり「"1","",3」の真ん中の値が空の文字列になります。</p>

packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html

@@ -52,7 +52,6 @@
     <p>このモードで処理する際には、メッセージ数を予め知ることができないため、<code>msg.parts.count</code>プロパティは設定されません。従って、<b>join</b>ノードの「自動モード」と組み合わせることはできません。</p>
 </script>
 
-
 <script type="text/html" data-help-name="join">
     <p>メッセージ列を結合して一つのメッセージにします。</p>
     <p>メッセージの結合には次の3つのモードが利用できます。</p>
@@ -80,6 +79,10 @@
         </dd>
         <dt class="optional">complete</dt>
         <dd>設定されている場合、本ノードはペイロードを追加し、保持しているメッセージを送信します。ペイロードを追加したくない場合は、msgから削除してください。</dd>
+        <dt class="optional">reset</dt>
+        <dd>設定されている場合、本ノードは部分的に完成したメッセージを送信せず、削除します。</dd>
+        <dt class="optional">restartTimeout</dt>
+        <dd>設定されている場合、本ノードにタイムアウトが設定され、そのタイムアウトを用いて処理が再開されます。</dd>
     </dl>
     <h3>詳細</h3>
 
@@ -96,7 +99,7 @@
     </ul>
     <p>出力メッセージのその他のプロパティはメッセージを送信する直前のメッセージをコピーします。</p>
     <p>「<i>合計値</i>」には出力メッセージを送信する前に受信すべきメッセージ数を指定します。オブジェクト出力の場合、この合計値に達すると後続メッセージの到着毎にメッセージを出力するように設定することもできます。</p>
-    <p>「<i>秒</i>」には新規メッセージを送信するまでの経過時間を設定します。</p>
+    <p>「<i>秒</i>」には新規メッセージを送信するまでの経過時間を設定します。<code>msg.restartTimeout</code>プロパティを設定したメッセージを渡すことで、指定した時間で再開できます。</p>
     <p><code>msg.complete</code>プロパティを設定したメッセージを受信すると、出力メッセージを送信します。この時、メッセージ列の数をリセットします。</p>
     <p><code>msg.reset</code>プロパティを設定したメッセージを受信すると、部分的に受信済みのメッセージを破棄します。これらのメッセージは送信されません。この時、メッセージ列の数をリセットします。</p>
 

packages/node_modules/@node-red/nodes/locales/ko/messages.json

@@ -771,7 +771,6 @@
             "outputas": "출력형식",
             "breakchunks": "청크로 분할",
             "breaklines": "행으로 분할",
-            "filelabel": "file",
             "sendError": "에러메세지를 송신(호환모드)",
             "deletelabel": "delete __file__",
             "utf8String": "UTF8문자열",

packages/node_modules/@node-red/nodes/locales/ru/messages.json

@@ -816,7 +816,6 @@
             "outputas": "Выход",
             "breakchunks": "Разбить файл на части",
             "breaklines": "Разбить на строки",
-            "filelabel": "файл",
             "sendError": "Отправлять сообщение при ошибке (устаревший режим)",
             "encoding": "Кодировка",
             "deletelabel": "удалить __file__",

packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json

@@ -804,7 +804,6 @@
             "outputas": "输出",
             "breakchunks": "分拆成块",
             "breaklines": "分拆成行",
-            "filelabel": "文件",
             "sendError": "发生错误时发送消息（传统模式）",
             "encoding": "编码",
             "deletelabel": "删除 __file__",

packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json

@@ -809,7 +809,6 @@
             "outputas": "輸出",
             "breakchunks": "分拆成塊",
             "breaklines": "分拆成行",
-            "filelabel": "文件",
             "sendError": "發生錯誤時發送消息（傳統模式）",
             "encoding": "編碼",
             "deletelabel": "刪除 __file__",

packages/node_modules/@node-red/nodes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -15,13 +15,13 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.5.0",
+        "acorn": "8.6.0",
         "acorn-walk": "8.2.0",
-        "ajv": "8.6.3",
+        "ajv": "8.8.2",
         "body-parser": "1.19.0",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.4",
-        "cookie-parser": "1.4.5",
+        "cookie-parser": "1.4.6",
         "cookie": "0.4.1",
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
@@ -29,7 +29,7 @@
         "form-data": "4.0.0",
         "fs-extra": "10.0.0",
         "fs.notify": "0.0.4",
-        "got": "11.8.2",
+        "got": "11.8.3",
         "hash-sum": "2.0.0",
         "hpagent": "0.1.2",
         "https-proxy-agent": "5.0.0",
@@ -40,7 +40,7 @@
         "multer": "1.4.3",
         "mustache": "4.2.0",
         "on-headers": "1.0.2",
-        "raw-body": "2.4.1",
+        "raw-body": "2.4.2",
         "tough-cookie": "4.0.0",
         "uuid": "8.3.2",
         "ws": "7.5.1",

packages/node_modules/@node-red/registry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.3",
+        "@node-red/util": "2.1.4",
         "clone": "2.1.2",
         "fs-extra": "10.0.0",
         "semver": "7.3.5",
         "tar": "6.1.11",
-        "uglify-js": "3.14.2"
+        "uglify-js": "3.14.4"
     }
 }

packages/node_modules/@node-red/runtime/lib/flows/Flow.js

@@ -439,8 +439,6 @@ class Flow {
                                 }
                             }
                             return [env.name, env];
-                            
-                            return [env.name, env];
                         });
                         group._env = Object.fromEntries(entries);
                     }
@@ -457,24 +455,24 @@ class Flow {
                                 const val
                                       = ((value === "true") ||
                                          (value === true));
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             if (type === "cred") {
-                                return {
+                                return [{
                                     val: value
-                                };
+                                }, null];
                             }
                             try {
                                 var val = redUtil.evaluateNodeProperty(value, type, node, null, null);
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             catch (e) {
                                 this.error(e);
-                                return null;
+                                return [null, null];
                             }
                         }
                     }
@@ -488,7 +486,7 @@ class Flow {
                 return this.getGroupEnvSetting(node, parent, name);
             }
         }
-        return null;
+        return [null, name];
     }
 
 
@@ -545,6 +543,9 @@ class Flow {
                     }
                 }
             }
+            else {
+                key = key.substring(8);
+            }
         }
         return this.parent.getSetting(key);
     }

packages/node_modules/@node-red/runtime/lib/flows/Subflow.js

@@ -373,10 +373,11 @@ class Subflow extends Flow {
         const node = this.subflowInstance;
         if (node.g) {
             const group = this.getGroupNode(node.g);
-            const result = this.getGroupEnvSetting(node, group, name);
+            const [result, newName] = this.getGroupEnvSetting(node, group, name);
             if (result) {
                 return result.val;
             }
+            name = newName;
         }
         
 

packages/node_modules/@node-red/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.1.3",
-        "@node-red/util": "2.1.3",
+        "@node-red/registry": "2.1.4",
+        "@node-red/util": "2.1.4",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.1",

packages/node_modules/@node-red/util/lib/i18n.js

@@ -136,8 +136,6 @@ function getCurrentLocale() {
 
 function init(settings) {
     if (!initPromise) {
-        // Keep this as a 'when' promise as top-level red.js uses 'otherwise'
-        // and embedded users of NR may have copied that.
         initPromise = new Promise((resolve,reject) => {
             i18n.use(MessageFileLoader);
             var opt = {
@@ -146,6 +144,8 @@ function init(settings) {
                 defaultNS: "runtime",
                 ns: [],
                 fallbackLng: defaultLang,
+                keySeparator: ".",
+                nsSeparator: ":",
                 interpolation: {
                     unescapeSuffix: 'HTML',
                     escapeValue: false,

packages/node_modules/@node-red/util/lib/util.js

@@ -526,10 +526,11 @@ function getSetting(node, name, flow_) {
     if (flow) {
         if (node && node.g) {
             const group = flow.getGroupNode(node.g);
-            const result = flow.getGroupEnvSetting(node, group, name);
+            const [result, newName] = flow.getGroupEnvSetting(node, group, name);
             if (result) {
                 return result.val;
             }
+            name = newName;
         }
         return flow.getSetting(name);
     }
@@ -842,6 +843,9 @@ function encodeObject(msg,opts) {
                         length: msg.msg.size
                     }
                     needsStringify = true;
+                } else if (msg.msg && msg.msg.constructor.name === "RegExp") {
+                    msg.format = 'regexp';
+                    msg.msg = msg.msg.toString();
                 }
                 if (needsStringify || (msg.format === "Object")) {
                     msg.msg = safeJSONStringify(msg.msg, function(key, value) {
@@ -907,6 +911,12 @@ function encodeObject(msg,opts) {
                                     data: Object.fromEntries(Array.from(value.entries()).slice(0,debuglength)),
                                     length: value.size
                                 }
+                            } else if (value.constructor.name === "RegExp") {
+                                value = {
+                                    __enc__: true,
+                                    type: "regexp",
+                                    data: value.toString()
+                                }
                             }
                         } else if (value === undefined) {
                             value = {

packages/node_modules/@node-red/util/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -16,10 +16,10 @@
     ],
     "dependencies": {
         "fs-extra": "10.0.0",
-        "i18next": "21.3.1",
+        "i18next": "21.5.4",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.8.5",
         "lodash.clonedeep": "^4.5.0",
-        "moment-timezone": "0.5.33"
+        "moment-timezone": "0.5.34"
     }
 }

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "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": "2.1.3",
-        "@node-red/runtime": "2.1.3",
-        "@node-red/util": "2.1.3",
-        "@node-red/nodes": "2.1.3",
+        "@node-red/editor-api": "2.1.4",
+        "@node-red/runtime": "2.1.4",
+        "@node-red/util": "2.1.4",
+        "@node-red/nodes": "2.1.4",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

test/nodes/core/function/rbe_spec.js

@@ -425,7 +425,7 @@ describe('rbe node', function() {
     });
 
     it('should not send output if x away or greater from original value (narrowbandEq)', function(done) {
-        var flow = [{"id":"n1", "type":"rbe", func:"narrowbandEq", gap:"10", inout:"out", wires:[["n2"]] },
+        var flow = [{"id":"n1", "type":"rbe", func:"narrowbandEq", gap:"10", inout:"out", start:"1", wires:[["n2"]] },
             {id:"n2", type:"helper"} ];
         helper.load(testNode, flow, function() {
             var n1 = helper.getNode("n1");
@@ -445,6 +445,7 @@ describe('rbe node', function() {
                     done();
                 }
             });
+            n1.emit("input", {payload:100});
             n1.emit("input", {payload:0});
             n1.emit("input", {payload:10});
             n1.emit("input", {payload:5});

test/unit/@node-red/runtime/lib/flows/Flow_spec.js

@@ -1275,6 +1275,52 @@ describe('Flow', function() {
             }
                 
         });
+        it("can access environment variable property using $parent", function (done) {
+            try {
+                after(function() {
+                    delete process.env.V0;
+                    delete process.env.V1;
+                })
+                process.env.V0 = "gv0";
+                process.env.V1 = "gv1";
+                var config = flowUtils.parseConfig([
+                    {id:"t1",type:"tab",env:[
+                        {"name": "V0", value: "v0", type: "str"}
+                    ]},
+                    {id:"g1",type:"group",z:"t1",env:[
+                        {"name": "V0", value: "v1", type: "str"},
+                        {"name": "V1", value: "v2", type: "str"}
+                    ]},
+                    {id:"g2",type:"group",z:"t1",g:"g1",env:[
+                        {"name": "V1", value: "v3", type: "str"}
+                    ]},
+                    {id:"1",x:10,y:10,z:"t1",type:"test",foo:"${$parent.V0}",wires:[]},
+                    {id:"2",x:10,y:10,z:"t1",g:"g1",type:"test",foo:"${$parent.V0}",wires:[]},
+                    {id:"3",x:10,y:10,z:"t1",g:"g1",type:"test",foo:"${$parent.V1}",wires:[]},
+                    {id:"4",x:10,y:10,z:"t1",g:"g2",type:"test",foo:"${$parent.V1}",wires:[]},
+                    {id:"5",x:10,y:10,z:"t1",type:"test",foo:"${$parent.V1}",wires:[]},
+                ]);
+                var flow = Flow.create({getSetting:v=>process.env[v]},config,config.flows["t1"]);
+                flow.start();
+
+                var activeNodes = flow.getActiveNodes();
+
+                activeNodes["1"].foo.should.equal("gv0");
+                activeNodes["2"].foo.should.equal("v0");
+                activeNodes["3"].foo.should.equal("gv1");
+                activeNodes["4"].foo.should.equal("v2");
+                activeNodes["5"].foo.should.equal("gv1");
+
+                flow.stop().then(function() {
+                    done();
+                });
+            }
+            catch (e) {
+                console.log(e.stack);
+                done(e);
+            }
+                
+        });
 
     });