puppeteer-bidi 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93bdca661a74b8ebba846818445d6e319c829fcbd16de7a40319350177a9b058
-  data.tar.gz: 0cd0a68461ca4e9546a2f8ef653e87a1caf0c380e65cc653e6d1bf000f23ec91
+  metadata.gz: 8321a46efce20f517001a8cf7e19d849120dc7139ab3ee324d1b70eb26c9e5de
+  data.tar.gz: 3b2fac88bdaf8248396608e68cf4302547cde9364ec93288a69c14293ad4019f
 SHA512:
-  metadata.gz: c38900fa8c8af9996c38b91f1a5cefc63e2797c609ef57b240877f04f907a78287df9ed261114cfdac0f0fb0e6033261fdc644df01b2f61dbca3ee287a10ab11
-  data.tar.gz: caf3af388d8a7fa1c3e178cbd326fda3797cc0c4b3ed765952c79472c2c4fe73fbc50618860d7b23f819a21b8ea483df5d800b198507d812fab18fdfd4a7fa04
+  metadata.gz: 70abd79d8bc6208fd115ad7324eece4c942e0b697ec5ca1a1fa2dc0eba5721d3abb933cde32df0bfb36dad22fcc86e59ebc2ecb16bb5a03f39dc97a1870976fa
+  data.tar.gz: 346f958a1b13fa51a0b0387230274f55f0f1f0f8e403605649ba41b29226a4d3af5a4a5e59ce1cd06d1a0e0468dea795e9ce99e9b7b022d978fd588db14ec512

data/API_COVERAGE.md

@@ -1,8 +1,9 @@
 # API Coverage
 
-- Puppeteer commit: `5dc0f3c7e67da8d4f965795dd2bd64396e00d6fd`
+- Puppeteer version: `25.3.0`
+- Puppeteer commit: `58d9b023ed74c3a1f14ec5fd9315872602270c72`
 - Generated by: `development/generate_api_coverage.rb`
-- Coverage: `188/268` (`70.15%`)
+- Coverage: `195/280` (`69.64%`)
 
 ## Browser (Puppeteer::Bidi::Browser)
 
@@ -17,19 +18,19 @@
 | `Browser.deleteCookie` | `Puppeteer::Bidi::Browser#delete_cookie` | ✅ |
 | `Browser.deleteMatchingCookies` | `Puppeteer::Bidi::Browser#delete_matching_cookies` | ✅ |
 | `Browser.disconnect` | `Puppeteer::Bidi::Browser#disconnect` | ✅ |
+| `Browser.extensions` | `Puppeteer::Bidi::Browser#extensions` | ❌ |
 | `Browser.getWindowBounds` | `Puppeteer::Bidi::Browser#get_window_bounds` | ✅ |
 | `Browser.installExtension` | `Puppeteer::Bidi::Browser#install_extension` | ❌ |
-| `Browser.isConnected` | `Puppeteer::Bidi::Browser#is_connected` | ❌ |
 | `Browser.newPage` | `Puppeteer::Bidi::Browser#new_page` | ✅ |
 | `Browser.pages` | `Puppeteer::Bidi::Browser#pages` | ✅ |
 | `Browser.process` | `Puppeteer::Bidi::Browser#process` | ✅ |
 | `Browser.removeScreen` | `Puppeteer::Bidi::Browser#remove_screen` | ❌ |
 | `Browser.screens` | `Puppeteer::Bidi::Browser#screens` | ❌ |
 | `Browser.setCookie` | `Puppeteer::Bidi::Browser#set_cookie` | ✅ |
-| `Browser.setPermission` | `Puppeteer::Bidi::Browser#set_permission` | ❌ |
+| `Browser.setPermission` | `Puppeteer::Bidi::Browser#set_permission` | ✅ |
 | `Browser.setWindowBounds` | `Puppeteer::Bidi::Browser#set_window_bounds` | ✅ |
