@node-red/nodes 4.0.2 → 4.0.3

package/core/network/05-tls.js

@@ -104,14 +104,14 @@ module.exports = function(RED) {
             if (this.credentials && this.credentials.passphrase) {
                 opts.passphrase = this.credentials.passphrase;
             }
-            if (this.servername) {
-                opts.servername = this.servername;
-            }
-            if (this.alpnprotocol) {
-                opts.ALPNProtocols = [this.alpnprotocol];
-            }
-            opts.rejectUnauthorized = this.verifyservercert;
         }
+        if (this.servername) {
+            opts.servername = this.servername;
+        }
+        if (this.alpnprotocol) {
+            opts.ALPNProtocols = [this.alpnprotocol];
+        }
+        opts.rejectUnauthorized = this.verifyservercert;
         return opts;
     }
 

package/core/network/10-mqtt.js

@@ -673,6 +673,8 @@ module.exports = function(RED) {
             delete node.options.protocolId; //V4+ default
             delete node.options.protocolVersion; //V4 default
             delete node.options.properties;//V5 only
+
+
             if (node.compatmode == "true" || node.compatmode === true || node.protocolVersion == 3) {
                 node.options.protocolId = 'MQIsdp';//V3 compat only
                 node.options.protocolVersion = 3;
@@ -691,6 +693,21 @@ module.exports = function(RED) {
                     setIntProp(node,node.options.properties,"sessionExpiryInterval");
                 }
             }
+            // Ensure will payload, if set, is a string
+            if (node.options.will && Object.hasOwn(node.options.will, 'payload')) {
+                let payload = node.options.will.payload
+                if (payload === null || typeof payload === 'undefined') {
+                    payload = "";
+                } else if (!Buffer.isBuffer(payload)) {
+                    if (typeof payload === "object") {
+                        payload = JSON.stringify(payload);
+                    } else if (typeof payload !== "string") {
+                        payload = "" + payload;
+                    }
+                }
+                node.options.will.payload = payload
+            }
+
             if (node.usetls && n.tls) {
                 var tlsNode = RED.nodes.getNode(n.tls);
                 if (tlsNode) {
@@ -725,6 +742,7 @@ module.exports = function(RED) {
         };
 
         node.deregister = function(mqttNode, done, autoDisconnect) {
+            setStatusDisconnected(mqttNode, false);
             delete node.users[mqttNode.id];
             if (autoDisconnect && !node.closing && node.connected && Object.keys(node.users).length === 0) {
                 node.disconnect(done);

package/core/sequence/17-split.html

@@ -21,7 +21,7 @@
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.split"></span></label>
+        <label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.splitThe"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row"><span data-i18n="[html]split.strBuff"></span></div>

package/core/sequence/19-batch.html

@@ -36,6 +36,10 @@
             <label style="margin-left: 10px; width: 175px;" for="node-input-overlap" data-i18n="batch.count.overlap"></label>
             <input type="text" id="node-input-overlap" style="width: 50px;">
         </div>
+        <div class="form-row">
+            <input type="checkbox" id="node-input-honourParts" style="margin-left: 10px; margin-right:10px; vertical-align:top; width:auto;">
+            <label for="node-input-honourParts" style="width:auto;" data-i18n="batch.honourParts"></label>
+        </div>
     </div>
 
     <div class="node-row-msg-interval">
@@ -45,7 +49,7 @@
             <span data-i18n="batch.interval.seconds"></span>
         </div>
         <div class="form-row">
-            <input type="checkbox" id="node-input-allowEmptySequence" style="margin-left:20px; margin-right: 10px; vertical-align:top; width:auto;">
+            <input type="checkbox" id="node-input-allowEmptySequence" style="margin-left:20px; margin-right:10px; vertical-align:top; width:auto;">
             <label for="node-input-allowEmptySequence" style="width:auto;" data-i18n="batch.interval.empty"></label>
         </div>
     </div>
@@ -101,6 +105,7 @@
                 }
             },
             allowEmptySequence: {value:false},
+            honourParts: {value:false},
             topics: {value:[{topic:""}]}
         },
         inputs:1,

package/core/sequence/19-batch.js

@@ -181,6 +181,8 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         var node = this;
         var mode = n.mode || "count";
+        var eof = false;
+        node.honourParts = n.honourParts || false;
 
         node.pending_count = 0;
         if (mode === "count") {
@@ -201,9 +203,12 @@ module.exports = function(RED) {
                     return;
                 }
                 var queue = node.pending;
+                if (node.honourParts && msg.hasOwnProperty("parts")) {
+                    if (msg.parts.index + 1 === msg.parts.count) { eof = true; }
+                }
                 queue.push({msg, send, done});
                 node.pending_count++;
-                if (queue.length === count) {
+                if (queue.length === count || eof === true) {
                     send_msgs(node, queue, is_overlap);
                     for (let i = 0; i < queue.length-overlap; i++) {
                         queue[i].done();
@@ -211,6 +216,7 @@ module.exports = function(RED) {
                     node.pending =
                         (overlap === 0) ? [] : queue.slice(-overlap);
                     node.pending_count = 0;
+                    eof = false;
                 }
                 var max_msgs = max_kept_msgs_count(node);
                 if ((max_msgs > 0) && (node.pending_count > max_msgs)) {

package/examples/function/range/01 - Scale input value.json

@@ -1 +1 @@
-[{"id":"827a48c0.912d88","type":"comment","z":"ff17dfa9.8fa6d","name":"Map property between different numeric ranges","info":"Range node can scale a number from one numeric range to another.\n\nSee Node-RED cookbook [item](https://cookbook.nodered.org/basic/map-between-different-number-ranges).","x":240,"y":60,"wires":[]},{"id":"bb23bd77.ce725","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"0","payloadType":"num","x":170,"y":120,"wires":[["42ed281c.790b38"]]},{"id":"42ed281c.790b38","type":"range","z":"ff17dfa9.8fa6d","minin":"0","maxin":"1023","minout":"0","maxout":"5","action":"clamp","round":false,"name":"","x":390,"y":160,"wires":[["56e6dd0f.436c24"]]},{"id":"54659d5c.0283e4","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"512","payloadType":"num","x":170,"y":160,"wires":[["42ed281c.790b38"]]},{"id":"85ce0127.07b06","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"1023","payloadType":"num","x":170,"y":200,"wires":[["42ed281c.790b38"]]},{"id":"56e6dd0f.436c24","type":"debug","z":"ff17dfa9.8fa6d","name":"","active":true,"console":"false","complete":"false","x":590,"y":160,"wires":[]}]
+[{"id":"827a48c0.912d88","type":"comment","z":"ff17dfa9.8fa6d","name":"Map property between different numeric ranges","info":"Range node can scale a number from one numeric range to another.\n\nSee Node-RED cookbook [item](https://cookbook.nodered.org/basic/map-between-different-number-ranges).","x":240,"y":60,"wires":[]},{"id":"bb23bd77.ce725","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"0","payloadType":"num","x":170,"y":120,"wires":[["42ed281c.790b38"]]},{"id":"42ed281c.790b38","type":"range","z":"ff17dfa9.8fa6d","minin":"0","maxin":"1023","minout":"0","maxout":"5","action":"clamp","round":false,"property":"payload","name":"","x":390,"y":160,"wires":[["56e6dd0f.436c24"]]},{"id":"54659d5c.0283e4","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"512","payloadType":"num","x":170,"y":160,"wires":[["42ed281c.790b38"]]},{"id":"85ce0127.07b06","type":"inject","z":"ff17dfa9.8fa6d","name":"","repeat":"","crontab":"","once":false,"topic":"","payload":"1023","payloadType":"num","x":170,"y":200,"wires":[["42ed281c.790b38"]]},{"id":"56e6dd0f.436c24","type":"debug","z":"ff17dfa9.8fa6d","name":"","active":true,"console":"false","complete":"false","x":590,"y":160,"wires":[]}]

package/locales/de/messages.json

@@ -912,6 +912,7 @@
         "objectSend": "Sende eine Nachricht für jedes Schlüssel/Wert-Paar",
         "strBuff": "<b>string</b> / <b>buffer</b>",
         "array": "<b>array</b>",
+        "splitThe": "Split",
         "splitUsing": "Aufteilung",
         "splitLength": "feste Längen von",
         "stream": "Als Nachrichtenstrom behandeln (Streaming-Modus)",

package/locales/en-US/messages.json

@@ -1011,12 +1011,13 @@
         "tip": "Tip: The filename should be an absolute path, otherwise it will be relative to the working directory of the Node-RED process."
     },
     "split": {
-        "split": "Split",
+        "split": "split",
         "intro": "Split <code>msg.payload</code> based on type:",
         "object": "<b>Object</b>",
         "objectSend": "Send a message for each key/value pair",
         "strBuff": "<b>String</b> / <b>Buffer</b>",
         "array": "<b>Array</b>",
+        "splitThe": "Split the",
         "splitUsing": "Split using",
         "splitLength": "Fixed length of",
         "stream": "Handle as a stream of messages",
@@ -1113,6 +1114,7 @@
         "too-many": "too many pending messages in batch node",
         "unexpected": "unexpected mode",
         "no-parts": "no parts property in message",
+        "honourParts": "Allow msg.parts to also complete batch operation.",
         "error": {
             "invalid-count": "Invalid count",
             "invalid-overlap": "Invalid overlap",

package/locales/fr/messages.json

@@ -1017,6 +1017,7 @@
         "objectSend": "Envoie un message pour chaque paire clé/valeur",
         "strBuff": "<b>Chaîne</b> / <b>Tampon</b>",
         "array": "<b>Tableau</b>",
+        "splitThe": "Diviser le",
         "splitUsing": "Diviser en utilisant",
         "splitLength": "Longueur fixe de",
         "stream": "Gérer comme un flux de messages",
@@ -1046,6 +1047,7 @@
         "joinedUsing": "joint en utilisant",
         "send": "Envoyer le message :",
         "afterCount": "Après un nombre de parties du message",
+        "useparts": "Utiliser la propriété msg.parts existante",
         "count": "nombre",
         "subsequent": "Et tous les messages suivants.",
         "afterTimeout": "Après un délai d'attente après le premier message",
@@ -1112,6 +1114,7 @@
         "too-many": "Trop de messages en attente dans le noeud batch",
         "unexpected": "Mode inattendu",
         "no-parts": "Aucune propriété de pièces dans le message",
+        "honourParts": "Autoriser msg.parts à compléter les opération par lots",
         "error": {
             "invalid-count": "Compte invalide",
             "invalid-overlap": "Recouvrement invalide",

package/locales/ja/messages.json

@@ -1017,6 +1017,7 @@
         "objectSend": "各key/valueペアのメッセージを送信",
         "strBuff": "<b>文字列</b> / <b>バッファ</b>",
         "array": "<b>配列</b>",
+        "splitThe": "に基づく",
         "splitUsing": "分割",
         "splitLength": "固定長",
         "stream": "メッセージのストリームとして処理",
@@ -1046,6 +1047,7 @@
         "joinedUsing": "連結文字",
         "send": "メッセージ送信:",
         "afterCount": "指定数のメッセージパーツを受信後",
+        "useparts": "既存のmsg.partsプロパティを使用",
         "count": "合計値",
         "subsequent": "後続のメッセージ毎",
         "afterTimeout": "最初のメッセージ受信からのタイムアウト後",
@@ -1112,6 +1114,7 @@
         "too-many": "batchノード内で保持しているメッセージが多すぎます",
         "unexpected": "想定外のモード",
         "no-parts": "メッセージにpartsプロパティがありません",
+        "honourParts": "msg.partsを用いたbatch操作を許可",
         "error": {
             "invalid-count": "メッセージ数が不正",
             "invalid-overlap": "オーバラップが不正",

package/locales/pt-BR/messages.json

@@ -44,7 +44,7 @@
              "global": "contexto global",
              "str": "Cadeia de caracteres",
              "num": "número",
-             "bool": "booliano",  
+             "bool": "booliano",
              "json": "objeto",
              "bin": "Armazenamento temporário",
              "date": "Carimbo de data/hora",
@@ -352,8 +352,8 @@
         }
     },
     "trigger": {
-        "send": "Enviar", 
-        "then": "então", 
+        "send": "Enviar",
+        "then": "então",
         "then-send": "então enviem",
         "output": {
             "string": "a cadeia de caracteres",
@@ -446,7 +446,7 @@
             "staticTopic": "Assinar um tópico único",
             "dynamicTopic": "Assinatura dinâmica",
             "auto-connect": "Conectar automaticamente",
-            "auto-mode-depreciated": "Esta opção está deprecada. Favor utilizar o novo modo de auto-detecção."            
+            "auto-mode-depreciated": "Esta opção está deprecada. Favor utilizar o novo modo de auto-detecção."
         },
         "sections-label": {
             "birth-message": "Mensagem enviada na conexão (mensagem de nascimento)",
@@ -466,8 +466,8 @@
             "close-topic": "Deixe em branco para desativar a mensagem de fechamento"
         },
         "state": {
-            "connected": "Conectado ao negociante: _ broker _", 
-            "disconnected": "Desconectado do negociante: _ broker _", 
+            "connected": "Conectado ao negociante: _ broker _",
+            "disconnected": "Desconectado do negociante: _ broker _",
             "connect-failed": "Falha na conexão com o negociante: __broker__",
             "broker-disconnected": "Cliente de negociante __broker__ desconectado: __reasonCode__ __reasonString__"
         },
@@ -898,7 +898,7 @@
             "o2j": "Objeto para opções JSON",
             "pretty": "Formatar cadeia de caracteres JSON",
             "action": "Ação",
-            "property": "Propriedade",  
+            "property": "Propriedade",
             "actions": {
                 "toggle": "Converter entre cadeia de caracteres JSON e Objeto",
                 "str": "Sempre converter em cadeia de caracteres JSON",
@@ -929,7 +929,7 @@
             "write": "escrever arquivo",
             "read": "ler arquivo",
             "filename": "Nome do arquivo",
-            "path": "caminho", 
+            "path": "caminho",
             "action": "Ação",
             "addnewline": "Adicionar nova linha (\\n) a cada carga útil?",
             "createdir": "Criar diretório se não existir?",
@@ -994,6 +994,7 @@
          "objectSend": "Envia uma mensagem para cada par chave/valor",
          "strBuff": "<b>Cadeia de caracteres</b> / <b>Armazenamento Temporário</b>",
          "array": "<b>Matriz</b>",
+         "splitThe": "Dividir",
          "splitUsing": "Dividir usando",
          "splitLength": "Comprimento fixo de",
          "stream": "Tratar como uma transmissão de mensagens",
@@ -1066,9 +1067,9 @@
     "batch" : {
         "batch": "lote",
         "mode": {
-            "label": "Modo", 
-            "num-msgs": "Agrupar por número de mensagens", 
-            "interval": "Agrupar por intervalo de tempo", 
+            "label": "Modo",
+            "num-msgs": "Agrupar por número de mensagens",
+            "interval": "Agrupar por intervalo de tempo",
             "concat": "Concatenar sequências"
         },
         "count": {

package/locales/ru/messages.json

@@ -874,6 +874,7 @@
         "objectSend":"Отправлять сообщение для каждой пары ключ/значение",
         "strBuff":"<b>Строка</b> / <b>Буфер</b>",
         "array":"<b>Массив</b>",
+        "splitThe": "Pазделить",
         "splitUsing":"С помощью",
         "splitLength":"Фикс. длина",
         "stream":"Обрабатывать как поток сообщений",

package/locales/zh-CN/messages.json

@@ -997,6 +997,7 @@
     "objectSend": "每个键值对作为单个消息发送",
     "strBuff": "<b>字符串</b> / <b>Buffer</b>",
     "array": "<b>数组</b>",
+    "splitThe": "Split",
     "splitUsing": "拆分使用",
     "splitLength": "固定长度",
     "stream": "作为消息流处理",

package/locales/zh-TW/messages.json

@@ -866,6 +866,7 @@
         "objectSend": "每個鍵值對作為單個消息發送",
         "strBuff": "<b>字串</b> / <b>Buffer</b>",
         "array": "<b>陣列</b>",
+        "splitThe": "Split",
         "splitUsing": "拆分使用",
         "splitLength": "固定長度",
         "stream": "作為消息流處理",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "4.0.2",
+    "version": "4.0.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -15,10 +15,10 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.11.3",
-        "acorn-walk": "8.3.2",
-        "ajv": "8.14.0",
-        "body-parser": "1.20.2",
+        "acorn": "8.12.1",
+        "acorn-walk": "8.3.4",
+        "ajv": "8.17.1",
+        "body-parser": "1.20.3",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.5",
         "cookie-parser": "1.4.6",
@@ -41,7 +41,7 @@
         "node-watch": "0.7.4",
         "on-headers": "1.0.2",
         "raw-body": "2.5.2",
-        "tough-cookie": "4.1.4",
+        "tough-cookie": "^5.0.0",
         "uuid": "9.0.1",
         "ws": "7.5.10",
         "xml2js": "0.6.2",