safety check in better place

Let msg.reset  reset Tcp request node connection when in stay connected mode

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",

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

@@ -51,7 +51,7 @@ module.exports = {
 
             var ui = require("./ui");
 
-            ui.init(settings, runtimeAPI);
+            ui.init(runtimeAPI);
 
             const editorApp = apiUtil.createExpressApp(settings)
 

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-const crypto = require('crypto')
 var express = require('express');
 var fs = require("fs");
 var path = require("path");
@@ -25,16 +24,13 @@ var apiUtils = require("../util");
 var theme = require("./theme");
 
 var runtimeAPI;
-let settings;
 var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
 var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.svg");
 var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
-let cacheBuster
 
 module.exports = {
-    init: function(_settings, _runtimeAPI) {
-        settings = _settings;
+    init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
         editorTemplate = fs.readFileSync(editorTemplatePath,"utf8");
         Mustache.parse(editorTemplate);
@@ -95,12 +91,6 @@ module.exports = {
     },
 
     editor: async function(req,res) {
-        if (!cacheBuster) {
-            // settings.instanceId is set asynchronously to the editor-api
-            // being initiaised. So we defer calculating the cacheBuster hash
-            // until the first load of the editor
-            cacheBuster = crypto.createHash('md5').update(`${settings.version || 'version'}-${settings.instanceId || 'instanceId'}`).digest("hex").substring(0,12)    
-        }
 
         let sessionMessages;
         if (req.session && req.session.messages) {
@@ -109,7 +99,6 @@ module.exports = {
         }
         res.send(Mustache.render(editorTemplate,{
             sessionMessages,
-            cacheBuster,
             ...await theme.context()
         }));
     },

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.3",
-        "@node-red/editor-client": "3.1.3",
+        "@node-red/util": "4.0.0-dev",
+        "@node-red/editor-client": "4.0.0-dev",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",

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

@@ -109,6 +109,7 @@
             "selectionToSubflow": "Auswahl in Subflow umwandeln",
             "flows": "Flow",
             "add": "Hinzufügen",
+            "rename": "Umbenennen",
             "delete": "Löschen",
             "keyboardShortcuts": "Tastenkürzel",
             "login": "Anmelden",

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

@@ -122,6 +122,7 @@
             "selectionToSubflow": "Selection to Subflow",
             "flows": "Flows",
             "add": "Add",
+            "rename": "Rename",
             "delete": "Delete",
             "keyboardShortcuts": "Keyboard shortcuts",
             "login": "Login",
@@ -1222,7 +1223,6 @@
             "invalid-expr": "Invalid JSONata expression: __error__",
             "invalid-prop": "Invalid property expression",
             "invalid-num": "Invalid number",
-            "invalid-num-prop": "__prop__: invalid number",
             "invalid-regexp": "Invalid input pattern",
             "invalid-regex-prop": "__prop__: invalid input pattern",
             "missing-required-prop": "__prop__: property value missing",

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

@@ -122,6 +122,7 @@
       "selectionToSubflow": "Convertir en sous-flux",
       "flows": "Flux",
       "add": "Ajouter",
+      "rename": "Renommer",
       "delete": "Supprimer",
       "keyboardShortcuts": "Raccourcis clavier",
       "login": "Se connecter",
@@ -1217,7 +1218,6 @@
       "invalid-expr": "Expression JSONata invalide : __error__",
       "invalid-prop": "Expression de propriété invalide",
       "invalid-num": "Numéro invalide",
-      "invalid-num-prop": "__prop__: numéro invalide",
       "invalid-regexp": "Modèle d'entrée non valide",
       "invalid-regex-prop": "__prop__: modèle d'entrée non valide",
       "missing-required-prop": "__prop__: valeur de la propriété manquante",

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

@@ -122,6 +122,7 @@
             "selectionToSubflow": "選択部分をサブフロー化",
             "flows": "フロー",
             "add": "フローを新規追加",
+            "rename": "フロー名を変更",
             "delete": "フローを削除",
             "keyboardShortcuts": "ショートカットキーの説明",
             "login": "ログイン",
@@ -129,11 +130,6 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
-            "showNodeHelp": "ノードのヘルプを表示",
-            "enableSelectedNodes": "選択したノードを有効化",
-            "disableSelectedNodes": "選択したノードを無効化",
-            "showSelectedNodeLabels": "選択したノードのラベル表示",
-            "hideSelectedNodeLabels": "選択したノードのラベル非表示",
             "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
@@ -515,7 +511,7 @@
         "selectAllConnected": "接続されたノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
-        "deleteSelected": "選択部分を削除",
+        "deleteSelected": "選択したノードや接続を削除",
         "deleteReconnect": "削除と再接続",
         "importNode": "フローの読み込み",
         "exportNode": "フローの書き出し",
@@ -1219,10 +1215,8 @@
     "validator": {
         "errors": {
             "invalid-json": "JSONデータが不正: __error__",
-            "invalid-expr": "不正なJSONata式: __error__",
             "invalid-prop": "プロパティ式が不正",
             "invalid-num": "数値が不正",
-            "invalid-num-prop": "__prop__: 数値が不正",
             "invalid-regexp": "入力パターンが不正",
             "invalid-regex-prop": "__prop__: 入力パターンが不正",
             "missing-required-prop": "__prop__: プロパティが未設定",
@@ -1232,7 +1226,6 @@
         }
     },
     "contextMenu": {
-        "showActionList": "動作一覧を表示",
         "insert": "挿入",
         "node": "ノード",
         "junction": "分岐点",

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

@@ -79,6 +79,7 @@
       "selectionToSubflow": "서브 플로우 선택",
       "flows": "플로우",
       "add": "추가",
+      "rename": "이름변경",
       "delete": "삭제",
       "keyboardShortcuts": "단축키",
       "login": "로그인",

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

@@ -109,6 +109,7 @@
             "selectionToSubflow": "Seleção para subfluxo",
             "flows": "Fluxos",
             "add": "Adicionar",
+            "rename": "Renomear",
             "delete": "Apagar",
             "keyboardShortcuts": "Atalhos do teclado",
             "login": "Ingressar",
@@ -1187,7 +1188,6 @@
             "invalid-json": "Dados JSON inválidos: __error__",
             "invalid-prop": "Expressão de propriedade inválida",
             "invalid-num": "Número inválido",
-            "invalid-num-prop": "__prop__: número inválido",
             "invalid-regexp": "Padrão de entrada inválido",
             "invalid-regex-prop": "__prop__: Padrão de entrada inválido",
             "missing-required-prop": "__prop__: valor de propriedade ausente",

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

@@ -95,6 +95,7 @@
             "selectionToSubflow": "Выделение в подпоток",
             "flows": "Потоки",
             "add": "Добавить",
+            "rename": "Переименовать",
             "delete": "Удалить",
             "keyboardShortcuts": "Сочетания клавиш",
             "login": "Войти",

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

@@ -120,6 +120,7 @@
       "selectionToSubflow": "将选择部分更改为子流程",
       "flows": "流程",
       "add": "增加",
+      "rename": "重命名",
       "delete": "删除",
       "keyboardShortcuts": "键盘快捷方式",
       "login": "登录",
@@ -1220,7 +1221,6 @@
       "invalid-expr": "无效的 JSONata 表达式: __error__",
       "invalid-prop": "无效的属性表达式",
       "invalid-num": "无效的数字",
-      "invalid-num-prop": "__prop__: 无效的数字",
       "invalid-regexp": "输入格式无效",
       "invalid-regex-prop": "__prop__: 输入格式无效",
       "missing-required-prop": "__prop__: 缺少属性值",

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

@@ -120,6 +120,7 @@
             "selectionToSubflow": "將選擇部分更改為子流程",
             "flows": "流程",
             "add": "增加",
+            "rename": "重新命名",
             "delete": "刪除",
             "keyboardShortcuts": "鍵盤快速鍵",
             "login": "登入",

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

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

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

@@ -39,16 +39,15 @@
              console.warn(evt,args);
          }
          if (handlers[evt]) {
-             let cpyHandlers = [...handlers[evt]];
-          
-             for (var i=0;i<cpyHandlers.length;i++) {
+             for (var i=0;i<handlers[evt].length;i++) {
                  try {
-                     cpyHandlers[i].apply(null, args);
+                     handlers[evt][i].apply(null, args);
                  } catch(err) {
                      console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
                      console.warn(err);
                  }
              }
+
          }
      }
      return {

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

@@ -722,7 +722,7 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:"core:show-config-tab"});
         menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
             {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:"core:add-flow"},
-            {id:"menu-item-workspace-edit",label:RED._("menu.label.edit"),onselect:"core:edit-flow"},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:"core:edit-flow"},
             {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
         ]});
         menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [

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

@@ -30,26 +30,8 @@ RED.contextMenu = (function () {
             const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
             const canEdit = !RED.workspaces.isLocked()
             const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
-            let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
-            if (hasSelection) {
-                selection.nodes.forEach(n => {
-                    if (n.type === 'group') {
-                        hasGroup = true;
-                    } else {
-                        isAllGroups = false;
-                    }
-                    if (n.d) {
-                        hasDisabledNode = true;
-                    } else {
-                        hasEnabledNode = true;
-                    }
-                    if (n.l === undefined || n.l) {
-                        hasLabeledNode = true;
-                    } else {
-                        hasUnlabeledNode = true;
-                    }
-                });
-            }
+            const isAllGroups = hasSelection && selection.nodes.filter(n => n.type !== 'group').length === 0
+            const hasGroup = hasSelection && selection.nodes.filter(n => n.type === 'group' ).length > 0
             const offset = $("#red-ui-workspace-chart").offset()
 
             let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
@@ -73,7 +55,7 @@ RED.contextMenu = (function () {
                     onselect: function () {
                         RED.view.showQuickAddDialog({
                             position: [addX, addY],
-                            touchTrigger: 'ontouchstart' in window,
+                            touchTrigger: true,
                             splice: isSingleLink ? selection.links[0] : undefined,
                             // spliceMultiple: isMultipleLinks
                         })
@@ -131,11 +113,11 @@ RED.contextMenu = (function () {
                     )
                 }
                 nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes'), disabled: !hasDisabledNode },
-                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes'), disabled: !hasEnabledNode },
+                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes') },
+                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes') },
                     null,
-                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels'), disabled: !hasUnlabeledNode },
-                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels'), disabled: !hasLabeledNode }
+                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels') },
+                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels') }
                 )
                 menuItems.push({
                     label: RED._('sidebar.info.node'),

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

@@ -484,7 +484,7 @@ RED.palette = (function() {
         var currentLabel = paletteNode.attr("data-palette-label");
         var currentInfo = paletteNode.attr("data-palette-info");
 
-        if (currentLabel !== sf.name || currentInfo !== sf.info || sf.in.length > 0 || sf.out.length > 0) {
+        if (currentLabel !== sf.name || currentInfo !== sf.info) {
             paletteNode.attr("data-palette-info",sf.info);
             setLabel(sf.type+":"+sf.id,paletteNode,sf.name,RED.utils.renderMarkdown(sf.info||""));
         }

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

@@ -232,7 +232,7 @@ RED.sidebar.context = (function() {
                                     typeHint: data.format,
                                     sourceId: id+"."+k,
                                     tools: tools,
-                                    path: k
+                                    path: ""
                                 }).appendTo(propRow.children()[1]);
                             }
                         })
@@ -278,7 +278,7 @@ RED.sidebar.context = (function() {
                                                     typeHint: data.format,
                                                     sourceId: id+"."+k,
                                                     tools: tools,
-                                                    path: k
+                                                    path: ""
                                                 }).appendTo(propRow.children()[1]);
                                             }
                                         });
@@ -299,7 +299,7 @@ RED.sidebar.context = (function() {
                         typeHint: v.format,
                         sourceId: id+"."+k,
                         tools: tools,
-                        path: k
+                        path: ""
                     }).appendTo(propRow.children()[1]);
                     if (contextStores.length > 1) {
                         $("<span>",{class:"red-ui-sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))

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

@@ -186,15 +186,8 @@ RED.typeSearch = (function() {
                 var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                 RED.utils.createIconElement(icon_url, iconContainer, false);
 
-                if (/^subflow:/.test(object.type)) {
-                    var sf = RED.nodes.subflow(object.type.substring(8));
-                    if (sf.in.length > 0) {
-                        $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
-                    }
-                    if (sf.out.length > 0) {
-                        $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
-                    }
-                } else if (!/^_action_:/.test(object.type) && object.type !== "junction") {
+
+                if (!/^_action_:/.test(object.type) && object.type !== "junction") {
                     if (def.inputs > 0) {
                         $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
                     }

packages/node_modules/@node-red/editor-client/templates/index.mst

@@ -24,24 +24,24 @@
 <title>{{ page.title }}</title>
 <link rel="icon" type="image/png" href="{{ page.favicon }}">
 <link rel="mask-icon" href="{{ page.tabicon.icon }}" color="{{ page.tabicon.colour }}">
-<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ cacheBuster }}">
-<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ cacheBuster }}">
-<link rel="stylesheet" href="red/style.min.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="red/style.min.css?v={{ page.version }}">
 {{#page.css}}
 <link rel="stylesheet" href="{{.}}">
 {{/page.css}}
 {{#asset.vendorMonaco}}
-<link rel="stylesheet" href="vendor/monaco/style.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="vendor/monaco/style.css?v={{ page.version }}">
 {{/asset.vendorMonaco}}
 </head>
 <body spellcheck="false">
 <div id="red-ui-editor"></div>
-<script src="vendor/vendor.js?v={{ cacheBuster }}"></script>
+<script src="vendor/vendor.js?v={{ page.version }}"></script>
 {{#asset.vendorMonaco}}
-<script src="{{ asset.vendorMonaco }}?v={{ cacheBuster }}"></script>
+<script src="{{ asset.vendorMonaco }}?v={{ page.version }}"></script>
 {{/asset.vendorMonaco}}
-<script src="{{ asset.red }}?v={{ cacheBuster }}"></script>
-<script src="{{ asset.main }}?v={{ cacheBuster }}"></script>
+<script src="{{ asset.red }}?v={{ page.version }}"></script>
+<script src="{{ asset.main }}?v={{ page.version }}"></script>
 {{# page.scripts }}
 <script src="{{.}}"></script>
 {{/ page.scripts }}

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

@@ -5,6 +5,7 @@ module.exports = function(RED) {
     const fs = require("fs-extra");
     const path = require("path");
     var debuglength = RED.settings.debugMaxLength || 1000;
+    var statuslength = RED.settings.debugStatusLength || 32;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
     const { hasOwnProperty } = Object.prototype;
@@ -164,7 +165,7 @@ module.exports = function(RED) {
                             }
                         }
 
-                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                        if (st.length > statuslength) { st = st.substr(0,statuslength) + "..."; }
 
                         var newStatus = {fill:fill, shape:shape, text:st};
                         if (JSON.stringify(newStatus) !== node.oldState) { // only send if we have to

packages/node_modules/@node-red/nodes/core/network/31-tcpin.js

@@ -411,23 +411,33 @@ module.exports = function(RED) {
                 if (msg._session && msg._session.type == "tcp") {
                     var client = connectionPool[msg._session.id];
                     if (client) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            client.write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            client.write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            client.write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            client.destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                client.write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                client.write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                client.write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
                 else {
                     for (var i in connectionPool) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            connectionPool[i].write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            connectionPool[i].write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            connectionPool[i].write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            connectionPool[i].destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                connectionPool[i].write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                connectionPool[i].write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                connectionPool[i].write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
@@ -547,13 +557,33 @@ module.exports = function(RED) {
 
         this.on("input", function(msg, nodeSend, nodeDone) {
             var i = 0;
-            if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
+            if (msg.payload !== undefined && (!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
                 msg.payload = msg.payload.toString();
             }
 
             var host = node.server || msg.host;
             var port = node.port || msg.port;
 
+            if (node.out === "sit" && msg?.reset) {
+                if (msg.reset === true) { // kill all connections
+                    for (var cl in clients) {
+                        if (clients[cl].hasOwnProperty("client")) {
+                            clients[cl].client.destroy();
+                            delete clients[cl];
+                        }
+                    }
+                }
+                if (typeof(msg.reset) === "string" && msg.reset.includes(":")) {  // just kill connection host:port
+                    if (clients.hasOwnProperty(msg.reset) && clients[msg.reset].hasOwnProperty("client")) {
+                        clients[msg.reset].client.destroy();
+                        delete clients[msg.reset];
+                    }
+                }
+                const cc = Object.keys(clients).length;
+                node.status({fill:"green",shape:cc===0?"ring":"dot",text:RED._("tcpin.status.connections",{count:cc})});
+                if ((host === undefined || port === undefined) && !msg.hasOwnProperty("payload")) { return; }
+            }
+
             // Store client information independently
             // the clients object will have:
             // clients[id].client, clients[id].msg, clients[id].timeout
@@ -621,13 +651,16 @@ module.exports = function(RED) {
                     clients[connection_id].connecting = true;
                     clients[connection_id].client.connect(connOpts, function() {
                         //node.log(RED._("tcpin.errors.client-connected"));
-                        node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        // node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        node.status({fill:"green",shape:"dot",text:RED._("tcpin.status.connections",{count:Object.keys(clients).length})});
                         if (clients[connection_id] && clients[connection_id].client) {
                             clients[connection_id].connected = true;
                             clients[connection_id].connecting = false;
                             let event;
                             while (event = dequeue(clients[connection_id].msgQueue)) {
-                                clients[connection_id].client.write(event.msg.payload);
+                                if (event.msg.payload !== undefined) {
+                                    clients[connection_id].client.write(event.msg.payload);
+                                }
                                 event.nodeDone();
                             }
                             if (node.out === "time" && node.splitc < 0) {
@@ -823,7 +856,9 @@ module.exports = function(RED) {
             else if (!clients[connection_id].connecting && clients[connection_id].connected) {
                 if (clients[connection_id] && clients[connection_id].client) {
                     let event = dequeue(clients[connection_id].msgQueue)
-                    clients[connection_id].client.write(event.msg.payload);
+                    if (event.msg.payload !== undefined ) {
+                        clients[connection_id].client.write(event.msg.payload);
+                    }
                     event.nodeDone();
                 }
             }

packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html

@@ -30,6 +30,8 @@
     before being sent.</p>
     <p>If <code>msg._session</code> is not present the payload is
     sent to <b>all</b> connected clients.</p>
+    <p>In Reply-to mode, setting <code>msg.reset = true</code> will reset the connection
+        specified by _session.id, or all connections if no _session.id is specified.</p>
     <p><b>Note: </b>On some systems you may need root or administrator access
     to access ports below 1024.</p>
 </script>
@@ -40,6 +42,8 @@
     returned characters into a fixed buffer, match a specified character before returning,
     wait a fixed timeout from first reply and then return, sit and wait for data, or send then close the connection
     immediately, without waiting for a reply.</p>
+    <p>If in sit and wait mode (remain connected) you can send <code>msg.reset = true</code> or <code>msg.reset = "host:port"</code> to force a break in
+    the connection and an automatic reconnection.</p>
     <p>The response will be output in <code>msg.payload</code> as a buffer, so you may want to .toString() it.</p>
     <p>If you leave tcp host or port blank they must be set by using the <code>msg.host</code> and <code>msg.port</code> properties in every message sent to the node.</p>
 </script>

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/registry/lib/externalModules.js

@@ -264,7 +264,7 @@ async function installModule(moduleDetails) {
             "module": moduleDetails.module,
             "version": moduleDetails.version,
             "dir": installDir,
-            "args": ["--production","--engine-strict"]
+            "args": ["--omit=dev","--engine-strict"]
         }
         return hooks.trigger("preInstall", triggerPayload).then((result) => {
             // preInstall passed

packages/node_modules/@node-red/registry/lib/installer.js

@@ -215,7 +215,7 @@ async function installModule(module,version,url) {
             "dir": installDir,
             "isExisting": isExisting,
             "isUpgrade": isUpgrade,
-            "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production','--engine-strict']
+            "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--omit=dev','--engine-strict']
         }
 
         return hooks.trigger("preInstall", triggerPayload).then((result) => {

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.3",
+        "@node-red/util": "4.0.0-dev",
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
         "semver": "7.5.4",

packages/node_modules/@node-red/runtime/lib/index.js

@@ -27,7 +27,6 @@ var express = require("express");
 var path = require('path');
 var fs = require("fs");
 var os = require("os");
-const crypto = require("crypto")
 
 const {log,i18n,events,exec,util,hooks} = require("@node-red/util");
 
@@ -52,7 +51,7 @@ var adminApi = {
 var nodeApp;
 var adminApp;
 var server;
-let userSettings;
+
 
 /**
  * Initialise the runtime module.
@@ -62,9 +61,8 @@ let userSettings;
  *                              better abstracted.
  * @memberof @node-red/runtime
  */
-function init(_userSettings,httpServer,_adminApi) {
+function init(userSettings,httpServer,_adminApi) {
     server = httpServer;
-    userSettings = _userSettings
 
     if (server && server.on) {
         // Add a listener to the upgrade event so that we can properly timeout connection
@@ -136,12 +134,7 @@ function start() {
         .then(function() { return settings.load(storage)})
         .then(function() { return library.init(runtime)})
         .then(function() {
-            if (settings.available()) {
-                if (settings.get('instanceId') === undefined) {
-                    settings.set('instanceId', crypto.randomBytes(8).toString('hex'))
-                }
-                userSettings.instanceId = settings.get('instanceId') || ''
-            }
+
             if (log.metric()) {
                 runtimeMetricInterval = setInterval(function() {
                     reportMetrics();

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

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

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.3",
+    "version": "4.0.0-dev",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "3.1.3",
-        "@node-red/runtime": "3.1.3",
-        "@node-red/util": "3.1.3",
-        "@node-red/nodes": "3.1.3",
+        "@node-red/editor-api": "4.0.0-dev",
+        "@node-red/runtime": "4.0.0-dev",
+        "@node-red/util": "4.0.0-dev",
+        "@node-red/nodes": "4.0.0-dev",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.18.2",

packages/node_modules/node-red/red.js

@@ -26,6 +26,15 @@ if (process.argv[2] === 'admin') {
     return;
 }
 
+var node_ver = parseInt(process.version.split('.')[0].substring(1));
+var node_rqd = parseInt((require('./package.json').engines.node || "0").match(/\d+/).join(''));
+if (node_ver < node_rqd) {
+    console.log("This version of Node-RED requires Node.js version",node_rqd,"as a minimum.");
+    console.log("Please upgrade your Node.js version and restart.")
+    process.exit(1);
+}
+// else { console.log(node_ver,">=",node_rqd,"- OK")}
+
 var http = require('http');
 var https = require('https');
 var util = require("util");

packages/node_modules/node-red/settings.js

@@ -449,6 +449,7 @@ module.exports = {
  *  - ui (for use with Node-RED Dashboard)
  *  - debugUseColors
  *  - debugMaxLength
+ *  - debugStatusLength
  *  - execMaxBufferSize
  *  - httpRequestTimeout
  *  - mqttReconnectTime
@@ -504,6 +505,9 @@ module.exports = {
     /** The maximum length, in characters, of any message sent to the debug sidebar tab */
     debugMaxLength: 1000,
 
+    /** The maximum length, in characters, of status messages under the debug node */
+    //debugStatusLength: 32,
+
     /** Maximum buffer size for the exec node. Defaults to 10Mb */
     //execMaxBufferSize: 10000000,
 

test/nodes/core/function/10-function_spec.js

@@ -1718,9 +1718,13 @@ describe('function node', function() {
     describe("init function", function() {
 
         it('should delay handling messages until init completes', function(done) {
+            const timeoutMS = 200;
+            // Since helper.load uses process.nextTick timers might occasionally finish
+            // a couple of milliseconds too early, so give some leeway to the check.
+            const timeoutCheckMargin = 5;
             var flow = [{id:"n1",type:"function",wires:[["n2"]],initialize: `
                 return new Promise((resolve,reject) => {
-                    setTimeout(resolve,200)
+                    setTimeout(resolve, ${timeoutMS});
                 })`,
                 func:"return msg;"
             },
@@ -1733,9 +1737,10 @@ describe('function node', function() {
                     msg.delta = Date.now() - msg.payload;
                     receivedMsgs.push(msg)
                     if (receivedMsgs.length === 5) {
-                        var errors = receivedMsgs.filter(msg => msg.delta < 200)
+                        let deltas = receivedMsgs.map(msg => msg.delta);
+                        var errors = deltas.filter(delta => delta < (timeoutMS - timeoutCheckMargin))
                         if (errors.length > 0) {
-                            done(new Error(`Message received before init completed - was ${msg.delta} expected >300`))
+                            done(new Error(`Message received before init completed - delta values ${JSON.stringify(deltas)} expected to be > ${timeoutMS - timeoutCheckMargin}`))
                         } else {
                             done();
                         }

test/unit/@node-red/editor-api/lib/editor/ui_spec.js

@@ -29,7 +29,7 @@ describe("api/editor/ui", function() {
     var app;
 
     before(function() {
-        ui.init({}, {
+        ui.init({
             nodes: {
                 getIcon: function(opts) {
                     return new Promise(function(resolve,reject) {