@node-red/nodes 2.2.2 → 3.0.0-beta.3

package/core/storage/23-watch.js

@@ -16,24 +16,9 @@
 
 module.exports = function(RED) {
     "use strict";
-    var Notify = require("fs.notify");
-    var fs = require("fs");
-    var path = require("path");
-
-    var getAllDirs = function (dir, filelist) {
-        filelist = filelist || [];
-        fs.readdirSync(dir).forEach(file => {
-            try {
-                if (fs.statSync(path.join(dir, file)).isDirectory() ) {
-                    filelist.push(path.join(dir, file));
-                    getAllDirs(path.join(dir, file), filelist);
-                }
-            } catch (error) {
-                //should we raise an error?
-            }
-        });
-        return filelist;
-    }
+    const watch = require('node-watch')
+    const fs = require("fs")
+    const path = require("path")
 
     function WatchNode(n) {
         RED.nodes.createNode(this,n);
@@ -44,52 +29,45 @@ module.exports = function(RED) {
             this.files[f] = this.files[f].trim();
         }
         this.p = (this.files.length === 1) ? this.files[0] : JSON.stringify(this.files);
-        var node = this;
+        const node = this;
 
-        if (node.recursive) {
-            for (var fi in node.files) {
-                if (node.files.hasOwnProperty(fi)) {
-                    node.files = node.files.concat(getAllDirs( node.files[fi]));
-                }
-            }
-        }
+        const watcher = watch(this.files, { recursive: this.recursive });
 
-        var notifications = new Notify(node.files);
-        notifications.on('change', function (file, event, fpath) {
-            var stat;
+        watcher.on('change', function (event, fpath) {
+            const file = path.basename(fpath)
+            let stat;
             try {
-                if (fs.statSync(fpath).isDirectory()) { fpath = path.join(fpath,file); }
                 stat = fs.statSync(fpath);
             } catch(e) { }
-            var type = "none";
-            var msg = { payload:fpath, topic:node.p, file:file, filename:fpath };
+            let type = "none";
+            const msg = {
+                payload:fpath,
+                topic:node.p,
+                file:file,
+                filename:fpath,
+                event: event
+            };
             if (stat) {
                 if (stat.isFile()) { type = "file"; msg.size = stat.size; }
                 else if (stat.isBlockDevice()) { type = "blockdevice"; }
                 else if (stat.isCharacterDevice()) { type = "characterdevice"; }
                 else if (stat.isSocket()) { type = "socket"; }
                 else if (stat.isFIFO()) { type = "fifo"; }
-                else if (stat.isDirectory()) {
-                    type = "directory";
-                    if (node.recursive) {
-                        notifications.add([fpath]);
-                        notifications.add(getAllDirs(fpath));
-                    }
-                }
+                else if (stat.isDirectory()) { type = "directory"; }
                 else { type = "n/a"; }
             }
             msg.type = type;
             node.send(msg);
         });
 
-        notifications.on('error', function (error, fpath) {
-            var msg = { payload:fpath };
+        watcher.on('error', function (error) {
+            const msg = { payload: "" };
             node.error(error,msg);
         });
 
         this.close = function() {
-            notifications.close();
+            watcher.close();
         }
     }
-    RED.nodes.registerType("watch",WatchNode);
+    RED.nodes.registerType("watch", WatchNode);
 }

package/locales/de/messages.json

@@ -423,6 +423,7 @@
             "string": "Ein String",
             "base64": "Ein Base64-kodierter String",
             "auto": "Auto-Erkennung (string oder buffer)",
+            "auto-detect": "Auto-Erkennung (parsed JSON-Objekt, string oder buffer)",
             "json": "Ein analysiertes (parsed) JSON-Objekt"
         },
         "true": "wahr",

package/locales/en-US/common/60-link.html

@@ -29,8 +29,8 @@
     <p>Create virtual wires between flows.</p>
     <h3>Details</h3>
     <p>This node can be configured to either send messages to all <code>link in</code>
-        nodes it is connected to, or to send a response back to the <code>link call</code>
-        node that triggered the flow.</p>
+       nodes it is connected to, or to send a response back to the <code>link call</code>
+       node that triggered the flow.</p>
     <p>When in 'send to all' mode, the wires between link nodes are only displayed when
        the node is selected. If there are any wires to other tabs, a virtual node
        is shown that can be clicked on to jump to the appropriate tab.</p>
@@ -39,12 +39,28 @@
 
 <script type="text/html" data-help-name="link call">
     <p>Calls a flow that starts with a <code>link in</code> node and passes on the response.</p>
+    <h3>Inputs</h3>
+    <dl class="message-properties">
+      <dt class="optional">target<span class="property-type">string</span></dt>
+      <dd>When the option <b>Link Type</b> is set to "Dynamic target", set <code>msg.target</code> to the name of the
+          <code>link in</code> node you wish to call.</dd>
+    </dl>
     <h3>Details</h3>
     <p>This node can be connected to a <code>link in</code> node that exists on any tab.
        The flow connected to that node must end with a <code>link out</code> node configured
        in 'return' mode.</p>
     <p>When this node receives a message, it is passed to the connected <code>link in</code> node.
-       It then waits for a response which it then sends on.</o>
+       It then waits for a response which it then sends on.</p>
     <p>If no response is received within the configured timeout, default 30 seconds, the node
        will log an error that can be caught using the <code>catch</code> node.</p>
+    <p>When the option <b>Link Type</b> is set to "Dynamic target" <code>msg.target</code> can be used to call a
+       <code>link in</code> by name or id. 
+    <ul>
+      <li>If there is a <code>link in</code> nodes with the same id, it will be called</li>
+      <li>If there are two or more <code>link in</code> nodes with the same name, an error will be raised</li>
+      <li>A <code>link call</code> cannot call a <code>link in</code> node inside a subflow</li>
+    </ul>
+    </p>
+    The flow connected to that node must end with a <code>link out</code> node configured
+    in 'return' mode.</p>
 </script>

package/locales/en-US/messages.json

@@ -85,7 +85,11 @@
         "errors": {
             "failed": "inject failed, see log for details",
             "toolong": "Interval too large",
-            "invalid-expr": "Invalid JSONata expression: __error__"
+            "invalid-expr": "Invalid JSONata expression: __error__",
+            "invalid-jsonata": "__prop__: invalid property expression: __error__",
+            "invalid-prop": "__prop__: invalid property expression: __error__",
+            "invalid-json": "__prop__: invalid JSON data: __error__",
+            "invalid-repeat": "Invalid repeat value"
         }
     },
     "catch": {
@@ -125,6 +129,7 @@
         "msgprop": "message property",
         "msgobj": "complete msg object",
         "autostatus": "same as debug output",
+        "messageCount": "message count",
         "to": "To",
         "debtab": "debug tab",
         "tabcon": "debug tab and console",
@@ -132,6 +137,7 @@
         "toConsole": "system console",
         "toStatus": "node status (32 characters)",
         "severity": "Level",
+        "node": "node",
         "notification": {
             "activated": "Successfully activated: __label__",
             "deactivated": "Successfully deactivated: __label__"
@@ -170,6 +176,11 @@
         "outMode": "Mode",
         "sendToAll": "Send to all connected link nodes",
         "returnToCaller": "Return to calling link node",
+        "timeout": "timeout",
+        "linkCallType": "Link Type",
+        "staticLinkCall": "Fixed target",
+        "dynamicLinkCall": "Dynamic target (msg.target)",
+        "dynamicLinkLabel": "Dynamic",
         "error": {
             "missingReturn": "Missing return node information"
         }
@@ -183,20 +194,22 @@
             "key": "Private Key",
             "passphrase": "Passphrase",
             "ca": "CA Certificate",
-            "verify-server-cert":"Verify server certificate",
+            "verify-server-cert": "Verify server certificate",
             "servername": "Server Name",
             "alpnprotocol": "ALPN Protocol"
         },
         "placeholder": {
-            "cert":"path to certificate (PEM format)",
-            "key":"path to private key (PEM format)",
-            "ca":"path to CA certificate (PEM format)",
-            "passphrase":"private key passphrase (optional)",
-            "servername":"for use with SNI",
-            "alpnprotocol":"for use with ALPN"
+            "cert": "path to certificate (PEM format)",
+            "key": "path to private key (PEM format)",
+            "ca": "path to CA certificate (PEM format)",
+            "passphrase": "private key passphrase (optional)",
+            "servername": "for use with SNI",
+            "alpnprotocol": "for use with ALPN"
         },
         "error": {
-            "missing-file": "No certificate/key file provided"
+            "missing-file": "No certificate/key file provided",
+            "invalid-cert": "Certificate not specified",
+            "invalid-key": "Private key not specified"
         }
     },
     "exec": {
@@ -250,8 +263,10 @@
             "moduleLoadError": "Failed to load module __module__: __error__",
             "moduleNameError": "Invalid module variable name: __name__",
             "moduleNameReserved": "Reserved variable name: __name__",
-            "inputListener":"Cannot add listener to 'input' event within Function",
-            "non-message-returned":"Function tried to send a message of type __type__"
+            "inputListener": "Cannot add listener to 'input' event within Function",
+            "non-message-returned": "Function tried to send a message of type __type__",
+            "invalid-js": "Error in JavaScript code",
+            "missing-module": "Module __module__ missing"
         }
     },
     "template": {
@@ -305,27 +320,35 @@
             "limit": "limit",
             "limitTopic": "limit topic",
             "random": "random",
-            "units" : {
+            "rate": "rate",
+            "random-first": "first random value",
+            "random-last": "last random value",
+            "units": {
                 "second": {
-                    "plural" : "Seconds",
+                    "plural": "Seconds",
                     "singular": "Second"
                 },
                 "minute": {
-                    "plural" : "Minutes",
+                    "plural": "Minutes",
                     "singular": "Minute"
                 },
                 "hour": {
-                    "plural" : "Hours",
+                    "plural": "Hours",
                     "singular": "Hour"
                 },
                 "day": {
-                    "plural" : "Days",
+                    "plural": "Days",
                     "singular": "Day"
                 }
             }
         },
         "errors": {
-            "too-many" : "too many pending messages in delay node"
+            "too-many": "too many pending messages in delay node",
+            "invalid-timeout": "Invalid delay value",
+            "invalid-rate": "Invalid rate value",
+            "invalid-rate-unit": "Invalid rate unit value",
+            "invalid-random-first": "Invalid first random value",
+            "invalid-random-last": "Invalid last random value"
         }
     },
     "trigger": {
@@ -360,9 +383,11 @@
             "trigger-block": "trigger & block",
             "trigger-loop": "resend every",
             "reset": "Reset the trigger if:",
-            "resetMessage":"msg.reset is set",
-            "resetPayload":"msg.payload equals",
-            "resetprompt": "optional"
+            "resetMessage": "msg.reset is set",
+            "resetPayload": "msg.payload equals",
+            "resetprompt": "optional",
+            "duration": "duration",
+            "topic": "topic"
         }
     },
     "comment": {
@@ -387,8 +412,8 @@
             "cleansession": "Use clean session",
             "cleanstart": "Use clean start",
             "use-tls": "Use TLS",
-            "tls-config":"TLS Configuration",
-            "verify-server-cert":"Verify server certificate",
+            "tls-config": "TLS Configuration",
+            "verify-server-cert": "Verify server certificate",
             "compatmode": "Use legacy MQTT 3.1 support",
             "userProperties": "User Properties",
             "subscriptionIdentifier": "Subscription ID",
@@ -420,12 +445,13 @@
             "action": "Action",
             "staticTopic": "Subscribe to single topic",
             "dynamicTopic": "Dynamic subscription",
-            "auto-connect": "Connect automatically"
+            "auto-connect": "Connect automatically",
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
         },
