frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Binary paylaod option to Http request node

Browse Source 
Also add JSON parse option to output
Allow user to select override using msg.method to stop getting warning.
Fix to close #399
This commit is contained in:
Dave C-J
2014-12-09 14:40:03 +00:00
parent 6fc3aab907
commit 27ef7d972f
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nodes/core/io/21-httpin.js
View File

@@ -23,7 +23,6 @@ module.exports = function(RED) {
var getBody = require('raw-body');
var mustache = require("mustache");
var querystring = require("querystring");
var cors = require('cors');
var jsonParser = express.json();
var urlencParser = express.urlencoded();
@@ -150,6 +149,7 @@ module.exports = function(RED) {
var nodeUrl = n.url;
var isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
var nodeMethod = n.method || "GET";
this.ret = n.ret || "txt";
var node = this;
this.on("input",function(msg) {
node.status({fill:"blue",shape:"dot",text:"requesting"});
@@ -170,15 +170,19 @@ module.exports = function(RED) {
}
var method;
if (msg.method) {
if (n.method && (n.method !== msg.method)) {
node.warn("Deprecated: msg properties should not override set node properties. See bit.ly/nr-override-msg-props");
if (msg.method) { // if method set in msg
if (n.method && (n.method !== "use")) { // warn if override option not set
node.warn("Deprecated: msg properties should not override fixed node properties. Use explicit override option. See bit.ly/nr-override-msg-props");
}
method = msg.method.toUpperCase();
method = msg.method.toUpperCase(); // but use it anyway
} else {
method = nodeMethod.toUpperCase();
if (n.method !== "use") {
method = nodeMethod.toUpperCase(); // otherwise use the selected method
} else { // unless they selected override
method = "GET"; // - in which case default to GET
}
}
//node.log(method+" : "+url);
node.log(method+" : "+url);
var opts = urllib.parse(url);
opts.method = method;
opts.headers = {};
@@ -221,7 +225,7 @@ module.exports = function(RED) {
}
var req = ((/^https/.test(url))?https:http).request(opts,function(res) {
res.setEncoding('utf8');
(node.ret === "bin") ? res.setEncoding('binary') : res.setEncoding('utf8');
msg.statusCode = res.statusCode;
msg.headers = res.headers;
msg.payload = "";
@@ -229,6 +233,13 @@ module.exports = function(RED) {
msg.payload += chunk;
});
res.on('end',function() {
if (node.ret === "bin") {
msg.payload = new Buffer(msg.payload,"binary");
}
else if (node.ret === "obj") {
try { msg.payload = JSON.parse(msg.payload); }
catch(e) { node.warn("JSON parse error"); }
}
node.send(msg);
node.status({});
});