From 771ee83fd41757fe1b86e96935c5fcefcea4b126 Mon Sep 17 00:00:00 2001 From: jaketothepast Date: Sat, 26 Jan 2019 07:48:38 -0500 Subject: [PATCH] Bring in winston for logging, upgrade to async/await for promises --- index.js | 63 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/index.js b/index.js index 413f205..2771083 100644 --- a/index.js +++ b/index.js @@ -1,27 +1,39 @@ var net = require('net'); var http = require('http'); var fs = require('fs'); +var winston = require("winston"); + +const logger = winston.createLogger({ + transports: [ + new winston.transports.File({filename: 'proxy.log'}) + ] +}); class HttpRequest { - constructor({attrs}) { + constructor(attrs) { this.attrs = attrs; - this.logSomething = this.logSomething.bind(this); + this.forwardRequest = this.forwardRequest.bind(this); } // TODO - not working yet. will come back to this. logSomething() { - fs.appendFile("proxy.log", this.attrs, (err) => { - console.log("Got an error."); + logger.log({ + level: 'info', + message: this.attrs }) } + + forwardRequest() { + + } } /** * Parse an HTTP request. * @param {String} bytes */ -function parseHttpRequest(bytes) { +async function parseHttpRequest(bytes) { let httpRequestAttrs = {headers: ""}; bytes.split("\r\n").map((row) => { @@ -55,25 +67,30 @@ async function logAndSend(bytes) { console.log(bytes) } -var server = net.createServer((socket) => { - socket.on('end', (c) => { - console.log("Client disconnected"); + +function startServer() { + var server = net.createServer((socket) => { + socket.on('end', (c) => { + console.log("Client disconnected"); + }); + socket.on("data", (c) => { + parseHttpRequest(c.toString()) + .then((req) => { + req.logSomething(); + }) + }); + }) + + server.on('connection', (c) => { + console.log("Client connected!"); }); - socket.on("data", (c) => { - parseHttpRequest(c.toString()).log(); + + server.listen(8124, () => { + console.log("Server bound."); }); -}) -server.on('connection', (c) => { - console.log("Client connected!" + c.read(10)); -}); + return server; +} -server.on("listening", (c) => { - console.log("LISTENING"); -}) - -server.listen(8124, () => { - console.log("Server bound."); -}) - -module.exports = [parseHttpRequest]; \ No newline at end of file +startServer(); +module.exports = [parseHttpRequest];