Refactoring go brr

Author: SiddharthShyniben

package-lock.json

@@ -27,7 +27,6 @@
 		"nanoparse": "^1.0.0",
 		"node-fetch": "^3.2.4",
 		"planckcolors": "^1.2.0",
-		"unbug": "^1.0.0",
 		"vm2": "^3.9.9"
 	}
 }

package.json

@@ -241,7 +241,7 @@ POST *https://reqres.in/api/users*
     etag: W/"79-MEAYpc0MhwHX2uP7lKGAdEBMx8s"
     expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
     nel: {"success_fraction":0,"report_to":"cf-nel","max_age":604800}
-    report-to: {"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v3?s=ntfm%2FdG82lCwNoI1DEY%2Fx%2F%2Bvbj9A%2Fn%2FE0xcyOqXjpQ7WiSA4iG5R%2BOnBjDzZ6CYFs6ltl1TSfVeZMB%2FmGhF1kjhXY%2FRtDz28ItiH37STrIJacYjwcItJ4kBm%2B6E%3D"}],"group":"cf-nel","max_age":604800}
+    report-to: {"endpoints":[{"url":"https://a.nel.cloudflare.com/report/v3?s=ntfm%2FdG82lCwNoI1DEY%2Fx%2F%2Bvbj9A%2Fn%2FE0xcyOqXjpQ7WiSA4iG5R%2BOnBjDzZ6CYFs6ltl1TSfVeZMB%2FmGhF1kjhXY%2FRtDz28ItiH37STrIJacYjwcItJ4kBm%2B6E%3D"}],"group":"cf-nel","max_age":604800}
     server: cloudflare
     via: 1.1 vegur
     x-powered-by: Express

src/help.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 import nanoparse from 'nanoparse';
-import unbug from 'unbug';
 import color from 'planckcolors';
+import fuzzysort from 'fuzzysort';
 
 import './warning.js';
 
@@ -13,35 +13,44 @@ import help from './help.js';
 const args = nanoparse(process.argv.slice(2));
 const command = args._[0];
 
-const debug = unbug('controller');
-
 const commands = {
-	default: () => {
+	default: (c) => {
 		console.log(color.bold(color.red('Invalid command!')));
+
+		const allCommands = ['help', 'init', 'run', 'version'];
+		const similar = fuzzysort.go(c, allCommands)
+		const hl = similar.map(k => '\t' + fuzzysort.highlight(k, '\x1b[31m', '\x1B[0m'))
+
+		console.log()
+		if (similar.length > 0) {
+			console.log('Did you mean:')
+			console.log(hl.join('\n'))
+		} else {
+			console.log('Available commands:')
+			console.log(allCommands.map(k => '\t' + k).join('\n'))
+		}
 	},
-	no_command: () => {
+	noCommand: () => {
 		console.log(color.red('No command detected!'));
 		console.log('Run', color.bold(color.green('req help')), 'for more information.');
 	},
 	help,
 	init,
 	run,
 	async version() {
+		const {version} = (await import('../package.json', {assert: {type: 'json'}})).default
 		console.log(
-			'req', 'v' + (await import('../package.json', {assert: {type: 'json'}})).default.version
+			'req', `v${version}`
 		);
 	},
 }
 
 commands.v = commands.version;
 
-debug('Starting up...')
-debug('Command:', command)
-debug('Args:', args)
-
 if (!command) {
-	commands.no_command();
+	commands.noCommand();
 } else {
-	const the_command = commands[command] || commands.default;
-	the_command(args);
+	const theCommand = commands[command];
+	if (theCommand) theCommand(args);
+	else commands.default(command);
 }

src/index.js

@@ -1,5 +1,5 @@
 import color from 'planckcolors';
-import {mkdirSync, readdirSync, readFileSync, writeFileSync} from 'fs';
+import {mkdirSync, readdirSync, writeFileSync} from 'fs';
 
 export default function init() {
 	console.log('Initializing req in current directory...');

src/init.js

@@ -1,8 +1,5 @@
-import jsonc from 'jsonc-simple-parser';
-const JSONC = jsonc;
-
-const METHODS = ['DELETE', 'GET', 'HEAD', 'POST', 'PUT', 'CONNECT', 'OPTIONS', 'TRACE', 'COPY', 'LOCK', 'MKCOL', 'MOVE', 'PROPFIND', 'PROPPATCH', 'SEARCH', 'UNLOCK', 'BIND', 'REBIND', 'UNBIND', 'ACL', 'REPORT', 'MKACTIVITY', 'CHECKOUT', 'MERGE', 'M-SEARCH', 'NOTIFY', 'SUBSCRIBE', 'UNSUBSCRIBE', 'PATCH', 'PURGE', 'MKCALENDAR', 'LINK', 'UNLINK'];
-const HTTP_VERSIONS = ['0.9', '1.0', '1.1', '2.0'];
+import JSONC from 'jsonc-simple-parser';
+import {HTTP_VERSIONS, METHODS} from './util.js';
 
 const requestRegex = /^([A-Z-]+) ([^ ]+) HTTP\/(\d)\.(\d)$/;
 const versionRegex = /HTTP\/(\d)\.(\d)$/;
@@ -13,12 +10,9 @@ const clean = line => line.replace(/^\/\/.+/g, '').replace(/^#.+/g, '').trim();
 
 export function parse(text) {
 	const ret = {
-		method: undefined,
-		url: undefined,
-		version: undefined,
 		headers: {},
-		body: undefined,
 	};
+
 	const lines = text.split('\n');
 
 	let parsedRequest = false;
@@ -38,9 +32,9 @@ export function parse(text) {
 
 		if (!parsedRequest) {
 			let nextLine = lines[i + 1];
-			while (nextLine && clean(nextLine) && nextLine.match(continuationRegex)) {
+			while (nextLine && clean(nextLine) && continuationRegex.test(nextLine)) {
 				const [, l] = nextLine.match(continuationRegex);
-				if (l.match(versionRegex)) line += ' ';
+				if (versionRegex.test(l)) line += ' ';
 				line += l;
 				i++;
 				nextLine = lines[i + 1];
@@ -65,9 +59,7 @@ export function parse(text) {
 			}
 
 			ret.method = method;
-
 			ret.url = url;
-
 			ret.version = realVersion;
 
 			parsedRequest = true;
@@ -93,7 +85,7 @@ export function parse(text) {
 		}
 	}
 
-	if (finalLine == 0) return ret;
+	if (finalLine === 0) return ret;
 
 	const {body, type} = toBody(lines.slice(finalLine).join('\n'))
 	ret.body = body;
@@ -105,10 +97,10 @@ export function parse(text) {
 
 function toBody(source) {
 	try {
-		JSONC.parse(source);
+		const parsed = JSONC.parse(source);
 
 		return {
-			body: JSONC.stringify(JSONC.parse(source)),
+			body: JSONC.stringify(parsed),
 			type: 'json'
 		}
 	} catch (e) {
@@ -118,4 +110,3 @@ function toBody(source) {
 		}
 	}
 }
-