public_html/index.html

@@ -11,7 +11,6 @@
 
 <h1>InstantChat</h1>
 
-<script src="js/settings.js"></script>
 <script src="js/client.js"></script>
 
 </body>

public_html/js/client.js

@@ -1,41 +1,47 @@
-"use strict";
+// Constants and variables
+// const wsUri = "ws://localhost:32715";
+const wsUri = "wss://chat.glitch-in.space:443/ws/";
+let websocket;
 
-class Client {
-	constructor(wsUri) {
-		this.wsUri = wsUri;
 
-		// Create WebSocket and set callbacks
+// Initialization
-		console.log("Initialize Client...")
+function init() {
-		this.webSocket = new WebSocket(wsUri);
+	console.log("Init...");
-		this.webSocket.onopen = this.onOpen.bind(this);
+	openWebSocket();
-		this.webSocket.onclose = this.onClose.bind(this);
+}
-		this.webSocket.onmessage = this.onMessage.bind(this);
-		this.webSocket.onerror = this.onError.bind(this);
-	}
 
-	// WebSocket event handlers
+// Open WebSocket
-	onOpen(evt) {
+function openWebSocket() {
-		console.log("Connected to " + this.wsUri);
+	websocket = new WebSocket(wsUri);
+	websocket.onopen = function(evt) { onOpen(evt) };
+	websocket.onclose = function(evt) { onClose(evt) };
+	websocket.onmessage = function(evt) { onMessage(evt) };
+	websocket.onerror = function(evt) { onError(evt) };
+}
+
+// WebSocket event handlers
+function onOpen(evt) {
+	console.log("Connected to " + wsUri + ".");
 
 	// Send init command containing chat ID and nickname
-		this.sendInit();
+	sendInit();
-	}
+}
 
-	onClose(evt) {
+function onClose(evt) {
 	console.log("Connection closed (code " + evt.code + ").");
-	}
+}
 
-	onMessage(evt) {
+function onMessage(evt) {
 	console.log("Received: " + evt.data);
-		this.parseMessage(evt.data);
+	parseMessage(evt.data);
-	}
+}
 
-	onError(evt) {
+function onError(evt) {
 	console.error("Connection error: ", evt);
-	}
+}
 
-	// Command senders
+// Command senders
-	sendInit() {
+function sendInit() {
 	// Define command as JSON object
 	let initObj = {
 		action: "init",
@@ -46,11 +52,11 @@ class Client {
 	// Send command as JSON string
 	let initJson = JSON.stringify(initObj);
 	console.log("Sending init: " + initJson);
-		this.webSocket.send(initJson);
+	websocket.send(initJson);
-	}
+}
 
-	// Message parsing
+// Message parsing
-	parseMessage(msgString) {
+function parseMessage(msgString) {
 	try {
 		let msg = JSON.parse(msgString);
 
@@ -76,11 +82,9 @@ class Client {
 	catch (e) {
 		console.error("Error parsing message JSON: " + e.message);
 	}
-	}
 }
 
 // Run script after page is loaded
 $(function() {
-	const wsUri = AppSettings.serverWsUri;
+	init();
-	let client = new Client(wsUri);
 });

public_html/js/settings.js

@@ -1,7 +0,0 @@
-"use strict";
-
-// Global settings object
-const AppSettings = {
-    // serverWsUri: "ws://localhost:32715",
-    serverWsUri: "wss://chat.glitch-in.space:443/ws/",
-};