Bump version

Modify all potentially case sensitive file operations to operate in a case-insensitive manner.

Gemfile.lock

@@ -8,22 +8,24 @@ GEM
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     event_emitter (0.2.6)
-    excon (1.2.7)
+    excon (1.3.0)
       logger
     ffi (1.17.2-x64-mingw-ucrt)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi-win32-extensions (1.0.4)
       ffi
+    fiddle (1.1.8)
     gosu (1.4.6)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ircparser (1.0.0)
-    libui (0.1.2-x64-mingw)
+    libui (0.2.0-x64-mingw-ucrt)
+      fiddle
     logger (1.7.0)
     mutex_m (0.3.0)
     rake (13.3.0)
-    rexml (3.4.1)
-    rubyzip (2.4.1)
+    rexml (3.4.4)
+    rubyzip (3.1.1)
     sdl2-bindings (0.2.3)
       ffi (~> 1.15)
     websocket (1.2.11)
@@ -58,4 +60,4 @@ DEPENDENCIES
   win32-security
 
 BUNDLED WITH
-   2.6.7
+   2.6.8

lib/api.rb

@@ -91,7 +91,7 @@ class W3DHub
           retry_interval: 1,
           retry_errors: [Excon::Error::Socket, Excon::Error::HTTPStatus] # Don't retry on timeout
         )
-      rescue Excon::Errors::Timeout => e
+      rescue Excon::Error::Timeout => e
         logger.error(LOG_TAG) { "Connection to \"#{url}\" timed out after: #{API_TIMEOUT} seconds" }
 
         DummyResponse.new(e)
@@ -135,7 +135,7 @@ class W3DHub
           retry_interval: 1,
           retry_errors: [Excon::Error::Socket, Excon::Error::HTTPStatus] # Don't retry on timeout
         )
-      rescue Excon::Errors::Timeout => e
+      rescue Excon::Error::Timeout => e
         logger.error(LOG_TAG) { "Connection to \"#{url}\" timed out after: #{API_TIMEOUT} seconds" }
 
         DummyResponse.new(e)
@@ -240,7 +240,7 @@ class W3DHub
       response = post("/apis/launcher/1/get-applications", DEFAULT_HEADERS, nil, backend)
 
       if response.status == 200
-        Applications.new(response.body)
+        Applications.new(response.body, backend)
       else
         logger.error(LOG_TAG) { "Failed to fetch applications list:" }
         logger.error(LOG_TAG) { response }
@@ -294,7 +294,7 @@ class W3DHub
               next
             end
 
-            # If the access levels doen't match then overwrite alternate's channel with primary's channel
+            # If the access levels don't match then overwrite alternate's channel with primary's channel
             if channel.user_level != _channel.user_level
               # Replace alternate's channel with primary's channel
               _game.channels[_game.channels.index(_channel)] = channel
@@ -303,7 +303,7 @@ class W3DHub
               next
             end
 
-            # If versions doen't match then pick whichever one is higher
+            # If versions don't match then pick whichever one is higher
             if Gem::Version.new(channel.current_version) > Gem::Version.new(_channel.current_version)
               # Replace alternate's channel with primary's channel
               _game.channels[_game.channels.index(_channel)] = channel

lib/api/account.rb

@@ -24,8 +24,9 @@ class W3DHub
 
       def to_json(env)
         d = @data.dup
+
         d[:avatar_uri] = @avatar_uri
-        d[:access_token_expiry] = d[:access_token_expiry].to_i
+        d[:access_token_expiry] = @access_token_expiry.to_i
 
         d.to_json(env)
       end

lib/api/applications.rb

@@ -3,14 +3,14 @@ class W3DHub
     class Applications
       attr_reader :data
 
-      def initialize(response)
+      def initialize(response, source = nil)
         @data = JSON.parse(response, symbolize_names: true)
 
         games = @data[:applications].select { |a| a[:category] == "games" }
 
         @games = []
 
