Improvements to server list updater, iirc.

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     cyberarm_engine (0.23.0)
       excon (~> 0.88)
       gosu (~> 1.1)
@@ -13,16 +13,16 @@ GEM
     ffi (1.15.5)
     ffi-win32-extensions (1.0.4)
       ffi
-    gosu (1.4.5)
+    gosu (1.4.6)
     gosu_more_drawables (0.3.1)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     ircparser (1.0.0)
     rake (13.0.6)
     rexml (3.2.5)
     rubyzip (2.3.2)
     websocket (1.2.9)
-    websocket-client-simple (0.6.0)
+    websocket-client-simple (0.6.1)
       event_emitter
       websocket
     win32-process (0.10.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   win32-security
 
 BUNDLED WITH
-   2.4.3
+   2.4.13

lib/api/applications.rb

@@ -9,7 +9,7 @@ class W3DHub
         @games = []
 
         games.each { |hash| @games << Game.new(hash) }
-        @games.sort_by! { |a| a.name }.reverse
+        @games.sort_by!(&:name).reverse
       end
 
       def games

lib/api/server_list_updater.rb

@@ -11,7 +11,11 @@ class W3DHub
         @@instance = ServerListUpdater.new
       end
 
+      attr_accessor :auto_reconnect
+
       def initialize
+        @auto_reconnect = false
+
         logger.info(LOG_TAG) { "Starting emulated SignalR Server List Updater..." }
         run
       end
@@ -20,6 +24,11 @@ class W3DHub
         Thread.new do
           begin
             connect
+
+            while W3DHub::BackgroundWorker.alive?
+              connect if @auto_reconnect
+              sleep 1
+            end
           rescue => e
             puts e
             puts e.backtrace
@@ -34,7 +43,7 @@ class W3DHub
       end
 
       def connect
-        auto_reconnect = false
+        @auto_reconnect = false
 
         logger.debug(LOG_TAG) { "Requesting connection token..." }
         response = Excon.post("https://gsh.w3dhub.com/listings/push/v2/negotiate?negotiateVersion=1", headers: Api::DEFAULT_HEADERS, body: "")
@@ -44,7 +53,21 @@ class W3DHub
         endpoint = "https://gsh.w3dhub.com/listings/push/v2?id=#{id}"
 
         logger.debug(LOG_TAG) { "Connecting to websocket..." }
+        this = self
         WebSocket::Client::Simple.connect(endpoint, headers: Api::DEFAULT_HEADERS) do |ws|
+          ws.on(:open) do
+            logger.debug(LOG_TAG) { "Requesting json protocol, v1..." }
+            ws.send({ protocol: "json", version: 1 }.to_json + "\x1e")
+
+            logger.debug(LOG_TAG) { "Subscribing to server changes..." }
+            Store.server_list.each_with_index do |server, i|
+              i += 1
+              mode = 1 # 2 full details, 1 basic details
+              out = { "type": 1, "invocationId": "#{i}", "target": "SubscribeToServerStatusUpdates", "arguments": [server.id, mode] }
+              ws.send(out.to_json + "\x1e")
+            end
+          end
+
           ws.on(:message) do |msg|
             msg = msg.data.split("\x1e").first
 
@@ -60,37 +83,25 @@ class W3DHub
                   id, data = hash[:arguments]
                   server = Store.server_list.find { |s| s.id == id }
                   server_updated = server&.update(data)
-                  States::Interface.instance&.update_server_browser(server) if server_updated
+
+                  BackgroundWorker.foreground_job(-> {}, ->(result){ States::Interface.instance&.update_server_browser(server) }) if server_updated
                 end
               end
             end
           end
 
-          ws.on(:open) do
-            logger.debug(LOG_TAG) { "Requesting json protocol, v1..." }
-            ws.send({ protocol: "json", version: 1 }.to_json + "\x1e")
-
-            logger.debug(LOG_TAG) { "Subscribing to server changes..." }
-            Store.server_list.each_with_index do |server, i|
-              i += 1
-              mode = 1 # 2 full details, 1 basic details
-              out = { "type": 1, "invocationId": "#{i}", "target": "SubscribeToServerStatusUpdates", "arguments": [server.id, mode] }
-              ws.send(out.to_json + "\x1e")
-            end
-          end
-
           ws.on(:close) do |e|
             p e
-            auto_reconnect = true
+            this.auto_reconnect = true
+            ws.close
           end
 
           ws.on(:error) do |e|
             p e
-            auto_reconnect = true
+            this.auto_reconnect = true
+            ws.close
           end
         end
-
-        connect if auto_reconnect
       end
     end
   end

lib/states/boot.rb

@@ -56,7 +56,10 @@ class W3DHub
 
         load_offline_applications_list if @offline_mode
 
-        push_state(States::Interface) if @offline_mode || (@progressbar.value >= 1.0 && @task_index == @tasks.size)
+        if @offline_mode || (@progressbar.value >= 1.0 && @task_index == @tasks.size)
+          pop_state
+          push_state(States::Interface)
+        end
 
         return if @offline_mode