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

Allow http request node to pass through existing msg properties rather than wiping clean (in case needed on other side...)

Browse Source 
Also one more try / catch to xml parser... could still barf if provoked.
This commit is contained in:
Dave C-J 2013-10-23 21:27:54 +01:00
parent 30f3a46d46
commit f1f00da1a8
2 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nodes/analysis/73-parsexml.js
View File

@ -30,17 +30,20 @@ function Xml2jsNode(n) {
this.useEyes = n.useEyes; this.useEyes = n.useEyes;
var node = this; var node = this;
this.on("input", function(msg) { this.on("input", function(msg) {
parseString(msg.payload, function (err, result) { try {
if (err) { node.error(err); } parseString(msg.payload, function (err, result) {
else { if (err) { node.error(err); }
msg.payload = result; else {
node.send(msg); msg.payload = result;
if (node.useEyes == true) { node.send(msg);
if (gotEyes == true) { eyes.inspect(msg); } if (node.useEyes == true) {
else { node.log(JSON.stringify(msg)); } if (gotEyes == true) { eyes.inspect(msg); }
} else { node.log(JSON.stringify(msg)); }
} }
}); }
});
}
catch(e) { console.log(e); }
}); });
} }
RED.nodes.registerType("xml2js",Xml2jsNode); RED.nodes.registerType("xml2js",Xml2jsNode);

154
nodes/io/21-httpin.js
View File

@ -22,103 +22,99 @@ var urllib = require("url");
var bodyParser = require("express").bodyParser(); var bodyParser = require("express").bodyParser();
function HTTPIn(n) { function HTTPIn(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
this.url = n.url; this.url = n.url;
this.method = n.method; this.method = n.method;
var node = this; var node = this;
this.callback = function(req,res) { this.callback = function(req,res) {
node.send({req:req,res:res}); node.send({req:req,res:res});
} }
if (this.method == "get") { if (this.method == "get") {
RED.app.get(this.url,this.callback); RED.app.get(this.url,this.callback);
} else if (this.method == "post") { } else if (this.method == "post") {
RED.app.post(this.url,bodyParser,this.callback); RED.app.post(this.url,bodyParser,this.callback);
} else if (this.method == "put") { } else if (this.method == "put") {
RED.app.put(this.url,bodyParser,this.callback); RED.app.put(this.url,bodyParser,this.callback);
} else if (this.method == "delete") { } else if (this.method == "delete") {
RED.app.delete(this.url,this.callback); RED.app.delete(this.url,this.callback);
} }
this.on("close",function() { this.on("close",function() {
var routes = RED.app.routes[this.method]; var routes = RED.app.routes[this.method];
for (var i in routes) { for (var i in routes) {
if (routes[i].path == this.url) { if (routes[i].path == this.url) {
routes.splice(i,1); routes.splice(i,1);
//break; //break;
} }
} }
}); });
} }
RED.nodes.registerType("http in",HTTPIn); RED.nodes.registerType("http in",HTTPIn);
function HTTPOut(n) { function HTTPOut(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
var node = this; var node = this;
this.on("input",function(msg) { this.on("input",function(msg) {
if (msg.res) { if (msg.res) {
if (msg.headers) { if (msg.headers) {
res.set(msg.headers); res.set(msg.headers);
} }
var statusCode = msg.statusCode || 200; var statusCode = msg.statusCode || 200;
msg.res.send(statusCode,msg.payload); msg.res.send(statusCode,msg.payload);
} else { } else {
node.warn("No response object"); node.warn("No response object");
} }
}); });
} }
RED.nodes.registerType("http response",HTTPOut); RED.nodes.registerType("http response",HTTPOut);
function HTTPRequest(n) { function HTTPRequest(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
var url = n.url; var url = n.url;
var method = n.method || "GET"; var method = n.method || "GET";
var httplib = (/^https/.test(url))?https:http; var httplib = (/^https/.test(url))?https:http;
var node = this; var node = this;
this.on("input",function(msg) { this.on("input",function(msg) {
if (msg.url) {
httplib = (/^https/.test(msg.url))?https:http; var opts = urllib.parse(msg.url||url);
} opts.method = (msg.method||method).toUpperCase();
var opts = urllib.parse(msg.url||url); if (msg.headers) {
opts.method = (msg.method||method).toUpperCase(); opts.headers = msg.headers;
if (msg.headers) { }
opts.headers = msg.headers; var req = httplib.request(opts,function(res) {
} res.setEncoding('utf8');
var req = httplib.request(opts,function(res) { msg.statusCode = res.statusCode;
res.setEncoding('utf8'); msg.headers = res.headers;
var message = { msg.payload = "";
statusCode: res.statusCode, res.on('data',function(chunk) {
headers: res.headers, msg.payload += chunk;
payload: "" });
}; res.on('end',function() {
res.on('data',function(chunk) { node.send(msg);
message.payload += chunk; });
}); });
res.on('end',function() { req.on('error',function(err) {
node.send(message); msg.payload = err.toString();
}); msg.statusCode = err.code;
}); node.send(msg);
req.on('error',function(err) { });
msg.payload = err.toString(); if (msg.payload && (method == "PUSH" || method == "PUT") ) {
msg.statusCode = err.code; if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
node.send(msg);
});
if (msg.payload && (method == "POST" || method == "PUT") ) {
if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
req.write(msg.payload); req.write(msg.payload);
} else if (typeof msg.payload == "number") { } else if (typeof msg.payload == "number") {
req.write(msg.payload+""); req.write(msg.payload+"");
} else { } else {
req.write(JSON.stringify(msg.payload)); req.write(JSON.stringify(msg.payload));
} }
} }
req.end(); req.end();
}); });
} }
RED.nodes.registerType("http request",HTTPRequest); RED.nodes.registerType("http request",HTTPRequest);