puppeteer-ruby 0.37.0 → 0.37.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e46056e6227e597554a407d47c132610af952d42b1cd7c2149e2046e0d8f1bb
-  data.tar.gz: 99a5c6fd6885181e32c72086a768c60583738974a3c86a05a693af2b97b51bc3
+  metadata.gz: '000206932f5d3d4626602e984cff4015039644eea2ef89ff139b239fffb9f673'
+  data.tar.gz: 0e560f862a3317a42c1e0e2907c599bc654d05e3f17fd5a650126b73bfd6948e
 SHA512:
-  metadata.gz: d4b1032b52bb5a0ad92e57f0bac5fe5208b785679f1d7efff0ab335cb28478f6110979102d0ec4759ef2f86654b4d231e018aa9cdb3982dc1ffa2e985fa4c55f
-  data.tar.gz: 42f81fe580fcb85b5c57397962362c3c6b0ba7462fe210c65ee017b9e73c0a3d9d091c03a7b18f6e6d78f3a3c52572a5d0bb8284f1087412344a184e8624170d
+  metadata.gz: aac4be4a26f3116eee198ea65c0017359589f2ad11cc95125497e3f84ea1277d9bbb8d1071b57fb42812bb12afd4370534c48586fbb79897acafb54d03222159
+  data.tar.gz: de51d1ca30e26e13346532118df225370fad4b1967d205dad0c150574c4fa60a649973aab83e24b2140b8f98f05626eb106a9141f04b94fe5d3927b1231737d4

data/CHANGELOG.md

@@ -1,7 +1,31 @@
-### master [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.0...master)]
+### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.4...main)]
 
 - xxx
 
+### 0.37.4 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.3...0.37.4)]
+
+Bugfix:
+
+- Fix ElementHandle#screenshot to work.
+
+### 0.37.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.2...0.37.3)]
+
+Improvement:
+
+- Improve the logic of detection of Chrome/Firefox executable path on Linux.
+
+### 0.37.2 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.1...0.37.2)]
+
+Bugfix:
+
+- `timeout: 0` did set the timeout value to zero. Now it disables the timeout as expected.
+
+### 0.37.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.0...0.37.1)]
+
+Bugfix:
+
+- Fix handle_SIGINT, handle_SIGTERM, handle_SIGHUP options to work with `false` value specified.
+
 ### 0.37.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.36.0...0.37.0)]
 
 New features:

data/README.md

@@ -41,7 +41,7 @@ NOTE: `require 'puppeteer-ruby'` is not necessary in Rails.
 ```ruby
 require 'puppeteer-ruby'
 
-Puppeteer.launch(headless: false, slow_mo: 50, args: ['--guest', '--window-size=1280,800']) do |browser|
+Puppeteer.launch(headless: false, slow_mo: 50, args: ['--window-size=1280,800']) do |browser|
   page = browser.new_page
   page.viewport = Puppeteer::Viewport.new(width: 1280, height: 800)
   page.goto("https://github.com/", wait_until: 'domcontentloaded')

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
-- Puppeteer version: v10.4.0
-- puppeteer-ruby version: 0.37.0
+- Puppeteer version: v12.0.0
+- puppeteer-ruby version: 0.37.4
 
 ## Puppeteer
 
@@ -134,6 +134,7 @@
 * viewport
 * ~~waitFor~~
 * waitForFileChooser => `#wait_for_file_chooser`
+* ~~waitForFrame~~
 * waitForFunction => `#wait_for_function`
 * waitForNavigation => `#wait_for_navigation`
 * ~~waitForNetworkIdle~~
@@ -226,6 +227,7 @@
 * goto
 * hover
 * isDetached => `#detached?`
+* ~~isOOPFrame~~
 * name
 * parentFrame => `#parent_frame`
 * select
@@ -295,43 +297,44 @@
 * type => `#type_text`
 * uploadFile => `#upload_file`
 