-        "sections-label":{
+        "sections-label": {
             "birth-message": "Message sent on connection (birth message)",
-            "will-message":"Message sent on an unexpected disconnection (will message)",
-            "close-message":"Message sent before disconnecting (close message)"
+            "will-message": "Message sent on an unexpected disconnection (will message)",
+            "close-message": "Message sent before disconnecting (close message)"
         },
         "tabs-label": {
             "connection": "Connection",
@@ -434,7 +460,7 @@
         },
         "placeholder": {
             "clientid": "Leave blank for auto generated",
-            "clientid-nonclean":"Must be set for non-clean sessions",
+            "clientid-nonclean": "Must be set for non-clean sessions",
             "will-topic": "Leave blank to disable will message",
             "birth-topic": "Leave blank to disable birth message",
             "close-topic": "Leave blank to disable close message"
@@ -451,6 +477,7 @@
             "string": "a String",
             "base64": "a Base64 encoded string",
             "auto": "auto-detect (string or buffer)",
+            "auto-detect": "auto-detect (parsed JSON object, string or buffer)",
             "json": "a parsed JSON object"
         },
         "true": "true",
@@ -465,7 +492,8 @@
             "invalid-json-parse": "Failed to parse JSON string",
             "invalid-action-action": "Invalid action specified",
             "invalid-action-alreadyconnected": "Disconnect from broker before connecting",
-            "invalid-action-badsubscription": "msg.topic is missing or invalid"
+            "invalid-action-badsubscription": "msg.topic is missing or invalid",
+            "invalid-client-id": "Missing Client ID"
         }
     },
     "httpin": {
@@ -478,7 +506,7 @@
             "status": "Status code",
             "headers": "Headers",
             "other": "other",
-            "paytoqs" : {
+            "paytoqs": {
                 "ignore": "Ignore",
                 "query": "Append to query-string parameters",
                 "body": "Send as request body"
@@ -492,7 +520,7 @@
         "setby": "- set by msg.method -",
         "basicauth": "Use authentication",
         "use-tls": "Enable secure (SSL/TLS) connection",
-        "tls-config":"TLS Configuration",
+        "tls-config": "TLS Configuration",
         "basic": "basic authentication",
         "digest": "digest authentication",
         "bearer": "bearer authentication",
@@ -517,11 +545,12 @@
             "no-response": "No response object",
             "json-error": "JSON parse error",
             "no-url": "No url specified",
-            "deprecated-call":"Deprecated call to __method__",
-            "invalid-transport":"non-http transport requested",
+            "deprecated-call": "Deprecated call to __method__",
+            "invalid-transport": "non-http transport requested",
             "timeout-isnan": "Timeout value is not a valid number, ignoring",
             "timeout-isnegative": "Timeout value is negative, ignoring",
-            "invalid-payload": "Invalid payload"
+            "invalid-payload": "Invalid payload",
+            "invalid-url": "Invalid url"
         },
         "status": {
             "requesting": "requesting"
@@ -554,7 +583,9 @@
             "connect-error": "An error occurred on the ws connection: ",
             "send-error": "An error occurred while sending: ",
             "missing-conf": "Missing server configuration",
-            "duplicate-path": "Cannot have two WebSocket listeners on the same path: __path__"
+            "duplicate-path": "Cannot have two WebSocket listeners on the same path: __path__",
+            "missing-server": "Missing server configuration",
+            "missing-client": "Missing client configuration"
         }
     },
     "watch": {
@@ -583,7 +614,8 @@
             "ms": "ms",
             "chars": "chars",
             "close": "Close",
-            "optional": "(optional)"
+            "optional": "(optional)",
+            "reattach": "re-attach delimiter"
         },
         "type": {
             "listen": "Listen on",
@@ -613,7 +645,6 @@
             "connection-closed": "connection closed from __host__:__port__",
             "connections": "__count__ connection",
             "connections_plural": "__count__ connections"
-
         },
         "errors": {
             "connection-lost": "connection lost to __host__:__port__",
@@ -624,7 +655,9 @@
             "no-host": "Host and/or port not set",
             "connect-timeout": "connect timeout",
             "connect-fail": "connect failed",
-            "bad-string": "failed to convert to string"
+            "bad-string": "failed to convert to string",
+            "invalid-host": "Invalid host",
+            "invalid-port": "Invalid port"
         }
     },
     "udp": {
@@ -638,7 +671,8 @@
             "send": "Send a",
             "toport": "to port",
             "address": "Address",
-            "decode-base64": "Decode Base64 encoded payload?"
+            "decode-base64": "Decode Base64 encoded payload?",
+            "port": "port"
         },
         "placeholder": {
             "interface": "(optional) local interface or address to bind to",
@@ -685,7 +719,8 @@
             "port-notset": "udp: port not set",
             "port-invalid": "udp: port number not valid",
             "alreadyused": "udp: port __port__ already in use",
-            "ifnotfound": "udp: interface __iface__ not found"
+            "ifnotfound": "udp: interface __iface__ not found",
+            "invalid-group": "invalid multicast group"
         }
     },
     "switch": {
@@ -693,7 +728,9 @@
         "label": {
             "property": "Property",
             "rule": "rule",
-            "repair": "recreate message sequences"
+            "repair": "recreate message sequences",
+            "value-rules": "value rules",
+            "sequence-rules": "sequence rules"
         },
         "previous": "previous value",
         "and": "and",
@@ -749,7 +786,9 @@
             "invalid-from": "Invalid 'from' property: __error__",
             "invalid-json": "Invalid 'to' JSON property",
             "invalid-expr": "Invalid JSONata expression: __error__",
-            "no-override": "Cannot set property of non-object type: __property__"
+            "no-override": "Cannot set property of non-object type: __property__",
+            "invalid-prop": "Invalid property expression: __property__",
+            "invalid-json-data": "Invalid JSON data: __error__"
         }
     },
     "range": {
@@ -760,7 +799,11 @@
             "resultrange": "to the target range",
             "from": "from",
             "to": "to",
-            "roundresult": "Round result to the nearest integer?"
+            "roundresult": "Round result to the nearest integer?",
+            "minin": "input from",
+            "maxin": "input to",
+            "minout": "target from",
+            "maxout": "target to"
         },
         "placeholder": {
             "min": "e.g. 0",
@@ -857,8 +900,8 @@
             "property": "Property",
             "actions": {
                 "toggle": "Convert between JSON String & Object",
-                "str":"Always convert to JSON String",
-                "obj":"Always convert to JavaScript Object"
+                "str": "Always convert to JSON String",
+                "obj": "Always convert to JavaScript Object"
             }
         }
     },
