SeleniumHQ · aguspe · Jan 23, 2025 · Dec 14, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/rb/lib/selenium/webdriver/bidi.rb b/rb/lib/selenium/webdriver/bidi.rb
@@ -26,6 +26,10 @@ class BiDi
       autoload :BrowsingContext, 'selenium/webdriver/bidi/browsing_context'
       autoload :Struct, 'selenium/webdriver/bidi/struct'
       autoload :Network, 'selenium/webdriver/bidi/network'
+      autoload :InterceptedRequest, 'selenium/webdriver/bidi/network/intercepted_request'
+      autoload :InterceptedResponse, 'selenium/webdriver/bidi/network/intercepted_response'
+      autoload :InterceptedAuth, 'selenium/webdriver/bidi/network/intercepted_auth'
+      autoload :InterceptedItem, 'selenium/webdriver/bidi/network/intercepted_item'
 
       def initialize(url:)
         @ws = WebSocketConnection.new(url: url)

diff --git a/rb/lib/selenium/webdriver/bidi/network.rb b/rb/lib/selenium/webdriver/bidi/network.rb
@@ -60,9 +60,25 @@ def continue_with_auth(request_id, username, password)
           )
         end
 
+        def continue_without_auth(request_id)
+          @bidi.send_cmd(
+            'network.continueWithAuth',
+            'request' => request_id,
+            'action' => 'default'
+          )
+        end
+
+        def cancel_auth(request_id)
+          @bidi.send_cmd(
+            'network.continueWithAuth',
+            'request' => request_id,
+            'action' => 'cancel'
+          )
+        end
+
         def continue_with_request(**args)
           @bidi.send_cmd(
-            'network.continueWithRequest',
+            'network.continueRequest',
             request: args[:request_id],
             'body' => args[:body],
             'cookies' => args[:cookies],
@@ -72,9 +88,22 @@ def continue_with_request(**args)
           )
         end
 
+        def continue_with_response(**args)
+          @bidi.send_cmd(
+            'network.continueResponse',
+            request: args[:response_id],
+            'body' => args[:body],
+            'cookies' => args[:cookies],
+            'credentials' => args[:credentials],
+            'headers' => args[:headers],
+            'status' => args[:status]
+          )
+        end
+
         def on(event, &)
           event = EVENTS[event] if event.is_a?(Symbol)
           @bidi.add_callback(event, &)
+          @bidi.session.subscribe(event)
         end
       end # Network
     end # BiDi

diff --git a/rb/lib/selenium/webdriver/bidi/network/intercepted_auth.rb b/rb/lib/selenium/webdriver/bidi/network/intercepted_auth.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class BiDi
+      class InterceptedAuth < InterceptedItem
+        def authenticate(username, password)
+          network.continue_with_auth(id, username, password)
+        end
+
+        def skip
+          network.continue_without_auth(id)
+        end
+
+        def cancel
+          network.cancel_auth(id)
+        end
+      end
+    end # BiDi
+  end # WebDriver
+end # Selenium
+
diff --git a/rb/lib/selenium/webdriver/bidi/network/intercepted_item.rb b/rb/lib/selenium/webdriver/bidi/network/intercepted_item.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class BiDi
+      class InterceptedItem
+        attr_reader :network, :request
+
+        def initialize(network, request)
+          @network = network
+          @request = request
+        end
+
+        def id
+          @id ||= @request['request']
+        end
+
+        def headers
+          request['headers']
+        end
+
+        def headers=(new_headers)
+          request['headers'] = new_headers
+        end
+      end
+    end # BiDi
+  end # WebDriver
+end # Selenium
+
diff --git a/rb/lib/selenium/webdriver/bidi/network/intercepted_request.rb b/rb/lib/selenium/webdriver/bidi/network/intercepted_request.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class BiDi
+      class InterceptedRequest < InterceptedItem
+        def continue
+          network.continue_with_request(request_id: id)
+        end
+      end
+    end # BiDi
+  end # WebDriver
+end # Selenium
+
diff --git a/rb/lib/selenium/webdriver/bidi/network/intercepted_response.rb b/rb/lib/selenium/webdriver/bidi/network/intercepted_response.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class BiDi
+      class InterceptedResponse < InterceptedItem
+        def continue
+          network.continue_with_response(response_id: id)
+        end
+      end
+    end # BiDi
+  end # WebDriver
+end # Selenium
+
diff --git a/rb/lib/selenium/webdriver/common/network.rb b/rb/lib/selenium/webdriver/common/network.rb
@@ -17,47 +17,57 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'forwardable'
+
 module Selenium
   module WebDriver
     class Network