-## ~~HTTPRequest~~
-
-* ~~abort~~
-* ~~abortErrorReason~~
-* ~~continue~~
-* ~~continueRequestOverrides~~
-* ~~enqueueInterceptAction~~
-* ~~failure~~
-* ~~finalizeInterceptions~~
-* ~~frame~~
-* ~~headers~~
-* ~~isNavigationRequest~~
-* ~~method~~
-* ~~postData~~
-* ~~redirectChain~~
-* ~~resourceType~~
-* ~~respond~~
-* ~~response~~
-* ~~responseForRequest~~
-* ~~url~~
+## HTTPRequest
+
+* abort
+* abortErrorReason => `#abort_error_reason`
+* continue
+* continueRequestOverrides => `#continue_request_overrides`
+* enqueueInterceptAction => `#enqueue_intercept_action`
+* failure
+* finalizeInterceptions => `#finalize_interceptions`
+* frame
+* headers
+* ~~initiator~~
+* isNavigationRequest => `#navigation_request?`
+* method
+* postData => `#post_data`
+* redirectChain => `#redirect_chain`
+* resourceType => `#resource_type`
+* respond
+* response
+* responseForRequest => `#response_for_request`
+* url
 
-## ~~HTTPResponse~~
+## HTTPResponse
 
-* ~~buffer~~
-* ~~frame~~
+* buffer
+* frame
 * ~~fromCache~~
 * ~~fromServiceWorker~~
-* ~~headers~~
-* ~~json~~
+* headers
+* json
 * ~~ok~~
-* ~~remoteAddress~~
-* ~~request~~
-* ~~securityDetails~~
-* ~~status~~
-* ~~statusText~~
-* ~~text~~
-* ~~url~~
+* remoteAddress => `#remote_address`
+* request
+* securityDetails => `#security_details`
+* status
+* statusText => `#status_text`
+* text
+* url
 
 ## ~~SecurityDetails~~
 
@@ -357,6 +360,7 @@
 
 * connection
 * detach
+* ~~id~~
 * send
 
 ## Coverage

data/lib/puppeteer/browser_runner.rb

@@ -94,7 +94,7 @@ class Puppeteer::BrowserRunner
         FileUtils.rm_rf(@temp_directory)
       end
     }
-    trap(:EXIT) do
+    at_exit do
       kill
     end
 

data/lib/puppeteer/element_handle.rb

@@ -323,7 +323,7 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
     end
   end
 
-  def screenshot(options = {})
+  def screenshot(type: nil, path: nil, full_page: nil, clip: nil, quality: nil, omit_background: nil, encoding: nil)
     needs_viewport_reset = false
 
     box = bounding_box
@@ -358,14 +358,16 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
     page_x = layout_metrics["layoutViewport"]["pageX"]
     page_y = layout_metrics["layoutViewport"]["pageY"]
 
-    clip = {
-      x: page_x + box.x,
-      y: page_y + box.y,
-      width: box.width,
-      height: box.height,
-    }
+    if clip.nil?
+      clip = {
+        x: page_x + box.x,
+        y: page_y + box.y,
+        width: box.width,
+        height: box.height,
+      }
+    end
 
-    @page.screenshot({ clip: clip }.merge(options))
+    @page.screenshot(type: type, path: path, full_page: full_page, clip: clip, quality: quality, omit_background: omit_background, encoding: encoding)
   ensure
     if needs_viewport_reset
       @page.viewport = viewport

data/lib/puppeteer/executable_path_finder.rb

@@ -0,0 +1,28 @@
+class Puppeteer::ExecutablePathFinder
+  # @param executable_names [Array<String>] executable file names to find.
+  def initialize(*executable_names)
+    @executable_names = executable_names
+  end
+
+  def find_executables_in_path
+    Enumerator.new do |result|
+      @executable_names.each do |name|
+        # Find the first existing path.
+        paths.each do |path|
+          candidate = File.join(path, name)
+          next unless File.exist?(candidate)
+          result << candidate
+          break
+        end
+      end
+    end
+  end
+
+  def find_first
+    find_executables_in_path.first
+  end
+
+  private def paths
+    ENV['PATH'].split(File::PATH_SEPARATOR)
+  end
+end

data/lib/puppeteer/frame.rb

