From b80bb93cfd9c495ca97ec42f5db61fc9e6b5012b Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Wed, 7 Apr 2021 00:26:22 +0100
Subject: [PATCH] removed reconnection attempts, added manual reconnect button

---
 src/js/tribe/tribe.js | 36 ++++++++++++------------------------
 src/sass/style.scss   |  3 +++
 static/index.html     |  1 +
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/js/tribe/tribe.js b/src/js/tribe/tribe.js
index ab1074935..d690e7c0e 100644
--- a/src/js/tribe/tribe.js
+++ b/src/js/tribe/tribe.js
@@ -24,11 +24,9 @@ export let socket = io(
     // socket: io("http://localhost:3000", {
     autoConnect: false,
     secure: true,
-    reconnectionAttempts: 1,
+    reconnectionAttempts: 0,
   }
 );
-export let reconnectionAttempts = 0;
-export let maxReconnectionAttempts = 1;
 export let activePage = "preloader";
 export let pageTransition = false;
 export let expectedVersion = "0.9.4";
@@ -977,7 +975,6 @@ async function insertImageEmoji(text) {
 socket.on("connect", (f) => {
   UpdateConfig.setTimerStyle("mini", true);
   state = 1;
-  reconnectionAttempts = 0;
   Notifications.add("Connected to Tribe", 1);
   let name = "Guest";
   if (firebase.auth().currentUser !== null) {
@@ -1047,34 +1044,20 @@ socket.on("connect_failed", (f) => {
   changeActiveSubpage("preloader");
   // $(".pageTribe .preloader div").removeClass("hidden");
   // $(".pageTribe .preloader").removeClass("hidden").css("opacity", 1);
-  reconnectionAttempts++;
-  if (reconnectionAttempts >= maxReconnectionAttempts) {
-    $(".pageTribe .preloader .icon").html(`<i class="fas fa-fw fa-times"></i>`);
-    $(".pageTribe .preloader .text").text(
-      `Could not connect to Tribe server: ${f.message}`
-    );
-  } else {
-    $(".pageTribe .preloader .text").text("Connection failed. Retrying");
-    Notifications.add("Tribe connection error: " + f.message, -1);
-  }
+  $(".pageTribe .preloader .icon").html(`<i class="fas fa-fw fa-times"></i>`);
+  $(".pageTribe .preloader .text").text(`Connection failed`);
+  $(".pageTribe .preloader .reconnectButton").removeClass(`hidden`);
 });
 
 socket.on("connect_error", (f) => {
   state = -1;
-  reconnectionAttempts++;
   console.error(f);
   changeActiveSubpage("preloader");
   // $(".pageTribe .preloader div").removeClass("hidden");
   // $(".pageTribe .preloader").removeClass("hidden").css("opacity", 1);
-  if (reconnectionAttempts >= maxReconnectionAttempts) {
-    $(".pageTribe .preloader .icon").html(`<i class="fas fa-fw fa-times"></i>`);
-    $(".pageTribe .preloader .text").text(
-      `Could not connect to Tribe server: ${f.message}`
-    );
-  } else {
-    $(".pageTribe .preloader .text").text("Connection error. Retrying");
-    Notifications.add("Tribe connection error: " + f.message, -1);
-  }
+  $(".pageTribe .preloader .icon").html(`<i class="fas fa-fw fa-times"></i>`);
+  $(".pageTribe .preloader .text").text(`Connection error`);
+  $(".pageTribe .preloader .reconnectButton").removeClass(`hidden`);
 });
 
 socket.on("mp_room_joined", (data) => {
@@ -1848,6 +1831,11 @@ $(".pageTest #result .tribeResultChat .chat .input input").keyup((e) => {
   }
 });
 
+$(".pageTribe .preloader .reconnectButton").click((e) => {
+  $(".pageTribe .preloader .reconnectButton").addClass(`hidden`);
+  init();
+});
+
 $(".pageTribe .lobby .chat .input input").keyup((e) => {
   if (e.keyCode === 13) {
     let msg = $(".pageTribe .lobby .chat .input input").val();
diff --git a/src/sass/style.scss b/src/sass/style.scss
index d1d14253e..b86ca584c 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -3591,6 +3591,9 @@ key {
       font-size: 1rem;
       color: var(--sub-color);
     }
+    .button {
+      font-size: 1rem;
+    }
   }
   .prelobby {
     display: grid;
diff --git a/static/index.html b/static/index.html
index 6b727c292..cd53f8aac 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3897,6 +3897,7 @@
                 <i class="fas fa-fw fa-spin fa-circle-notch"></i>
               </div>
               <div class="text">Waiting for login</div>
+              <div class="reconnectButton button hidden">Retry</div>
             </div>
 
             <div class="prelobby hidden">