TypeScript server improvements

Slight organization conserns, moving a couple curly braces to the same line to improve readability, etc.

TypescriptServer/src/custom_stuff.ts

@@ -0,0 +1,62 @@
+// Please edit this file
+import { Socket } from 'net';
+import { Data, packet } from './networking'
+import { clients } from './globals'
+
+export function handlePacket(c: Client, data: Data):void {
+	var cmd = data.cmd.toLowerCase();
+
+	switch(cmd) {
+		case 'hello':
+			console.log("Hello from client: " + data.kappa);
+			c.sendHello();
+			break;
+		case 'message':
+			console.log('Message from client: ' + data.msg);
+			c.sendMessage(data.msg + ' indeed');
+			break;
+		// Add your commands here:
+        // case 'yourcommand':
+        //     // some code
+        //     break;
+	}
+}
+
+
+export class Client {
+	socket: Socket;
+	username: string; // todo: implement actual usernames
+
+    constructor(socket: Socket) {
+		this.socket = socket;
+
+        this.username = undefined;
+        this.socket = socket;
+        // you can add more variables here
+    }
+
+    // these 2 functions are internal,
+	write(data: Data):void {
+		this.socket.write(packet.build(data));
+	}
+
+    broadcastAll(data: Data):void {
+        clients.forEach(c => {
+			c.write(data);
+        });
+    }
+    // you might want to implement a broadcastLobby() if you have those
+
+
+	// Custom Wrappers
+	sendHello():void {
+		this.write({ cmd: 'hello', str: 'Hello, client' });
+	}
+
+	sendMessage(msg: string):void {
+		this.write({ cmd: 'message', msg: msg });
+	}
+    // feel free to add more below
+
+
+}

TypescriptServer/src/globals.ts

@@ -0,0 +1,5 @@
+// here you can put any global variables to later import
+// (for access across files)
+import { Client } from './custom_stuff'
+
+export var clients:Client[] = [];

TypescriptServer/src/networking.ts

@@ -1,75 +1,13 @@
+// this file contains internal things that you shouldn't touch (unless you know what you're doing)
 import { Socket } from 'net'
+import { Client, handlePacket } from './custom_stuff'
 import { encode, decode } from '@msgpack/msgpack'
 
-export type Data = { [key: string]: string; };
+// theoretically you can make it any type, but anything other than a map makes little sense
+export type Data = { [key: string]: any; cmd: string; };
 
-export function handlePacket(c: Client, data: Data): void
-{
-	var cmd = data.cmd.toLowerCase();
-
-	switch(cmd)
-	{
-		case 'hello':
-			console.log("Hello from client: " + data.kappa);
-			c.sendHello();
-			break;
-		case 'message':
-			console.log('Message from client: ' + data.msg);
-			c.sendMessage(data.msg + ' indeed');
-			break;
-		// Add your commands here:
-	}
-}
-
-export class Client
-{
-	socket: Socket;
-	username: string;
-
-	//#region Necessary Functions
-
-    constructor(socket: Socket)
-	{
-		this.socket = socket;
-
-        this.username = undefined;
-        this.socket = socket;
-        // you can add more variables here
-    }
-
-	write(data: Data): void
-	{
-		this.socket.write(packet.build(data));
-	}
-
-    broadcastAll(data: Data, clients: Client[]): void
-	{
-        clients.forEach(
-			c =>
-			{
-            	c.write(data);
-        	}
-		);
-    }
-	//#endregion
-
-	//#region Wrappers
-	sendHello(): void
-	{
-		this.write({ cmd: 'hello', str: 'Hello, client' });
-	}
-
-	sendMessage(msg: string): void
-	{
-		this.write({ cmd: 'message', msg: msg });
-	}
-	//#endregion
-}
-
-export let packet =
-{
-	build: (data: Data): Buffer =>
-	{
+export let packet = {
+	build: function(data: Data):Buffer {
         var dataBuff = encode(data);
         var sizeBuff = Buffer.alloc(2);
         sizeBuff.writeUInt16LE(dataBuff.length);
@@ -78,8 +16,7 @@ export let packet =
         return buff;
     },
 
-	parse: (c: Client, data: any): void =>
-	{
+	parse: function(c: Client, data: any):void {
 		var dataSize = data.length;
 		for(var i = 0; i < dataSize;)
 		{

TypescriptServer/src/server.ts

@@ -2,47 +2,31 @@ import * as net from 'net';
 
 const port = 1338;
 
-// Unnecessary complexity
-//import { handlePacket } from './custom/handlePacket';
-//import { Clients } from './static/clients'; 
-//import { packet } from './static/packet'; // packet = { parse(), build() }
-import { Client, Data, handlePacket, packet } from './networking'; // class Client {...}
+import { Client, handlePacket } from './custom_stuff'
+import { Data, packet } from './networking';
+import { clients } from './globals';
 
-let clients: Client[] = []; //No need for a single file
+const server = net.createServer(socket => {
+	console.log("Socket connected!");
+
+	var c = new Client(socket);
+	c.username = ""; // todo: implement actual nicknames
+
+	clients.push(c); // unnecessary, but useful if you want to iterate over all clients
 
-const server = net.createServer(
-	socket =>
-	{
-		console.log("Socket connected!");
-
-		var c = new Client(socket);
-		c.username = ""; // todo: implement actual nicknames
-
-		clients.push(c); // add the client to clients list (unnecessary)
+	// Bind functions on events
+	socket.on('error', (err) => {
+		console.log(`Error! ${err}`); // Don't crash the server on error
+	});
+
+	socket.on('data', (data) => {
+		packet.parse(c, data); // Handle data
+	});
 
-		// Bind functions on events
-		socket.on('error',
-			err =>
-			{
-				console.log(`Error! ${err}`); // Don't crash on error
-			}
-		);
-
-		socket.on('data', 
-			data =>
-			{
-				packet.parse(c, data); // Do stuff
-			}
-		);
-
-		socket.on('end',
-			() =>
-			{
-				console.log('Socket ended.');
-			}
-		);
-	}
-);
+	socket.on('end', () => {
+		console.log('Socket ended.');
+	});
+});
 
 server.listen(port);
 console.log("Server running on port " + port + "!");