X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=main.js;h=8e01ae3c356900f676d261b96a91703b23bac1b5;hp=cf2f3a36e17285d7a53a6dccbe7152a3aaa77e5e;hb=4818299175c62e9ce3179814b0823e24ecb470a8;hpb=69de98364f738e698acf96e9a4430e702495f87f

diff --git a/main.js b/main.js
index cf2f3a3..8e01ae3 100644
--- a/main.js
+++ b/main.js
@@ -20,12 +20,25 @@ const skelPage  = fs.readFileSync('./skel.html', { encoding: 'utf8' }).split('<!
 const clientJS  = fs.readFileSync(opts['client-js'])
 const hostJS    = fs.readFileSync(opts['host-js'])
 const routes    = {}
-const httpsOpts = (opts['no-tls'] ?
-		   undefined      :
-		   {
-		     key: fs.readFileSync(opts['ca-key']),
-		     cert: fs.readFileSync(opts['ca-cert'])
-		   })
+const httpsOpts = {}
+if (!opts['no-tls']) {
+  fs.readFile(opts['ca-key'], { encoding: 'utf8' }, (err, data) => {
+    if (err) {
+      console.log(`WARN: Key ${opts['ca-key']} not accessible, tls will fail`)
+      httpsOpts.key = ''
+    }
+    else
+      httpsOpts.key = data
+  })
+  fs.readFile(opts['ca-cert'], { encoding: 'utf8' }, (err, data) => {
+    if (err) {
+      console.log(`WARN: Cert ${opts['ca-cert']} not accessible, tls will fail`)
+      httpsOpts.cert = ''
+    }
+    else
+      httpsOpts.cert = data
+  })
+}
 
 const routeConnection = (request,response) => {
   const serveFile = (fPath) => {
@@ -65,10 +78,12 @@ const routeConnection = (request,response) => {
     response.writeHead(200, { 'Content-Type': 'text/html' })
     response.write(`${skelPage[0]}${clientJS}${skelPage[1]}`)
     response.end()
+    //TODO: if route.socket == undefined: have server delay this send until host connects
+    //      (this happens when a client connects to an active route with no currently-online host)
     route.socket.send(request.headers['x-forwarded-for'] || request.connection.remoteAddress)
   }
   else {
-    routes[htArgv[0]] = true
+    routes[routeName] = true
     const newRoute = {}
     newRoute.host = request.headers['x-forwarded-for'] || request.connection.remoteAddress
     getport().then( (port) => {
@@ -78,14 +93,16 @@ const routeConnection = (request,response) => {
       else
 	newRoute.httpd = https.createServer(httpsOpts)
       newRoute.httpd.listen(newRoute.port)
-      newRoute.ws = new ws.Server( { server: newRoute.httpd } )
-      newRoute.ws.on('connection', (ws) => { console.log("socket connected"); newRoute.socket = ws; ws.send("CONNECTED") } )
-      newRoute.ws.on('message', (msg) => { console.log("Received message" + msg) })
-      console.log("Listening for websocket " + newRoute.host + " on port " + newRoute.port)
-      routes[htArgv[0]] = newRoute
+      newRoute.wsd = new ws.Server( { server: newRoute.httpd } )
+      newRoute.wsd.on('connection', (sock) => {
+	newRoute.socket = sock
+	sock.on('message', (msg) => { console.log(`[${newRoute.host}] ${msg}`) })
+      })
+      console.log(`Listening for websocket ${newRoute.host} on port ${newRoute.port}`)
+      routes[routeName] = newRoute
     }).then(() => {
       response.writeHead(200, { 'Content-Type': 'text/html' })
-      response.write(skelPage[0] + 'const _strapp_port = \'' + newRoute.port + '\'\n' + hostJS + skelPage[1])
+      response.write(`${skelPage[0]}const _strapp_port = ${newRoute.port}\n${hostJS}\n${skelPage[1]}`)
       response.end()
     })
   }