-        games.each { |hash| @games << Game.new(hash) }
+        games.each { |hash| @games << Game.new(hash, source) }
         @games.sort_by!(&:name).reverse
       end
 
@@ -20,9 +20,11 @@ class W3DHub
 
       class Game
         attr_reader :id, :name, :type, :category, :studio_id, :channels, :web_links, :color
+        attr_reader :___source
 
-        def initialize(hash)
+        def initialize(hash, source = nil)
           @data = hash
+          @data[:___source] = source if source
 
           @id = @data[:id].to_s
           @name = @data[:name]
@@ -31,7 +33,7 @@ class W3DHub
           @studio_id = @data[:"studio-id"]
 
            # TODO: Do processing
-          @channels = @data[:channels].map { |channel| Channel.new(channel) }
+          @channels = @data[:channels].map { |channel| Channel.new(channel, source) }
           @web_links = @data[:"web-links"]&.map { |link| WebLink.new(link) } || []
           @extended_data = @data[:"extended-data"]
 
@@ -55,17 +57,34 @@ class W3DHub
           @uses_ren_folder
         end
 
+        def source
+          @data[:___source]&.to_sym || :w3dhub
+        end
+
+        def source=(sym)
+          @data[:___source] = sym
+        end
+
         class Channel
           attr_reader :id, :name, :user_level, :current_version
 
-          def initialize(hash)
+          def initialize(hash, source = nil)
             @data = hash
+            @data[:___source] = source
 
             @id = @data[:id].to_s
             @name = @data[:name]
             @user_level = @data[:"user-level"]
             @current_version = @data[:"current-version"]
           end
+
+          def source
+            @data[:___source]&.to_sym || :w3dhub
+          end
+
+          def source=(sym)
+            @data[:___source] = sym
+          end
         end
 
         class WebLink

lib/application_manager.rb

@@ -235,11 +235,11 @@ class W3DHub
       end
     end
 
-    def join_server(app_id, channel, server, password = nil)
-      if installed?(app_id, channel) && Store.settings[:server_list_username].to_s.length.positive?
+    def join_server(app_id, channel, server, username = Store.settings[:server_list_username], password = nil, multi = false)
+      if installed?(app_id, channel) && username.to_s.length.positive?
         run(
           app_id, channel,
-          "+connect #{server.address}:#{server.port} +netplayername #{Store.settings[:server_list_username]}#{password ? " +password \"#{password}\"" : ""}"
+          "+connect #{server.address}:#{server.port} +netplayername #{username}#{password ? " +password \"#{password}\"" : ""}#{multi ? " +multi" : ""}"
         )
       end
     end

lib/application_manager/task.rb

@@ -112,6 +112,38 @@ class W3DHub
         @task_state == :failed
       end
 
+      def normalize_path(path, base_path)
+        path = path.to_s.gsub("\\", "/")
+        return "#{base_path}/#{path}" if W3DHub.windows? # Windows is easy, or annoying, depending how you look at it...
+
+        constructed_path = base_path
+        lowercase_full_path = "#{base_path}/#{path}".downcase.strip.freeze
+
+        accepted_parts = 0
+        split_path = path.split("/")
+        split_path.each do |segment|
+          Dir.glob("#{constructed_path}/*").each do |part|
+            next unless "#{constructed_path}/#{segment}".downcase == part.downcase
+
+            # Handle edge case where a file with the same name is in a higher directory
+            next if File.file?(part) && part.downcase.strip != lowercase_full_path
+
+            constructed_path = part
+            accepted_parts += 1
+            break
+          end
+        end
+
+        # Find file if it exists else use provided path as cased
+        if constructed_path.downcase.strip == lowercase_full_path
+          constructed_path
+        elsif accepted_parts.positive?
+          "#{constructed_path}/#{split_path[accepted_parts..].join('/')}"
+        else
+          "#{base_path}/#{path}" # File doesn't exist, case doesn't matter.
+        end
+      end
+
       def failure_reason
         @task_failure_reason || ""
       end
