keep error propagation for devtools but mark deprecated

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)
+        @ws = WebSocketConnection.new(url: url, protocol: :bidi)
       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:)
+      def initialize(url:, protocol: nil)
         @callback_threads = ThreadGroup.new
 
         @callbacks_mtx = Mutex.new
@@ -45,6 +45,7 @@ def initialize(url:)
         @closing = false
         @session_id = nil
         @url = url
+        @protocol = protocol
 
         process_handshake
         @socket_thread = attach_socket_listener
@@ -91,7 +92,7 @@ def remove_callback(event, id)
           callbacks_for_event = callbacks[event]
           return if callbacks_for_event.reject! { |cb| cb.object_id == id }
 
-          ids = callbacks[event]&.map(&:object_id)
+          ids = callbacks_for_event.map(&:object_id)
           raise Error::WebDriverError, "Callback with ID #{id} does not exist for event #{event}: #{ids}"
         end
       end
@@ -109,9 +110,7 @@ def send_cmd(**payload)
           raise e, "WebSocket is closed (#{e.class}: #{e.message})"
         end
 
-        wait.until do
-          @messages_mtx.synchronize { messages.delete(id) }
-        end
+        wait.until { @messages_mtx.synchronize { messages.delete(id) } }
       end
 
       private
@@ -140,9 +139,8 @@ def attach_socket_listener
               message = process_frame(frame)
               next unless message['method']
 
-              params = message['params']
               @messages_mtx.synchronize { callbacks[message['method']].dup }.each do |callback|
-                @callback_threads.add(callback_thread(params, &callback))
+                @callback_threads.add(callback_thread(message['params'], &callback))
               end
             end
           end
@@ -178,10 +176,14 @@ def callback_thread(params)
         rescue Error::WebDriverError, *CONNECTION_ERRORS => e
           WebDriver.logger.debug "Callback aborted: #{e.class}: #{e.message}", id: :ws
         rescue StandardError => e
-          # Main thread needs to know that it can stop waiting
-          Thread.main.raise(e) if params['isBlocked']
           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
@@ -208,6 +210,14 @@ 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)
+        @ws = WebSocketConnection.new(url: url, protocol: :devtools)
         @session_id = nil
         start_session(target_type: target_type)
       end

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

@@ -5,6 +5,8 @@ module Selenium
 
       @callback_threads: untyped
 
+      @protocol: Symbol?
+
       @session_id: untyped
 
       @url: untyped
@@ -33,7 +35,7 @@ module Selenium
 
       MAX_LOG_MESSAGE_SIZE: Integer
 
-      def initialize: (url: untyped) -> void
+      def initialize: (url: String, ?protocol?: Symbol) -> void
 
       def add_callback: (untyped event) { () -> void } -> untyped
 
@@ -47,6 +49,10 @@ module Selenium
 
       private
 
+      def bidi?: -> bool
+
+      def devtools?: -> bool
+
       def messages: () -> untyped
 
       def process_handshake: () -> untyped