fix when errors get bubbled up

Author: titusfortner

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

@@ -170,9 +170,12 @@ def callback_thread(params)
         rescue Error::WebDriverError, *CONNECTION_ERRORS => e
           WebDriver.logger.debug "Callback aborted: #{e.class}: #{e.message}", id: :ws
         rescue StandardError => e
-          # Unexpected handler failure; log with a short backtrace.
+          # Do not allow an error raised during bidi interception to prevent potential deadlock
+          Thread.main.raise(e) unless @closing || params['isBlocked']
+
+          condition = @closing ? 'on closing' : 'during interception'
           bt = Array(e.backtrace).first(5).join("\n")
-          WebDriver.logger.error "Callback error: #{e.class}: #{e.message}\n#{bt}", id: :ws
+          WebDriver.logger.error "Callback error #{condition}: #{e.class}: #{e.message}\n#{bt}", id: :ws
         end
       end
 

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -209,13 +209,18 @@ def switch_to_default_content
         QUIT_ERRORS = [IOError, EOFError, WebSocket::Error].freeze
 
         def quit
-          execute :delete_session
-        ensure
           begin
-            http.close
-          rescue *QUIT_ERRORS
-            nil
+            execute :delete_session
+          rescue *QUIT_ERRORS => e
+            WebDriver.logger.debug "delete_session failed during quit: #{e.class}: #{e.message}", id: :ws
+          ensure
+            begin
+              http.close
+            rescue *QUIT_ERRORS => e
+              WebDriver.logger.debug "http.close failed during quit: #{e.class}: #{e&.message}", id: :ws
+            end
           end
+          nil
         end
 
         def close