@@ -259,7 +291,7 @@ class W3DHub
           next if packages.detect do |pkg|
             pkg.category == "games" &&
             pkg.subcategory == @app_id &&
-            pkg.name == file.package &&
+            pkg.name.to_s.casecmp?(file.package.to_s) &&
             pkg.version == file.version
           end
 
@@ -295,17 +327,13 @@ class W3DHub
         @files.reverse.each do |file|
           break unless folder_exists
 
-          safe_file_name = file.name.gsub("\\", "/")
-          # Fix borked Data -> data 'cause Windows don't care about capitalization
-          safe_file_name.sub!("Data/", "data/")
-
-          file_path = "#{path}/#{safe_file_name}"
+          file_path = normalize_path(file.name, path)
 
           processed_files += 1
           @status.progress = processed_files.to_f / file_count
 
           next if file.removed_since
-          next if accepted_files.key?(safe_file_name)
+          next if accepted_files.key?(file_path)
 
           unless File.exist?(file_path)
             rejected_files << { file: file, manifest_version: file.version }
@@ -325,7 +353,7 @@ class W3DHub
           logger.info(LOG_TAG) { file.inspect } if file.checksum.nil?
 
           if digest.hexdigest.upcase == file.checksum.upcase
-            accepted_files[safe_file_name] = file.version
+            accepted_files[file_path] = file.version
             logger.info(LOG_TAG) { "[#{file.version}] Verified file: #{file_path}" }
           else
             rejected_files << { file: file, manifest_version: file.version }
@@ -369,7 +397,7 @@ class W3DHub
           }
         end
 
-        package_details = Api.package_details(hashes)
+        package_details = Api.package_details(hashes, @channel.source || :w3dhub)
 
         unless package_details
           fail!("Failed to fetch package details")
@@ -383,9 +411,9 @@ class W3DHub
           end
 
           package = @packages.find do |pkg|
-            pkg.category == rich.category &&
-            pkg.subcategory == rich.subcategory &&
-            "#{pkg.name}.zip" == rich.name &&
+            pkg.category.to_s.casecmp?(rich.category.to_s) &&
+            pkg.subcategory.to_s.casecmp?(rich.subcategory.to_s) &&
+            "#{pkg.name}.zip".casecmp?(rich.name) &&
             pkg.version == rich.version
           end
 
@@ -529,7 +557,7 @@ class W3DHub
           logger.info(LOG_TAG) { "    #{file.name}" }
 
           path = Cache.install_path(@application, @channel)
-          file_path = "#{path}/#{file.name}".sub('Data/', 'data/')
+          file_path = normalize_path(file.name, path)
 
           File.delete(file_path) if File.exist?(file_path)
 
@@ -562,7 +590,7 @@ class W3DHub
       def write_paths_ini
         path = Cache.install_path(@application, @channel)
 
-        File.open("#{path}/data/paths.ini", "w") do |file|
+        File.open(normalize_path("data/paths.ini", path), "w") do |file|
           file.puts("[paths]")
           file.puts("RegBase=W3D Hub")
           file.puts("RegClient=#{@application.category}\\#{@application.id}-#{@channel.id}")
@@ -596,7 +624,7 @@ class W3DHub
         # Check for and integrity of local manifest
 
         package = nil
-        array = Api.package_details([{ category: category, subcategory: subcategory, name: name, version: version }])
+        array = Api.package_details([{ category: category, subcategory: subcategory, name: name, version: version }], @channel.source || :w3dhub)
         if array.is_a?(Array)
           package = array.first
         else
@@ -707,15 +735,15 @@ class W3DHub
         logger.info(LOG_TAG) { "      Unpacking patch \"#{package_path}\" in \"#{temp_path}\"" }
         unzip(package_path, temp_path)
 
