puppeteer-ruby 0.37.4 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '000206932f5d3d4626602e984cff4015039644eea2ef89ff139b239fffb9f673'
-  data.tar.gz: 0e560f862a3317a42c1e0e2907c599bc654d05e3f17fd5a650126b73bfd6948e
+  metadata.gz: d18f0aae5e331fee42f66c8140bdc3cced9c0514a03ab65460c4036a94bc6eb2
+  data.tar.gz: babeb261ac3661a6738eb3d02dddeef22685590791fbd579483edd2da7800606
 SHA512:
-  metadata.gz: aac4be4a26f3116eee198ea65c0017359589f2ad11cc95125497e3f84ea1277d9bbb8d1071b57fb42812bb12afd4370534c48586fbb79897acafb54d03222159
-  data.tar.gz: de51d1ca30e26e13346532118df225370fad4b1967d205dad0c150574c4fa60a649973aab83e24b2140b8f98f05626eb106a9141f04b94fe5d3927b1231737d4
+  metadata.gz: 0d70da4b6dc257f39d020286672180d93a4fe2aa321828035eeba80aeff92e7b1f28ff07acd15396d03aad33ab84b4f3474f1c75b587cb833d90f17dde4b024f
+  data.tar.gz: ccb8a58f1ffff28d1498c560c8f17671064ca00ce4b98af9dbc5e844ab1c77d9c28fc503c021ae019d9e799a287976fe01a88bbce3f87979d163f7d384336c0e

data/CHANGELOG.md

@@ -1,7 +1,19 @@
-### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.4...main)]
+### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.38.0...main)]
 
 - xxx
 
+### 0.38.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.4...0.38.0)]
+
+New features:
+
+- Puppeteer 11.0 functionalities
+    * OOP iframe support
+    * Customize debugging port
+    * HTTPRequest#initiator
+    * Customize temp directory for user data
+    * Add webp to screenshot quality option allow list
+
+
 ### 0.37.4 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.3...0.37.4)]
 
 Bugfix:

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
 - Puppeteer version: v12.0.0
-- puppeteer-ruby version: 0.37.4
+- puppeteer-ruby version: 0.38.0
 
 ## Puppeteer
 
@@ -134,7 +134,7 @@
 * viewport
 * ~~waitFor~~
 * waitForFileChooser => `#wait_for_file_chooser`
-* ~~waitForFrame~~
+* waitForFrame => `#wait_for_frame`
 * waitForFunction => `#wait_for_function`
 * waitForNavigation => `#wait_for_navigation`
 * ~~waitForNetworkIdle~~
@@ -227,7 +227,7 @@
 * goto
 * hover
 * isDetached => `#detached?`
-* ~~isOOPFrame~~
+* isOOPFrame => `#oop_frame?`
 * name
 * parentFrame => `#parent_frame`
 * select
@@ -308,7 +308,7 @@
 * finalizeInterceptions => `#finalize_interceptions`
 * frame
 * headers
-* ~~initiator~~
+* initiator
 * isNavigationRequest => `#navigation_request?`
 * method
 * postData => `#post_data`
@@ -360,7 +360,7 @@
 
 * connection
 * detach
-* ~~id~~
+* id
 * send
 
 ## Coverage

data/lib/puppeteer/cdp_session.rb

@@ -15,6 +15,11 @@ class Puppeteer::CDPSession
     @session_id = session_id
   end
 
+  # @internal
+  def id
+    @session_id
+  end
+
   attr_reader :connection
 
   # @param method [String]

data/lib/puppeteer/dom_world.rb

@@ -45,10 +45,14 @@ class Puppeteer::DOMWorld
     end
   end
 
