diff --git a/lib/modules/webserver/backend/index.html b/lib/modules/webserver/backend/index.html new file mode 100644 index 00000000..01d3caf4 --- /dev/null +++ b/lib/modules/webserver/backend/index.html @@ -0,0 +1 @@ +Welcome to Embark! diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js index 40356be6..7be27eb0 100644 --- a/lib/modules/webserver/server.js +++ b/lib/modules/webserver/server.js @@ -3,6 +3,8 @@ let http = require('http'); let serveStatic = require('serve-static'); const {canonicalHost, defaultHost, dockerHostSwap} = require('../../utils/host'); require('http-shutdown').extend(); +var express = require('express'); +let path = require('path'); class Server { constructor(options) { @@ -20,9 +22,16 @@ class Server { } let serve = serveStatic(this.dist, {'index': ['index.html', 'index.htm']}); - this.server = http.createServer(function onRequest(req, res) { - serve(req, res, finalhandler(req, res)); - }).withShutdown(); + var app = express(); + + app.use(serve); + app.use('/backend', serveStatic(path.join(__dirname, 'backend'), {'backend': ['index.html', 'index.htm']})); + + //app.get('/embark', function (req, res) { + // res.send('Welcome to Embark') + //}); + + app.listen(this.port); let message = __("webserver available at") + " " + diff --git a/package.json b/package.json index 9b6cddf6..d139c5bc 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "eth-ens-namehash": "^2.0.8", "eth-lib": "^0.2.8", "ethereumjs-wallet": "0.6.0", + "express": "^4.16.2", "file-loader": "^1.1.5", "finalhandler": "^1.1.1", "follow-redirects": "^1.2.4",