-| `Browser.target` | `Puppeteer::Bidi::Browser#target` | ❌ |
-| `Browser.targets` | `Puppeteer::Bidi::Browser#targets` | ❌ |
+| `Browser.target` | `Puppeteer::Bidi::Browser#target` | ✅ |
+| `Browser.targets` | `Puppeteer::Bidi::Browser#targets` | ✅ |
 | `Browser.uninstallExtension` | `Puppeteer::Bidi::Browser#uninstall_extension` | ❌ |
 | `Browser.userAgent` | `Puppeteer::Bidi::Browser#user_agent` | ✅ |
 | `Browser.version` | `Puppeteer::Bidi::Browser#version` | ❌ |
@@ -51,8 +52,8 @@
 | `BrowserContext.pages` | `Puppeteer::Bidi::BrowserContext#pages` | ✅ |
 | `BrowserContext.setCookie` | `Puppeteer::Bidi::BrowserContext#set_cookie` | ✅ |
 | `BrowserContext.setPermission` | `Puppeteer::Bidi::BrowserContext#set_permission` | ✅ |
-| `BrowserContext.targets` | `Puppeteer::Bidi::BrowserContext#targets` | ❌ |
-| `BrowserContext.waitForTarget` | `Puppeteer::Bidi::BrowserContext#wait_for_target` | ❌ |
+| `BrowserContext.targets` | `Puppeteer::Bidi::BrowserContext#targets` | ✅ |
+| `BrowserContext.waitForTarget` | `Puppeteer::Bidi::BrowserContext#wait_for_target` | ✅ |
 
 ## ElementHandle (Puppeteer::Bidi::ElementHandle)
 
@@ -116,6 +117,7 @@
 | `Frame.content` | `Puppeteer::Bidi::Frame#content` | ✅ |
 | `Frame.evaluate` | `Puppeteer::Bidi::Frame#evaluate` | ✅ |
 | `Frame.evaluateHandle` | `Puppeteer::Bidi::Frame#evaluate_handle` | ✅ |
+| `Frame.extensionRealms` | `Puppeteer::Bidi::Frame#extension_realms` | ❌ |
 | `Frame.focus` | `Puppeteer::Bidi::Frame#focus` | ❌ |
 | `Frame.frameElement` | `Puppeteer::Bidi::Frame#frame_element` | ✅ |
 | `Frame.goto` | `Puppeteer::Bidi::Frame#goto` | ✅ |
@@ -250,6 +252,7 @@
 | `Page.emulateCPUThrottling` | `Puppeteer::Bidi::Page#emulate_cpu_throttling` | ❌ |
 | `Page.emulateFocusedPage` | `Puppeteer::Bidi::Page#emulate_focused_page` | ❌ |
 | `Page.emulateIdleState` | `Puppeteer::Bidi::Page#emulate_idle_state` | ❌ |
+| `Page.emulateLocale` | `Puppeteer::Bidi::Page#emulate_locale` | ✅ |
 | `Page.emulateMediaFeatures` | `Puppeteer::Bidi::Page#emulate_media_features` | ❌ |
 | `Page.emulateMediaType` | `Puppeteer::Bidi::Page#emulate_media_type` | ❌ |
 | `Page.emulateNetworkConditions` | `Puppeteer::Bidi::Page#emulate_network_conditions` | ❌ |
@@ -259,6 +262,7 @@
 | `Page.evaluateHandle` | `Puppeteer::Bidi::Page#evaluate_handle` | ✅ |
 | `Page.evaluateOnNewDocument` | `Puppeteer::Bidi::Page#evaluate_on_new_document` | ✅ |
 | `Page.exposeFunction` | `Puppeteer::Bidi::Page#expose_function` | ✅ |