-  # @param {!Puppeteer.FrameManager} frameManager
-  # @param {!Puppeteer.Frame} frame
-  # @param {!Puppeteer.TimeoutSettings} timeoutSettings
-  def initialize(frame_manager, frame, timeout_settings)
+  # @param client [Puppeteer::CDPSession]
+  # @param frame_manager [Puppeteer::FrameManager]
+  # @param frame [Puppeteer::Frame]
+  # @param timeout_settings [Puppeteer::TimeoutSettings]
+  def initialize(client, frame_manager, frame, timeout_settings)
+    # Keep own reference to client because it might differ from the FrameManager's
+    # client for OOP iframes.
+    @client = client
     @frame_manager = frame_manager
     @frame = frame
     @timeout_settings = timeout_settings
@@ -58,7 +62,7 @@ class Puppeteer::DOMWorld
     @ctx_bindings = Set.new
     @detached = false
 
-    frame_manager.client.on_event('Runtime.bindingCalled', &method(:handle_binding_called))
+    @client.on_event('Runtime.bindingCalled', &method(:handle_binding_called))
   end
 
   attr_reader :frame

data/lib/puppeteer/frame.rb

@@ -1,25 +1,47 @@
 class Puppeteer::Frame
   using Puppeteer::DefineAsyncMethod
 
-  # @param {!FrameManager} frameManager
-  # @param {!Puppeteer.CDPSession} client
-  # @param {?Frame} parentFrame
-  # @param {string} frameId
-  def initialize(frame_manager, client, parent_frame, frame_id)
+  # @param frame_manager [Puppeteer::FrameManager]
+  # @param parent_frame [Puppeteer::Frame|nil]
+  # @param frame_id [String]
+  # @param client [Puppeteer::CDPSession]
+  def initialize(frame_manager, parent_frame, frame_id, client)
     @frame_manager = frame_manager
-    @client = client
     @parent_frame = parent_frame
     @id = frame_id
     @detached = false
 
     @loader_id = ''
     @lifecycle_events = Set.new
-    @main_world = Puppeteer::DOMWorld.new(frame_manager, self, frame_manager.timeout_settings)
-    @secondary_world = Puppeteer::DOMWorld.new(frame_manager, self, frame_manager.timeout_settings)
     @child_frames = Set.new
     if parent_frame
       parent_frame._child_frames << self
     end
+
+    update_client(client)
+  end
+
+  def inspect
+    values = %i[id parent_frame detached loader_id lifecycle_events child_frames].map do |sym|
+      value = instance_variable_get(:"@#{sym}")
+      "@#{sym}=#{value}"
+    end
+    "#<Puppeteer::Frame #{values.join(' ')}>"
+  end
+
+  def _client
+    @client
+  end
+
+  # @param client [Puppeteer::CDPSession]
+  private def update_client(client)
+    @client = client
+    @main_world = Puppeteer::DOMWorld.new(@client, @frame_manager, self, @frame_manager.timeout_settings)
+    @secondary_world = Puppeteer::DOMWorld.new(@client, @frame_manager, self, @frame_manager.timeout_settings)
+  end
+
+  def oop_frame?
+    @client != @frame_manager.client
   end
 
   attr_accessor :frame_manager, :id, :loader_id, :lifecycle_events, :main_world, :secondary_world

data/lib/puppeteer/frame_manager.rb

@@ -27,50 +27,67 @@ class Puppeteer::FrameManager
     # @type {!Set<string>}
     @isolated_worlds = Set.new
 
-    @client.on_event('Page.frameAttached') do |event|
-      handle_frame_attached(event['frameId'], event['parentFrameId'])
+    setup_listeners(@client)
+  end
+
+  private def setup_listeners(client)
+    client.on_event('Page.frameAttached') do |event|
+      handle_frame_attached(client, event['frameId'], event['parentFrameId'])
     end
-    @client.on_event('Page.frameNavigated') do |event|
+    client.on_event('Page.frameNavigated') do |event|
       handle_frame_navigated(event['frame'])
     end
-    @client.on_event('Page.navigatedWithinDocument') do |event|
+    client.on_event('Page.navigatedWithinDocument') do |event|
       handle_frame_navigated_within_document(event['frameId'], event['url'])
     end