@@ -28,7 +28,7 @@ class Puppeteer::Frame
   # @param rederer [String]
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
-  # @return [Puppeteer::Response]
+  # @return [Puppeteer::HTTPResponse]
   def goto(url, referer: nil, timeout: nil, wait_until: nil)
     @frame_manager.navigate_frame(self, url, referer: referer, timeout: timeout, wait_until: wait_until)
   end

data/lib/puppeteer/frame_manager.rb

@@ -82,7 +82,7 @@ class Puppeteer::FrameManager
   # @param frame [Puppeteer::Frame]
   # @param url [String]
   # @param {!{referer?: string, timeout?: number, waitUntil?: string|!Array<string>}=} options
-  # @return [Puppeteer::Response]
+  # @return [Puppeteer::HTTPResponse]
   def navigate_frame(frame, url, referer: nil, timeout: nil, wait_until: nil)
     assert_no_legacy_navigation_options(wait_until: wait_until)
 
@@ -132,7 +132,7 @@ class Puppeteer::FrameManager
 
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
-  # @return [Puppeteer::Response]
+  # @return [Puppeteer::HTTPResponse]
   def wait_for_frame_navigation(frame, timeout: nil, wait_until: nil)
     assert_no_legacy_navigation_options(wait_until: wait_until)
 

data/lib/puppeteer/{request.rb → http_request.rb}

@@ -1,4 +1,4 @@
-class Puppeteer::Request
+class Puppeteer::HTTPRequest
   include Puppeteer::DebugPrint
   include Puppeteer::IfPresent
 
@@ -16,7 +16,7 @@ class Puppeteer::Request
       @request.instance_variable_get(:@interception_id)
     end
 
-    # @param response [Puppeteer::Response]
+    # @param response [Puppeteer::HTTPResponse]
     def response=(response)
       @request.instance_variable_set(:@response, response)
     end
@@ -56,6 +56,12 @@ class Puppeteer::Request
     @post_data = event['request']['postData']
     @frame = frame
     @redirect_chain = redirect_chain
+    @continue_request_overrides = {}
+    @current_strategy = 'none'
+    @current_priority = nil
+    @intercept_actions = []
+    @initiator = event['initiator']
+
     @headers = {}
     event['request']['headers'].each do |key, value|
       @headers[key.downcase] = value
@@ -68,6 +74,76 @@ class Puppeteer::Request
   attr_reader :internal
   attr_reader :url, :resource_type, :method, :post_data, :headers, :response, :frame
 
+  private def assert_interception_allowed
+    unless @allow_interception
+      raise InterceptionNotEnabledError.new
+    end
+  end
+
+  private def assert_interception_not_handled
+    if @interception_handled
+      raise AlreadyHandledError.new
+    end
+  end
+
+  # @returns the `ContinueRequestOverrides` that will be used
+  # if the interception is allowed to continue (ie, `abort()` and
+  # `respond()` aren't called).
+  def continue_request_overrides
+    assert_interception_allowed
+    @continue_request_overrides
+  end
+
+  # @returns The `ResponseForRequest` that gets used if the
+  # interception is allowed to respond (ie, `abort()` is not called).
+  def response_for_request
+    assert_interception_allowed
+    @response_for_request
+  end
+
+  # @returns the most recent reason for aborting the request
+  def abort_error_reason
+    assert_interception_allowed
+    @abort_error_reason
+  end
+
+  # @returns An array of the current intercept resolution strategy and priority
+  # `[strategy,priority]`. Strategy is one of: `abort`, `respond`, `continue`,
+  #  `disabled`, `none`, or `already-handled`.
+  def intercept_resolution
+    if !@allow_interception
+      ['disabled']
+    elsif @interception_handled
+      ['already-handled']
+    else
+      [@current_strategy, @current_priority]
+    end
+  end
+
+  # Adds an async request handler to the processing queue.
+  # Deferred handlers are not guaranteed to execute in any particular order,
+  # but they are guarnateed to resolve before the request interception
+  # is finalized.
+  #
+  # @param pending_handler [Proc]
+  def enqueue_intercept_action(pending_handler)
+    @intercept_actions << pending_handler
+  end
+
+  # Awaits pending interception handlers and then decides how to fulfill
+  # the request interception.
+  def finalize_interceptions
+    @intercept_actions.each(&:call)
+    case @intercept_resolution
+    when :abort
+      abort_impl(**@abort_error_reason)
+    when :respond
+      respond_impl(**@response_for_request)
+    when :continue
+      continue_impl(@continue_request_overrides)
+    end
+  end
+
   def navigation_request?
     @is_navigation_request
   end