+| `Page.extensionRealms` | `Puppeteer::Bidi::Page#extension_realms` | ❌ |
 | `Page.focus` | `Puppeteer::Bidi::Page#focus` | ✅ |
 | `Page.frames` | `Puppeteer::Bidi::Page#frames` | ✅ |
 | `Page.getDefaultNavigationTimeout` | `Puppeteer::Bidi::Page#get_default_navigation_timeout` | ✅ |
@@ -266,6 +270,7 @@
 | `Page.goBack` | `Puppeteer::Bidi::Page#go_back` | ✅ |
 | `Page.goForward` | `Puppeteer::Bidi::Page#go_forward` | ✅ |
 | `Page.goto` | `Puppeteer::Bidi::Page#goto` | ✅ |
+| `Page.hasDevTools` | `Puppeteer::Bidi::Page#has_dev_tools` | ❌ |
 | `Page.hover` | `Puppeteer::Bidi::Page#hover` | ✅ |
 | `Page.isClosed` | `Puppeteer::Bidi::Page#closed?` | ✅ |
 | `Page.isDragInterceptionEnabled` | `Puppeteer::Bidi::Page#is_drag_interception_enabled` | ❌ |
@@ -300,8 +305,9 @@
 | `Page.setUserAgent` | `Puppeteer::Bidi::Page#set_user_agent` | ✅ |
 | `Page.setViewport` | `Puppeteer::Bidi::Page#set_viewport` | ✅ |
 | `Page.tap` | `Puppeteer::Bidi::Page#tap` | ❌ |
-| `Page.target` | `Puppeteer::Bidi::Page#target` | ❌ |
+| `Page.target` | `Puppeteer::Bidi::Page#target` | ✅ |
 | `Page.title` | `Puppeteer::Bidi::Page#title` | ✅ |
+| `Page.triggerExtensionAction` | `Puppeteer::Bidi::Page#trigger_extension_action` | ❌ |
 | `Page.type` | `Puppeteer::Bidi::Page#type` | ✅ |
 | `Page.url` | `Puppeteer::Bidi::Page#url` | ✅ |
 | `Page.viewport` | `Puppeteer::Bidi::Page#viewport` | ✅ |
@@ -326,9 +332,20 @@
 | `PuppeteerNode.connect` | `Puppeteer::Bidi.connect` | ✅ |
 | `Puppeteer.customQueryHandlerNames` | `Puppeteer::Bidi.custom_query_handler_names` | ❌ |
 | `PuppeteerNode.defaultArgs` | `Puppeteer::Bidi.default_args` | ❌ |
+| `PuppeteerNode.defaultBrowser` | `Puppeteer::Bidi.default_browser` | ❌ |
 | `PuppeteerNode.executablePath` | `Puppeteer::Bidi.executable_path` | ❌ |
+| `PuppeteerNode.lastLaunchedBrowser` | `Puppeteer::Bidi.last_launched_browser` | ❌ |
 | `PuppeteerNode.launch` | `Puppeteer::Bidi.launch` | ✅ |
 | `Puppeteer.registerCustomQueryHandler` | `Puppeteer::Bidi.register_custom_query_handler` | ❌ |
 | `PuppeteerNode.trimCache` | `Puppeteer::Bidi.trim_cache` | ❌ |
 | `Puppeteer.unregisterCustomQueryHandler` | `Puppeteer::Bidi.unregister_custom_query_handler` | ❌ |
 
+## WebWorker (Puppeteer::Bidi::WebWorker)
+
+| Node.js | Ruby | Supported |
+| --- | --- | :---: |
+| `WebWorker.close` | `Puppeteer::Bidi::WebWorker#close` | ❌ |
+| `WebWorker.evaluate` | `Puppeteer::Bidi::WebWorker#evaluate` | ❌ |
+| `WebWorker.evaluateHandle` | `Puppeteer::Bidi::WebWorker#evaluate_handle` | ❌ |
+| `WebWorker.url` | `Puppeteer::Bidi::WebWorker#url` | ❌ |
+| `WebWorker.waitForFunction` | `Puppeteer::Bidi::WebWorker#wait_for_function` | ❌ |