-    @client.on_event('Page.frameDetached') do |event|
-      handle_frame_detached(event['frameId'])
+    client.on_event('Page.frameDetached') do |event|
+      handle_frame_detached(event['frameId'], event['reason'])
     end
-    @client.on_event('Page.frameStoppedLoading') do |event|
+    client.on_event('Page.frameStoppedLoading') do |event|
       handle_frame_stopped_loading(event['frameId'])
     end
-    @client.on_event('Runtime.executionContextCreated') do |event|
-      handle_execution_context_created(event['context'])
+    client.on_event('Runtime.executionContextCreated') do |event|
+      handle_execution_context_created(event['context'], client)
     end
-    @client.on_event('Runtime.executionContextDestroyed') do |event|
-      handle_execution_context_destroyed(event['executionContextId'])
+    client.on_event('Runtime.executionContextDestroyed') do |event|
+      handle_execution_context_destroyed(event['executionContextId'], client)
     end
-    @client.on_event('Runtime.executionContextsCleared') do |event|
-      handle_execution_contexts_cleared
+    client.on_event('Runtime.executionContextsCleared') do |event|
+      handle_execution_contexts_cleared(client)
     end
-    @client.on_event('Page.lifecycleEvent') do |event|
+    client.on_event('Page.lifecycleEvent') do |event|
       handle_lifecycle_event(event)
     end
+    client.on_event('Target.attachedToTarget') do |event|
+      handle_attached_to_target(event)
+    end
+    client.on_event('Target.detachedFromTarget') do |event|
+      handle_detached_from_target(event)
+    end
   end
 
   attr_reader :client, :timeout_settings
 
-  private def init
+  private def init(cdp_session = nil)
+    client = cdp_session || @client
+
     results = await_all(
-      @client.async_send_message('Page.enable'),
-      @client.async_send_message('Page.getFrameTree'),
+      client.async_send_message('Page.enable'),
+      client.async_send_message('Page.getFrameTree'),
     )
     frame_tree = results.last['frameTree']
-    handle_frame_tree(frame_tree)
+    handle_frame_tree(client, frame_tree)
     await_all(
-      @client.async_send_message('Page.setLifecycleEventsEnabled', enabled: true),
-      @client.async_send_message('Runtime.enable'),
+      client.async_send_message('Page.setLifecycleEventsEnabled', enabled: true),
+      client.async_send_message('Runtime.enable'),
     )
-    ensure_isolated_world(UTILITY_WORLD_NAME)
-    @network_manager.init
+    ensure_isolated_world(client, UTILITY_WORLD_NAME)
+    @network_manager.init unless cdp_session
+  rescue => err
+    # The target might have been closed before the initialization finished.
+    return if err.message.include?('Target closed') || err.message.include?('Session closed')
+
+    raise
   end
 
   define_async_method :async_init
@@ -154,6 +171,28 @@ class Puppeteer::FrameManager
     watcher.navigation_response
   end
 
+  # @param event [Hash]
+  def handle_attached_to_target(event)
+    return if event['targetInfo']['type'] != 'iframe'
+
+    frame = @frames[event['targetInfo']['targetId']]
+    session = Puppeteer::Connection.from_session(@client).session(event['sessionId'])
+
+    frame.send(:update_client, session)
+    setup_listeners(session)
+    async_init(session)
+  end
+
+  # @param event [Hash]
+  def handle_detached_from_target(event)
+    frame = @frames[event['targetId']]
+    if frame && frame.oop_frame?
+      # When an OOP iframe is removed from the page, it
+      # will only get a Target.detachedFromTarget event.
+      remove_frame_recursively(frame)
+    end
+  end
+
   # @param event [Hash]
   def handle_lifecycle_event(event)
     frame = @frames[event['frameId']]
@@ -170,16 +209,17 @@ class Puppeteer::FrameManager
     emit_event(FrameManagerEmittedEvents::LifecycleEvent, frame)
   end
 