-        # Fix borked Data -> data 'cause Windows don't care about capitalization
-        safe_file_name = "#{manifest_file.name.sub('Data/', 'data/')}"
+        file_path = normalize_path(manifest_file.name, path)
+        temp_file_path = normalize_path(manifest_file.name, temp_path)
 
-        logger.info(LOG_TAG) { "      Loading #{temp_path}/#{safe_file_name}.patch..." }
-        patch_mix = W3DHub::Mixer::Reader.new(file_path: "#{temp_path}/#{safe_file_name}.patch", ignore_crc_mismatches: false)
+        logger.info(LOG_TAG) { "      Loading #{temp_file_path}.patch..." }
+        patch_mix = W3DHub::Mixer::Reader.new(file_path: "#{temp_file_path}.patch", ignore_crc_mismatches: false)
         patch_info = JSON.parse(patch_mix.package.files.find { |f| f.name.casecmp?(".w3dhub.patch") || f.name.casecmp?(".bhppatch") }.data, symbolize_names: true)
 
-        logger.info(LOG_TAG) { "      Loading #{path}/#{safe_file_name}..." }
-        target_mix = W3DHub::Mixer::Reader.new(file_path: "#{path}/#{safe_file_name}", ignore_crc_mismatches: false)
+        logger.info(LOG_TAG) { "      Loading #{file_path}..." }
+        target_mix = W3DHub::Mixer::Reader.new(file_path: "#{file_path}", ignore_crc_mismatches: false)
 
         logger.info(LOG_TAG) { "      Removing files..." } if patch_info[:removedFiles].size.positive?
         patch_info[:removedFiles].each do |file|
@@ -737,8 +765,8 @@ class W3DHub
           end
         end
 
-        logger.info(LOG_TAG) { "      Writing updated #{path}/#{safe_file_name}..." } if patch_info[:updatedFiles].size.positive?
-        W3DHub::Mixer::Writer.new(file_path: "#{path}/#{safe_file_name}", package: target_mix.package, memory_buffer: true, encrypted: target_mix.encrypted?)
+        logger.info(LOG_TAG) { "      Writing updated #{file_path}..." } if patch_info[:updatedFiles].size.positive?
+        W3DHub::Mixer::Writer.new(file_path: "#{file_path}", package: target_mix.package, memory_buffer: true, encrypted: target_mix.encrypted?)
 
         FileUtils.remove_dir(temp_path)
 
@@ -749,17 +777,15 @@ class W3DHub
         stream = Zip::InputStream.new(File.open(package_path))
 
         while (entry = stream.get_next_entry)
+          # Normalize the path to handle case-insensitivity consistently
+          file_path = normalize_path(entry.name, path)
 
-          safe_file_name = entry.name.gsub("\\", "/")
-          # Fix borked Data -> data 'cause Windows don't care about capitalization
-          safe_file_name.sub!("Data/", "data/")
-
-          dir_path = "#{path}/#{File.dirname(safe_file_name)}"
+          dir_path = File.dirname(file_path)
           unless dir_path.end_with?("/.") || Dir.exist?(dir_path)
             FileUtils.mkdir_p(dir_path)
           end
 
-          File.open("#{path}/#{safe_file_name}", "wb") do |f|
+          File.open(file_path, "wb") do |f|
             i = entry.get_input_stream
 
             while (chunk = i.read(32_000_000)) # Read up to ~32 MB per chunk

lib/application_manager/tasks/installer.rb

@@ -53,4 +53,4 @@ class W3DHub
       end
     end
   end
-end
+end

lib/cache.rb

@@ -90,6 +90,10 @@ class W3DHub
     # Download a W3D Hub package
     def self.fetch_package(package, block)
       endpoint_download_url = package.download_url || "#{Api::W3DHUB_API_ENDPOINT}/apis/launcher/1/get-package"
