From 8634d76a2ff24728ac0bab796faec985ee5e31ee Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 19 Dec 2019 12:18:03 +0100
Subject: make onlinecheck async, ignore last serverlist entry as it's just a
 single %

---
 webAO/master.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'webAO/master.js')

diff --git a/webAO/master.js b/webAO/master.js
index 3c2c01b..140a726 100644
--- a/webAO/master.js
+++ b/webAO/master.js
@@ -50,7 +50,7 @@ function onOpen(_e) {
 	masterserver.send("VC#%");
 }
 
-function checkOnline(serverID, coIP) {
+async function checkOnline(serverID, coIP) {
 	function onCOOpen(_e) {
 		document.getElementById(`server${serverID}`).className = "available";
 		oserv.send(`HI#${hdid}#%`);
@@ -72,6 +72,7 @@ function checkOnline(serverID, coIP) {
 		}
 	}
 
+	console.log(coIP);
 	var oserv = new WebSocket("ws://" + coIP);
 
 	oserv.onopen = function (evt) {
@@ -91,7 +92,8 @@ function onMessage(e) {
 	
 	if (header === "ALL") {
 		const servers = msg.split("#").slice(1);
-		for (let i = 0; i < servers.length; i++) {
+		console.log(servers);
+		for (let i = 0; i < servers.length-1; i++) {
 			const serverEntry = servers[i];
 			const args = serverEntry.split("&");
 			const asset = args[4] ? `&asset=${args[4]}` : "";
@@ -101,7 +103,7 @@ function onMessage(e) {
 				+ `<a class="button" href="client.html?mode=watch&ip=${args[2]}:${args[3]}${asset}">Watch</a>`
 				+ `<a class="button" href="client.html?mode=join&ip=${args[2]}:${args[3]}${asset}">Join</a></li>`;
 			server_description[i] = args[1];
-			setTimeout(checkOnline(i, args[2] + ":" + args[3]), 100);
+			checkOnline(i, `${args[2]}:${args[3]}`);
 		}
 	}
 	else if (header === "SN") {
@@ -113,7 +115,7 @@ function onMessage(e) {
 			+ `<a class="button" href="client.html?mode=join&ip=${args[2]}:${args[4]}">Join</a></li>`;
 		server_description[i] = args[6];
 		masterserver.send("SR#" + i + "#%");
-		setTimeout(checkOnline(i, args[2] + ":" + args[4]), i*1000);
+		checkOnline(i, `${args[2]}:${args[3]}`);
 	}
 	else if (header === "servercheok") {
 		const args = msg.split("#").slice(1);
-- 
cgit 


From 3ea54b16038108db524de1729a8eceeb9a8ae487 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 19 Dec 2019 12:18:43 +0100
Subject: delete my debug logging entries

---
 webAO/master.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'webAO/master.js')

diff --git a/webAO/master.js b/webAO/master.js
index 140a726..8637291 100644
--- a/webAO/master.js
+++ b/webAO/master.js
@@ -72,7 +72,6 @@ async function checkOnline(serverID, coIP) {
 		}
 	}
 
-	console.log(coIP);
 	var oserv = new WebSocket("ws://" + coIP);
 
 	oserv.onopen = function (evt) {
@@ -92,7 +91,6 @@ function onMessage(e) {
 	
 	if (header === "ALL") {
 		const servers = msg.split("#").slice(1);
-		console.log(servers);
 		for (let i = 0; i < servers.length-1; i++) {
 			const serverEntry = servers[i];
 			const args = serverEntry.split("&");
-- 
cgit 


From 7169a80cf4e68ae06069cfb2bfbcd003b3a892fd Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 19 Dec 2019 12:41:22 +0100
Subject: change localhost port to 50001 and ID to -1

---
 webAO/master.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'webAO/master.js')

diff --git a/webAO/master.js b/webAO/master.js
index 8637291..608cc29 100644
--- a/webAO/master.js
+++ b/webAO/master.js
@@ -25,7 +25,7 @@ masterserver.onopen = (evt) => onOpen(evt);
 masterserver.onmessage = (evt) => onMessage(evt);
 
 const server_description = [];
-server_description[99] = "This is your computer on port 27016";
+server_description[-1] = "This is your computer on port 50001";
 const online_counter = [];
 
 export function setServ(ID) {
@@ -72,6 +72,10 @@ async function checkOnline(serverID, coIP) {
 		}
 	}
 
+	function onCOError(_e) {
+		console.warn(serverID + " threw an error.");
+	}
+
 	var oserv = new WebSocket("ws://" + coIP);
 
 	oserv.onopen = function (evt) {
@@ -82,6 +86,10 @@ async function checkOnline(serverID, coIP) {
 		onCOMessage(evt);
 	};
 
+	oserv.onerror = function(evt) {
+		onCOError(evt)
+	  };
+
 }
 
 function onMessage(e) {
@@ -103,6 +111,7 @@ function onMessage(e) {
 			server_description[i] = args[1];
 			checkOnline(i, `${args[2]}:${args[3]}`);
 		}
+		checkOnline(-1, "127.0.0.1:50001");
 	}
 	else if (header === "SN") {
 		const args = msg.split("#");
-- 
cgit