+  # @param session [Puppeteer::CDPSession]
   # @param frame_tree [Hash]
-  def handle_frame_tree(frame_tree)
+  def handle_frame_tree(session, frame_tree)
     if frame_tree['frame']['parentId']
-      handle_frame_attached(frame_tree['frame']['id'], frame_tree['frame']['parentId'])
+      handle_frame_attached(session, frame_tree['frame']['id'], frame_tree['frame']['parentId'])
     end
     handle_frame_navigated(frame_tree['frame'])
     return if !frame_tree['childFrames']
 
     frame_tree['childFrames'].each do |child|
-      handle_frame_tree(child)
+      handle_frame_tree(session, child)
     end
   end
 
@@ -204,15 +244,25 @@ class Puppeteer::FrameManager
     @frames[frame_id]
   end
 
-  # @param {string} frameId
-  # @param {?string} parentFrameId
-  def handle_frame_attached(frame_id, parent_frame_id)
-    return if @frames.has_key?(frame_id)
+  # @param session [Puppeteer::CDPSession]
+  # @param frameId [String]
+  # @param parentFrameId [String|nil]
+  def handle_frame_attached(session, frame_id, parent_frame_id)
+    if @frames.has_key?(frame_id)
+      frame = @frames[frame_id]
+      if session && frame.oop_frame?
+        # If an OOP iframes becomes a normal iframe again
+        # it is first attached to the parent page before
+        # the target is removed.
+        frame.send(:update_client, session)
+      end
+      return
+    end
     if !parent_frame_id
       raise ArgymentError.new('parent_frame_id must not be nil')
     end
     parent_frame = @frames[parent_frame_id]
-    frame = Puppeteer::Frame.new(self, @client, parent_frame, frame_id)
+    frame = Puppeteer::Frame.new(self, parent_frame, frame_id, session)
     @frames[frame_id] = frame
 
     emit_event(FrameManagerEmittedEvents::FrameAttached, frame)
@@ -247,7 +297,7 @@ class Puppeteer::FrameManager
         frame.id = frame_payload['id']
       else
         # Initial main frame navigation.
-        frame = Puppeteer::Frame.new(self, @client, nil, frame_payload['id'])
+        frame = Puppeteer::Frame.new(self, nil, frame_payload['id'], @client)
       end
       @frames[frame_payload['id']] = frame
       @main_frame = frame
@@ -259,22 +309,26 @@ class Puppeteer::FrameManager
     emit_event(FrameManagerEmittedEvents::FrameNavigated, frame)
   end
 
+  # @param session [Puppeteer::CDPSession]
   # @param name [String]
-  def ensure_isolated_world(name)
-    return if @isolated_worlds.include?(name)
-    @isolated_worlds << name
+  private def ensure_isolated_world(session, name)
+    key = "#{session.id}:#{name}"
+    return if @isolated_worlds.include?(key)
+    @isolated_worlds << key
 
