fix: seleium 4.46 compatibility (#690)

* fix: selneium 4.46 compatibility

* update steep

Author: KazuCocoa

appium_lib_core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'selenium-webdriver', '~> 4.21', '< 4.46'
+  spec.add_dependency 'selenium-webdriver', '~> 4.21'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

lib/appium_lib_core/common/base/bridge.rb

@@ -47,6 +47,17 @@ class Bridge < ::Selenium::WebDriver::Remote::Bridge
         # No 'browserName' means the session is native appium connection
         APPIUM_NATIVE_BROWSER_NAME = 'appium'
 
+        # Selenium 4.46 moved server URL configuration from Bridge to the HTTP client.
+        def initialize(url:, http_client: nil)
+          if selenium_bridge_accepts_url?
+            super
+          else
+            http_client ||= ::Selenium::WebDriver::Remote::Http::Default.new
+            http_client.server_url = url
+            super(http_client: http_client)
+          end
+        end
+
         def browser
           @browser ||= begin
             name = @capabilities&.browser_name
@@ -137,6 +148,12 @@ def add_appium_prefix(capabilities)
 
         private
 
+        def selenium_bridge_accepts_url?
+          ::Selenium::WebDriver::Remote::Bridge.instance_method(:initialize).parameters.any? do |_, name|
+            name == :url
+          end
+        end
+
         def camel_case(str_or_sym)
           str_or_sym.to_s.gsub(/_([a-z])/) { Regexp.last_match(1)&.upcase }
         end

lib/appium_lib_core/common/base/http_default.rb

@@ -63,14 +63,14 @@ def delete_additional_header(key)
           #
           # @return [URI] An instance of URI updated to. Returns default +server_url+ if some of arguments are +nil+
           def update_sending_request_to(scheme:, host:, port:, path:)
-            return @server_url unless validate_url_param(scheme, host, port, path)
+            return server_url unless validate_url_param(scheme, host, port, path)
 
             # Add / if 'path' does not have it
             path = "/#{path}" unless path.start_with?('/')
             path = "#{path}/" unless path.end_with?('/')
 
             @http = nil
-            @server_url = URI.parse "#{scheme}://#{host}:#{port}#{path}"
+            self.server_url = URI.parse "#{scheme}://#{host}:#{port}#{path}"
           end
 
           private

sig/gems/selenium/bridge.rbs

@@ -30,7 +30,7 @@ module Selenium
 
         attr_reader capabilities: untyped
 
-        def initialize: (url: String | URI, ?http_client: untyped?) -> void
+        def initialize: (?url: untyped, ?http_client: untyped?) -> void
 
         def cancel_fedcm_dialog: -> nil
 

sig/lib/appium_lib_core/common/base/bridge.rbs

@@ -49,6 +49,8 @@ module Appium
         # No 'browserName' means the session is native appium connection
         APPIUM_NATIVE_BROWSER_NAME: "appium"
 
+        def initialize: (url: untyped, ?http_client: untyped?) -> void
+
         def browser: () -> untyped
 
         # Appium only.
@@ -103,6 +105,8 @@ module Appium
 
         private
 
+        def selenium_bridge_accepts_url?: () -> bool
+
         def camel_case: (untyped str_or_sym) -> untyped
 
         def extension_prefix?: (untyped capability_name) -> untyped

sig/lib/appium_lib_core/common/base/driver.rbs

@@ -2,6 +2,8 @@ module Appium
   module Core
     class Base
       class Driver < Selenium::WebDriver::Driver
+        extend Forwardable
+
         @wait_timeout: untyped
 
         @wait_interval: untyped

sig/lib/appium_lib_core/driver.rbs

@@ -79,6 +79,16 @@ module Appium
       attr_reader path: String
 
       def initialize: (Hash[String | Symbol, String] capabilities) -> void
+
+      def valid?: () -> bool
+
+      private
+
+      def resolve_addresses: (String host) -> Array[String]
+
+      def ip_literal?: (String host) -> bool
+
+      def disallowed?: (String ip) -> bool
     end
 
     class Driver

test/unit/driver_test.rb

@@ -463,8 +463,9 @@ def test_default_timeout_for_http_client_with_direct_no_supported_client
       core = ::Appium::Core.for(Caps.android_direct)
       driver = android_mock_create_session_w3c_direct_default_client.call(core)
 
-      assert_nil driver.send(:bridge).http.open_timeout
-      assert_nil driver.send(:bridge).http.read_timeout
+      default_http_client = Selenium::WebDriver::Remote::Http::Default.new
+      assert_equal default_http_client.open_timeout, driver.send(:bridge).http.open_timeout
+      assert_equal default_http_client.read_timeout, driver.send(:bridge).http.read_timeout
       uri = driver.send(:bridge).http.send(:server_url)
       assert core.direct_connect
       assert_equal 'http', uri.scheme