Bit of cleanup, some test fixes, moving some funcs

Author: code-asher

packages/ide/src/fill/electron.ts

@@ -13,8 +13,10 @@ import { clipboard } from "./clipboard";
 	return [];
 };
 
+// This is required to make the fill load in Node without erroring.
 if (typeof document === "undefined") {
-	(<any>global).document = {} as any;
+	// tslint:disable-next-line no-any
+	(global as any).document = {} as any;
 }
 
 const oldCreateElement: <K extends keyof HTMLElementTagNameMap>(
@@ -52,7 +54,7 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
 					if (view.contentDocument) {
 						view.contentDocument.body.id = frameID;
 						view.contentDocument.body.parentElement!.style.overflow = "hidden";
-						const script = document.createElement("script");
+						const script = createElement("script");
 						script.src = url;
 						view.contentDocument.head.appendChild(script);
 					}

packages/ide/src/fill/net.ts

@@ -13,7 +13,6 @@ class Net implements NodeNet {
 	) {}
 
 	public get Socket(): typeof net.Socket {
-		// @ts-ignore
 		return this.client.Socket;
 	}
 

packages/ide/src/upload.ts

@@ -221,7 +221,7 @@ export class Upload {
 
 			await rm();
 
-			reader.addEventListener("load", async () => {
+			const load = async (): Promise<void> => {
 				const buffer = new Uint8Array(reader.result as ArrayBuffer);
 				let bufferOffset = 0;
 
@@ -259,7 +259,9 @@ export class Upload {
 				}
 
 				seek();
-			});
+			};
+
+			reader.addEventListener("load", load);
 
 			seek();
 		});

packages/logger/src/logger.ts

@@ -56,57 +56,6 @@ export const field = <T>(name: string, value: T): Field<T> => {
 	return new Field(name, value);
 };
 
