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

package/core/network/31-tcpin.html

@@ -50,7 +50,8 @@
     </div>
 
     <div id="node-row-newline" class="form-row hidden" style="padding-left:110px;">
-        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional">
+        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
+        <input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
     </div>
 
     <div class="form-row">
@@ -70,14 +71,27 @@
         defaults: {
             name: {value:""},
             server: {value:"server", required:true},
-            host: {value:"", validate:function(v) { return (this.server == "server")||v.length > 0;} },
-            port: {value:"", required:true, validate:RED.validators.number()},
+            host: {
+                value:"",
+                validate:function(v, opt) {
+                    if ((this.server == "server")||v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:tcpin.errors.invalid-host");
+                }
+            },
+            port: {
+                value:"", required:true,
+                label:RED._("node-red:tcpin.label.port"),
+                validate:RED.validators.number(false)},
             datamode:{value:"stream"},
             datatype:{value:"buffer"},
             newline:{value:""},
             topic: {value:""},
+            trim: {value:false},
             base64: {/*deprecated*/ value:false, required:true},
-            tls: {type:"tls-config", value:'', required:false}
+            tls: {type:"tls-config", value:'', required:false,
+                  label:RED._("node-red:httpin.tls-config") }
         },
         inputs:0,
         outputs:1,
@@ -186,12 +200,29 @@
         color: "Silver",
         defaults: {
             name: {value:""},
-            host: {value:"",validate:function(v) { return (this.beserver != "client")||v.length > 0;} },
-            port: {value:"",validate:function(v) { return (this.beserver == "reply")||RED.validators.number()(v); } },
+            host: {
+                value:"",
+                validate:function(v, opt) {
+                    if ((this.beserver != "client")||v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:tcpin.errors.invalid-host");
+                }
+            },
+            port: {
+                value:"",
+                validate:function(v) {
+                    if ((this.beserver == "reply")||RED.validators.number()(v)) {
+                        return true;
+                    }
+                    return RED._("node-red:tcpin.errors.invalid-port");
+                }
+            },
             beserver: {value:"client", required:true},
             base64: {value:false, required:true},
             end: {value:false, required:true},
-            tls: {type:"tls-config", value:'', required:false}
+            tls: {type:"tls-config", value:'', required:false,
+                  label:RED._("node-red:httpin.tls-config") }
         },
         inputs:1,
         outputs:0,
@@ -286,7 +317,8 @@
         <span id="node-units"></span>
     </div>
     <div id="node-row-newline" class="form-row hidden" style="padding-left:162px;">
-        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional">
+        <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
+        <input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -301,12 +333,17 @@
         defaults: {
             name: {value:""},
             server: {value:""},
-            port: {value:"", validate:RED.validators.regex(/^(\d*|)$/)},
+            port: {
+                value:"",
+                label: RED._("node-red:tcpin.label.port"),
+                validate:RED.validators.regex(/^(\d*|)$/)
+            },
             out: {value:"time", required:true},
             ret: {value:"buffer"},
             splitc: {value:"0", required:true},
             newline: {value:""},
-            tls: {type:"tls-config", value:'', required:false}
+            trim: {value:false},
+            tls: {type:"tls-config", value:'', required:false, label:RED._("node-red:httpin.tls-config")}
         },
         inputs:1,
         outputs:1,

package/core/network/31-tcpin.js

@@ -88,6 +88,7 @@ module.exports = function(RED) {
         this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
         this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
         this.base64 = n.base64;
+        this.trim = n.trim || false;
         this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
         this.closing = false;
         this.connected = false;
@@ -135,7 +136,8 @@ module.exports = function(RED) {
                             buffer = buffer+data;
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
-                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd()};
+                                msg = {topic:node.topic, payload:parts[i]};
+                                if (node.trim == true) { msg.payload += node.newline; }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -229,7 +231,8 @@ module.exports = function(RED) {
                             buffer = buffer+data;
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
-                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd(), ip:socket.remoteAddress, port:socket.remotePort};
+                                msg = {topic:node.topic, payload:parts[i], ip:socket.remoteAddress, port:socket.remotePort};
+                                if (node.trim == true) { msg.payload += node.newline; }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -432,7 +435,7 @@ module.exports = function(RED) {
             });
         }
         else {
-            var connectedSockets = [];
+            const connectedSockets = new Set();
             node.status({text:RED._("tcpin.status.connections",{count:0})});
             let srv = net;
             let connOpts;
@@ -453,16 +456,16 @@ module.exports = function(RED) {
                 });
                 socket.on('close',function() {
                     node.log(RED._("tcpin.status.connection-closed",{host:socket.remoteAddress, port:socket.remotePort}));
-                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
-                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                    connectedSockets.delete(socket);
+                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
                 });
                 socket.on('error',function() {
                     node.log(RED._("tcpin.errors.socket-error",{host:socket.remoteAddress, port:socket.remotePort}));
-                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
-                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                    connectedSockets.delete(socket);
+                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
                 });
-                connectedSockets.push(socket);
-                node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                connectedSockets.add(socket);
+                node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
             });
 
             node.on("input", function(msg, nodeSend, nodeDone) {
@@ -475,10 +478,10 @@ module.exports = function(RED) {
                     } else {
                         buffer = Buffer.from(""+msg.payload);
                     }
-                    for (var i = 0; i < connectedSockets.length; i += 1) {
-                        if (node.doend === true) { connectedSockets[i].end(buffer); }
-                        else { connectedSockets[i].write(buffer); }
-                    }
+                    connectedSockets.forEach(soc => {
+                        if (node.doend === true) { soc.end(buffer); }
+                        else { soc.write(buffer); }
+                    })
                 }
                 nodeDone();
             });