-    @client.send_message('Page.addScriptToEvaluateOnNewDocument',
+    session.send_message('Page.addScriptToEvaluateOnNewDocument',
       source: "//# sourceURL=#{Puppeteer::ExecutionContext::EVALUATION_SCRIPT_URL}",
       worldName: name,
     )
-    create_isolated_worlds_promises = frames.map do |frame|
-      @client.async_send_message('Page.createIsolatedWorld',
-        frameId: frame.id,
-        grantUniveralAccess: true,
-        worldName: name,
-      )
-    end
+    create_isolated_worlds_promises = frames.
+      select { |frame| frame._client == session }.
+      map do |frame|
+        session.async_send_message('Page.createIsolatedWorld',
+          frameId: frame.id,
+          grantUniveralAccess: true,
+          worldName: name,
+        )
+      end
     await_all(*create_isolated_worlds_promises)
   end
 
@@ -289,19 +343,31 @@ class Puppeteer::FrameManager
   end
 
   # @param frame_id [String]
-  def handle_frame_detached(frame_id)
+  # @param reason [String]
+  def handle_frame_detached(frame_id, reason)
     frame = @frames[frame_id]
-    if frame
-      remove_frame_recursively(frame)
+    if reason == 'remove'
+      # Only remove the frame if the reason for the detached event is
+      # an actual removement of the frame.
+      # For frames that become OOP iframes, the reason would be 'swap'.
+      if frame
+        remove_frame_recursively(frame)
+      end
     end
   end
 
   # @param context_payload [Hash]
-  def handle_execution_context_created(context_payload)
+  # @pram session [Puppeteer::CDPSession]
+  def handle_execution_context_created(context_payload, session)
     frame = if_present(context_payload.dig('auxData', 'frameId')) { |frame_id| @frames[frame_id] }
 
     world = nil
     if frame
+      # commented out the original implementation for allowing us to use Frame#evaluate on OOP iframe.
+      #
+      # # Only care about execution contexts created for the current session.
+      # return if @client != session
+
       if context_payload.dig('auxData', 'isDefault')
         world = frame.main_world
       elsif context_payload['name'] == UTILITY_WORLD_NAME && !frame.secondary_world.has_context?
@@ -316,34 +382,45 @@ class Puppeteer::FrameManager
       @isolated_worlds << context_payload['name']
     end
 
-    context = Puppeteer::ExecutionContext.new(@client, context_payload, world)
+    context = Puppeteer::ExecutionContext.new(frame._client || @client, context_payload, world)
     if world
       world.context = context
     end
-    @context_id_to_context[context_payload['id']] = context
+    key = "#{session.id}:#{context_payload['id']}"
+    @context_id_to_context[key] = context
   end
 
-  # @param {number} executionContextId
-  def handle_execution_context_destroyed(execution_context_id)
-    context = @context_id_to_context[execution_context_id]
+  # @param execution_context_id [Integer]
+  # @param session [Puppeteer::CDPSEssion]
+  def handle_execution_context_destroyed(execution_context_id, session)
+    key = "#{session.id}:#{execution_context_id}"
+    context = @context_id_to_context[key]
     return unless context
-    @context_id_to_context.delete(execution_context_id)
+    @context_id_to_context.delete(key)
     if context.world
       context.world.delete_context(execution_context_id)
     end
   end
 
-  def handle_execution_contexts_cleared
-    @context_id_to_context.each do |execution_context_id, context|
-      if context.world
-        context.world.delete_context(execution_context_id)
+  # @param session [Puppeteer::CDPSession]
+  def handle_execution_contexts_cleared(session)
+    @context_id_to_context.select! do |execution_context_id, context|
+      # Make sure to only clear execution contexts that belong
+      # to the current session.
+      if context.client != session
+        true # keep
+      else
+        if context.world
+          context.world.delete_context(execution_context_id)
+        end
+        false # remove
       end
     end
-    @context_id_to_context.clear
   end
 
-  def execution_context_by_id(context_id)
-    @context_id_to_context[context_id] or raise "INTERNAL ERROR: missing context with id = #{context_id}"
+  def execution_context_by_id(context_id, session)
+    key = "#{session.id}:#{context_id}"
+    @context_id_to_context[key] or raise "INTERNAL ERROR: missing context with id = #{context_id}"
   end
 
   # @param {!Frame} frame

data/lib/puppeteer/http_request.rb

@@ -72,7 +72,15 @@ class Puppeteer::HTTPRequest
   end
 
   attr_reader :internal
-  attr_reader :url, :resource_type, :method, :post_data, :headers, :response, :frame
+  attr_reader :url, :resource_type, :method, :post_data, :headers, :response, :frame, :initiator
+
+  def inspect
+    values = %i[request_id method url].map do |sym|
+      value = instance_variable_get(:"@#{sym}")
+      "@#{sym}=#{value}"
+    end
+    "#<Puppeteer::HTTPRequest #{values.join(' ')}>"
+  end
 
   private def assert_interception_allowed
     unless @allow_interception

data/lib/puppeteer/launcher/chrome.rb

@@ -34,13 +34,13 @@ module Puppeteer::Launcher
         if @launch_options.pipe?
           chrome_arguments << '--remote-debugging-pipe'
         else
-          chrome_arguments << '--remote-debugging-port=0'
+          chrome_arguments << "--remote-debugging-port=#{@chrome_arg_options.debugging_port}"
         end
       end
 
       temporary_user_data_dir = nil
       if chrome_arguments.none? { |arg| arg.start_with?('--user-data-dir') }
-        temporary_user_data_dir = Dir.mktmpdir('puppeteer_dev_chrome_profile-')
+        temporary_user_data_dir = Dir.mktmpdir('puppeteer_dev_chrome_profile-', ENV['PUPPETEER_TMP_DIR'])
         chrome_arguments << "--user-data-dir=#{temporary_user_data_dir}"
       end
 
@@ -78,7 +78,10 @@ module Puppeteer::Launcher
           close_callback: -> { runner.close },
         )
 
