X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=main.js;h=f123a413fd73593d94bbbce8705586395cac3c90;hp=cdf860133ab1f1c34453bdb9f607d0b9b6cb74b1;hb=d33866cf8b1a188ad9ab23a934986bfd1b4726cb;hpb=2f06270153df4b3b43d42645714168629dd10372 diff --git a/main.js b/main.js index cdf8601..f123a41 100644 --- a/main.js +++ b/main.js @@ -1,12 +1,12 @@ /** - * @file Node entry and main driver - * @author Jordan Lavatai, Ken Grimes - * @version 0.0.1 - * @license AGPL-3.0 - * @copyright loljk 2017 - * @summary HTTP(S) Router that uses the first directory in the requested URL - * as the route name - */ +* @file Node entry and main driver +* @author Jordan Lavatai, Ken Grimes +* @version 0.0.1 +* @license AGPL-3.0 +* @copyright loljk 2017 +* @summary HTTP(S) Router that uses the first directory in the requested URL +* as the route name +*/ const fs = require('fs') const ws = require('ws') const path = require('path') @@ -25,17 +25,27 @@ const router = { httpd: undefined, wsProtocol: opts['no-tls'] ? 'ws' : 'wss', respond: (request,response) => { + let body = [] + request.on('error', function(err) { + console.error(`error is ${err}`); + }).on('data', function(chunk) { + console.log(`chunk is ${chunk}`) + body.push(chunk); + }).on('end', function() { + console.log(`body is ${body}`) + }) + console.log('server handling request') const serveFile = (fPath) => { fs.readFile(fPath, { encoding: 'utf8' }, (err, data) => { - if (err || data == undefined) { - response.writeHead(404) - response.end() - } - else { - response.writeHead(200, { 'Content-Type': mime.lookup(fPath) }) - response.write(data) - response.end() - } + if (err || data == undefined) { + response.writeHead(404) + response.end() + } + else { + response.writeHead(200, { 'Content-Type': mime.lookup(fPath) }) + response.write(data) + response.end() + } }) } const htArgv = request.url.slice(1).split("?") @@ -46,88 +56,101 @@ const router = { else if (routeName in opts['bindings']) { let localPath = path.normalize(opts['bindings'][routeName].concat(path.sep + routePath.slice(1).join(path.sep))) if (localPath.includes(opts['bindings'][routeName])) { - fs.readdir(localPath, (err, files) => { - if (err) - serveFile(localPath) - else - serveFile(`${localPath}/index.html`) - }) + fs.readdir(localPath, (err, files) => { + if (err) + serveFile(localPath) + else + serveFile(`${localPath}/index.html`) + }) } else { - console.log(`SEC: ${localPath} references files not in route`) + console.log(`SEC: ${localPath} references files not in route`) } } + /* TODO: Handle reconnecting host */ else if (routeName in router.routes) { + const route = router.routes[routeName] - response.writeHead(200, { 'Content-Type': 'text/html' }) - response.write(`${router.skelPage[0]}${router.clientJS}${router.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) + + /* Client is INIT GET */ + if (request.headers['x-strapp-type'] == undefined) { + console.log('client init GET') + response.writeHead(200, { 'Content-Type': 'text/html' }) + response.write(`${router.skelPage[0]}${router.clientJS}${router.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) + } + else { /* Client sent offer, waiting for answer */ + console.log(JSON.parse(request.headers['x-strapp-type'])) + route.socket.on('message', (hostResponse) => { + console.log(hostResponse) + }) + } + } else { router.routes[routeName] = true const newRoute = {} newRoute.host = request.headers['x-forwarded-for'] || request.connection.remoteAddress getport().then( (port) => { - newRoute.port = port - if (opts['no-tls']) - newRoute.httpd = http.createServer() - else - newRoute.httpd = https.createServer(router.httpsOpts) - newRoute.httpd.listen(newRoute.port) - 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}`) - router.routes[routeName] = newRoute + newRoute.port = port + if (opts['no-tls']) + newRoute.httpd = http.createServer() + else + newRoute.httpd = https.createServer(router.httpsOpts) + newRoute.httpd.listen(newRoute.port) + 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}`) + router.routes[routeName] = newRoute }).then(() => { - response.writeHead(200, { 'Content-Type': 'text/html' }) - response.write(`${router.skelPage[0]}` + - `\tconst _strapp_port = ${newRoute.port}\n` + - `\tconst _strapp_protocol = '${router.wsProtocol}'\n` + - `${router.hostJS}\n${router.skelPage[1]}`) - response.end() - }) + response.writeHead(200, { 'Content-Type': 'text/html' }) + response.write(`${router.skelPage[0]}` + + `\tconst _strapp_port = ${newRoute.port}\n` + + `\tconst _strapp_protocol = '${router.wsProtocol}'\n` + + `${router.hostJS}\n${router.skelPage[1]}`) + response.end() + }) + } + } - } -} -/** - * @summary Boot up the router. With TLS, we must wait for file reads to sync. - */ -if (!opts['no-tls']) { - let filesRead = 0 - let key = undefined - let cert = undefined - const syncRead = () => { - if (++filesRead == 2) { - if (key == undefined) + /** + * @summary Boot up the router. With TLS, we must wait for file reads to sync. + */ + if (!opts['no-tls']) { + console.log('tls') + let filesRead = 0 + let key = undefined + let cert = undefined + const syncRead = () => { + if (++filesRead == 2) { + if (key == undefined) console.log(`ERR: Key ${opts['ca-key']} inaccessible, tls will fail`) - if(cert == undefined) + if(cert == undefined) console.log(`ERR: Cert ${opts['ca-cert']} inaccessible, tls will fail`) - else if (key != undefined) { - router.httpsOpts = { cert: cert, key: key} - router.httpd = https.createServer(router.httpsOpts, router.respond) + else if (key != undefined) { + router.httpsOpts = { cert: cert, key: key} + router.httpd = https.createServer(router.httpsOpts, router.respond) .listen(opts['port']) + } } } + fs.readFile(opts['ca-key'], { encoding: 'utf8' }, (err, data) => { + if (!err) key = data + syncRead() + }) + fs.readFile(opts['ca-cert'], { encoding: 'utf8' }, (err, data) => { + if (!err) cert = data + syncRead() + }) } - fs.readFile(opts['ca-key'], { encoding: 'utf8' }, (err, data) => { - if (!err) key = data - syncRead() - }) - fs.readFile(opts['ca-cert'], { encoding: 'utf8' }, (err, data) => { - if (!err) cert = data - syncRead() - }) -} -else + else router.httpd = http.createServer(router.respond).listen(opts['port']) -//TODO: if ("electron" in process.versions) open a local renderwindow, and route to it - + //TODO: if ("electron" in process.versions) open a local renderwindow, and route to it