@@ -116,24 +192,43 @@ class Puppeteer::Request
   #   end
   #
   # @param error_code [String|Symbol]
-  def continue(url: nil, method: nil, post_data: nil, headers: nil)
+  def continue(url: nil, method: nil, post_data: nil, headers: nil, priority: nil)
     # Request interception is not supported for data: urls.
     return if @url.start_with?('data:')
 
-    unless @allow_interception
-      raise InterceptionNotEnabledError.new
-    end
-    if @interception_handled
-      raise AlreadyHandledError.new
-    end
-    @interception_handled = true
+    assert_interception_allowed
+    assert_interception_not_handled
 
     overrides = {
       url: url,
       method: method,
-      post_data: post_data,
+      postData: post_data,
       headers: headers_to_array(headers),
     }.compact
+
+    if priority.nil?
+      continue_impl(overrides)
+      return
+    end
+
+    @continue_request_overrides = overrides
+    if @current_priority.nil? || priority > @current_priority
+      @current_strategy = :continue
+      @current_priority = priority
+      return
+    end
+
+    if priority == @current_priority
+      if @current_strategy == :abort || @current_strategy == :respond
+        return
+      end
+      @current_strategy = :continue
+    end
+  end
+
+  private def continue_impl(overrides)
+    @interception_handled = true
+
     begin
       @client.send_message('Fetch.continueRequest',
         requestId: @interception_id,
@@ -162,16 +257,40 @@ class Puppeteer::Request
   # @param headers [Hash<String, String>]
   # @param content_type [String]
   # @param body [String]
-  def respond(status: nil, headers: nil, content_type: nil, body: nil)
+  def respond(status: nil, headers: nil, content_type: nil, body: nil, priority: nil)
     # Mocking responses for dataURL requests is not currently supported.
     return if @url.start_with?('data:')
 
-    unless @allow_interception
-      raise InterceptionNotEnabledError.new
+    assert_interception_allowed
+    assert_interception_not_handled
+
+    if priority.nil?
+      respond_impl(status: status, headers: headers, content_type: content_type, body: body)
+      return
     end
-    if @interception_handled
-      raise AlreadyHandledError.new
+
+    @response_for_request = {
+      status: status,
+      headers: headers,
+      content_type: content_type,
+      body: body,
+    }
+
+    if @current_priority.nil? || priority > @current_priority
+      @current_strategy = :respond
+      @current_priority = priority
+      return
+    end
+
+    if priority == @current_priority
+      if @current_strategy == :abort
+        return
+      end
+      @current_strategy = :respond
     end
+  end
+
+  private def respond_impl(status: nil, headers: nil, content_type: nil, body: nil)
     @interception_handled = true
 
     mock_response_headers = {}
@@ -191,6 +310,7 @@ class Puppeteer::Request
       responseHeaders: headers_to_array(mock_response_headers),
       body: if_present(body) { |mock_body| Base64.strict_encode64(mock_body) },
     }.compact
