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

Add strict mode and latest icons to http node(s)

Browse Source
This commit is contained in:
Dave C-J 2014-06-08 15:05:08 +01:00
parent 0cbc277a2c
commit 00f87cbcd6
2 changed files with 68 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
nodes/core/io/21-httpin.html
View File

@ -16,8 +16,8 @@
<script type="text/x-red" data-template-name="http in"> <script type="text/x-red" data-template-name="http in">
<div class="form-row"> <div class="form-row">
<label for="node-input-method"><i class="icon-tasks"></i> Method</label> <label for="node-input-method"><i class="fa fa-tasks"></i> Method</label>
<select type="text" id="node-input-method" style="width: 150px;"> <select type="text" id="node-input-method" style="width:72%;">
<option value="get">GET</option> <option value="get">GET</option>
<option value="post">POST</option> <option value="post">POST</option>
<option value="put">PUT</option> <option value="put">PUT</option>
@ -25,68 +25,68 @@
</select> </select>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-topic"><i class="icon-globe"></i> url</label> <label for="node-input-topic"><i class="fa fa-globe"></i> url</label>
<input type="text" id="node-input-url" placeholder="/url"> <input type="text" id="node-input-url" placeholder="/url">
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label> <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name"> <input type="text" id="node-input-name" placeholder="Name">
</div> </div>
<div id="node-input-tip" class="form-tips">The url will be relative to <code><span id="node-input-path"></span></code>.</div> <div id="node-input-tip" class="form-tips">The url will be relative to <code><span id="node-input-path"></span></code>.</div>
</script> </script>
<script type="text/x-red" data-help-name="http in"> <script type="text/x-red" data-help-name="http in">
<p>Provides an input node for http requests, allowing the creation of simple web services.</p> <p>Provides an input node for http requests, allowing the creation of simple web services.</p>
<p>The resulting message has the following properties: <p>The resulting message has the following properties:
<ul> <ul>
<li>msg.req : <a href="http://expressjs.com/api.html#req">http request</a></li> <li>msg.req : <a href="http://expressjs.com/api.html#req">http request</a></li>
<li>msg.res : <a href="http://expressjs.com/api.html#res">http response</a></li> <li>msg.res : <a href="http://expressjs.com/api.html#res">http response</a></li>
</ul> </ul>
</p>
<p>For POST/PUT requests, the body is available under <code>msg.req.body</code>. This
uses the <a href="http://expressjs.com/api.html#bodyParser">Express bodyParser middleware</a> to parse the content to a JSON object.
</p> </p>
<p> <p>For POST/PUT requests, the body is available under <code>msg.req.body</code>. This
By default, this expects the body of the request to be url encoded: uses the <a href="http://expressjs.com/api.html#bodyParser">Express bodyParser middleware</a> to parse the content to a JSON object.
<pre>foo=bar&amp;this=that</pre>
</p> </p>
<p> <p>
To send JSON encoded data to the node, the content-type header of the request must be set to By default, this expects the body of the request to be url encoded:
<code>application/json</code>. <pre>foo=bar&amp;this=that</pre>
</p> </p>
<p> <p>
<b>Note: </b>This node does not send any response to the http request. This should be done with To send JSON encoded data to the node, the content-type header of the request must be set to
a subsequent HTTP Response node, or Function node. <code>application/json</code>.
In the case of a Function node, the <a href="http://expressjs.com/api.html#res">Express response documentation</a> </p>
describes how this should be done. For example: <p>
<pre>msg.res.send(200, 'Thanks for the request ');<br/>return msg;</pre> <b>Note: </b>This node does not send any response to the http request. This should be done with
a subsequent HTTP Response node, or Function node.
In the case of a Function node, the <a href="http://expressjs.com/api.html#res">Express response documentation</a>
describes how this should be done. For example:
<pre>msg.res.send(200, 'Thanks for the request ');<br/>return msg;</pre>
</p> </p>
</script> </script>
<script type="text/x-red" data-template-name="http response"> <script type="text/x-red" data-template-name="http response">
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label> <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name"> <input type="text" id="node-input-name" placeholder="Name">
</div> </div>
<div class="form-tips">The messages sent to this node <b>must</b> originate from an <i>http input</i> node</div> <div class="form-tips">The messages sent to this node <b>must</b> originate from an <i>http input</i> node</div>
</script> </script>
<script type="text/x-red" data-help-name="http response"> <script type="text/x-red" data-help-name="http response">
<p>Sends responses back to http requests received from an HTTP Input node.</p> <p>Sends responses back to http requests received from an HTTP Input node.</p>
<p>The response can be customised using the following message properties:</p> <p>The response can be customised using the following message properties:</p>
<ul> <ul>
<li><code>payload</code> is sent as the body of the reponse</li> <li><code>payload</code> is sent as the body of the reponse</li>
<li><code>statusCode</code>, if set, is used as the response status code (default: 200)</li> <li><code>statusCode</code>, if set, is used as the response status code (default: 200)</li>
<li><code>headers</code>, if set, should be an object containing field/value <li><code>headers</code>, if set, should be an object containing field/value
pairs to be added as response headers.</li> pairs to be added as response headers.</li>
</ul> </ul>
</script> </script>
<script type="text/x-red" data-template-name="http request"> <script type="text/x-red" data-template-name="http request">
<div class="form-row"> <div class="form-row">
<label for="node-input-method"><i class="icon-tasks"></i> Method</label> <label for="node-input-method"><i class="fa fa-tasks"></i> Method</label>
<select type="text" id="node-input-method" style="width: 150px;"> <select type="text" id="node-input-method" style="width:72%;">
<option value="GET">GET</option> <option value="GET">GET</option>
<option value="POST">POST</option> <option value="POST">POST</option>
<option value="PUT">PUT</option> <option value="PUT">PUT</option>
@ -94,7 +94,7 @@
</select> </select>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-url"><i class="icon-tasks"></i> URL</label> <label for="node-input-url"><i class="fa fa-globe"></i> URL</label>
<input type="text" id="node-input-url" placeholder="http://"> <input type="text" id="node-input-url" placeholder="http://">
</div> </div>
<div class="form-row"> <div class="form-row">
@ -103,40 +103,40 @@
<label for="node-input-useAuth" style="width: 70%;">Use basic authentication?</label> <label for="node-input-useAuth" style="width: 70%;">Use basic authentication?</label>
</div> </div>
<div class="form-row node-input-useAuth-row"> <div class="form-row node-input-useAuth-row">
<label for="node-config-input-user"><i class="icon-user"></i> Username</label> <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
<input type="text" id="node-config-input-user"> <input type="text" id="node-config-input-user">
</div> </div>
<div class="form-row node-input-useAuth-row"> <div class="form-row node-input-useAuth-row">
<label for="node-config-input-pass"><i class="icon-lock"></i> Password</label> <label for="node-config-input-pass"><i class="fa fa-lock"></i> Password</label>
<input type="password" id="node-config-input-pass"> <input type="password" id="node-config-input-pass">
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label> <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name"> <input type="text" id="node-input-name" placeholder="Name">
</div> </div>
</script> </script>
<script type="text/x-red" data-help-name="http request"> <script type="text/x-red" data-help-name="http request">
<p>Provides a node for making http requests.</p> <p>Provides a node for making http requests.</p>
<p>The URL and HTTP method can be configured in the node, but also <p>The URL and HTTP method can be configured in the node, but also
overridden by the incoming message: overridden by the incoming message:
<ul> <ul>
<li><code>url</code>, if set, is used as the url of the request</li> <li><code>url</code>, if set, is used as the url of the request</li>
<li><code>method</code>, if set, is used as the HTTP method of the request. Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code> or <code>DELETE</code> (default: GET)</li> <li><code>method</code>, if set, is used as the HTTP method of the request. Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code> or <code>DELETE</code> (default: GET)</li>
<li><code>headers</code>, if set, should be an object containing field/value <li><code>headers</code>, if set, should be an object containing field/value
pairs to be added as request headers</li> pairs to be added as request headers</li>
<li><code>payload</code> is sent as the body of the request</li> <li><code>payload</code> is sent as the body of the request</li>
</ul> </ul>
<p>When configured within the node, the URL property can contain <a href="http://mustache.github.io/mustache.5.html" target="_new">mustache-style</a> tags. These allow the <p>When configured within the node, the URL property can contain <a href="http://mustache.github.io/mustache.5.html" target="_new">mustache-style</a> tags. These allow the
url to be constructed using values of the incoming message. For example, if the url is set to url to be constructed using values of the incoming message. For example, if the url is set to
<code>example.com/{{topic}}</code>, it will have the value of <code>msg.topic</code> automatically inserted.</p> <code>example.com/{{topic}}</code>, it will have the value of <code>msg.topic</code> automatically inserted.</p>
<p> <p>
The output message contains the following properties: The output message contains the following properties:
<ul> <ul>
<li><code>payload</code> is the body of the response</li> <li><code>payload</code> is the body of the response</li>
<li><code>statusCode</code> is the status code of the response, or the error code if the request could not be completed</li> <li><code>statusCode</code> is the status code of the response, or the error code if the request could not be completed</li>
<li><code>headers</code> is an object containing the response headers</li> <li><code>headers</code> is an object containing the response headers</li>
</ul> </ul>
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
@ -177,7 +177,7 @@
} }
}); });
RED.nodes.registerType('http response',{ RED.nodes.registerType('http response',{
category: 'output', category: 'output',
color:"rgb(231, 231, 174)", color:"rgb(231, 231, 174)",
@ -195,7 +195,7 @@
return this.name?"node_label_italic":""; return this.name?"node_label_italic":"";
} }
}); });
RED.nodes.registerType('http request',{ RED.nodes.registerType('http request',{
category: 'function', category: 'function',
color:"rgb(231, 231, 174)", color:"rgb(231, 231, 174)",
@ -239,7 +239,7 @@
} }
}); });
$("#node-input-useAuth").change(function() { $("#node-input-useAuth").change(function() {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
$(".node-input-useAuth-row").show(); $(".node-input-useAuth-row").show();
@ -253,12 +253,12 @@
var oldPass = $('#node-config-input-pass').data("v"); var oldPass = $('#node-config-input-pass').data("v");
var newUser = $('#node-config-input-user').val(); var newUser = $('#node-config-input-user').val();
var newPass = $('#node-config-input-pass').val(); var newPass = $('#node-config-input-pass').val();
if (!$("#node-input-useAuth").is(":checked")) { if (!$("#node-input-useAuth").is(":checked")) {
newUser = ""; newUser = "";
newPass = ""; newPass = "";
} }
if (oldUser != newUser || oldPass != newPass) { if (oldUser != newUser || oldPass != newPass) {
if (newUser == "" && newPass == "") { if (newUser == "" && newPass == "") {
$.ajax({ $.ajax({
@ -284,9 +284,3 @@
} }
}); });
</script> </script>

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

@ -15,7 +15,7 @@
**/ **/
module.exports = function(RED) { module.exports = function(RED) {
"use strict";
var util = require("util"); var util = require("util");
var http = require("follow-redirects").http; var http = require("follow-redirects").http;
var https = require("follow-redirects").https; var https = require("follow-redirects").https;
@ -153,6 +153,7 @@ module.exports = function(RED) {
url = nodeUrl; url = nodeUrl;
} }
var method = (msg.method||nodeMethod).toUpperCase(); var method = (msg.method||nodeMethod).toUpperCase();
node.log(method+" : "+url);
var opts = urllib.parse(url); var opts = urllib.parse(url);
opts.method = method; opts.method = method;
opts.headers = {}; opts.headers = {};