file node - close files when required

Dave Conway-Jones · Dave Conway-Jones · commit 160c27c15ab3 · 2017-06-28T17:36:04.000+01:00
diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
@@ -59,24 +59,27 @@ module.exports = function(RED) {
 
                 while (node.data.length > 0) {
                     if (this.overwriteFile === "true") {
-                        node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w' });
+                        node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
                         node.wstream.on("error", function(err) {
                             node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
                         });
+                        node.wstream.write(node.data.shift(), function() { node.wstream.end(); });
                     }
                     else {
-                        if (!node.wstream) {
-                            node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a' });
+                        if ((!node.wstream) || (!node.filename)) {
+                            node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true });
                             node.wstream.on("error", function(err) {
                                 node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
                             });
                         }
+                        if (node.filename) { node.wstream.write(node.data.shift()); }
+                        else { node.wstream.write(node.data.shift(), function() { node.wstream.end(); }); }
                     }
-                    node.wstream.write(node.data.shift());
                 }
             }
         });
         this.on('close', function() {
+            if (node.wstream) { node.wstream.end(); }
             node.status({});
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -59,24 +59,27 @@ module.exports = function(RED) {`
`59`	`59`
`60`	`60`	`while (node.data.length > 0) {`
`61`	`61`	`if (this.overwriteFile === "true") {`
`62`		`- node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w' });`
	`62`	`+ node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });`
`63`	`63`	`node.wstream.on("error", function(err) {`
`64`	`64`	`node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);`
`65`	`65`	`});`
	`66`	`+ node.wstream.write(node.data.shift(), function() { node.wstream.end(); });`
`66`	`67`	`}`
`67`	`68`	`else {`
`68`		`- if (!node.wstream) {`
`69`		`- node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a' });`
	`69`	`+ if ((!node.wstream) \|\| (!node.filename)) {`
	`70`	`+ node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true });`
`70`	`71`	`node.wstream.on("error", function(err) {`
`71`	`72`	`node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);`
`72`	`73`	`});`
`73`	`74`	`}`
	`75`	`+ if (node.filename) { node.wstream.write(node.data.shift()); }`
	`76`	`+ else { node.wstream.write(node.data.shift(), function() { node.wstream.end(); }); }`
`74`	`77`	`}`
`75`		`- node.wstream.write(node.data.shift());`
`76`	`78`	`}`
`77`	`79`	`}`
`78`	`80`	`});`
`79`	`81`	`this.on('close', function() {`
	`82`	`+ if (node.wstream) { node.wstream.end(); }`
`80`	`83`	`node.status({});`
`81`	`84`	`});`
`82`	`85`	`}`