@@ -495,12 +498,10 @@ module.exports = function(RED) {
                 } else {
                     node.log(RED._("tcpin.status.listening-port",{port:node.port}));
                     node.on('close', function() {
-                        for (var c in connectedSockets) {
-                            if (connectedSockets.hasOwnProperty(c)) {
-                                connectedSockets[c].end();
-                                connectedSockets[c].unref();
-                            }
-                        }
+                        connectedSockets.forEach(soc => {
+                            soc.end();
+                            soc.unref();
+                        })
                         server.close();
                         node.log(RED._("tcpin.status.stopped-listening",{port:node.port}));
                     });
@@ -518,6 +519,7 @@ module.exports = function(RED) {
         this.out = n.out;
         this.ret = n.ret || "buffer";
         this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
+        this.trim = n.trim || false;
         this.splitc = n.splitc;
         if (n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
@@ -653,7 +655,8 @@ module.exports = function(RED) {
                                         let parts = chunk.split(node.newline);
                                         for (var p=0; p<parts.length-1; p+=1) {
                                             let m = RED.util.cloneMessage(msg);
-                                            m.payload = parts[p] + node.newline.trimEnd();
+                                            m.payload = parts[p];
+                                            if (node.trim == true) { m.payload += node.newline; }
                                             nodeSend(m);
                                         }
                                         chunk = parts[parts.length-1];

package/core/network/32-udp.html

@@ -62,10 +62,22 @@
         defaults: {
             name: {value:""},
             iface: {value:""},
-            port: {value:"",required:true,validate:RED.validators.number()},
+            port: {
+                value:"", required:true,
+                label:RED._("node-red:udp.label.port"),
+                validate:RED.validators.number(false)
+            },
             ipv: {value:"udp4"},
             multicast: {value:"false"},
-            group: {value:"",validate:function(v) { return (this.multicast !== "true")||v.length > 0;} },
+            group: {
+                value:"",
+                validate:function(v,opt) {
+                    if ((this.multicast !== "true")||v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:udp.errors.invalid-group");
+                }
+            },
             datatype: {value:"buffer",required:true}
         },
         inputs:0,

package/core/parsers/70-CSV.html

@@ -75,7 +75,10 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            sep: {value:',',required:true,validate:RED.validators.regex(/^.{1,2}$/)},
+            sep: {
+                value:',', required:true,
+                label:RED._("node-red:csv.label.separator"),
+                validate:RED.validators.regex(/^.{1,2}$/)},
             //quo: {value:'"',required:true},
             hdrin: {value:""},
             hdrout: {value:"none"},

package/core/parsers/70-JSON.html

@@ -21,7 +21,7 @@
         <label style="width:100%;"><span data-i18n="json.label.o2j"></span></label>
     </div>
     <div class="form-row node-json-to-json-options" style="padding-left: 20px;">
-        <input style="width:20px; vertical-align:top; margin-right: 5px;" type="checkbox" id="node-input-pretty"><label style="width: auto;" for="node-input-pretty" data-i18n="json.label.pretty"></span>
+        <input style="width:20px; vertical-align:top; margin-right: 5px;" type="checkbox" id="node-input-pretty"><label style="width: auto;" for="node-input-pretty" data-i18n="json.label.pretty"></label>
     </div>
 </script>
 
@@ -31,7 +31,8 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            property: {value:"payload",required:true},
+            property: {value:"payload",required:true,
+                       label:RED._("node-red:json.label.property")},
             action: {value:""},
             pretty: {value:false}
         },

package/core/parsers/70-XML.html

@@ -26,7 +26,8 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            property: {value:"payload",required:true},
+            property: {value:"payload",required:true,
+                       label:RED._("node-red:common.label.property")},
             attr: {value:""},
             chr: {value:""}
         },

package/core/parsers/70-YAML.html

@@ -15,7 +15,8 @@
         category: 'parser',
         color:"#DEBD5C",
         defaults: {
-            property: {value:"payload",required:true},
+            property: {value:"payload",required:true,
+                       label:RED._("node-red:common.label.property")},
             name: {value:""}
         },
         inputs:1,

package/core/sequence/17-split.html

@@ -202,7 +202,11 @@
             name: {value:""},
             mode: {value:"auto"},
             build: { value:"object"},
-            property: { value:"payload", validate:RED.validators.typedInput("propertyType")},
+            property: {
+                value:"payload",
+                label: RED._("node-red:join.message-prop"),
+                validate:RED.validators.typedInput("propertyType", false)
+            },
             propertyType: { value:"msg"},
             key: {value:"topic"},
             joiner: { value:"\\n"},
@@ -243,7 +247,7 @@
                     var jsonata_or_empty = {
                         value: "jsonata",
                         label: "expression",
-                        icon: "red/images/typedInput/expr.png",
+                        icon: "red/images/typedInput/expr.svg",
                         validate: function(v) {
                             try{
                                 if(v !== "") {

package/core/sequence/19-batch.html

@@ -47,7 +47,7 @@
         <div class="form-row">
             <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>
     </div>
 
     <div class="node-row-msg-concat">
@@ -73,9 +73,33 @@
         defaults: {
             name: {value:""},
             mode: {value:"count"},
-            count: {value:10,validate:function(v) { return RED.validators.number(v) && (v >= 1); }},
-            overlap: {value:0,validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            interval: {value:10,validate:function(v) { return RED.validators.number(v) && (v >= 1); }},
+            count: {
+                value:10,
+                validate:function(v, opt) {
+                    if (RED.validators.number(v) && (v >= 1)) {
+                        return true;
+                    }
+                    return RED._("node-red:batch.error.invalid-count");
+                }
+            },
+            overlap: {
+                value:0,
+                validate:function(v, opt) {
+                    if (RED.validators.number(v) && (v >= 0)) {
+                        return true;
+                    }
+                    return RED._("node-red:batch.error.invalid-overlap");
+                }
+            },
+            interval: {
+                value:10,
+                validate:function(v, opt) {
+                    if (RED.validators.number(v) && (v >= 1)) {
+                        return true;
+                    }
+                    return RED._("node-red:batch.error.invalid-interval");
+                }
+            },
             allowEmptySequence: {value:false},
             topics: {value:[{topic:""}]}
         },

package/core/storage/10-file.html

@@ -3,6 +3,7 @@
     <div class="form-row node-input-filename">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
          <input id="node-input-filename" type="text">
+         <input type="hidden" id="node-input-filenameType">
     </div>
     <div class="form-row">
         <label for="node-input-overwriteFile"><i class="fa fa-random"></i> <span data-i18n="file.label.action"></span></label>
@@ -29,7 +30,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+        <input type="text" id="node-input-name">
     </div>
     <div class="form-tips"><span data-i18n="file.tip"></span></div>
 </script>
@@ -37,7 +38,8 @@
 <script type="text/html" data-template-name="file in">
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
-         <input id="node-input-filename" type="text" data-i18n="[placeholder]file.label.filename">
+         <input id="node-input-filename" type="text">
+         <input type="hidden" id="node-input-filenameType">
     </div>
     <div class="form-row">
         <label for="node-input-format"><i class="fa fa-sign-out"></i> <span data-i18n="file.label.outputas"></span></label>
@@ -60,7 +62,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+        <input type="text" id="node-input-name">
     </div>
     <div class="form-tips"><span data-i18n="file.tip"></span></div>
 </script>
@@ -197,6 +199,7 @@
         defaults: {
             name: {value:""},
             filename: {value:""},
+            filenameType: {value:"str"},
             appendNewline: {value:true},
             createDir: {value:false},
             overwriteFile: {value:"false"},
@@ -207,10 +210,13 @@
         outputs:1,
         icon: "file-out.svg",
         label: function() {
+            var fn = this.filename;
+            if(this.filenameType != "str" && this.filenameType != "env" ) { fn = ""; }
+            if(this.filenameType === "env") { fn = "env."+fn; }
             if (this.overwriteFile === "delete") {
-                return this.name||this._("file.label.deletelabel",{file:this.filename});
+                return this.name||this._("file.label.deletelabel",{file:fn});
             } else {
-                return this.name||this.filename||this._("file.label.write");
+                return this.name||fn||this._("file.label.write");
             }
         },
         paletteLabel: RED._("node-red:file.label.write"),
@@ -229,6 +235,31 @@
                 value: "setbymsg",
                 label: node._("file.encoding.setbymsg")
             }).text(label).appendTo(encSel);
+            $("#node-input-filename").typedInput({
+                default: "str",
+                types: [{label:RED._("node-red:file.label.path"), value:"str", icon:""}, "msg", "jsonata", "env"],
+                typeField: $("#node-input-filenameType")
+            });
+            if(typeof node.filenameType == 'undefined') {
+                //existing node AND filenameType is not set - inplace (compatible) upgrade to new typedInput
+                if(node.filename == "") { //was using empty value to denote msg.filename - set typedInput to match
+                    node.filename = "filename";
+                    node.filenameType = "msg";
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                } else if(/^\${[^}]+}$/.test(node.filename)) { //was using an ${ENV_VAR}
+                    node.filenameType = "env";
+                    node.filename = node.filename.replace(/\${([^}]+)}/g, function(match, name) {
+                        return (name === undefined)?"":name;
+                    });
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                } else { //was using a static filename - set typedInput type to str
+                    node.filenameType = "str";
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                }
+            }
             encodings.forEach(function(item) {
                 if(Array.isArray(item)) {
                     var group = $("<optgroup/>", {
@@ -267,6 +298,7 @@
         defaults: {
             name: {value:""},
             filename: {value:""},
+            filenameType: {value:"str"},
             format: {value:"utf8"},
             chunk: {value:false},
             sendError: {value: false},
@@ -291,7 +323,10 @@
         },
         icon: "file-in.svg",
         label: function() {
-            return this.name||this.filename||this._("file.label.read");
+            var fn = this.filename;
+            if(this.filenameType != "str" && this.filenameType != "env" ) { fn = ""; }
+            if(this.filenameType === "env") { fn = "env."+fn; }
+            return this.name||fn||this._("file.label.read");
         },
         paletteLabel: RED._("node-red:file.label.read"),
         labelStyle: function() {
@@ -305,6 +340,31 @@
                 value: "none",
                 label: label
             }).text(label).appendTo(encSel);
+            $("#node-input-filename").typedInput({
+                default: "str",
+                types: [{label:RED._("node-red:file.label.path"), value:"str", icon:""}, "msg", "jsonata", "env"],
+                typeField: $("#node-input-filenameType")
+            });
+            if(typeof node.filenameType == 'undefined') {
+                //existing node AND filenameType is not set - inplace (compatible) upgrade to new typedInput
+                if(node.filename == "") { //was using empty value to denote msg.filename - set typedInput to match
+                    node.filename = "filename";
+                    node.filenameType = "msg";
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                } else if(/^\${[^}]+}$/.test(node.filename)) { //was using an ${ENV_VAR}
+                    node.filenameType = "env";
+                    node.filename = node.filename.replace(/\${([^}]+)}/g, function(match, name) {
+                        return (name === undefined)?"":name;
+                    });
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                } else { //was using a static filename - set typedInput type to str
+                    node.filenameType = "str";
+                    $("#node-input-filename").typedInput("type", node.filenameType);
+                    $("#node-input-filename").typedInput("value", node.filename);
+                }
+            }
             encodings.forEach(function(item) {
                 if(Array.isArray(item)) {
                     var group = $("<optgroup/>", {

package/core/storage/10-file.js

@@ -39,6 +39,7 @@ module.exports = function(RED) {
         // Write/delete a file
         RED.nodes.createNode(this,n);
         this.filename = n.filename;
+        this.filenameType = n.filenameType;
         this.appendNewline = n.appendNewline;
         this.overwriteFile = n.overwriteFile.toString();
         this.createDir = n.createDir || false;
@@ -50,7 +51,28 @@ module.exports = function(RED) {
         node.closeCallback = null;
 
         function processMsg(msg,nodeSend, done) {
-            var filename = node.filename || msg.filename || "";
+            var filename = node.filename || "";
+            //Pre V3 compatibility - if filenameType is empty, do in place upgrade
+            if(typeof node.filenameType == 'undefined' || node.filenameType == "") {
+                //existing node AND filenameType is not set - inplace (compatible) upgrade
+                if(filename == "") { //was using empty value to denote msg.filename
+                    node.filename = "filename";
+                    node.filenameType = "msg";
+                } else { //was using a static filename - set typedInput type to str
+                    node.filenameType = "str";
+                }
+            }
+
+            RED.util.evaluateNodeProperty(node.filename,node.filenameType,node,msg,(err,value) => {
+                if (err) {
+                    node.error(err,msg);
+                    return done();
+                } else {
+                    filename = value;
+                }
+            });
+            filename = filename || "";
+            msg.filename = filename;
             var fullFilename = filename;
             if (filename && RED.settings.fileWorkingDirectory && !path.isAbsolute(filename)) {
                 fullFilename = path.resolve(path.join(RED.settings.fileWorkingDirectory,filename));
@@ -158,7 +180,7 @@ module.exports = function(RED) {
                             done();
                         });
                     }
-                    if (node.filename) {
+                    if (node.filenameType === "str" || node.filenameType === "env") {
                         // Static filename - write and reuse the stream next time
                         node.wstream.write(buf, function() {
                             nodeSend(msg);
@@ -256,6 +278,7 @@ module.exports = function(RED) {
         // Read a file
         RED.nodes.createNode(this,n);
         this.filename = n.filename;
+        this.filenameType = n.filenameType;
         this.format = n.format;
         this.chunk = false;
         this.encoding = n.encoding || "none";
@@ -270,8 +293,28 @@ module.exports = function(RED) {
         var node = this;
 
         this.on("input",function(msg, nodeSend, nodeDone) {
-            var filename = (node.filename || msg.filename || "").replace(/\t|\r|\n/g,'');
+            var filename = node.filename || "";
+            //Pre V3 compatibility - if filenameType is empty, do in place upgrade
+            if(typeof node.filenameType == 'undefined' || node.filenameType == "") {
+                //existing node AND filenameType is not set - inplace (compatible) upgrade
+                if(filename == "") { //was using empty value to denote msg.filename
+                    node.filename = "filename";
+                    node.filenameType = "msg";
+                } else { //was using a static filename - set typedInput type to str
+                    node.filenameType = "str";
+                }
+            }
+            RED.util.evaluateNodeProperty(node.filename,node.filenameType,node,msg,(err,value) => {
+                if (err) {
+                    node.error(err,msg);
+                    return done();
+                } else {
+                    filename = (value || "").replace(/\t|\r|\n/g,'');
+                }
+            });
+            filename = filename || "";
             var fullFilename = filename;
+            var filePath = "";
             if (filename && RED.settings.fileWorkingDirectory && !path.isAbsolute(filename)) {
                 fullFilename = path.resolve(path.join(RED.settings.fileWorkingDirectory,filename));
             }

package/core/storage/23-watch.html

@@ -36,7 +36,8 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            files: {value:"",required:true},
+            files: {value:"",required:true,
+                    label:RED._("node-red:watch.label.files")},
             recursive: {value:""}
         },
         color:"BurlyWood",