@node-red/nodes 2.2.0-beta.1 → 2.2.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

package/core/common/20-inject.html

@@ -234,7 +234,7 @@
                             }
                         } else if (v[i].vt === "jsonata") {
                             try{jsonata(v[i].v);}catch(e){return false;}
-                        } else if ([i].vt === "json") {
+                        } else if (v[i].vt === "json") {
                             try{JSON.parse(v[i].v);}catch(e){return false;}
                         }
                     }

package/core/function/10-function.js

@@ -112,6 +112,7 @@ module.exports = function(RED) {
                 "var node = {"+
                     "id:__node__.id,"+
                     "name:__node__.name,"+
+                    "path:__node__.path,"+
                     "outputCount:__node__.outputCount,"+
                     "log:__node__.log,"+
                     "error:__node__.error,"+
@@ -163,6 +164,7 @@ module.exports = function(RED) {
             __node__: {
                 id: node.id,
                 name: node.name,
+                path: node._path,
                 outputCount: node.outputs,
                 log: function() {
                     node.log.apply(node, arguments);
@@ -344,6 +346,7 @@ module.exports = function(RED) {
                         var node = {
                             id:__node__.id,
                             name:__node__.name,
+                            path:__node__.path,
                             outputCount:__node__.outputCount,
                             log:__node__.log,
                             error:__node__.error,
@@ -366,6 +369,7 @@ module.exports = function(RED) {
                         var node = {
                             id:__node__.id,
                             name:__node__.name,
+                            path:__node__.path,
                             outputCount:__node__.outputCount,
                             log:__node__.log,
                             error:__node__.error,

package/core/function/89-delay.html

@@ -114,7 +114,8 @@
             timeout: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             timeoutUnits: {value:"seconds"},
             rate: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            nbRateUnits: {value:"1", required:false, validate:RED.validators.regex(/\d+|/)},
+            nbRateUnits: {value:"1", required:false,
+                          validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             rateUnits: {value: "second"},
             randomFirst: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             randomLast: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},

package/core/network/10-mqtt.js

@@ -288,7 +288,7 @@ module.exports = function(RED) {
                         //TODO: delete msg.responseTopic - to prevent it being resent?
                     }
                 }
-                topicOK = topicOK && !/[\+#]/.test(msg.topic);
+                topicOK = topicOK && !/[\+#\b\f\n\r\t\v\0]/.test(msg.topic);
 
                 if (topicOK) {
                     node.brokerConn.publish(msg, done); // send the message
@@ -730,12 +730,18 @@ module.exports = function(RED) {
                     node.client.on("reconnect", function() {
                         setStatusConnecting(node, true);
                     });
-                    //TODO: what to do with this event? Anything? Necessary?
+                    //Broker Disconnect - V5 event
                     node.client.on("disconnect", function(packet) {
                         //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
-                        var rc = packet && packet.properties && packet.properties.reasonString;
-                        var rc = packet && packet.properties && packet.reasonCode;
-                        //TODO: If keeping this event, do we use these? log these?
+                        const rc = (packet && packet.properties && packet.reasonCode) || packet.reasonCode;
+                        const rs = packet && packet.properties && packet.properties.reasonString || "";
+                        const details = {
+                            broker: (node.clientid?node.clientid+"@":"")+node.brokerurl,
+                            reasonCode: rc,
+                            reasonString: rs
+                        }
+                        node.log(RED._("mqtt.state.broker-disconnected", details));
+                        setStatusDisconnected(node, true);
                     });
                     // Register disconnect handlers
                     node.client.on('close', function () {

package/core/network/21-httprequest.js

@@ -264,7 +264,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
             if (opts.headers.hasOwnProperty('cookie')) {
                 var cookies = cookie.parse(opts.headers.cookie, {decode:String});
                 for (var name in cookies) {
-                    opts.cookieJar.setCookie(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
+                    opts.cookieJar.setCookieSync(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
                 }
                 delete opts.headers.cookie;
             }
@@ -277,13 +277,13 @@ in your Node-RED user directory (${RED.settings.userDir}).
                         } else if (typeof msg.cookies[name] === 'object') {
                             if(msg.cookies[name].encode === false){
                                 // If the encode option is false, the value is not encoded.
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
                             } else {
                                 // The value is encoded by encodeURIComponent().
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
                             }
                         } else {
-                            opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
+                            opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
                         }
                     }
                 }

package/locales/en-US/messages.json

@@ -442,7 +442,8 @@
         "state": {
             "connected": "Connected to broker: __broker__",
             "disconnected": "Disconnected from broker: __broker__",
-            "connect-failed": "Connection failed to broker: __broker__"
+            "connect-failed": "Connection failed to broker: __broker__",
+            "broker-disconnected": "Broker __broker__ disconnected client: __reasonCode__ __reasonString__"
         },
         "retain": "Retain",
         "output": {

package/locales/ja/messages.json

@@ -442,7 +442,8 @@
         "state": {
             "connected": "ブローカへ接続しました: __broker__",
             "disconnected": "ブローカから切断されました: __broker__",
-            "connect-failed": "ブローカへの接続に失敗しました: __broker__"
+            "connect-failed": "ブローカへの接続に失敗しました: __broker__",
+            "broker-disconnected": "ブローカ __broker__ がクライアントを切断しました: __reasonCode__ __reasonString__"
         },
         "retain": "保持",
         "output": {
@@ -580,7 +581,9 @@
             "server": "サーバ",
             "return": "戻り値",
             "ms": "ミリ秒",
-            "chars": "文字"
+            "chars": "文字",
+            "close": "終了",
+            "optional": "(任意)"
         },
         "type": {
             "listen": "待ち受け",
@@ -619,7 +622,8 @@
             "socket-error": "__host__:__port__ にてソケットのエラーが生じました",
             "no-host": "ホスト名またはポートが設定されていません",
             "connect-timeout": "接続がタイムアウトしました",
-            "connect-fail": "接続に失敗しました"
+            "connect-fail": "接続に失敗しました",
+            "bad-string": "文字列への変換に失敗しました"
         }
     },
     "udp": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.2.0-beta.1",
+    "version": "2.2.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -17,7 +17,7 @@
     "dependencies": {
         "acorn": "8.7.0",
         "acorn-walk": "8.2.0",
-        "ajv": "8.8.2",
+        "ajv": "8.9.0",
         "body-parser": "1.19.1",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.4",
@@ -37,13 +37,13 @@
         "js-yaml": "3.14.1",
         "media-typer": "1.1.0",
         "mqtt": "4.3.4",
-        "multer": "1.4.3",
+        "multer": "1.4.4",
         "mustache": "4.2.0",
         "on-headers": "1.0.2",
         "raw-body": "2.4.2",
         "tough-cookie": "4.0.0",
         "uuid": "8.3.2",
-        "ws": "7.5.1",
+        "ws": "7.5.6",
         "xml2js": "0.4.23",
         "iconv-lite": "0.6.3"
     }