chore: merge api back into base server (#46)

The base server has issues connecting to the API within the
integration environment. By merging the two back together,
the service can stick to only using the DT probability setting
to connect to any DT service.

ecosystem-workload.config.js

@@ -9,9 +9,5 @@ module.exports = {
     name: 'server',
     script: './server.js',
     instances: 1
-  }, {
-    name: 'api',
-    script: './api.js',
-    instances: 1
   }]
 }

ecosystem.config.js

@@ -3,9 +3,5 @@ module.exports = {
     name: 'server',
     script: './server.js',
     instances: 1
-  }, {
-    name: 'api',
-    script: './api.js',
-    instances: 1
   }]
 }

server.js

@@ -97,19 +97,19 @@ app.use(function (req, res, next) {
 app.use(require('./server/coffee'))
 
 var http = require('http')
-app.use('/api', function (req, res) {
-  const opts = { method: req.method }
-
-  if (Math.random() < opbeansRedirectProbability) {
-    const service = opbeansServiceUrls[Math.floor(Math.random() * opbeansServiceUrls.length)]
-    opts.hostname = service.hostname
-    opts.port = service.port
-    opts.path = req.originalUrl
-  } else {
-    opts.hostname = conf.server.hostname
-    opts.port = conf.server.port2
-    opts.path = req.url // req.url will just contain the sub-path without the /api
+app.use('/api', function (req, res, next) {
+  if (Math.random() > opbeansRedirectProbability) {
+    return next()
   }
+
+  const service = opbeansServiceUrls[Math.floor(Math.random() * opbeansServiceUrls.length)]
+  const opts = {
+    method: req.method,
+    hostname: service.hostname,
+    port: service.port,
+    path: req.originalUrl
+  }
+
   req.log.debug('proxying request: %s => %s:%s', req.originalUrl, opts.hostname, opts.port + opts.path)
 
   var clientReq = http.request(opts)
@@ -122,6 +122,8 @@ app.use('/api', function (req, res) {
   req.pipe(clientReq)
 })
 
+app.use('/api', require('./server/routes'))
+
 app.get('*', function (req, res) {
   res.sendFile(path.resolve(__dirname, 'client/build', 'index.html'))
 })

server/config.js

@@ -14,8 +14,7 @@ var conf = module.exports = {
     protocol: process.env.OPBEANS_SERVER_PROTOCOL || 'http:',
     auth: process.env.OPBEANS_SERVER_AUTH || '',
     hostname: process.env.OPBEANS_SERVER_HOSTNAME || 'localhost',
-    port: process.env.OPBEANS_SERVER_PORT || process.env.PORT || 3000,
-    port2: process.env.OPBEANS_SERVER_PORT2 || 3001
+    port: process.env.OPBEANS_SERVER_PORT || process.env.PORT || 3000
   },
   pg: {
     database: process.env.PGDATABASE || 'opbeans'