data/lib/puppeteer/bidi/async_utils.rb

@@ -134,10 +134,15 @@ module Puppeteer
           end
         end
 
-        # Wait for all tasks to complete
-        barrier.wait
-
-        results
+        begin
+          # Wait for all tasks to complete
+          barrier.wait
+          results
+        ensure
+          # Promise.all rejects as soon as a task fails. Stop pending siblings so
+          # callers that time out do not leave fibers waiting on unresolved promises.
+          barrier.stop
+        end
       end
 
       def first(*tasks)

data/lib/puppeteer/bidi/browser.rb

@@ -162,6 +162,18 @@ module Puppeteer
         @default_browser_context.pages
       end
 
+      # Get all known targets.
+      # @rbs return: Array[BrowserTarget | PageTarget | FrameTarget] -- Known targets
+      def targets
+        each_target.to_a
+      end
+
+      # Get the browser target.
+      # @rbs return: BrowserTarget -- Browser target
+      def target
+        @target ||= BrowserTarget.new(self)
+      end
+
       # Get all cookies in the default browser context.
       # @rbs return: Array[Hash[String, untyped]] -- Cookies
       def cookies
@@ -192,6 +204,14 @@ module Puppeteer
         @default_browser_context.delete_matching_cookies(*filters, **filter)
       end
 
+      # Set permission states in the default browser context.
+      # @rbs origin: String | Symbol -- Origin URL (must not be '*')
+      # @rbs *permissions: Hash[Symbol | String, untyped] -- Permission descriptors with states
+      # @rbs return: void
+      def set_permission(origin, *permissions)
+        @default_browser_context.set_permission(origin, *permissions)
+      end
+
       # Get browser window bounds for a given window ID.
       # @rbs window_id: String -- Window ID
       # @rbs return: Hash[Symbol, untyped] -- Window bounds hash
@@ -296,7 +316,7 @@ module Puppeteer
 
       # Wait until a target (top-level browsing context) satisfies the predicate.
       # @rbs timeout: Integer? -- Timeout in milliseconds (default: 30000)
-      # @rbs &predicate: (BrowserTarget | PageTarget | FrameTarget) -> boolish -- Predicate evaluated against each Target
+      # @rbs &predicate: (BrowserTarget | PageTarget | FrameTarget) -> boolish -- Predicate for each Target
       # @rbs return: BrowserTarget | PageTarget | FrameTarget -- Matching target
       def wait_for_target(timeout: nil, &predicate)
         predicate ||= ->(_target) { true }