+
     begin
       @client.send_message('Fetch.fulfillRequest',
         requestId: @interception_id,
@@ -216,7 +336,7 @@ class Puppeteer::Request
   #   end
   #
   # @param error_code [String|Symbol]
-  def abort(error_code: :failed)
+  def abort(error_code: :failed, priority: nil)
     # Request interception is not supported for data: urls.
     return if @url.start_with?('data:')
 
@@ -224,12 +344,21 @@ class Puppeteer::Request
     unless error_reason
       raise ArgumentError.new("Unknown error code: #{error_code}")
     end
-    unless @allow_interception
-      raise InterceptionNotEnabledError.new
+    assert_interception_allowed
+    assert_interception_not_handled
+
+    if priority.nil?
+      abort_impl(error_reason)
     end
-    if @interception_handled
-      raise AlreadyHandledError.new
+    @abort_error_reason = error_reason
+
+    if @current_priority.nil? || priority > @current_priority
+      @current_strategy = :abort
+      @current_priority = priority
     end
+  end
+
+  private def abort_impl(error_reason)
     @interception_handled = true
 
     begin

data/lib/puppeteer/{response.rb → http_response.rb}

@@ -1,6 +1,6 @@
 require 'json'
 
-class Puppeteer::Response
+class Puppeteer::HTTPResponse
   include Puppeteer::IfPresent
 
   class Redirected < StandardError
@@ -29,7 +29,7 @@ class Puppeteer::Response
   end
 
   # @param client [Puppeteer::CDPSession]
-  # @param request [Puppeteer::Request]
+  # @param request [Puppeteer::HTTPRequest]
   # @param response_payload [Hash]
   def initialize(client, request, response_payload)
     @client = client

data/lib/puppeteer/launcher/chrome.rb

@@ -48,7 +48,7 @@ module Puppeteer::Launcher
         if @launch_options.channel
           executable_path_for_channel(@launch_options.channel.to_s)
         else
-          @launch_options.executable_path || executable_path_for_channel('chrome')
+          @launch_options.executable_path || fallback_executable_path
         end
       use_pipe = chrome_arguments.include?('--remote-debugging-pipe')
       runner = Puppeteer::BrowserRunner.new(chrome_executable, chrome_arguments, temporary_user_data_dir)
@@ -216,10 +216,14 @@ module Puppeteer::Launcher
       if channel
         executable_path_for_channel(channel.to_s)
       else
-        executable_path_for_channel('chrome')
+        fallback_executable_path
       end
     end
 
+    private def fallback_executable_path
+      executable_path_for_channel('chrome')
+    end
+
     CHROMIUM_CHANNELS = {
       windows: {
         'chrome' => "#{ENV['PROGRAMFILES']}\\Google\\Chrome\\Application\\chrome.exe",
@@ -236,7 +240,16 @@ module Puppeteer::Launcher
         'msedge' => '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
       },
       linux: {
-        'chrome' => '/opt/google/chrome/chrome',
+        'chrome' => -> {
+          Puppeteer::ExecutablePathFinder.new(
+            'google-chrome-stable',
+            'google-chrome',
+            'chrome',
+            'chromium-freeworld',
+            'chromium-browser',
+            'chromium',
+          ).find_first
+        },
         'chrome-beta' => '/opt/google/chrome-beta/chrome',
         'chrome-dev' => '/opt/google/chrome-unstable/chrome',
       },
@@ -254,6 +267,10 @@ module Puppeteer::Launcher
         end
 
       chrome_path = chrome_path_map[channel]
+      if chrome_path.is_a?(Proc)
+        chrome_path = chrome_path.call
+      end
+
       unless chrome_path
         raise ArgumentError.new("Invalid channel: '#{channel}'. Allowed channel is #{chrome_path_map.keys}")
       end

data/lib/puppeteer/launcher/firefox.rb

@@ -42,7 +42,7 @@ module Puppeteer::Launcher
         if @launch_options.channel
           executable_path_for_channel(@launch_options.channel.to_s)
         else
-          @launch_options.executable_path || executable_path_for_channel('nightly')
+          @launch_options.executable_path || fallback_executable_path
         end
       runner = Puppeteer::BrowserRunner.new(firefox_executable, firefox_arguments, temporary_user_data_dir)
       runner.start(
@@ -138,14 +138,18 @@ module Puppeteer::Launcher
       if channel
         executable_path_for_channel(channel.to_s)
       else
-        executable_path_for_channel('firefox')
+        fallback_executable_path
       end
     end
 
+    private def fallback_executable_path
+      executable_path_for_channel('firefox')
+    end
+
     FIREFOX_EXECUTABLE_PATHS = {
       windows: "#{ENV['PROGRAMFILES']}\\Firefox Nightly\\firefox.exe",
       darwin: '/Applications/Firefox Nightly.app/Contents/MacOS/firefox',
-      linux: '/usr/bin/firefox',
+      linux: -> { Puppeteer::ExecutablePathFinder.new('firefox').find_first },
     }.freeze
 
     # @param channel [String]
@@ -163,6 +167,9 @@ module Puppeteer::Launcher
         else
           FIREFOX_EXECUTABLE_PATHS[:linux]
         end
+      if firefox_path.is_a?(Proc)
+        firefox_path = firefox_path.call
+      end
 
       unless File.exist?(firefox_path)
         raise "Nightly version of Firefox is not installed on this system.\nExpected path: #{firefox_path}"

data/lib/puppeteer/launcher/launch_options.rb

@@ -35,9 +35,9 @@ module Puppeteer::Launcher
       @channel = options[:channel]
       @executable_path = options[:executable_path]
       @ignore_default_args = options[:ignore_default_args] || false
-      @handle_SIGINT = options[:handle_SIGINT] || true
-      @handle_SIGTERM = options[:handle_SIGTERM] || true
-      @handle_SIGHUP = options[:handle_SIGHUP] || true
+      @handle_SIGINT = options.fetch(:handle_SIGINT, true)
+      @handle_SIGTERM = options.fetch(:handle_SIGTERM, true)
+      @handle_SIGHUP = options.fetch(:handle_SIGHUP, true)
       @timeout = options[:timeout] || 30000
       @dumpio = options[:dumpio] || false
       @env = options[:env] || ENV

data/lib/puppeteer/lifecycle_watcher.rb

@@ -88,7 +88,7 @@ class Puppeteer::LifecycleWatcher
     check_lifecycle_complete
   end
 
-  # @param [Puppeteer::Request] request
+  # @param [Puppeteer::HTTPRequest] request
   def handle_request(request)
     return if request.frame != @frame || !request.navigation_request?
     @navigation_request = request
@@ -103,7 +103,7 @@ class Puppeteer::LifecycleWatcher
     check_lifecycle_complete
   end
 
-  # @return [Puppeteer::Response]
+  # @return [Puppeteer::HTTPResponse]
   def navigation_response
     if_present(@navigation_request) do |request|
       request.response

data/lib/puppeteer/network_manager.rb

@@ -142,9 +142,14 @@ class Puppeteer::NetworkManager
   end
 
   # @param user_agent [String]
-  def user_agent=(user_agent)
-    @client.send_message('Network.setUserAgentOverride', userAgent: user_agent)
+  # @param user_agent_metadata [Hash]
+  def set_user_agent(user_agent, user_agent_metadata = nil)
+    @client.send_message('Network.setUserAgentOverride', {
+      userAgent: user_agent,
+      userAgentMetadata: user_agent_metadata,
+    }.compact)
   end
+  alias_method :user_agent=, :set_user_agent
 
   def cache_enabled=(enabled)
     @user_cache_disabled = !enabled
@@ -246,9 +251,14 @@ class Puppeteer::NetworkManager
       end
     end
     frame = if_present(event['frameId']) { |frame_id| @frame_manager.frame(frame_id) }
-    request = Puppeteer::Request.new(@client, frame, interception_id, @user_request_interception_enabled, event, redirect_chain)
+    request = Puppeteer::HTTPRequest.new(@client, frame, interception_id, @user_request_interception_enabled, event, redirect_chain)
     @request_id_to_request[event['requestId']] = request
     emit_event(NetworkManagerEmittedEvents::Request, request)
+    begin
+      request.finalize_interceptions
+    rescue => err
+      debug_puts(err)
+    end
   end
 
   private def handle_request_served_from_cache(event)
@@ -257,13 +267,13 @@ class Puppeteer::NetworkManager
     end
   end
 
-  # @param request [Puppeteer::Request]
+  # @param request [Puppeteer::HTTPRequest]
   # @param response_payload [Hash]
   private def handle_request_redirect(request, response_payload)
-    response = Puppeteer::Response.new(@client, request, response_payload)
+    response = Puppeteer::HTTPResponse.new(@client, request, response_payload)
     request.internal.response = response
     request.internal.redirect_chain << request
-    response.internal.body_loaded_promise.reject(Puppeteer::Response::Redirected.new)
+    response.internal.body_loaded_promise.reject(Puppeteer::HTTPResponse::Redirected.new)
     @request_id_to_request.delete(request.internal.request_id)
     @attempted_authentications.delete(request.internal.interception_id)
     emit_event(NetworkManagerEmittedEvents::Response, response)
@@ -276,7 +286,7 @@ class Puppeteer::NetworkManager
     # FileUpload sends a response without a matching request.
     return unless request
 
-    response = Puppeteer::Response.new(@client, request, event['response'])
+    response = Puppeteer::HTTPResponse.new(@client, request, event['response'])
     request.internal.response = response
     emit_event(NetworkManagerEmittedEvents::Response, response)
   end

data/lib/puppeteer/page.rb

@@ -153,6 +153,12 @@ class Puppeteer::Page
       raise ArgumentError.new("Unknown event name: #{event_name}. Known events are #{PageEmittedEvents.values.to_a.join(", ")}")
     end
 
+    if event_name.to_s == 'request'
+      super('request') do |req|
+        req.enqueue_intercept_action(-> { block.call(req) })
+      end
+    end
+
     super(event_name.to_s, &block)
   end
 
@@ -461,37 +467,6 @@ class Puppeteer::Page
 
     nil
   end
-  # /**
-  #  * @param {string} name
-  #  * @param {Function} puppeteerFunction
-  #  */
-  # async exposeFunction(name, puppeteerFunction) {
-  #   if (this._pageBindings.has(name))
-  #     throw new Error(`Failed to add page binding with name ${name}: window['${name}'] already exists!`);
-  #   this._pageBindings.set(name, puppeteerFunction);
-
-  #   const expression = helper.evaluationString(addPageBinding, name);
-  #   await this._client.send('Runtime.addBinding', {name: name});
-  #   await this._client.send('Page.addScriptToEvaluateOnNewDocument', {source: expression});
-  #   await Promise.all(this.frames().map(frame => frame.evaluate(expression).catch(debugError)));
-
-  #   function addPageBinding(bindingName) {
-  #     const binding = window[bindingName];
-  #     window[bindingName] = (...args) => {
-  #       const me = window[bindingName];
-  #       let callbacks = me['callbacks'];
-  #       if (!callbacks) {
-  #         callbacks = new Map();
-  #         me['callbacks'] = callbacks;
-  #       }
-  #       const seq = (me['lastSeq'] || 0) + 1;
-  #       me['lastSeq'] = seq;
-  #       const promise = new Promise((resolve, reject) => callbacks.set(seq, {resolve, reject}));
-  #       binding(JSON.stringify({name: bindingName, seq, args}));
-  #       return promise;
-  #     };
-  #   }
-  # }
 
   # @param username [String?]
   # @param password [String?]
@@ -505,9 +480,11 @@ class Puppeteer::Page
   end
 
   # @param user_agent [String]
-  def user_agent=(user_agent)
-    @frame_manager.network_manager.user_agent = user_agent
+  # @param user_agent_metadata [Hash]
+  def set_user_agent(user_agent, user_agent_metadata = nil)
+    @frame_manager.network_manager.set_user_agent(user_agent, user_agent_metadata)
   end
+  alias_method :user_agent=, :set_user_agent
 
   def metrics
     response = @client.send_message('Performance.getMetrics')
@@ -667,7 +644,7 @@ class Puppeteer::Page
 
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
-  # @return [Puppeteer::Response]
+  # @return [Puppeteer::HTTPResponse]
   def reload(timeout: nil, wait_until: nil)
     wait_for_navigation(timeout: timeout, wait_until: wait_until) do
       @client.send_message('Page.reload')
@@ -697,11 +674,12 @@ class Puppeteer::Page
     @wait_for_network_manager_event_listener_ids[event_name] =
       @frame_manager.network_manager.add_event_listener(event_name) do |event_target|
         if predicate.call(event_target)
-          promise.fulfill(nil)
+          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
@@ -751,7 +729,7 @@ class Puppeteer::Page
   #  wait_for_request(predicate: -> (req){ req.url.start_with?('https://example.com/search') })
   #
   # @param url [String]
-  # @param predicate [Proc(Puppeteer::Request -> Boolean)]
+  # @param predicate [Proc(Puppeteer::HTTPRequest -> Boolean)]
   define_async_method :async_wait_for_request
 
   def wait_for_response(url: nil, predicate: nil, timeout: nil)
@@ -777,7 +755,7 @@ class Puppeteer::Page
   # @!method async_wait_for_response(url: nil, predicate: nil, timeout: nil)
   #
   # @param url [String]
-  # @param predicate [Proc(Puppeteer::Request -> Boolean)]
+  # @param predicate [Proc(Puppeteer::HTTPRequest -> Boolean)]
   define_async_method :async_wait_for_response
 
   # @param timeout [number|nil]

data/lib/puppeteer/version.rb

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

data/lib/puppeteer/wait_task.rb

@@ -37,7 +37,7 @@ class Puppeteer::WaitTask
 
     # Since page navigation requires us to re-install the pageScript, we should track
     # timeout on our end.
-    if timeout
+    if timeout && timeout > 0
       timeout_error = TimeoutError.new(title: title, timeout: timeout)
       Concurrent::Promises.schedule(timeout / 1000.0) { terminate(timeout_error) unless @timeout_cleared }
     end

data/lib/puppeteer.rb

@@ -33,10 +33,13 @@ require 'puppeteer/dialog'
 require 'puppeteer/dom_world'
 require 'puppeteer/emulation_manager'
 require 'puppeteer/exception_details'
+require 'puppeteer/executable_path_finder'
 require 'puppeteer/execution_context'
 require 'puppeteer/file_chooser'
 require 'puppeteer/frame'
 require 'puppeteer/frame_manager'
+require 'puppeteer/http_request'
+require 'puppeteer/http_response'
 require 'puppeteer/js_coverage'
 require 'puppeteer/js_handle'
 require 'puppeteer/keyboard'
@@ -50,8 +53,6 @@ require 'puppeteer/protocol_stream_reader'
 require 'puppeteer/puppeteer'
 require 'puppeteer/query_handler_manager'
 require 'puppeteer/remote_object'
-require 'puppeteer/request'
-require 'puppeteer/response'
 require 'puppeteer/target'
 require 'puppeteer/tracing'
 require 'puppeteer/timeout_helper'

data/puppeteer-ruby.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rollbar'
   spec.add_development_dependency 'rspec', '~> 3.10.0 '
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 1.21.0'
+  spec.add_development_dependency 'rubocop', '~> 1.23.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'webrick'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.4
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -282,11 +282,14 @@ files:
 - lib/puppeteer/event_callbackable.rb
 - lib/puppeteer/events.rb
 - lib/puppeteer/exception_details.rb
+- lib/puppeteer/executable_path_finder.rb
 - lib/puppeteer/execution_context.rb
 - lib/puppeteer/file_chooser.rb
 - lib/puppeteer/frame.rb
 - lib/puppeteer/frame_manager.rb
 - lib/puppeteer/geolocation.rb
+- lib/puppeteer/http_request.rb
+- lib/puppeteer/http_response.rb
 - lib/puppeteer/if_present.rb
 - lib/puppeteer/js_coverage.rb
 - lib/puppeteer/js_handle.rb
@@ -313,8 +316,6 @@ files:
 - lib/puppeteer/puppeteer.rb
 - lib/puppeteer/query_handler_manager.rb
 - lib/puppeteer/remote_object.rb
-- lib/puppeteer/request.rb
-- lib/puppeteer/response.rb
 - lib/puppeteer/target.rb
 - lib/puppeteer/timeout_helper.rb
 - lib/puppeteer/timeout_settings.rb