Revert "Utilize IncomingMessage and ServerResponse classes (dirigeant…

…s#124)"

This reverts commit da7e709.

.gitignore

@@ -61,5 +61,3 @@ docs
 \.vscode/
 \.idea/
 desktop.ini
-
-pnpm-lock\.yaml

src/index.js

@@ -4,8 +4,6 @@ module.exports = {
 	DashboardClient: require('./lib/Client'),
 	Client: require('./lib/Client'),
 	Server: require('./lib/http/Server'),
-	KlasaIncomingMessage: require('./lib/http/KlasaIncomingMessage'),
-	KlasaServerResponse: require('./lib/http/KlasaServerResponse'),
 	Middleware: require('./lib/structures/Middleware'),
 	MiddlewareStore: require('./lib/structures/MiddlewareStore'),
 	Route: require('./lib/structures/Route'),
@@ -60,7 +58,3 @@ module.exports = {
  * @external ServerResponse
  * @see {@link https://nodejs.org/dist/latest-v10.x/docs/api/http.html#http_class_http_serverresponse}
  */
-/**
- * @external Socket
- * @see {@link https://nodejs.org/dist/latest-v10.x/docs/api/net.html#net_class_net_socket}
- */

src/lib/http/Server.js

@@ -1,4 +1,8 @@
 const http = require('http');
+const { parse } = require('url');
+
+const { split } = require('../util/Util');
+const { METHODS_LOWER } = require('../util/constants');
 
 /**
  * The http server for klasa-dashboard-hooks
@@ -35,7 +39,7 @@ class Server {
 	 * @param {DashboardClient} client The Klasa client
 	 */
 	constructor(client) {
-		const { http2, serverOptions } = client.options.dashboardHooks;
+		const { http2, sslOptions } = client.options.dashboardHooks;
 		/**
 		 * The Client that manages this Server instance
 		 * @since 0.0.1
@@ -49,8 +53,8 @@ class Server {
 		 * @type {external:HTTPServer}
 		 */
 		this.server = http2 ?
-			require('http2').createSecureServer(serverOptions) :
-			serverOptions.cert ? require('https').createServer(serverOptions) : http.createServer(serverOptions);
+			require('http2').createSecureServer(sslOptions) :
+			sslOptions ? require('https').createServer(sslOptions) : http.createServer();
 
 		/**
 		 * The onError function called when a url does not match
@@ -78,11 +82,19 @@ class Server {
 	 * @param {external:ServerResponse} response The response
 	 */
 	async handler(request, response) {
-		request.init(this.client);
+		const info = parse(request.url, true);
+		const splitURL = split(info.pathname);
+		const route = this.client.routes.findRoute(request.method, splitURL);
+
+		if (route) request.params = route.execute(splitURL);
+		request.originalUrl = request.originalUrl || request.url;
+		request.path = info.pathname;
+		request.search = info.search;
+		request.query = info.query;
 
 		try {
-			await this.client.middlewares.run(request, response, request.route);
-			await (request.route ? request.execute(response) : this.onNoMatch(request, response));
+			await this.client.middlewares.run(request, response, route);
+			await (route ? route[METHODS_LOWER[request.method]](request, response) : this.onNoMatch(request, response));
 		} catch (err) {
 			this.client.emit('error', err);
 			this.onError(err, request, response);

src/lib/util/constants.js

@@ -1,18 +1,11 @@
 const { METHODS } = require('http');
 
-const KlasaIncomingMessage = require('../http/KlasaIncomingMessage');
-const KlasaServerResponse = require('../http/KlasaServerResponse');
-
 exports.OPTIONS = {
 	dashboardHooks: {
 		apiPrefix: 'api/',
 		origin: '*',
 		port: 4000,
-		http2: false,
-		serverOptions: {
-			IncomingMessage: KlasaIncomingMessage,
-			ServerResponse: KlasaServerResponse
-		}
+		http2: false
 	},
 	pieceDefaults: {
 		routes: {

src/middlewares/authenticated.js

@@ -17,7 +17,8 @@ module.exports = class extends Middleware {
 	}
 
 	unauthorized(response) {
-		return response.status(401).end(RESPONSES.UNAUTHORIZED);
+		response.writeHead(401);
+		return response.end(RESPONSES.UNAUTHORIZED);
 	}
 
 };

src/routes/application.js

@@ -8,7 +8,7 @@ module.exports = class extends Route {
 	}
 
 	get(request, response) {
-		return response.json({
+		return response.end(JSON.stringify({
 			users: this.client.users.size,
 			guilds: this.client.guilds.size,
 			channels: this.client.channels.size,
@@ -18,7 +18,7 @@ module.exports = class extends Route {
 			memory: process.memoryUsage().heapUsed / 1024 / 1024,
 			invite: this.client.invite,
 			...this.client.application
-		});
+		}));
 	}
 
 };

src/routes/oauthCallback.js

@@ -33,22 +33,24 @@ module.exports = class extends Route {
 		const body = await res.json();
 		const user = await oauthUser.api(body.access_token);
 
-		return response.json({
+		return response.end(JSON.stringify({
 			access_token: encrypt({
 				token: body.access_token,
 				scope: [user.id, ...user.guilds.filter(guild => guild.userCanManage).map(guild => guild.id)]
 			}, this.client.options.clientSecret),
 			user
-		});
+		}));
 		/* eslint-enable camelcase */
 	}
 
 	notReady(response) {
-		return response.status(500).end(RESPONSES.NOT_READY);
+		response.writeHead(500);
+		return response.end(RESPONSES.NOT_READY);
 	}
 
 	noCode(response) {
-		return response.status(400).end(RESPONSES.NO_CODE);
+		response.writeHead(400);
+		return response.end(RESPONSES.NO_CODE);
 	}
 
 };

src/routes/oauthUser.js

@@ -32,7 +32,7 @@ module.exports = class extends Route {
 			}, this.client.options.clientSecret));
 		}
 
-		return response.json(dashboardUser);
+		return response.end(JSON.stringify(dashboardUser));
 	}
 
 	async post(request, response) {