@@ -341,6 +361,7 @@ module Puppeteer
         session_events = [
           :'browsingContext.contextCreated',
           :'browsingContext.navigationStarted',
+          :'browsingContext.navigationCommitted',
           :'browsingContext.historyUpdated',
           :'browsingContext.fragmentNavigated',
           :'browsingContext.domContentLoaded',
@@ -352,11 +373,10 @@ module Puppeteer
           session_listeners << [event, session_listener]
         end
 
-        browser_disconnect_listener = proc do |data|
+        browser_disconnect_listener = proc do |reason|
           next if promise.resolved?
 
-          reason = data[:reason] || 'Browser disconnected'
-          promise.reject(Core::BrowserDisconnectedError.new(reason))
+          promise.reject(Core::BrowserDisconnectedError.new(reason || 'Browser disconnected'))
           cleanup.call
         end
 
@@ -408,13 +428,13 @@ module Puppeteer
         warn(error.full_message)
       end
 
-      # @rbs &block: (BrowserTarget | PageTarget | FrameTarget) -> void -- Block to yield each target to
-      # @rbs return: Enumerator[BrowserTarget | PageTarget | FrameTarget, void] -- Enumerator of targets
+      # @rbs () -> Enumerator[BrowserTarget | PageTarget | FrameTarget, void]
+      #    | () { (BrowserTarget | PageTarget | FrameTarget) -> void } -> void
       def each_target(&block)
         return enum_for(:each_target) unless block_given?
         return unless @core_browser
 
-        yield BrowserTarget.new(self)
+        yield target
 
         @core_browser.user_contexts.each do |user_context|
           next if user_context.disposed?
@@ -422,12 +442,7 @@ module Puppeteer
           browser_context = browser_context_for(user_context)
           next unless browser_context
 
-          user_context.browsing_contexts.each do |browsing_context|
-            next if browsing_context.disposed?
-
-            page = browser_context.page_for(browsing_context)
-            yield PageTarget.new(page) if page
-          end
+          browser_context.targets.each { |target| yield target }
         end
       end
 

data/lib/puppeteer/bidi/browser_context.rb

@@ -42,6 +42,7 @@ module Puppeteer
         @browser = browser
         @user_context = user_context
         @pages = {}
+        @frame_targets = {}
         @overrides = []
       end
 
@@ -80,6 +81,28 @@ module Puppeteer
                      .map { |browsing_context| page_for(browsing_context) }
       end
 
+      # Get all known targets in this browser context.
+      # @rbs return: Array[PageTarget | FrameTarget] -- Known targets
+      def targets
+        pages.flat_map do |page|
+          [page.target] + page.frames.drop(1).map { |frame| target_for_frame(frame) }
+        end
+      end
+
+      # Wait until a target in this context satisfies the predicate.
+      # @rbs timeout: Integer? -- Timeout in milliseconds (default: 30000)
+      # @rbs &predicate: (PageTarget | FrameTarget) -> boolish -- Predicate evaluated against each target
+      # @rbs return: PageTarget | FrameTarget -- Matching target
+      def wait_for_target(timeout: nil, &predicate)
+        predicate ||= ->(_target) { true }
+
+        browser.wait_for_target(timeout: timeout) do |target|
+          (target.is_a?(PageTarget) || target.is_a?(FrameTarget)) &&
+            target.browser_context == self &&
+            predicate.call(target)
+        end #: PageTarget | FrameTarget
+      end
+
       # Get all cookies in this context.
       # @rbs return: Array[Hash[String, untyped]] -- Cookies
       def cookies
@@ -122,7 +145,6 @@ module Puppeteer
           bidi_cookie["expiry"] = expiry unless expiry.nil?
           bidi_cookie.merge!(CookieUtils.cdp_specific_cookie_properties_from_puppeteer_to_bidi(
                                normalized_cookie,
-                               "sameParty",
                                "sourceScheme",
                                "priority",
                                "url"
@@ -275,6 +297,19 @@ module Puppeteer
 
       private
 
+      # @rbs frame: Frame -- Frame to get target for
+      # @rbs return: FrameTarget -- Frame target
+      def target_for_frame(frame)
+        context_id = frame.browsing_context.id
+        @frame_targets[context_id] ||= begin
+          target = FrameTarget.new(frame)
+          frame.browsing_context.once(:closed) do
+            @frame_targets.delete(context_id)
+          end
+          target
+        end
+      end
+
       def cookie_matches_filter?(cookie, raw_filter)
         filter = CookieUtils.normalize_cookie_input(raw_filter)
         return false unless filter["name"] == cookie["name"]

data/lib/puppeteer/bidi/console_message.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# rbs_inline: enabled
+
+module Puppeteer
+  module Bidi
+    # ConsoleMessage represents a browser console/log entry.
+    class ConsoleMessage
+      attr_reader :type, :text, :args, :location, :stack_trace
+
+      # @rbs type: String -- Console message type
+      # @rbs text: String -- Console text
+      # @rbs args: Array[JSHandle] -- Console argument handles
+      # @rbs location: Hash[Symbol, untyped]? -- Source location
+      # @rbs stack_trace: Array[Hash[Symbol, untyped]] -- Stack trace frames
+      # @rbs return: void
+      def initialize(type:, text:, args: [], location: nil, stack_trace: [])
+        @type = type
+        @text = text
+        @args = args
+        @location = location
+        @stack_trace = stack_trace
+      end
+    end
+  end
+end

data/lib/puppeteer/bidi/cookie_utils.rb

@@ -35,8 +35,8 @@ module Puppeteer
           "session" => expiry.nil? || expiry <= 0,
         }.compact
 
-        cookie.merge!(cdp_specific_cookie_properties_from_bidi(bidi_cookie, "sameParty", "sourceScheme",
-                                                              "partitionKeyOpaque", "priority"))
+        cookie.merge!(cdp_specific_cookie_properties_from_bidi(bidi_cookie, "sourceScheme", "partitionKeyOpaque",
+                                                              "priority"))
         cookie.merge!(partition_key_from_bidi(partition_key, return_composite_partition_key))
 
         cookie

data/lib/puppeteer/bidi/core/README.md

@@ -101,8 +101,7 @@ context = browser.default_user_context
 browsing_context = context.create_browsing_context('tab')
 
 # Listen for navigation events
-browsing_context.on(:navigation) do |data|
-  navigation = data[:navigation]
+browsing_context.on(:navigation) do |navigation|
   puts "Navigation started to #{browsing_context.url}"
 end
 
@@ -123,12 +122,12 @@ All core classes extend `EventEmitter` and emit various events:
 
 ```ruby
 # Browser events
-browser.on(:closed) { |data| puts "Browser closed: #{data[:reason]}" }
-browser.on(:disconnected) { |data| puts "Browser disconnected: #{data[:reason]}" }
+browser.on(:closed) { |reason| puts "Browser closed: #{reason}" }
+browser.on(:disconnected) { |reason| puts "Browser disconnected: #{reason}" }
 
 # BrowsingContext events
-browsing_context.on(:navigation) { |data| puts "Navigation: #{data[:navigation]}" }
-browsing_context.on(:request) { |data| puts "Request: #{data[:request].url}" }
+browsing_context.on(:navigation) { |navigation| puts "Navigation: #{navigation}" }
+browsing_context.on(:request) { |request| puts "Request: #{request.url}" }
 browsing_context.on(:load) { puts "Page loaded" }
 browsing_context.on(:dom_content_loaded) { puts "DOM ready" }
 
@@ -147,8 +146,8 @@ Core classes implement the `Disposable` pattern for proper resource cleanup:
 browser.close  # Disposes all user contexts, browsing contexts, etc.
 
 # Disposal triggers appropriate events
-browsing_context.on(:closed) do |data|
-  puts "Context closed: #{data[:reason]}"
+browsing_context.on(:closed) do |reason|
+  puts "Context closed: #{reason}"
 end
 
 # Check disposal status

data/lib/puppeteer/bidi/core/browser.rb

@@ -65,7 +65,7 @@ module Puppeteer
             begin
               @session.async_send_command('browser.close', {})
             ensure
-              dispose_browser('Browser closed', closed: true)
+              dispose_browser('Browser already closed.', closed: true)
             end
           end
         end
@@ -159,9 +159,9 @@ module Puppeteer
         protected
 
         def perform_dispose
-          @reason ||= 'Browser was disconnected, probably because the session ended'
-          emit(:closed, { reason: @reason }) if @closed
-          emit(:disconnected, { reason: @reason })
+          @reason ||= 'Browser was disconnected, probably because the session ended.'
+          emit(:closed, @reason) if @closed
+          emit(:disconnected, @reason)
           @disposables.dispose
           super
         end
@@ -171,8 +171,8 @@ module Puppeteer
         def initialize_browser
           Async do
             # Listen for session end
-            @session.on(:ended) do |data|
-              dispose_browser(data[:reason])
+            @session.on(:ended) do |reason|
+              dispose_browser(reason)
             end
 
             # Listen for shared worker creation

data/lib/puppeteer/bidi/core/browsing_context.rb

@@ -37,7 +37,6 @@ module Puppeteer
           @disposables = Disposable::DisposableStack.new
           @children = {}
           @realms = {}
-          @requests = {}
           @inflight_request_ids = {}
           @navigation = nil
           @emulation_state = { javascript_enabled: true }
@@ -218,7 +217,7 @@ module Puppeteer
           raise BrowsingContextClosedError, @reason if closed?
           realm = WindowRealm.from(self, sandbox)
           realm.on(:worker) do |worker_realm|
-            emit(:worker, { realm: worker_realm })
+            emit(:worker, worker_realm)
           end
           realm
         end
@@ -360,7 +359,7 @@ module Puppeteer
             end
 
             @client_hints_are_set = true
-            session.async_send_command('emulation.setClientHintsOverride', {
+            session.async_send_command('userAgentClientHints.setClientHintsOverride', {
               clientHints: client_hints,
               contexts: [@id]
             }).wait
@@ -382,6 +381,18 @@ module Puppeteer
           })
         end
 
+        # Set locale override
+        # @rbs locale: String? -- Locale, or nil to restore the default
+        # @rbs return: Async::Task[void]
+        def set_locale_override(locale = nil)
+          raise BrowsingContextClosedError, @reason if closed?
+
+          session.async_send_command("emulation.setLocaleOverride", {
+            locale: locale,
+            contexts: [@id]
+          })
+        end
+
         # Set files on an input element
         # @rbs element: Hash[String, untyped] -- Element reference
         # @rbs files: Array[String] -- File paths
@@ -454,8 +465,8 @@ module Puppeteer
         def dispose
           return if disposed?
 
-          @reason ||= 'Browsing context closed, probably because the user context closed'
-          emit(:closed, { reason: @reason })
+          @reason ||= 'Browsing context already closed, probably because the user context closed.'
+          emit(:closed, @reason)
 
           super # This sets @disposed = true and calls perform_dispose
         end
@@ -492,8 +503,8 @@ module Puppeteer
 
         def initialize_context
           # Listen for user context closure
-          @user_context.once(:closed) do |data|
-            dispose_context("Browsing context closed: #{data[:reason]}")
+          @user_context.once(:closed) do |reason|
+            dispose_context("Browsing context already closed: #{reason}")
           end
 
           # Listen for various browsing context events
@@ -505,7 +516,7 @@ module Puppeteer
           session.on('browsingContext.contextDestroyed') do |info|
             next unless info['context'] == @id
             dispose_children('Parent browsing context was disposed')
-            dispose_context('Browsing context already closed')
+            dispose_context('Browsing context already closed.')
           end
 
           # Child context created
@@ -527,7 +538,7 @@ module Puppeteer
               @children.delete(child_context.id)
             end
 
-            emit(:browsingcontext, { browsing_context: child_context })
+            emit(:browsingcontext, child_context)
           end
 
           # History updated
@@ -562,9 +573,6 @@ module Puppeteer
           session.on('browsingContext.navigationStarted') do |info|
             next unless info['context'] == @id
 
-            # Clean up disposed requests
-            @requests.delete_if { |_, request| request.disposed? }
-
             # Skip if navigation hasn't finished
             next if @navigation && !@navigation.disposed?
 
@@ -586,65 +594,44 @@ module Puppeteer
             end
 
             # Emit navigation event for subscribers (e.g., Frame#wait_for_navigation)
-            emit(:navigation, { navigation: @navigation })
+            emit(:navigation, @navigation)
           end
 
           # Network events
           session.on('network.beforeRequestSent') do |event|
             next unless event['context'] == @id
 
-            request_id = event.dig('request', 'request')
-            next if @requests.key?(request_id)
+            first_event_for_request = track_inflight_request(event)
+            next if event['redirectCount'].to_i > 0
+            next unless first_event_for_request
 
             request = Request.from(self, event)
-            @requests[request_id] = request
-            emit(:request, { request: request })
-
-            # Increment inflight requests counter
-            @inflight_mutex.synchronize do
-              @inflight_request_ids[request_id] = true
-              @inflight_requests += 1
-              emit(:inflight_changed, { inflight: @inflight_requests })
-            end
+            emit(:request, request)
           end
 
           session.on('network.responseCompleted') do |event|
             next unless event['context'] == @id
 
-            request_id = event.dig('request', 'request')
-            next unless @inflight_request_ids.delete(request_id)
-
-            # Decrement inflight requests counter
-            @inflight_mutex.synchronize do
-              @inflight_requests -= 1
-              emit(:inflight_changed, { inflight: @inflight_requests })
-            end
+            finish_inflight_request(event)
           end
 
           session.on('network.fetchError') do |event|
             next unless event['context'] == @id
 
-            request_id = event.dig('request', 'request')
-            next unless @inflight_request_ids.delete(request_id)
-
-            # Decrement inflight requests counter
-            @inflight_mutex.synchronize do
-              @inflight_requests -= 1
-              emit(:inflight_changed, { inflight: @inflight_requests })
-            end
+            finish_inflight_request(event)
           end
 
           # Log entries
           session.on('log.entryAdded') do |entry|
             next unless entry.dig('source', 'context') == @id
-            emit(:log, { entry: entry })
+            emit(:log, entry)
           end
 
           # User prompts
           session.on('browsingContext.userPromptOpened') do |info|
             next unless info['context'] == @id
             # user_prompt = UserPrompt.from(self, info)
-            # emit(:userprompt, { user_prompt: user_prompt })
+            # emit(:userprompt, user_prompt)
           end
 
           # File dialog
@@ -654,6 +641,43 @@ module Puppeteer
           end
         end
 
+        def track_inflight_request(event)
+          key = inflight_request_key(event)
+          return false unless key
+
+          inflight = nil
+          @inflight_mutex.synchronize do
+            unless @inflight_request_ids.key?(key)
+              @inflight_request_ids[key] = true
+              @inflight_requests += 1
+              inflight = @inflight_requests
+            end
+          end
+          emit(:inflight_changed, { inflight: inflight }) if inflight
+          !inflight.nil?
+        end
+
+        def finish_inflight_request(event)
+          key = inflight_request_key(event)
+          return unless key
+
+          inflight = nil
+          @inflight_mutex.synchronize do
+            if @inflight_request_ids.delete(key)
+              @inflight_requests -= 1
+              inflight = @inflight_requests
+            end
+          end
+          emit(:inflight_changed, { inflight: inflight }) if inflight
+        end
+
+        def inflight_request_key(event)
+          request_id = event.dig('request', 'request')
+          return nil unless request_id
+
+          [request_id, event['redirectCount'].to_i]
+        end
+
         def dispose_children(reason)
           @children.values.each do |child|
             next if child.closed?

data/lib/puppeteer/bidi/core/navigation.rb

@@ -58,8 +58,7 @@ module Puppeteer
           end
 
           # Listen for requests with navigation ID
-          @browsing_context.on(:request) do |data|
-            request = data[:request]
+          @browsing_context.on(:request) do |request|
             next unless request.navigation
             next unless matches?(request.navigation)
 
@@ -81,7 +80,11 @@ module Puppeteer
           end
 
           # Listen for navigation completion events
-          %w[browsingContext.domContentLoaded browsingContext.load].each do |event_name|
+          %w[
+            browsingContext.domContentLoaded
+            browsingContext.load
+            browsingContext.navigationCommitted
+          ].each do |event_name|
             session.on(event_name) do |info|
               next unless info['context'] == @browsing_context.id
               next if info['navigation'].nil?