Skip to content
Snippets Groups Projects
Commit 29847f30 authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

better test of Body (action "HTTP")

parent 6a146403
No related branches found
No related tags found
No related merge requests found
Pipeline #14222 failed
/** /**
* @author Rolf Niepraschk (Rolf.Niepraschk@ptb.de) * @author Rolf Niepraschk (Rolf.Niepraschk@ptb.de)
* version: 2018-08-21 * version: 2018-10-01
*/ */
var fs = require('fs'); var fs = require('fs');
...@@ -8,10 +8,12 @@ var fs = require('fs'); ...@@ -8,10 +8,12 @@ var fs = require('fs');
/** /**
* Datenstruktur mit Default-Werten * Datenstruktur mit Default-Werten
*/ */
// TODO: Get VERSION & DATE from "package.json"
var cfg = { var cfg = {
// Nur wenn sie mit '?' beginnt, wird Eintrag aus "package.json" verwendet // Nur wenn sie mit '?' beginnt, wird Eintrag aus "package.json" verwendet
VERSION: '12.11.2', VERSION: '12.11.3',
DATE: '2018-04-18', DATE: '2018-10-01',
RELAY_PORT: 55555, RELAY_PORT: 55555,
WEBSOCKET_PORT: 9001, WEBSOCKET_PORT: 9001,
DEFAULT_EXEC_TIMEOUT: 60000, // msec DEFAULT_EXEC_TIMEOUT: 60000, // msec
......
...@@ -21,9 +21,19 @@ var logger = cfg.logger; ...@@ -21,9 +21,19 @@ var logger = cfg.logger;
*/ */
function call(pRef, js) { function call(pRef, js) {
var host = url.parse(js.Url).hostname; var host = url.parse(js.Url).hostname;
var method = js.Method ? js.Method : (js.Body ? 'POST' : 'GET'); var method;
var json = js.Json || false; var json = js.Json || false;
var proxy = process.env.http_proxy; var proxy = process.env.http_proxy;
if (js.Body) {
method = 'POST';
if (typeof js.Body != 'string' && typeof js.Body != 'Buffer') {
response.prepareError(pRef, js,
'Body must be of type string or Buffer!');
return;
}
} else {
method = 'GET';
}
if (process.env.no_proxy) { if (process.env.no_proxy) {
var np = process.env.no_proxy.split(','); var np = process.env.no_proxy.split(',');
for (var i=0;i<np.length;i++) { for (var i=0;i<np.length;i++) {
......
{ {
"name": "relayServer", "name": "relayServer",
"version": "12.7.4", "version": "12.11.3",
"description": "Nodejs-basierter http-Server für Messaufgaben", "description": "Nodejs-basierter http-Server für Messaufgaben",
"author": { "author": {
"name": "Rolf Niepraschk", "name": "Rolf Niepraschk",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment