Migrated hyperflow server to express 4.x

Author: balis

bin/restapi_test.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -ne 2 ]; then
   echo "restapi_test.sh: creates an instance of the Ping Pong workflow"
   echo "     and sends a signal to it using the HyperFlow REST API."
   echo
   echo "Usage:"
   echo "- first run the HyperFlow server:     node app.js"
-  echo "- then run this script:               scripts/restapi_test.sh <port>"
+  echo "- then run this script:               scripts/restapi_test.sh <port> <path to workflow.json>"
   echo "where <port> is the port number on which the server is running"
   exit
 fi
@@ -18,7 +18,7 @@ uri="http://localhost:$1/apps"
 # Body: valid workflow description in JSON
 # on success returns: 201, Location: {appuri}
 # "location" - wf instance URI extracted from the HTTP header 
-location=`curl -v -X POST -d @workflows/Montage_143.json $uri --header "Content-Type:application/json" 2>&1 | grep Location | cut -f 3 -d' '`
+location=`curl -v -X POST -d @$2 $uri --header "Content-Type:application/json" 2>&1 | grep Location | cut -f 3 -d' '`
 
 appuri="http://localhost:$1"$location
 echo $appuri

package.json

@@ -1,8 +1,8 @@
 {
   "name": "hyperflow",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "engines": {
-    "node": "~4.8.7"
+    "node": "~10.15.1"
   },
   "bin": {
     "hflow": "./bin/hflow",
@@ -15,13 +15,14 @@
     "adm-zip": "0.4.11",
     "amqplib": "0.5.2",
     "async": "0.2.x",
+    "body-parser": "^1.18.3",
     "consolidate": "0.10.x",
     "crc": "0.2.1",
     "cross-spawn": "^6.0.5",
     "docopt": "0.6.2",
     "ejs": "2.6.1",
     "eventemitter2": "5.x",
-    "express": "3.x",
+    "express": "4.16.x",
     "eyes": "0.1.8",
     "file": "0.2.x",
     "form-data": "2.3.x",

server/hyperflow-server.js

@@ -1,20 +1,17 @@
 /*
 ** HyperFlow engine
-** Author: Bartosz Balis (2012-2014)
+** Author: Bartosz Balis (2012-2019)
 **
 ** HyperFlow server implementing the REST API for HyperFlow workflows.
 */
 
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 
 var redisURL = process.env.REDIS_URL ? {url: process.env.REDIS_URL} : undefined;
 // for express
 var express = require('express'),
+    bodyParser = require('body-parser'),
     cons = require('consolidate'),
     spawn = require('child_process').spawn,
     http = require('http'),
@@ -47,29 +44,14 @@ var contentType = 'text/html';
 //var baseUrl = 'http://localhost:'+process.env.PORT;
 var baseUrl = ''; // with empty baseUrl all links are relative; I couldn't get hostname to be rendered properly in htmls
 
-// Configuration
-app.configure(function() {
-        //app.use(express.compress());
-	app.engine('ejs', cons.ejs);
-	app.set('views', __dirname + '/views');
-	app.set('view engine', 'ejs');
-	app.use(express.bodyParser({strict: false}));
-	app.use(express.methodOverride());
-	app.use(app.router);
-	app.use(express.static(__dirname + '/public'));
-	app.disable('strict routing');
-});
+// parse application/x-www-form-urlencoded
+app.use(bodyParser.urlencoded({ extended: false }))
 
-app.configure('development', function() {
-	app.use(express.errorHandler({
-		dumpExceptions: true,
-		showStack: true
-	}));
-});
+// parse application/json
+app.use(bodyParser.json())
+
+app.disable('strict routing');
 
-app.configure('production', function() {
-	app.use(express.errorHandler());
-});
 
 /////////////////////////////////////////////////////////////////
 ////           REST API for HyperFlow workflows              ////