Merge branch 'master' into dev

2025-03-01 10:36:34 +00:00 · 2022-01-12 17:59:26 +00:00
parent cb96fb735e 6d2793cac6
commit f86e743cce
38 changed files with 545 additions and 230 deletions
--- a/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
@@ -146,7 +146,7 @@ function authenticateUserToken(req) {
                } else {
                    reject();
                }
-            });
+            }).catch(reject);
        } else {
            reject();
        }
@@ -163,6 +163,9 @@ TokensStrategy.prototype.authenticate = function(req) {
    authenticateUserToken(req).then(user => {
        this.success(user,{scope:user.permissions});
    }).catch(err => {
+        if (err) {
+            log.trace("token authentication failure: "+err.stack?err.stack:err)
+        }
        this.fail(401);
    });
 }
--- a/packages/node_modules/@node-red/editor-api/lib/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/index.js
@@ -90,6 +90,8 @@ function init(settings,_server,storage,runtimeAPI) {
                    auth.getToken,
                    auth.errorHandler
                );
+            } else if (settings.adminAuth.tokens) {
+                adminApp.use(passport.initialize());
            }
            adminApp.post("/auth/revoke",auth.needsPermission(""),auth.revoke,apiUtil.errorHandler);
        }
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -59,6 +59,8 @@
        "hideOtherFlows": "他のフローを非表示",
        "showAllFlows": "全てのフローを表示",
        "hideAllFlows": "全てのフローを非表示",
+        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
+        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
        "listFlows": "フロー一覧",
        "listSubflows": "サブフロー一覧",
@@ -669,7 +671,8 @@
                "unusedConfigNodes": "未使用の設定ノード",
                "invalidNodes": "不正なノード",
                "uknownNodes": "未知のノード",
-                "unusedSubflows": "未使用のサブフロー"
+                "unusedSubflows": "未使用のサブフロー",
+                "hiddenFlows": "非表示のフロー"
            }
        },
        "help": {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/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();
                        }
                    }
                ],
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -578,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")) {
@@ -588,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();
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
+++ b/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);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
@@ -55,7 +55,9 @@
                        }
                    });
                }
-                if (!isSameObj(old_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;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -208,10 +208,20 @@ 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,
@@ -542,9 +552,6 @@ 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) {
@@ -572,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) {
--- a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
@@ -73,8 +73,8 @@ export default {
            },
            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.',
-                "ja": '<p><i class="fa fa-times"></i> アイコンをクリックすることで、タブを非表示にできます。</p><p>情報サイドバーには、全てのタブが一覧表示されており、現在非表示になっているタブを確認できます。'
+                "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() {
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/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() {
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/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
                    })
                }
            }
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/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 () {
--- a/packages/node_modules/@node-red/nodes/core/function/rbe.js
+++ b/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; }
                        }
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/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
--- a/packages/node_modules/@node-red/nodes/examples/common/link/03
+++ b/packages/node_modules/@node-red/nodes/examples/common/link/03
@@ -0,0 +1,156 @@
+[
+    {
+        "id": "62ea32aa.d73aac",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "Example: Link Call Node",
+        "info": "Link call node can call link in node then get result from link out node.",
+        "x": 230,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "c588bc36.87fec",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↓ call link in node",
+        "info": "",
+        "x": 440,
+        "y": 220,
+        "wires": []
+    },
+    {
+        "id": "cd31efb4d2c6967e",
+        "type": "link call",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "links": [
+            "dbc46892c8d14c37"
+        ],
+        "timeout": "30",
+        "x": 420,
+        "y": 260,
+        "wires": [
+            [
+                "c3db64d1d2260340"
+            ]
+        ]
+    },
+    {
+        "id": "dbc46892c8d14c37",
+        "type": "link in",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "links": [],
+        "x": 315,
+        "y": 340,
+        "wires": [
+            [
+                "e10575d73f2e5352"
+            ]
+        ]
+    },
+    {
+        "id": "6b61792143b3b0a3",
+        "type": "inject",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 240,
+        "y": 260,
+        "wires": [
+            [
+                "cd31efb4d2c6967e"
+            ]
+        ]
+    },
+    {
+        "id": "e10575d73f2e5352",
+        "type": "change",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "Hello, World!",
+                "tot": "str"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 450,
+        "y": 340,
+        "wires": [
+            [
+                "cf8438e7137bc0f0"
+            ]
+        ]
+    },
+    {
+        "id": "cf8438e7137bc0f0",
+        "type": "link out",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "mode": "return",
+        "links": [],
+        "x": 595,
+        "y": 340,
+        "wires": []
+    },
+    {
+        "id": "c3db64d1d2260340",
+        "type": "debug",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 600,
+        "y": 260,
+        "wires": []
+    },
+    {
+        "id": "6d077dfa0987febb",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↑called from link call node",
+        "info": "",
+        "x": 410,
+        "y": 380,
+        "wires": []
+    },
+    {
+        "id": "53b9a0adfd8c4217",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↑return to link call node",
+        "info": "",
+        "x": 680,
+        "y": 380,
+        "wires": []
+    }
+]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file-in/01
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/01
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file-in/02
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/02
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file-in/03
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/03
@@ -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"
--- a/packages/node_modules/@node-red/nodes/examples/storage/file-in/04
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/04
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file/01
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/01
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file/02
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/02
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file/03
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/03
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/examples/storage/file/04
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/04
@@ -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": []
    }
 ]
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/89-delay.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/rbe.html
+++ b/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>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/sequence/17-split.html
@@ -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">
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/89-delay.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/rbe.html
+++ b/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>
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/parsers/70-CSV.html
@@ -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>
--- a/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/sequence/17-split.html
@@ -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>

--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -83,6 +83,7 @@ function createNode(flow,config) {
                }
            }
            try {
+                Object.defineProperty(conf,'_module', {value: typeRegistry.getNodeInfo(type), enumerable: false, writable: true })
                Object.defineProperty(conf,'_flow', {value: flow, enumerable: false, writable: true })
                newNode = new nodeTypeConstructor(conf);
            } catch (err) {
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -59,6 +59,9 @@ function Node(n) {
        // which we can tolerate as they are the same object.
        Object.defineProperty(this,'_flow', {value: n._flow, enumerable: false, writable: true })
    }
+    if (n._module) {
+        Object.defineProperty(this,'_module', {value: n._module, enumerable: false, writable: true })
+    }
    this.updateWires(n.wires);
 }

@@ -496,7 +499,12 @@ function log_helper(self, level, msg) {
    if (self.name) {
        o.name = self.name;
    }
-    self._flow.log(o);
+    // See https://github.com/node-red/node-red/issues/3327
+    try {
+        self._flow.log(o);
+    } catch(err) {
+        logUnexpectedError(self, err)
+    }
 }
 /**
 * Log an INFO level message
@@ -576,4 +584,59 @@ Node.prototype.status = function(status) {
    this._flow.handleStatus(this,status);
 };

+
+function inspectObject(flow) {
+    try {
+        let properties = new Set()
+        let currentObj = flow
+        do {
+            if (!Object.getPrototypeOf(currentObj)) { break }
+            Object.getOwnPropertyNames(currentObj).map(item => properties.add(item))
+        } while ((currentObj = Object.getPrototypeOf(currentObj)))
+        let propList = [...properties.keys()].map(item => `${item}[${(typeof flow[item])[0]}]`)
+        propList.sort();
+        let result = [];
+        let line = "";
+        while (propList.length > 0) {
+            let prop = propList.shift()
+            if (line.length+prop.length > 80) {
+                result.push(line)
+                line = "";
+            } else {
+                line += " "+prop
+            }
+        }
+        if (line.length > 0) {
+            result.push(line);
+        }
+        return result.join("\n  ")
+
+    } catch(err) {
+        return "Failed to capture object properties: "+err.toString()
+    }
+}
+
+function logUnexpectedError(node, error) {
+    let moduleInfo = node._module?`${node._module.module}@${node._module.version}`:"undefined"
+    Log.error(`
+********************************************************************
+Unexpected Node Error
+${error.stack}
+Node:
+ Type: ${node.type}
+ Module: ${moduleInfo}
+ ID: ${node._alias||node.id}
+ Properties:
+  ${inspectObject(node)}
+Flow: ${node._flow?node._flow.path:'undefined'}
+ Type: ${node._flow?node._flow.TYPE:'undefined'}
+ Properties:
+  ${node._flow?inspectObject(node._flow):'undefined'}
+
+Please report this issue, including the information logged above:
+https://github.com/node-red/node-red/issues/
+********************************************************************
+`)
+}
+
 module.exports = Node;