From 82428c0ccc7b4938564b434fb0de153afb5af508 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Sat, 11 Apr 2020 18:02:04 +0200
Subject: add an error message when the connection fails

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

(limited to 'webAO/master.js')

diff --git a/webAO/master.js b/webAO/master.js
index 4281a49..5527ce5 100644
--- a/webAO/master.js
+++ b/webAO/master.js
@@ -24,6 +24,7 @@ if (window.requestIdleCallback) {
 
 			masterserver = new WebSocket("ws://" + MASTERSERVER_IP);
 			masterserver.onopen = (evt) => onOpen(evt);
+			masterserver.onerror = (evt) => onError(evt);
 			masterserver.onmessage = (evt) => onMessage(evt);
 
 			if (/webOS|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|PlayStation|Opera Mini/i.test(navigator.userAgent)) {
@@ -40,6 +41,7 @@ if (window.requestIdleCallback) {
 
 			masterserver = new WebSocket("ws://" + MASTERSERVER_IP);
 			masterserver.onopen = (evt) => onOpen(evt);
+			masterserver.onerror = (evt) => onError(evt);
 			masterserver.onmessage = (evt) => onMessage(evt);
 
 			if (/webOS|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|PlayStation|Opera Mini/i.test(navigator.userAgent)) {
@@ -74,6 +76,15 @@ function onOpen(_e) {
 	masterserver.send("VC#%");
 }
 
+/**
+ * Triggered when an network error occurs.
+ * @param {ErrorEvent} e 
+ */
+function onError(evt) {
+	document.getElementById("ms_error").style.display = "block";
+	document.getElementById("ms_error_code").innerText = `A network error occurred: ${evt.reason} (${evt.code})`;
+}
+
 function checkOnline(serverID, coIP) {
 	let oserv = new WebSocket("ws://" + coIP);
 
@@ -159,4 +170,4 @@ function onMessage(e) {
 			msChat.scrollTop = msChat.scrollHeight;
 		}
 	}
-}
+}
\ No newline at end of file
-- 
cgit