-/**
- * Hashes a string.
- */
-const djb2 = (str: string): number => {
-	let hash = 5381;
-	for (let i = 0; i < str.length; i++) {
-		hash = ((hash << 5) + hash) + str.charCodeAt(i); /* hash * 33 + c */
-	}
-
-	return hash;
-};
-
-/**
- * Convert rgb to hex.
- */
-const rgbToHex = (r: number, g: number, b: number): string => {
-	const integer = ((Math.round(r) & 0xFF) << 16)
-		+ ((Math.round(g) & 0xFF) << 8)
-		+ (Math.round(b) & 0xFF);
-
-	const str = integer.toString(16);
-
-	return "#" + "000000".substring(str.length) + str;
-};
-
-/**
- * Convert fully-formed hex to rgb.
- */
-const hexToRgb = (hex: string): [number, number, number] => {
-	const integer = parseInt(hex.substr(1), 16);
-
-	return [
-		(integer >> 16) & 0xFF,
-		(integer >> 8) & 0xFF,
-		integer & 0xFF,
-	];
-};
-
-/**
- * Generates a deterministic color from a string using hashing.
- */
-const hashStringToColor = (str: string): string => {
-	const hash = djb2(str);
-
-	return rgbToHex(
-		(hash & 0xFF0000) >> 16,
-		(hash & 0x00FF00) >> 8,
-		hash & 0x0000FF,
-	);
-};
-
 /**
  * This formats & builds text for logging.
  * It should only be used to build one log item at a time since it stores the
@@ -207,7 +156,7 @@ export class BrowserFormatter extends Formatter {
  */
 export class ServerFormatter extends Formatter {
 	public tag(name: string, color: string): void {
-		const [r, g, b] = hexToRgb(color);
+		const [r, g, b] = this.hexToRgb(color);
 		while (name.length < 5) {
 			name += " ";
 		}
@@ -220,7 +169,7 @@ export class ServerFormatter extends Formatter {
 			this.format += "\u001B[1m";
 		}
 		if (color) {
-			const [r, g, b] = hexToRgb(color);
+			const [r, g, b] = this.hexToRgb(color);
 			this.format += `\u001B[38;2;${r};${g};${b}m`;
 		}
 		this.format += this.getType(arg);
@@ -241,6 +190,19 @@ export class ServerFormatter extends Formatter {
 		this.args.push(JSON.stringify(obj));
 		console.log(...this.flush()); // tslint:disable-line no-console
 	}
+
+	/**
+	 * Convert fully-formed hex to rgb.
+	 */
+	private hexToRgb(hex: string): [number, number, number] {
+		const integer = parseInt(hex.substr(1), 16);
+
+		return [
+			(integer >> 16) & 0xFF,
+			(integer >> 8) & 0xFF,
+			integer & 0xFF,
+		];
+	}
 }
 
 /**
@@ -258,7 +220,7 @@ export class Logger {
 		private readonly defaultFields?: FieldArray,
 	) {
 		if (name) {
-			this.nameColor = hashStringToColor(name);
+			this.nameColor = this.hashStringToColor(name);
 		}
 		const envLevel = typeof global !== "undefined" && typeof global.process !== "undefined" ? global.process.env.LOG_LEVEL : process.env.LOG_LEVEL;
 		if (envLevel) {
@@ -401,7 +363,7 @@ export class Logger {
 				const green = expPer < 1 ? max : min;
 				const red = expPer >= 1 ? max : min;
 				this._formatter.push(` ${time.identifier}=`, "#3794ff");
-				this._formatter.push(`${diff}ms`, rgbToHex(red > 0 ? red : 0, green > 0 ? green : 0, 0));
+				this._formatter.push(`${diff}ms`, this.rgbToHex(red > 0 ? red : 0, green > 0 ? green : 0, 0));
 			});
 		}
 
@@ -413,6 +375,44 @@ export class Logger {
 		}
 		// tslint:enable no-console
 	}
+
+	/**
+	 * Hashes a string.
+	 */
+	private djb2(str: string): number {
+		let hash = 5381;
+		for (let i = 0; i < str.length; i++) {
+			hash = ((hash << 5) + hash) + str.charCodeAt(i); /* hash * 33 + c */
+		}
+
+		return hash;
+	}
+
+	/**
+	 * Convert rgb to hex.
+	 */
+	private rgbToHex(r: number, g: number, b: number): string {
+		const integer = ((Math.round(r) & 0xFF) << 16)
+			+ ((Math.round(g) & 0xFF) << 8)
+			+ (Math.round(b) & 0xFF);
+
+		const str = integer.toString(16);
+
+		return "#" + "000000".substring(str.length) + str;
+	}
+
+	/**
+	 * Generates a deterministic color from a string using hashing.
+	 */
+	private hashStringToColor(str: string): string {
+		const hash = this.djb2(str);
+
+		return this.rgbToHex(
+			(hash & 0xFF0000) >> 16,
+			(hash & 0x00FF00) >> 8,
+			hash & 0x0000FF,
+		);
+	}
 }
 
 export const logger = new Logger(

packages/protocol/src/browser/client.ts

@@ -1,15 +1,16 @@
 import { ReadWriteConnection, InitData, OperatingSystem, ISharedProcessData } from "../common/connection";
 import { NewEvalMessage, ServerMessage, EvalDoneMessage, EvalFailedMessage, TypedValue, ClientMessage, NewSessionMessage, TTYDimensions, SessionOutputMessage, CloseSessionInputMessage, WorkingInitMessage, EvalEventMessage } from "../proto";
-import { Emitter, Event } from "@coder/events";
+import { Emitter } from "@coder/events";
 import { logger, field } from "@coder/logger";
 import { ChildProcess, SpawnOptions, ForkOptions, ServerProcess, ServerSocket, Socket, ServerListener, Server, ActiveEval } from "./command";
 import { EventEmitter } from "events";
+import { Socket as NetSocket } from "net";
 
 /**
  * Client accepts an arbitrary connection intended to communicate with the Server.
  */
 export class Client {
-	public readonly Socket: typeof ServerSocket;
+	public readonly Socket: typeof NetSocket;
 
 	private evalId = 0;
 	private readonly evalDoneEmitter = new Emitter<EvalDoneMessage>();
@@ -47,12 +48,11 @@ export class Client {
 		});
 
 		const that = this;
+		// @ts-ignore NOTE: this doesn't fully implement net.Socket.
 		this.Socket = class extends ServerSocket {
-
 			public constructor() {
 				super(that.connection, that.connectionId++, that.registerConnection);
 			}
-
 		};
 
 		this.initDataPromise = new Promise((resolve): void => {
@@ -151,39 +151,39 @@ export class Client {
 		});
 
 		const d1 = this.evalDoneEmitter.event((doneMsg) => {
-			if (doneMsg.getId() === id) {
-				d1.dispose();
-				d2.dispose();
+			if (doneMsg.getId() !== id) {
+				return;
+			}
+
+			d1.dispose();
+			d2.dispose();
 
-				const resp = doneMsg.getResponse();
-				if (!resp) {
-					res();
-
-					return;
-				}
-
-				const rt = resp.getType();
-				// tslint:disable-next-line
-				let val: any;
-				switch (rt) {
-					case TypedValue.Type.BOOLEAN:
-						val = resp.getValue() === "true";
-						break;
-					case TypedValue.Type.NUMBER:
-						val = parseInt(resp.getValue(), 10);
-						break;
-					case TypedValue.Type.OBJECT:
-						val = JSON.parse(resp.getValue());
-						break;
-					case TypedValue.Type.STRING:
-						val = resp.getValue();
-						break;
-					default:
-						throw new Error(`unsupported typed value ${rt}`);
-				}
-
-				res(val);
+			const resp = doneMsg.getResponse();
+			if (!resp) {
+				return res();
 			}
+
+			const rt = resp.getType();
+			// tslint:disable-next-line no-any
+			let val: any;
+			switch (rt) {
+				case TypedValue.Type.BOOLEAN:
+					val = resp.getValue() === "true";
+					break;
+				case TypedValue.Type.NUMBER:
+					val = parseInt(resp.getValue(), 10);
+					break;
+				case TypedValue.Type.OBJECT:
+					val = JSON.parse(resp.getValue());
+					break;
+				case TypedValue.Type.STRING:
+					val = resp.getValue();
+					break;
+				default:
+					throw new Error(`unsupported typed value ${rt}`);
+			}
+
+			res(val);
 		});
 
 		const d2 = this.evalFailedEmitter.event((failedMsg) => {