frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

update close & input handling of File node

Browse Source
This commit is contained in:
Hiroyasu Nishiyama 2018-10-03 21:29:28 +09:00
parent 58c8311d56
commit 1441042458
1 changed files with 86 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
nodes/core/storage/50-file.js
View File

@ -28,10 +28,9 @@ module.exports = function(RED) {
this.createDir = n.createDir || false; this.createDir = n.createDir || false;
var node = this; var node = this;
node.wstream = null; node.wstream = null;
node.data = [];
node.msgQueue = []; node.msgQueue = [];
node.closing = false; node.closing = false;
node.closeCallbacks = []; node.closeCallback = null;
function processMsg(msg, done) { function processMsg(msg, done) {
var filename = node.filename || msg.filename || ""; var filename = node.filename || msg.filename || "";
@ -76,83 +75,81 @@ module.exports = function(RED) {
if (typeof data === "boolean") { data = data.toString(); } if (typeof data === "boolean") { data = data.toString(); }
if (typeof data === "number") { data = data.toString(); } if (typeof data === "number") { data = data.toString(); }
if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; } if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; }
node.data.push({msg:msg,data:Buffer.from(data)}); if (node.overwriteFile === "true") {
var wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true });
while (node.data.length > 0) { node.wstream = wstream;
if (node.overwriteFile === "true") { wstream.on("error", function(err) {
(function(packet) { node.error(RED._("file.errors.writefail",{error:err.toString()}),msg);
node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'w', autoClose:true }); done();
node.wstream.on("error", function(err) { });
node.error(RED._("file.errors.writefail",{error:err.toString()}),msg); wstream.on("open", function() {
}); wstream.end(data, function() {
node.wstream.on("open", function() { node.send(msg);
node.wstream.end(packet.data, function() { done();
node.send(packet.msg); });
done(); })
}); return;
}) }
})(node.data.shift()); else {
} // Append mode
else { var recreateStream = !node.wstream || !node.filename;
// Append mode if (node.wstream && node.wstreamIno) {
var recreateStream = !node.wstream || !node.filename; // There is already a stream open and we have the inode
if (node.wstream && node.wstreamIno) { // of the file. Check the file hasn't been deleted
// There is already a stream open and we have the inode // or deleted and recreated.
// of the file. Check the file hasn't been deleted try {
// or deleted and recreated. var stat = fs.statSync(filename);
try { // File exists - check the inode matches
var stat = fs.statSync(filename); if (stat.ino !== node.wstreamIno) {
// File exists - check the inode matches // The file has been recreated. Close the current
if (stat.ino !== node.wstreamIno) { // stream and recreate it
// The file has been recreated. Close the current
// stream and recreate it
recreateStream = true;
node.wstream.end();
delete node.wstream;
delete node.wstreamIno;
}
} catch(err) {
// File does not exist
recreateStream = true; recreateStream = true;
node.wstream.end(); node.wstream.end();
delete node.wstream; delete node.wstream;
delete node.wstreamIno; delete node.wstreamIno;
} }
} } catch(err) {
if (recreateStream) { // File does not exist
node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true }); recreateStream = true;
node.wstream.on("open", function(fd) { node.wstream.end();
try { delete node.wstream;
var stat = fs.statSync(filename); delete node.wstreamIno;
node.wstreamIno = stat.ino;
} catch(err) {
}
});
node.wstream.on("error", function(err) {
node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
});
}
if (node.filename) {
// Static filename - write and reuse the stream next time
var packet = node.data.shift()
node.wstream.write(packet.data, function() {
node.send(packet.msg);
done();
});
} else {
// Dynamic filename - write and close the stream
var packet = node.data.shift()
node.wstream.end(packet.data, function() {
node.send(packet.msg);
delete node.wstream;
delete node.wstreamIno;
done();
});
} }
} }
if (recreateStream) {
node.wstream = fs.createWriteStream(filename, { encoding:'binary', flags:'a', autoClose:true });
node.wstream.on("open", function(fd) {
try {
var stat = fs.statSync(filename);
node.wstreamIno = stat.ino;
} catch(err) {
}
});
node.wstream.on("error", function(err) {
node.error(RED._("file.errors.appendfail",{error:err.toString()}),msg);
done();
});
}
if (node.filename) {
// Static filename - write and reuse the stream next time
node.wstream.write(data, function() {
node.send(msg);
done();
});
} else {
// Dynamic filename - write and close the stream
node.wstream.end(data, function() {
node.send(msg);
delete node.wstream;
delete node.wstreamIno;
done();
});
}
} }
} }
else {
done();
}
} }
function processQ(queue) { function processQ(queue) {
@ -162,6 +159,9 @@ module.exports = function(RED) {
if (queue.length > 0) { if (queue.length > 0) {
processQ(queue); processQ(queue);
} }
else if (node.closing) {
closeNode();
}
}); });
} }
@ -171,9 +171,15 @@ module.exports = function(RED) {
// pending write exists // pending write exists
return; return;
} }
processQ(msgQueue); try {
if (node.closing) { processQ(msgQueue);
closeNode(); }
catch (e) {
node.msgQueue = [];
if (node.closing) {
closeNode();
}
throw e;
} }
}); });
@ -181,23 +187,23 @@ module.exports = function(RED) {
if (node.wstream) { node.wstream.end(); } if (node.wstream) { node.wstream.end(); }
if (node.tout) { clearTimeout(node.tout); } if (node.tout) { clearTimeout(node.tout); }
node.status({}); node.status({});
var callbacks = node.closeCallbacks; var cb = node.closeCallback;
node.closeCallbacks = []; node.closeCallback = null;
node.closing = false; node.closing = false;
for (cb in callbacks) { if (cb) {
cb(); cb();
} }
} }
this.on('close', function(cb) { this.on('close', function(done) {
if (cb) {
node.closeCallbacks.push(done);
}
if (node.closing) { if (node.closing) {
// already closing // already closing
return; return;
} }
node.closing = true; node.closing = true;
if (done) {
node.closeCallback = done;
}
if (node.msgQueue.length > 0) { if (node.msgQueue.length > 0) {
// close after queue processed // close after queue processed
return; return;