1 files changed, 30 insertions, 7 deletions

diff --git a/app/server/index.js b/app/server/index.js
index 3fcb8ee..f80541c 100644
--- a/app/server/index.js
+++ b/app/server/index.js
@@ -1,6 +1,6 @@
 require('dotenv').config()
-const app = require('express')()
-const server = require('http').createServer(app)
+const express = require('express')
+const app = express()
 const io = require('socket.io')(server)
 const ss = require('socket.io-stream')
 
@@ -8,17 +8,17 @@ const client = io.of('/client')
 const relay = io.of('/relay')
 
 client.on('connect', socket => {
-  console.log('client connected')
+  console.log('Client connected')
   socket.on('cmd', data => {
     relay.emit('cmd', data)
   })
   socket.on('disconnect', () => {
-    console.log("client disconnected")
+    console.log("Client disconnected")
   })
 })
 
 relay.on('connect', socket => {
-  console.log('relay connected')
+  console.log('Relay connected')
   socket.on('params', data => {
     client.emit('params', data)
   })
@@ -31,8 +31,31 @@ relay.on('connect', socket => {
   })
 
   socket.on('disconnect', () => {
-    console.log("relay disconnected")
+    console.log("Relay disconnected")
   })
 })
 
-server.listen(process.env.EXPRESS_PORT)
\ No newline at end of file
+app.use(express.static('public', { extensions: ['html'] }))
+
+// app.get('/images', site.images)
+// app.post('/print', bodyParser.urlencoded({ extended: false }), site.print)
+// app.use("/upload", require('./upload'))
+
+let server;
+if (process.env.USE_HTTPS === 'true') {
+  credentials = {
+    key: fs.readFileSync('ssl/key.nocrypt.pem', 'utf8'),
+    cert: fs.readFileSync('ssl/cert.pem', 'utf8')
+  }
+  server = https.createServer(credentials, app).listen(8443, function () {
+    var port = server.address().port;
+    console.log('Cortex remote listening at https://lvh.me:%s', port);
+  });
+} else {
+  const server = require('http').createServer(app)
+  server.listen(process.env.EXPRESS_PORT, () => {
+    console.log("Cortex remote listening on http://localhost:" + process.env.EXPRESS_PORT)
+  })
+}
+
+ws.init(server)