frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2734 from node-red-hitachi/csv-node-mapi 

Messaging API support in CSV node
This commit is contained in:
Nick O'Leary 2020-12-07 13:50:09 +00:00 committed by GitHub
parent 169a2484f2 8007bea7db
commit 41d12c433e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js vendored
View File

@ -55,7 +55,7 @@ module.exports = function(RED) {
node.template = clean(node.template);
node.hdrSent = false;
this.on("input", function(msg) {
this.on("input", function(msg, send, done) {
if (msg.hasOwnProperty("reset")) {
node.hdrSent = false;
}
@ -145,9 +145,10 @@ module.exports = function(RED) {
}
msg.payload = ou;
msg.columns = node.template.join(',');
if (msg.payload !== '') { node.send(msg); }
if (msg.payload !== '') { send(msg); }
done();
}
catch(e) { node.error(e,msg); }
catch(e) { done(e); }
}
else if (typeof msg.payload == "string") { // convert CSV string to object
try {
@ -256,13 +257,13 @@ module.exports = function(RED) {
msg.payload = node.store;
msg.columns = node.template.filter(val => val).join(',');
delete msg.parts;
node.send(msg);
send(msg);
node.store = [];
}
}
else {
msg.columns = node.template.filter(val => val).join(',');
node.send(msg); // finally send the array
send(msg); // finally send the array
}
}
else {
@ -286,19 +287,21 @@ module.exports = function(RED) {
newMessage.parts.count -= 1;
}
}
node.send(newMessage);
send(newMessage);
}
}
node.linecount = 0;
done();
}
catch(e) { node.error(e,msg); }
catch(e) { done(e); }
}
else { node.warn(RED._("csv.errors.csv_js")); }
else { node.warn(RED._("csv.errors.csv_js")); done(); }
}
else {
if (!msg.hasOwnProperty("reset")) {
node.send(msg); // If no payload and not reset - just pass it on.
send(msg); // If no payload and not reset - just pass it on.
}
done();
}
});
}

39
test/nodes/core/parsers/70-CSV_spec.js
View File

@ -773,4 +773,43 @@ describe('CSV node', function() {
});
});
it('should call done when message processing is completed', function(done) {
const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
const flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[[]]},
{ id:"c1", type:"complete", scope: ["n1"], uncaught:false, wires:[["h1"]]},
{ id:"h1", type:"helper", wires:[[]]} ];
helper.load([csvNode,completeNode], flow, function() {
const n1 = helper.getNode("n1");
const h1 = helper.getNode("h1");
h1.on("input", function(msg) {
try {
msg.should.have.a.property('payload', "1,2,3,4");
done();
} catch (e) {
done(e);
}
});
n1.receive({payload:"1,2,3,4"});
});
});
it('should call done when input causes an error', function(done) {
const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
const flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[[]]},
{ id:"c1", type:"complete", scope: ["n1"], uncaught:false, wires:[["h1"]]},
{ id:"h1", type:"helper", wires:[[]]} ];
helper.load([csvNode,completeNode], flow, function() {
const n1 = helper.getNode("n1");
const h1 = helper.getNode("h1");
h1.on("input", function(msg) {
try {
msg.should.have.a.property('payload', 1);
done();
} catch (e) {
done(e);
}
});
n1.receive({payload:1}); // neither object nor string
});
});
});