-        browser.wait_for_target(predicate: ->(target) { target.type == 'page' })
+        browser.wait_for_target(
+          predicate: ->(target) { target.type == 'page' },
+          timeout: @launch_options.timeout,
+        )
 
         browser
       rescue

data/lib/puppeteer/launcher/chrome_arg_options.rb

@@ -34,9 +34,10 @@ module Puppeteer::Launcher
       if @headless.nil?
         @headless = !@devtools
       end
+      @debugging_port = options[:debugging_port] || 0
     end
 
-    attr_reader :args, :user_data_dir
+    attr_reader :args, :user_data_dir, :debugging_port
 
     def headless?
       @headless

data/lib/puppeteer/launcher/firefox.rb

@@ -28,7 +28,7 @@ module Puppeteer::Launcher
         end
 
       if firefox_arguments.none? { |arg| arg.start_with?('--remote-debugging-') }
-        firefox_arguments << '--remote-debugging-port=0'
+        firefox_arguments << "--remote-debugging-port=#{@chrome_arg_options.debugging_port}"
       end
 
       temporary_user_data_dir = nil
@@ -71,7 +71,10 @@ module Puppeteer::Launcher
           close_callback: -> { runner.close },
         )
 
-        browser.wait_for_target(predicate: ->(target) { target.type == 'page' })
+        browser.wait_for_target(
+          predicate: ->(target) { target.type == 'page' },
+          timeout: @launch_options.timeout,
+        )
 
         browser
       rescue
@@ -228,7 +231,7 @@ module Puppeteer::Launcher
     end
 
     private def create_profile(extra_prefs = {})
