resolving a conflict

Author: Alexandros Semelidis

src/client/public/index.js

@@ -56,7 +56,11 @@ $(function onload() {
 					objPanel.show();
 					txtUsername.val('');
 					chatEmpty();
+<<<<<<< HEAD
 					panelEmpty();
+=======
+					txtMessage.focus();
+>>>>>>> 91bb2d2083828c1184c8b25621cd214d8688992f
 					chatWriteLine(`You are connected! (${s})`);
 					getUsers();
 				} else {
@@ -159,6 +163,12 @@ $(function onload() {
 		);
 	});
 
+	txtUsername.on('keypress', (e) => {
+		if (e.which === 13) {
+			btnJoin.click();
+		}
+	});
+
 	txtMessage.on('keypress', (e) => {
 		if (e.which === 13) {
 			btnSend.click();

src/server/Configuration.ts

@@ -0,0 +1 @@
+export const UPPERCASE_USERNAMES: boolean = false;

src/server/Connections.ts

@@ -41,6 +41,17 @@ export function FindConnById(pId: string): Promise<Connection | null> {
 	});
 }
 
+export function FindConnByName(pName: string): Promise<Connection | null> {
+	return new Promise((resolve) => {
+		for (const [_Id, _Conn] of Connections.entries()) {
+			if (_Conn.name.toUpperCase() === pName.toUpperCase()) {
+				return resolve(_Conn);
+			}
+		}
+		resolve(null);
+	});
+}
+
 export function RemoveConnById(pId: string): Promise<Boolean> {
 	return new Promise((resolve) => {
 		const deleted = Connections.delete(pId);

src/server/WebSocket.ts

@@ -10,8 +10,11 @@ import {
 	RemoveConnById,
 	CheckConnById,
 	ConnInfo,
+	FindConnByName,
 } from './Connections.ts';
 
+import { UPPERCASE_USERNAMES } from './Configuration.ts';
+
 /**
  * h: Handler
  * s: Sender
@@ -49,14 +52,21 @@ export async function HandleWSConn(pWebSocket: WebSocket): Promise<void> {
 				const objEvent: WSMessage = JSON.parse(event);
 				switch (objEvent.h) {
 					case 'join': {
-						const _name = objEvent.d;
-						if (/^[a-zA-Z0-9]+$/i.test(_name)) {
+						const _name = UPPERCASE_USERNAMES
+							? objEvent.d.toUpperCase()
+							: objEvent.d;
+						if (!/^[a-zA-Z0-9]+$/i.test(_name)) {
+							await RespondJoin(_connInfo, 'Invalid username');
+						} else if (await FindConnByName(_name)) {
+							await RespondJoin(
+								_connInfo,
+								'Username already in use'
+							);
+						} else {
 							_conn.state = true;
-							_conn.name = objEvent.d;
+							_conn.name = _name;
 							await BroadcastJoin(_connInfo);
 							await RespondJoin(_connInfo, 'OK');
-						} else {
-							await RespondJoin(_connInfo, 'Invalid username');
 						}
 						break;
 					}