-      attr_reader :callbacks
+      extend Forwardable
+
+      attr_reader :callbacks, :network
+      alias bidi network
+
+      def_delegators :network, :continue_with_auth, :continue_with_request, :continue_with_response
 
       def initialize(bridge)
         @network = BiDi::Network.new(bridge.bidi)
         @callbacks = {}
       end
 
-      def add_authentication_handler(username, password)
-        intercept = @network.add_intercept(phases: [BiDi::Network::PHASES[:auth_required]])
-        auth_id = @network.on(:auth_required) do |event|
-          request_id = event['requestId']
-          @network.continue_with_auth(request_id, username, password)
-        end
-        @callbacks[auth_id] = intercept
+      def remove_handler(id)
+        intercept = callbacks[id]
+        network.remove_intercept(intercept['intercept'])
+        callbacks.delete(id)
+      end
 
-        auth_id
+      def clear_handlers
+        callbacks.each_key { |id| remove_handler(id) }
       end
 
-      def remove_handler(id)
-        intercept = @callbacks[id]
-        @network.remove_intercept(intercept['intercept'])
-        @callbacks.delete(id)
+      def add_authentication_handler(&)
+        add_handler(:auth_required, BiDi::Network::PHASES[:auth_required], BiDi::InterceptedAuth, &)
       end
 
-      def clear_handlers
-        @callbacks.each_key { |id| remove_handler(id) }
+      def add_request_handler(&)
+        add_handler(:before_request, BiDi::Network::PHASES[:before_request], BiDi::InterceptedRequest, &)
       end
 
-      def add_request_handler
-        intercept = @network.add_intercept(phases: [BiDi::Network::PHASES[:before_request]])
-        request_id = @network.on(:before_request) do |event|
-          request_id = event['requestId']
-          @network.continue_with_request(request_id: request_id)
-        end
+      def add_response_handler(&)
+        add_handler(:response_started, BiDi::Network::PHASES[:response_started], BiDi::InterceptedResponse, &)
+      end
+
+      private
 
-        @callbacks[request_id] = intercept
+      def add_handler(event_type, phase, intercept_type, &block)
+        intercept = network.add_intercept(phases: [phase])
+        callback_id = network.on(event_type) do |event|
+          request = event['request']
+          intercepted_item = intercept_type.new(network, request)
+          block.call(intercepted_item)
+        end
 
-        request_id
+        callbacks[callback_id] = intercept
+        callback_id
       end
     end # Network
   end # WebDriver

diff --git a/rb/sig/lib/selenium/webdriver/bidi.rbs b/rb/sig/lib/selenium/webdriver/bidi.rbs
@@ -7,7 +7,7 @@ module Selenium
 
       def initialize: (url: String) -> void
 
-      def add_callback: (String event) { () -> void } -> Integer
+      def add_callback: (String | Symbol event) { () -> void } -> Integer
 
       def close: () -> nil
 

diff --git a/rb/sig/lib/selenium/webdriver/bidi/network.rbs b/rb/sig/lib/selenium/webdriver/bidi/network.rbs
@@ -12,7 +12,13 @@ module Selenium
 
         def add_intercept: (?phases: Array[String], ?contexts: BrowsingContext?, ?url_patterns: untyped?) -> Hash[String, String]
 
-        def continue_with_request: -> untyped
+        def cancel_auth: -> untyped
+
+        def continue_with_request: (**untyped args) -> untyped
+
+        def continue_with_response: (**untyped args) -> untyped
+
+        def continue_without_auth: -> untyped
 
         def remove_intercept: (String intercept) -> untyped
 

diff --git a/rb/sig/lib/selenium/webdriver/common/network.rbs b/rb/sig/lib/selenium/webdriver/common/network.rbs
@@ -7,14 +7,22 @@ module Selenium
 
       attr_reader callbacks: Hash[String, String]
 
+      attr_reader network: untyped
+
       def initialize: (Remote::Bridge bridge) -> void
 
       def add_authentication_handler: (String username, String password) -> String
 
       def add_request_handler: -> Integer
 
+      def add_response_handler: -> String
+
+      alias bidi network
+
       def clear_handlers: -> Hash[nil, nil]
 
+      def fetch_id: -> String
+
       def remove_handler: (Integer id) -> nil
     end
   end