-      Dir.mktmpdir('puppeteer_dev_firefox_profile-').tap do |profile_path|
+      Dir.mktmpdir('puppeteer_dev_firefox_profile-', ENV['PUPPETEER_TMP_DIR']).tap do |profile_path|
         server = 'dummy.test'
         default_preferences = {
           # Make sure Shield doesn't hit the network.

data/lib/puppeteer/page/screenshot_options.rb

@@ -34,7 +34,7 @@ class Puppeteer::Page
       @type ||= 'png'
 
       if options[:quality]
-        unless @type == 'jpeg'
+        if @type != 'jpeg' && @type != 'webp'
           raise ArgumentError.new("options.quality is unsupported for the #{@type} screenshots")
         end
         unless options[:quality].is_a?(Numeric)

data/lib/puppeteer/page.rb

@@ -50,19 +50,26 @@ class Puppeteer::Page
     @workers = {}
     @user_drag_interception_enabled = false
 
-    @client.on_event('Target.attachedToTarget') do |event|
-      if event['targetInfo']['type'] != 'worker'
+    @client.add_event_listener('Target.attachedToTarget') do |event|
+      if event['targetInfo']['type'] != 'worker' && event['targetInfo']['type'] != 'iframe'
         # If we don't detach from service workers, they will never die.
+        # We still want to attach to workers for emitting events.
+        # We still want to attach to iframes so sessions may interact with them.
+        # We detach from all other types out of an abundance of caution.
+        # See https://source.chromium.org/chromium/chromium/src/+/main:content/browser/devtools/devtools_agent_host_impl.cc?ss=chromium&q=f:devtools%20-f:out%20%22::kTypePage%5B%5D%22
+        # for the complete list of available types.
         @client.async_send_message('Target.detachFromTarget', sessionId: event['sessionId'])
         next
       end
 
-      session = Puppeteer::Connection.from_session(@client).session(event['sessionId']) # rubocop:disable Lint/UselessAssignment
-      #   const worker = new Worker(session, event.targetInfo.url, this._addConsoleMessage.bind(this), this._handleException.bind(this));
-      #   this._workers.set(event.sessionId, worker);
-      #   this.emit(PageEmittedEvents::WorkerCreated, worker);
+      if event['targetInfo']['type'] == 'worker'
+        session = Puppeteer::Connection.from_session(@client).session(event['sessionId']) # rubocop:disable Lint/UselessAssignment
+        #   const worker = new Worker(session, event.targetInfo.url, this._addConsoleMessage.bind(this), this._handleException.bind(this));
+        #   this._workers.set(event.sessionId, worker);
+        #   this.emit(PageEmittedEvents::WorkerCreated, worker);
+      end
     end
-    @client.on_event('Target.detachedFromTarget') do |event|
+    @client.add_event_listener('Target.detachedFromTarget') do |event|
       session_id = event['sessionId']
       worker = @workers[session_id]
       next unless worker
@@ -103,10 +110,10 @@ class Puppeteer::Page
     @client.on_event('Page.loadEventFired') do |event|
       emit_event(PageEmittedEvents::Load)
     end
-    @client.on('Runtime.consoleAPICalled') do |event|
+    @client.add_event_listener('Runtime.consoleAPICalled') do |event|
       handle_console_api(event)
     end
-    @client.on('Runtime.bindingCalled') do |event|
+    @client.add_event_listener('Runtime.bindingCalled') do |event|
       handle_binding_called(event)
     end
     @client.on_event('Page.javascriptDialogOpening') do |event|
@@ -518,7 +525,7 @@ class Puppeteer::Page
       return
     end
 
-    context = @frame_manager.execution_context_by_id(event['executionContextId'])
+    context = @frame_manager.execution_context_by_id(event['executionContextId'], @client)
     values = event['args'].map do |arg|
       remote_object = Puppeteer::RemoteObject.new(arg)
       Puppeteer::JSHandle.create(context: context, remote_object: remote_object)
@@ -664,19 +671,38 @@ class Puppeteer::Page
   private def wait_for_network_manager_event(event_name, predicate:, timeout:)
     option_timeout = timeout || @timeout_settings.timeout
 
-    @wait_for_network_manager_event_listener_ids ||= {}
-    if_present(@wait_for_network_manager_event_listener_ids[event_name]) do |listener_id|
+    promise = resolvable_future
+
+    listener_id = @frame_manager.network_manager.add_event_listener(event_name) do |event_target|
+      if predicate.call(event_target)
+        promise.fulfill(event_target)
+      end
+    end
+
+    begin
+      # Timeout.timeout(0) means "no limit" for timeout.
+      Timeout.timeout(option_timeout / 1000.0) do
+        await_any(promise, session_close_promise)
+      end
+    rescue Timeout::Error
+      raise Puppeteer::TimeoutError.new("waiting for #{event_name} failed: timeout #{option_timeout}ms exceeded")
+    ensure
       @frame_manager.network_manager.remove_event_listener(listener_id)
     end
+  end
+
+  private def wait_for_frame_manager_event(*event_names, predicate:, timeout:)
+    option_timeout = timeout || @timeout_settings.timeout
 
     promise = resolvable_future
 
-    @wait_for_network_manager_event_listener_ids[event_name] =
-      @frame_manager.network_manager.add_event_listener(event_name) do |event_target|
+    listener_ids = event_names.map do |event_name|
+      @frame_manager.add_event_listener(event_name) do |event_target|
         if predicate.call(event_target)
-          promise.fulfill(event_target)
+          promise.fulfill(event_target) unless promise.resolved?
         end
       end
+    end
 
     begin
       # Timeout.timeout(0) means "no limit" for timeout.
@@ -684,9 +710,11 @@ class Puppeteer::Page
         await_any(promise, session_close_promise)
       end
     rescue Timeout::Error
-      raise Puppeteer::TimeoutError.new("waiting for #{event_name} failed: timeout #{timeout}ms exceeded")
+      raise Puppeteer::TimeoutError.new("waiting for #{event_names.join(" or ")} failed: timeout #{option_timeout}ms exceeded")
     ensure
-      @frame_manager.network_manager.remove_event_listener(@wait_for_network_manager_event_listener_ids[event_name])
+      listener_ids.each do |listener_id|
+        @frame_manager.remove_event_listener(listener_id)
+      end
     end
   end
 
@@ -709,7 +737,7 @@ class Puppeteer::Page
       if url
         -> (request) { request.url == url }
       else
-        -> (request) { predicate.call(request) }
+        predicate
       end
 
     wait_for_network_manager_event(NetworkManagerEmittedEvents::Request,
@@ -743,7 +771,7 @@ class Puppeteer::Page
       if url
         -> (response) { response.url == url }
       else
-        -> (response) { predicate.call(response) }
+        predicate
       end
 
     wait_for_network_manager_event(NetworkManagerEmittedEvents::Response,
@@ -758,6 +786,34 @@ class Puppeteer::Page
   # @param predicate [Proc(Puppeteer::HTTPRequest -> Boolean)]
   define_async_method :async_wait_for_response
 
+  def wait_for_frame(url: nil, predicate: nil, timeout: nil)
+    if !url && !predicate
+      raise ArgumentError.new('url or predicate must be specified')
+    end
+    if predicate && !predicate.is_a?(Proc)
+      raise ArgumentError.new('predicate must be a proc.')
+    end
+    frame_predicate =
+      if url
+        -> (frame) { frame.url == url }
+      else
+        predicate
+      end
+
+    wait_for_frame_manager_event(
+      FrameManagerEmittedEvents::FrameAttached,
+      FrameManagerEmittedEvents::FrameNavigated,
+      predicate: frame_predicate,
+      timeout: timeout,
+    )
+  end
+
+  # @!method async_wait_for_frame(url: nil, predicate: nil, timeout: nil)
+  #
+  # @param url [String]
+  # @param predicate [Proc(Puppeteer::Frame -> Boolean)]
+  define_async_method :async_wait_for_frame
+
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
   def go_back(timeout: nil, wait_until: nil)

data/lib/puppeteer/puppeteer.rb

@@ -44,6 +44,7 @@ class Puppeteer::Puppeteer
     args: nil,
     user_data_dir: nil,
     devtools: nil,
+    debugging_port: nil,
     headless: nil,
     ignore_https_errors: nil,
     default_viewport: NoViewport.new,
@@ -63,6 +64,7 @@ class Puppeteer::Puppeteer
       args: args,
       user_data_dir: user_data_dir,
       devtools: devtools,
+      debugging_port: debugging_port,
       headless: headless,
       ignore_https_errors: ignore_https_errors,
       default_viewport: default_viewport,

data/lib/puppeteer/target.rb

@@ -119,6 +119,11 @@ class Puppeteer::Target
     end
   end
 
+  # @internal
+  def raw_type
+    @target_info.type
+  end
+
   # @return {!Puppeteer.Browser}
   def browser
     @browser_context.browser

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.37.4'
+  VERSION = '0.38.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.37.4
+  version: 0.38.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby