just switch to logging errors instead of propagating them

Author: titusfortner

rb/lib/selenium/webdriver/bidi.rb

@@ -32,7 +32,7 @@ class BiDi
       autoload :InterceptedItem, 'selenium/webdriver/bidi/network/intercepted_item'
 
       def initialize(url:)
-        @ws = WebSocketConnection.new(url: url, protocol: :bidi)
+        @ws = WebSocketConnection.new(url: url)
       end
 
       def close

rb/lib/selenium/webdriver/common/websocket_connection.rb

@@ -35,7 +35,7 @@ class WebSocketConnection
 
       MAX_LOG_MESSAGE_SIZE = 9999
 
-      def initialize(url:, protocol: nil)
+      def initialize(url:)
         @callback_threads = ThreadGroup.new
 
         @callbacks_mtx = Mutex.new
@@ -45,7 +45,6 @@ def initialize(url:, protocol: nil)
         @closing = false
         @session_id = nil
         @url = url
-        @protocol = protocol
 
         process_handshake
         @socket_thread = attach_socket_listener
@@ -178,12 +177,6 @@ def callback_thread(params)
         rescue StandardError => e
           return if @closing
 
-          if devtools?
-            # Async thread exceptions are not deterministic and should not be relied on; we should stop
-            WebDriver.logger.deprecate('propogating errors from DevTools callbacks')
-            Thread.main.raise(e)
-          end
-
           bt = Array(e.backtrace).first(5).join("\n")
           WebDriver.logger.error "Callback error: #{e.class}: #{e.message}\n#{bt}", id: :ws
         end
@@ -210,14 +203,6 @@ def ws
         @ws ||= WebSocket::Handshake::Client.new(url: @url)
       end
 
-      def devtools?
-        @protocol == :devtools
-      end
-
-      def bidi?
-        @protocol == :bidi
-      end
-
       def next_id
         @id ||= 0
         @id += 1

rb/lib/selenium/webdriver/devtools.rb

@@ -29,7 +29,7 @@ class DevTools
       autoload :Response, 'selenium/webdriver/devtools/response'
 
       def initialize(url:, target_type:)
-        @ws = WebSocketConnection.new(url: url, protocol: :devtools)
+        @ws = WebSocketConnection.new(url: url)
         @session_id = nil
         start_session(target_type: target_type)
       end

rb/spec/integration/selenium/webdriver/devtools_spec.rb

@@ -45,13 +45,12 @@ module WebDriver
         }.to yield_control
       end
 
-      it 'propagates errors in events' do
+      it 'logs errors in events' do
+        driver.devtools.page.enable
+        driver.devtools.page.on(:load_event_fired) { raise 'This is fine!' }
         expect {
-          driver.devtools.page.enable
-          driver.devtools.page.on(:load_event_fired) { raise 'This is fine!' }
           driver.navigate.to url_for('xhtmlTest.html')
-          sleep 0.5
-        }.to raise_error(RuntimeError, 'This is fine!')
+        }.to have_error(:ws, /This is fine!/)
       end
 
       describe '#target' do

rb/spec/rspec_matchers.rb

@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-LEVELS = %w[warning info deprecated].freeze
+LEVELS = %w[error warning info deprecated].freeze
 
 LEVELS.each do |level|
   RSpec::Matchers.define "have_#{level}" do |entry|