From 5719fc8930ec91147964182d9d8dab16c1ae6cab Mon Sep 17 00:00:00 2001 From: Cohen Erickson Date: Sat, 13 Aug 2022 13:01:19 -0500 Subject: [PATCH] Prepare --- app.mjs | 80 +++++++++++++---------------------------------- static/index.html | 4 --- 2 files changed, 21 insertions(+), 63 deletions(-) diff --git a/app.mjs b/app.mjs index ac77459..b2d463d 100644 --- a/app.mjs +++ b/app.mjs @@ -1,73 +1,35 @@ import createBareServer from '@tomphttp/bare-server-node'; import http from 'http'; -import https from 'https'; import nodeStatic from 'node-static'; -import fs from 'fs'; import * as custombare from './static/customBare.mjs'; - -const httpPort = 80; -const httpsPort = 443; -const debug = true; - - - +const PORT = process.env.PORT || 3000; const bareServer = createBareServer('/bare/', { - logErrors: false, - localAddress: undefined, - maintainer: { - email: 'tomphttp@sys32.dev', - website: 'https://github.com/tomphttp/', - }, + logErrors: false, + localAddress: undefined }); const serve = new nodeStatic.Server('static/'); -const patronServe = new nodeStatic.Server('static/'); -const fakeServe = new nodeStatic.Server('fakeStatic/'); -const httpServer = http.createServer(); -const httpsServer = https.createServer(); +const server = http.createServer(); -fs.readdir('/etc/letsencrypt/live', { withFileTypes: true }, (err, files) => { - if (!err) - files - .filter(file => file.isDirectory()) - .map(folder => folder.name) - .forEach(dir => { - httpsServer.addContext(dir, { - key: fs.readFileSync(`/etc/letsencrypt/live/${dir}/privkey.pem`), - cert: fs.readFileSync(`/etc/letsencrypt/live/${dir}/fullchain.pem`) - }); - }); +server.on('request', (request, response) => { + if (custombare.route(request, response)) return true; + + if (bareServer.shouldRoute(request)) { + bareServer.routeRequest(request, response); + } else { + serve.serve(request, response); + } +}); +server.on('upgrade', (req, socket, head) => { + if (bareServer.shouldRoute(req)) { + bareServer.routeUpgrade(req, socket, head); + } else { + socket.end(); + } }); -httpServer.on('request', request); -httpsServer.on('request', request); -httpServer.on('upgrade', upgrade); -httpsServer.on('upgrade', upgrade); +server.listen(PORT); -function request(request, response) { - if (custombare.route(request, response)) return true; - if (debug === true) { - console.log(`[${request.method}] - ${request.url} - LINK: ${request.headers['host']} - AGENT: ${request.headers['user-agent']}`); - } - - if (bareServer.shouldRoute(request)) { - bareServer.routeRequest(request, response); - } else { - serve.serve(request, response); - } -} - -function upgrade(req, socket, head) { - if (bareServer.shouldRoute(req)) { - bareServer.routeUpgrade(req, socket, head); - } else { - socket.end(); - } -} - -httpServer.listen(httpPort); -httpsServer.listen(httpsPort); - -console.log("Server running on http://localhost:" + httpPort + " and https://localhost:" + httpsPort); \ No newline at end of file +console.log(`Server running at http://localhost:${PORT}/.`); diff --git a/static/index.html b/static/index.html index 553b2cf..f95a73f 100644 --- a/static/index.html +++ b/static/index.html @@ -14,10 +14,6 @@ - -