+      if package.download_url
+        uri_path = package.download_url.split("/").last
+        endpoint_download_url = package.download_url.sub(uri_path, URI.encode_uri_component(uri_path))
+      end
       path = package_path(package.category, package.subcategory, package.name, package.version)
       headers = { "Content-Type": "application/x-www-form-urlencoded", "User-Agent": Api::USER_AGENT }
       headers["Authorization"] = "Bearer #{Store.account.access_token}" if Store.account && !package.download_url
@@ -129,10 +133,24 @@ class W3DHub
         return true
       else
         logger.debug(LOG_TAG) { "    Failed to retrieve package: (#{package.category}:#{package.subcategory}:#{package.name}:#{package.version})" }
-        logger.debug(LOG_TAG) { "      Download URL: #{endpoint_download_url}, response: #{response.status}" }
+        logger.debug(LOG_TAG) { "      Download URL: #{endpoint_download_url}, response: #{response&.status || -1}" }
 
-        false
+        return false
       end
+    rescue Excon::Error::Timeout => e
+      logger.error(LOG_TAG) { "    Connection to \"#{endpoint_download_url}\" timed out after: #{W3DHub::Api::API_TIMEOUT} seconds" }
+      logger.error(LOG_TAG) { e }
+      logger.debug(LOG_TAG) { "    Failed to retrieve package: (#{package.category}:#{package.subcategory}:#{package.name}:#{package.version})" }
+      logger.debug(LOG_TAG) { "      Download URL: #{endpoint_download_url}, response: #{response&.status || -1}" }
+
+      return false
+    rescue Excon::Error => e
+      logger.error(LOG_TAG) { "    Connection to \"#{endpoint_download_url}\" errored:" }
+      logger.error(LOG_TAG) { e }
+      logger.debug(LOG_TAG) { "    Failed to retrieve package: (#{package.category}:#{package.subcategory}:#{package.name}:#{package.version})" }
+      logger.debug(LOG_TAG) { "      Download URL: #{endpoint_download_url}, response: #{response&.status || -1}" }
+
+      return false
     ensure
       file&.close
     end

lib/common.rb

@@ -81,15 +81,19 @@ class W3DHub
         )
       end
 
-      def self.join_server(server, password)
+      def self.join_server(server:, username: Store.settings[:server_list_username], password: nil, multi: false)
         if (
           (server.status.password && password.length.positive?) ||
           !server.status.password) &&
-           Store.settings[:server_list_username].to_s.length.positive?
+           username.to_s.length.positive?
 
           Store.application_manager.join_server(
             server.game,
-            server.channel, server, password
+            server.channel,
+            server,
+            username,
+            password,
+            multi
           )
         else
           CyberarmEngine::Window.instance.push_state(W3DHub::States::MessageDialog, type: "?", title: "?", message: "?")

lib/pages/games.rb

@@ -375,7 +375,7 @@ class W3DHub
                     end
 
                     container = stack(fill: true, width: 1.0, padding: 8) do
-                      image_path = File.exist?("#{GAME_ROOT_PATH}/media/icons/#{game.id}.png") ? "#{GAME_ROOT_PATH}/media/icons/#{game.id}.png" : "#{GAME_ROOT_PATH}/media/icons/default_icon.png"
+                      image_path = File.exist?("#{CACHE_PATH}/#{game.id}.png") ? "#{CACHE_PATH}/#{game.id}.png" : "#{GAME_ROOT_PATH}/media/icons/default_icon.png"
                       flow(width: 1.0, margin_top: 8) do
                         flow(fill: true)
                         image image_path, width: 0.5

lib/pages/server_browser.rb

@@ -410,11 +410,11 @@ class W3DHub
                         if server.status.password
                           W3DHub.prompt_for_password(
                             accept_callback: proc do |password|
-                              W3DHub.join_server(server, password)
+                              W3DHub.join_server(server: server, password: password)
                             end
                           )
                         else
-                          W3DHub.join_server(server, nil)
+                          W3DHub.join_server(server: server)
                         end
                       end
                     )