@@ -885,6 +928,7 @@
             "write": "write file",
             "read": "read file",
             "filename": "Filename",
+            "path": "path",
             "action": "Action",
             "addnewline": "Add newline (\\n) to each payload?",
             "createdir": "Create directory if it doesn't exist?",
@@ -944,15 +988,15 @@
     },
     "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>",
-        "splitUsing":"Split using",
-        "splitLength":"Fixed length of",
-        "stream":"Handle as a stream of messages",
-        "addname":" Copy key to "
+        "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>",
+        "splitUsing": "Split using",
+        "splitLength": "Fixed length of",
+        "stream": "Handle as a stream of messages",
+        "addname": " Copy key to "
     },
     "join": {
         "join": "join",
@@ -985,6 +1029,7 @@
         "complete": "After a message with the <code>msg.complete</code> property set",
         "tip": "This mode assumes this node is either paired with a <i>split</i> node or the received messages will have a properly configured <code>msg.parts</code> property.",
         "too-many": "too many pending messages in join node",
+        "message-prop": "message property",
         "merge": {
             "topics-label": "Merged Topics",
             "topics": "topics",
@@ -1003,46 +1048,51 @@
             "invalid-type": "Cannot join __error__ to buffer"
         }
     },
-    "sort" : {
+    "sort": {
         "sort": "sort",
-        "target" : "Sort",
-        "seq" : "message sequence",
-        "key" : "Key",
-        "elem" : "element value",
-        "order" : "Order",
-        "ascending" : "ascending",
-        "descending" : "descending",
-        "as-number" : "as number",
-        "invalid-exp" : "Invalid JSONata expression in sort node: __message__",
-        "too-many" : "Too many pending messages in sort node",
-        "clear" : "clear pending message in sort node"
+        "target": "Sort",
+        "seq": "message sequence",
+        "key": "Key",
+        "elem": "element value",
+        "order": "Order",
+        "ascending": "ascending",
+        "descending": "descending",
+        "as-number": "as number",
+        "invalid-exp": "Invalid JSONata expression in sort node: __message__",
+        "too-many": "Too many pending messages in sort node",
+        "clear": "clear pending message in sort node"
     },
-    "batch" : {
+    "batch": {
         "batch": "batch",
         "mode": {
-            "label" : "Mode",
-            "num-msgs" : "Group by number of messages",
-            "interval" : "Group by time interval",
-            "concat" : "Concatenate sequences"
+            "label": "Mode",
+            "num-msgs": "Group by number of messages",
+            "interval": "Group by time interval",
+            "concat": "Concatenate sequences"
         },
         "count": {
-            "label" : "Number of messages",
-            "overlap" : "Overlap",
-            "count" : "count",
-            "invalid" : "Invalid count and overlap"
+            "label": "Number of messages",
+            "overlap": "Overlap",
+            "count": "count",
+            "invalid": "Invalid count and overlap"
         },
         "interval": {
-            "label" : "Interval",
-            "seconds" : "seconds",
-            "empty" : "send empty message when no message arrives"
+            "label": "Interval",
+            "seconds": "seconds",
+            "empty": "send empty message when no message arrives"
         },
         "concat": {
             "topics-label": "Topics",
-            "topic" : "topic"
+            "topic": "topic"
         },
-        "too-many" : "too many pending messages in batch node",
-        "unexpected" : "unexpected mode",
-        "no-parts" : "no parts property in message"
+        "too-many": "too many pending messages in batch node",
+        "unexpected": "unexpected mode",
+        "no-parts": "no parts property in message",
+        "error": {
+            "invalid-count": "Invalid count",
+            "invalid-overlap": "Invalid overlap",
+            "invalid-interval": "Invalid interval"
+        }
     },
     "rbe": {
         "rbe": "filter",
@@ -1051,9 +1101,12 @@
             "init": "Send initial value",
             "start": "Start value",
             "name": "Name",
-            "septopics": "Apply mode separately for each "
+            "septopics": "Apply mode separately for each ",
+            "gap": "value change",
+            "property": "property",
+            "topic": "topic"
         },
-        "placeholder":{
+        "placeholder": {
             "bandgap": "e.g. 10 or 5%",
             "start": "leave blank to use first data received"
         },

package/locales/en-US/network/21-httprequest.html

@@ -25,7 +25,7 @@
         <dd>If not configured in the node, this optional property sets the HTTP method of the request.
             Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code>, <code>PATCH</code> or <code>DELETE</code>.</dd>
         <dt class="optional">headers <span class="property-type">object</span></dt>
-        <dd>Sets the HTTP headers of the request.</dd>
+        <dd>Sets the HTTP headers of the request. NOTE: Any headers set in the node configuration will overwrite any matching headers in <code>msg.headers</code> </dd>
         <dt class="optional">cookies <span class="property-type">object</span></dt>
         <dd>If set, can be used to send cookies with the request.</dd>
         <dt class="optional">payload</dt>

package/locales/en-US/storage/10-file.html

@@ -20,7 +20,9 @@
     <h3>Inputs</h3>
     <dl class="message-properties">
         <dt class="optional">filename <span class="property-type">string</span></dt>
-        <dd>If not configured in the node, this optional property sets the name of the file to be updated.</dd>
+        <dd>The name of the file to be updated can be provided in the node configuration, or as a message property. 
+            By default it will use <code>msg.filename</code> but this can be customised in the node.
+        </dd>
         <dt class="optional">encoding <span class="property-type">string</span></dt>
         <dd>If encoding is configured to be set by msg, then this optional property can set the encoding.</dt>
     </dl>
@@ -43,7 +45,9 @@
     <h3>Inputs</h3>
     <dl class="message-properties">
         <dt class="optional">filename <span class="property-type">string</span></dt>
-        <dd>if not set in the node configuration, this property sets the filename to read.</dd>
+        <dd>The name of the file to be read can be provided in the node configuration, or as a message property. 
+            By default it will use <code>msg.filename</code> but this can be customised in the node.
+        </dd>
     </dl>
     <h3>Outputs</h3>
     <dl class="message-properties">