move rpc around.. serve html

1 files changed, 14 insertions, 25 deletions

diff --git a/app/server/index.js b/app/server/index.js
index f80541c..55daba4 100644
--- a/app/server/index.js
+++ b/app/server/index.js
@@ -1,9 +1,22 @@
 require('dotenv').config()
 const express = require('express')
 const app = express()
-const io = require('socket.io')(server)
+const http = require('http')
+const socket_io = require('socket.io')
 const ss = require('socket.io-stream')
 
+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 = http.createServer(app)
+server.listen(process.env.EXPRESS_PORT, () => {
+  console.log("Cortex remote listening on http://localhost:" + process.env.EXPRESS_PORT)
+})
+
+const io = socket_io(server)
 const client = io.of('/client')
 const relay = io.of('/relay')
 
@@ -35,27 +48,3 @@ relay.on('connect', socket => {
   })
 })
 
-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)