Raise a more specific error if the websocket connection dies

twalpole · Dec 1, 2021 · 1cdda23 · 1cdda23
1 parent ca86be4
commit 1cdda23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/capybara/apparition/driver/chrome_client.rb b/lib/capybara/apparition/driver/chrome_client.rb
@@ -194,6 +194,8 @@ def process_messages
         puts "Unexpected CDPError: #{e.message}"
       end
       retry
+    rescue WebSocketClientError => e
+      puts "Unexpected websocket connection exception: #{e}: #{e.message}: #{e.backtrace}"
     rescue StandardError => e
       puts "Unexpected inner loop exception: #{e}: #{e.message}: #{e.backtrace}"
       retry

diff --git a/lib/capybara/apparition/driver/web_socket_client.rb b/lib/capybara/apparition/driver/web_socket_client.rb
@@ -55,7 +55,11 @@ def start_driver
     end
 
     def parse_input
-      @driver.parse(@socket.read)
+      data = @socket.read
+      raise WebSocketClientError.new if data.nil? || data.empty?
+      data
+    rescue EOFError, Errno::ECONNRESET
+      raise WebSocketClientError.new
     end
   end