@@ -422,18 +422,24 @@ class W3DHub
                     if server.status.password
                       W3DHub.prompt_for_password(
                         accept_callback: proc do |password|
-                          W3DHub.join_server(server, password)
+                          W3DHub.join_server(server: server, password: password)
                         end
                       )
                     else
-                      W3DHub.join_server(server, nil)
+                      W3DHub.join_server(server: server)
                     end
                   end
                 end
 
                 if W3DHUB_DEVELOPER
-                  list_box(items: (1..12).to_a.map(&:to_s), margin_left: 16, width: 72, tip: "Number of game clients", enabled: (game_installed && !game_updatable), **TESTING_BUTTON)
-                  button "Multijoin", tip: "Launch multiple clients with configured username_\#{number}", enabled: (game_installed && !game_updatable), **TESTING_BUTTON
+                  client_instances = list_box(items: (1..12).to_a.map(&:to_s), margin_left: 16, width: 72, tip: "Number of game clients", enabled: (game_installed && !game_updatable), **TESTING_BUTTON)
+                  button("Multijoin", tip: "Launch multiple clients with configured username_\#{number}", enabled: (game_installed && !game_updatable), **TESTING_BUTTON) do
+                    username = Store.settings[:server_list_username]
+
+                    client_instances.value.to_i.times do |i|
+                      W3DHub.join_server(server: server, username: format("%s_%d", username, i), multi: true)
+                    end
+                  end
                 end
 
                 flow(fill: true)

lib/states/boot.rb

@@ -11,7 +11,7 @@ class W3DHub
         @fraction = 0.0
         @w3dhub_logo = get_image("#{GAME_ROOT_PATH}/media/icons/app.png")
         @tasks = {
-          # connectivity_check: { started: false, complete: false }, # HEAD connectivity-check.ubuntu.com or HEAD secure.w3dhub.com?
+          connectivity_check: { started: false, complete: false }, # HEAD connectivity-check.ubuntu.com or HEAD secure.w3dhub.com?
           # launcher_updater: { started: false, complete: false },
           server_list: { started: false, complete: false },
           refresh_user_token: { started: false, complete: false },
@@ -139,6 +139,41 @@ class W3DHub
         @tasks[:refresh_user_token][:complete] = true
       end
 
+      def connectivity_check
+        domains = {
+          "w3dhub-api.w3d.cyberarm.dev": false,
+          "s3.w3d.cyberarm.dev": false,
+          "secure.w3dhub.com": false
+        }
+
+        @status_label.value = "Checking uplink..."
+        domains.each do |key, value|
+          begin
+            Resolv.getaddress(key.to_s)
+          rescue => e
+            logger.error(LOG_TAG) {"Failed to resolve hostname: #{key.to_s}"}
+            logger.error(LOG_TAG) {e}
+
+            push_state(
+              ConfirmDialog,
+              title: "DNS Resolution Failure",
+              message: "Failed to resolve: #{key.to_s}\n\nTry disabling VPN or proxy if in use.\n\n\nContinue offline?",
+              cancel_callback: ->() { window.close },
+              accept_callback: ->() {
+                @offline_mode = true
+                Store.offline_mode = true
+                @tasks[:connectivity_check][:complete] = true
+              }
+            )
+
+            # Prevent task from being marked as completed
+            return false
+          end
+        end
+
+        @tasks[:connectivity_check][:complete] = true
+      end
+
       def service_status
         Api.on_thread(:service_status) do |service_status|
           @service_status = service_status

lib/states/dialogs/message_dialog.rb

@@ -24,6 +24,7 @@ class W3DHub
           stack(width: 1.0, height: 46, padding: 8) do
             button "Okay", width: 1.0 do
               pop_state
+              @options[:accept_callback]&.call
             end
           end
         end

lib/version.rb

@@ -1,4 +1,4 @@
 class W3DHub
-  DIR_NAME = "W3DHubAlt"
-  VERSION = "0.7.0"
-end
+  DIR_NAME = "W3DHubAlt".freeze
+  VERSION = "0.8.1".freeze
+end