ferrum 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c6a15f2244fefda208b8b35181892fd1287414a31485acf98aa55226210cdb3
-  data.tar.gz: 6214c762f7ea1b85558220de3501fa43791f7f2027682b33d3ee0d6c6ba654ae
+  metadata.gz: 5c762e928c31b548af3ecfc9e2ca3cd90e7315c34c313387a0bde299bc201e31
+  data.tar.gz: c46c348b3631700428723ca110bb4a40e0106cfca9b84ab0f743bf4356f348e9
 SHA512:
-  metadata.gz: 41499a98b5c623ce277ea890255bac0ae89c696c0d297b322b60e73594cad6ad1451dff474ff14fbd58cc5dead1f62d3d7962ec81677a89c9bdc5abb52296bf8
-  data.tar.gz: 280dc77020f401cdcd0bca4f87214fa83d1899413cda6f1decb761c201cece76a7dec48f4c45973e0726dcf9cb1acaa6b37512fc860f8bfeeea8cf42d1b15d62
+  metadata.gz: 854dd57cdd66bfd68535d88f087b145e4f700afdb078c3f0776e374d1fd9c919010c32282cef9b5ac4bb1c2cff21ee7307c7d5b3e3e58bc354cf4477206b8cd9
+  data.tar.gz: 207738d98111f3d67322ab926f022e184672b73ae8246acb4a01260d12db07d602f10c29b6612ca1830926091444dae51aeaf0896c5e33d8f202fe9c791dc2a7

data/README.md

@@ -1,5 +1,11 @@
 # Ferrum - fearless Ruby Chrome driver
 
+[![Build Status](https://travis-ci.org/route/ferrum.svg?branch=master)](https://travis-ci.org/route/ferrum)
+
+<img align="right" width="95" height="95"
+     alt="Ferrum logo"
+     src="https://raw.githubusercontent.com/route/ferrum/master/logo.svg?sanitize=true">
+
 As simple as Puppeteer, though even simpler.
 
 It is Ruby clean and high-level API to Chrome. Runs headless by default,
@@ -20,7 +26,7 @@ Chrome binary should be in the `PATH` or `BROWSER_PATH` or you can pass it as an
 option.
 
 ``` ruby
-gem "ferrum"
+gem install "ferrum"
 ```
 
 Navigate to a website and save a screenshot:
@@ -265,7 +271,6 @@ Saves screenshot on a disk or returns it as base64.
   * :selector `String` css selector for given element
   * :scale `Float` zoom in/out
 
-
 ```ruby
 browser.goto("https://google.com/")
 # Save on the disk in PNG
@@ -291,10 +296,9 @@ Saves PDF on a disk or returns it as base64.
   * :paper_height `Float` set paper height
   * See other [native options](https://chromedevtools.github.io/devtools-protocol/tot/Page#method-printToPDF) you can pass
 
-
 ```ruby
 browser.goto("https://google.com/")
-# Save on the disk in PNG
+# Save to disk as a PDF
 browser.pdf(path: "google.pdf", paper_width: 1.0, paper_height: 1.0) # => 14983
 ```
 
@@ -314,7 +318,9 @@ Cleans up collected data.
 Returns all headers for a given request in `goto` method.
 
 
-## Input
+### Mouse
+
+browser.mouse
 
 #### scroll_to(x, y)
 
@@ -325,9 +331,10 @@ Scroll page to a given x, y
   * y `Integer` the pixel along the vertical axis of the document that you want
   displayed in the upper left
 
-### Mouse
-
-browser.mouse
+```ruby
+browser.goto("https://www.google.com/search?q=Ruby+headless+driver+for+Capybara")
+browser.mouse.scroll_to(0, 400)
+```
 
 #### click(\*\*options) : `Mouse`
 
@@ -538,40 +545,64 @@ end
 ```
 
 
-## Modals
+## Authorization
+
+#### authorize(\*\*options)
+
+If site uses authorization you can provide credentials using this method.
 
-#### find_modal
-#### accept_confirm
-#### dismiss_confirm
-#### accept_prompt
-#### dismiss_prompt
-#### reset_modals
+* options `Hash`
+  * :type `Symbol` `:server` | `:proxy` site or proxy authorization
+  * :user `String`
+  * :password `String`
 
 
-## Auth
+## Dialog
 
-#### authorize(user, password)
+#### accept(text)
 
-If site uses authorization you can provide credentials using this method.
+Accept dialog with given text or default prompt if applicable
 
-* user `String`
-* passowrd `String`
+  * text `String`
 
-#### proxy_authorize(user, password)
+#### dismiss
 
-If you want to use proxy that requires authentication this is the method you need.
+Dismiss dialog
 
-* user `String`
-* passowrd `String`
+```ruby
+browser = Ferrum::Browser.new
+browser.on(:dialog) do |dialog|
+  if dialog.match?(/bla-bla/)
+    dialog.accept
+  else
+    dialog.dismiss
+  end
+end
+browser.goto("https://google.com")
+```
 
 
 ## Interception
 
-#### intercept_request
+#### intercept_request(\*\*options)
+
+Set request interception for given options. This method is only sets request
+interception, you should use `on` callback to catch it.
+
+* options `Hash`
+  * :pattern `String` \* by default
+  * :resource_type `Symbol` one of the [resource types](https://chromedevtools.github.io/devtools-protocol/tot/Network#type-ResourceType)
+
+#### on(event)
+
+Set callback for given event.
+
+* event `Symbol`
 
 ```ruby
 browser = Ferrum::Browser.new
-browser.intercept_request do |request|
+browser.intercept_request
+browser.on(:request_intercepted) do |request|
   if request.match?(/bla-bla/)
     request.abort
   else

data/lib/ferrum.rb

@@ -3,13 +3,9 @@
 require "ferrum/browser"
 require "ferrum/node"
 
-Thread.abort_on_exception = true
-Thread.report_on_exception = true if Thread.respond_to?(:report_on_exception=)
-
 module Ferrum
   class Error               < StandardError; end
   class NoSuchWindowError   < Error; end
-  class ModalNotFoundError  < Error; end
   class NotImplementedError < Error; end
 
   class EmptyTargetsError < Error
@@ -93,6 +89,22 @@ module Ferrum
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
     end
 
+    def started
+      @@started ||= monotonic_time
+    end
+
+    def elapsed_time(start = nil)
+      monotonic_time - (start || @@started)
+    end
+
+    def monotonic_time
+      Concurrent.monotonic_time
+    end
+
+    def timeout?(start, timeout)
+      elapsed_time(start) > timeout
+    end
+
     def with_attempts(errors:, max:, wait:)
       attempts ||= 1
       yield

data/lib/ferrum/browser.rb

@@ -9,29 +9,26 @@ require "ferrum/browser/client"
 
 module Ferrum
   class Browser
-    TIMEOUT = 5
+    DEFAULT_TIMEOUT = ENV.fetch("FERRUM_DEFAULT_TIMEOUT", 5).to_i
     WINDOW_SIZE = [1024, 768].freeze
     BASE_URL_SCHEMA = %w[http https].freeze
 
     extend Forwardable
-
-    attr_reader :window_size
-
-    delegate on: :@client
     delegate %i[window_handle window_handles switch_to_window
                 open_new_window close_window within_window page] => :targets
     delegate %i[goto back forward refresh status
                 at_css at_xpath css xpath current_url title body
                 headers cookies network_traffic clear_network_traffic response_headers
-                intercept_request on_request_intercepted continue_request abort_request
-                mouse keyboard scroll_to
+                intercept_request continue_request abort_request
+                mouse keyboard
                 screenshot pdf
                 evaluate evaluate_on evaluate_async execute
                 frame_url frame_title within_frame
-                find_modal accept_confirm dismiss_confirm accept_prompt dismiss_prompt reset_modals
-                authorize proxy_authorize] => :page
+                authorize
+                on] => :page
 
-    attr_reader :process, :logger, :js_errors, :slowmo, :base_url, :options
+    attr_reader :client, :process, :logger, :js_errors, :slowmo, :base_url,
+                :options, :window_size
     attr_writer :timeout
 
     def initialize(options = nil)
@@ -75,7 +72,7 @@ module Ferrum
     end
 
     def timeout
-      @timeout || TIMEOUT
+      @timeout || DEFAULT_TIMEOUT
     end
 
     def command(*args)
@@ -121,6 +118,7 @@ module Ferrum
     private
 
     def start
+      Ferrum.started
       @process = Process.start(@options)
       @client = Client.new(self, @process.ws_url, 0, false)
     end

data/lib/ferrum/browser/client.rb

@@ -16,6 +16,9 @@ module Ferrum
         @subscriber = Subscriber.new
 
         @thread = Thread.new do
+          Thread.current.abort_on_exception = true
+          Thread.current.report_on_exception = true if Thread.current.respond_to?(:report_on_exception=)
+
           while message = @ws.messages.pop
             if message.key?("method")
               @subscriber.async.call(message)
@@ -50,9 +53,7 @@ module Ferrum
         @ws.close
         # Give a thread some time to handle a tail of messages
         @pendings.clear
-        Timeout.timeout(1) { @thread.join }
-      rescue Timeout::Error
-        @thread.kill
+        @thread.kill unless @thread.join(1)
       end
 
       private

data/lib/ferrum/browser/process.rb

@@ -10,7 +10,8 @@ module Ferrum
   class Browser
     class Process
       KILL_TIMEOUT = 2
-      PROCESS_TIMEOUT = 2
+      WAIT_KILLED = 0.05
+      PROCESS_TIMEOUT = ENV.fetch("FERRUM_PROCESS_TIMEOUT", 2).to_i
       BROWSER_PATH = ENV["BROWSER_PATH"]
       BROWSER_HOST = "127.0.0.1"
       BROWSER_PORT = "0"
@@ -69,10 +70,10 @@ module Ferrum
               ::Process.kill("KILL", pid)
             else
               ::Process.kill("USR1", pid)
-              start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+              start = Ferrum.monotonic_time
               while ::Process.wait(pid, ::Process::WNOHANG).nil?
-                sleep 0.05
-                next unless (::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start) > KILL_TIMEOUT
+                sleep(WAIT_KILLED)
+                next unless Ferrum.timeout?(start, KILL_TIMEOUT)
                 ::Process.kill("KILL", pid)
                 ::Process.wait(pid)
                 break
@@ -142,17 +143,13 @@ module Ferrum
           read_io, write_io = IO.pipe
           process_options = { in: File::NULL }
           process_options[:pgroup] = true unless Ferrum.windows?
-          if Ferrum.mri?
-            process_options[:out] = process_options[:err] = write_io
-          end
+          process_options[:out] = process_options[:err] = write_io
 
           raise Cliver::Dependency::NotFound.new(NOT_FOUND) unless @path
 
-          redirect_stdout(write_io) do
-            @cmd = [@path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
-            @pid = ::Process.spawn(*@cmd, process_options)
-            ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
-          end
+          @cmd = [@path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
+          @pid = ::Process.spawn(*@cmd, process_options)
+          ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
 
           parse_ws_url(read_io, @process_timeout)
         ensure
@@ -173,34 +170,17 @@ module Ferrum
 
       private
 
-      def redirect_stdout(write_io)
-        if Ferrum.mri?
-          yield
-        else
-          begin
-            prev = STDOUT.dup
-            $stdout = write_io
-            STDOUT.reopen(write_io)
-            yield
-          ensure
-            STDOUT.reopen(prev)
-            $stdout = STDOUT
-            prev.close
-          end
-        end
-      end
-
       def kill
         self.class.process_killer(@pid).call
         @pid = nil
       end
 
-      def parse_ws_url(read_io, timeout = PROCESS_TIMEOUT)
+      def parse_ws_url(read_io, timeout)
         output = ""
-        start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        start = Ferrum.monotonic_time
         max_time = start + timeout
         regexp = /DevTools listening on (ws:\/\/.*)/
-        while (now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)) < max_time
+        while (now = Ferrum.monotonic_time) < max_time
           begin
             output += read_io.read_nonblock(512)
           rescue IO::WaitReadable

data/lib/ferrum/browser/web_socket.rb

@@ -24,6 +24,9 @@ module Ferrum
         @driver.on(:close,   &method(:on_close))
 
         @thread = Thread.new do
+          Thread.current.abort_on_exception = true
+          Thread.current.report_on_exception = true if Thread.current.respond_to?(:report_on_exception=)
+
           begin
             while data = @sock.readpartial(512)
               @driver.parse(data)
@@ -33,8 +36,6 @@ module Ferrum
           end
         end
 
-        @thread.priority = 1
-
         @driver.start
       end
 
@@ -46,7 +47,7 @@ module Ferrum
       def on_message(event)
         data = JSON.parse(event.data)
         @messages.push(data)
-        @logger&.puts("    ◀ #{event.data}\n")
+        @logger&.puts("    ◀ #{Ferrum.elapsed_time} #{event.data}\n")
       end
 
       def on_close(_event)
@@ -57,7 +58,7 @@ module Ferrum
       def send_message(data)
         json = data.to_json
         @driver.text(json)
-        @logger&.puts("\n\n▶ #{json}")
+        @logger&.puts("\n\n▶ #{Ferrum.elapsed_time} #{json}")
       end
 
       def write(data)

data/lib/ferrum/dialog.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Ferrum
+  class Dialog
+    attr_reader :message, :default_prompt
+
+    def initialize(page, params)
+      @page = page
+      @message = params["message"]
+      @default_prompt = params["defaultPrompt"]
+    end
+
+    def accept(prompt_text = nil)
+      options = { accept: true }
+      response = prompt_text || default_prompt
+      options.merge!(promptText: response) if response
+      @page.command("Page.handleJavaScriptDialog", **options)
+    end
+
+    def dismiss
+      @page.command("Page.handleJavaScriptDialog", accept: false)
+    end
+
+    def match?(regexp)
+      !!message.match(regexp)
+    end
+  end
+end

data/lib/ferrum/mouse.rb

@@ -2,6 +2,7 @@
 
 module Ferrum
   class Mouse
+    CLICK_WAIT = ENV.fetch("FERRUM_CLICK_WAIT", 0.1).to_f
     VALID_BUTTONS = %w[none left middle right back forward].freeze
 
     def initialize(page)
@@ -9,12 +10,17 @@ module Ferrum
       @x = @y = 0
     end
 
-    def click(x:, y:, delay: 0, timeout: 0, **options)
+    def scroll_to(top, left)
+      tap { @page.execute("window.scrollTo(#{top}, #{left})") }
+    end
+
+    def click(x:, y:, delay: 0, wait: CLICK_WAIT, **options)
       move(x: x, y: y)
       down(**options)
       sleep(delay)
-      # Potential wait because if network event is triggered then we have to wait until it's over.
-      up(timeout: timeout, **options)
+      # Potential wait because if some network event is triggered then we have
+      # to wait until it's over and frame is loaded or failed to load.
+      up(wait: wait, **options)
       self
     end
 
@@ -35,11 +41,11 @@ module Ferrum
 
     private
 
-    def mouse_event(type:, button: :left, count: 1, modifiers: nil, timeout: 0)
+    def mouse_event(type:, button: :left, count: 1, modifiers: nil, wait: 0)
       button = validate_button(button)
       options = { x: @x, y: @y, type: type, button: button, clickCount: count }
       options.merge!(modifiers: modifiers) if modifiers
-      @page.command("Input.dispatchMouseEvent", timeout: timeout, **options)
+      @page.command("Input.dispatchMouseEvent", wait: wait, **options)
     end
 
     def validate_button(button)

data/lib/ferrum/network/intercepted_request.rb

@@ -19,7 +19,7 @@ module Ferrum::Network
     end
 
     def match?(regexp)
-      !!(url =~ regexp)
+      !!url.match(regexp)
     end
 
     def abort

data/lib/ferrum/node.rb

@@ -30,7 +30,7 @@ module Ferrum
     # keys: (:alt, (:ctrl | :control), (:meta | :command), :shift)
     # offset: { :x, :y }
     def click(mode: :left, keys: [], offset: {})
-      x, y = page.find_position(self, offset[:x], offset[:y])
+      x, y = find_position(offset[:x], offset[:y])
       modifiers = page.keyboard.modifiers(keys)
 
       case mode
@@ -43,7 +43,7 @@ module Ferrum
         page.mouse.down(modifiers: modifiers, count: 2)
         page.mouse.up(modifiers: modifiers, count: 2)
       when :left
-        page.mouse.click(x: x, y: y, modifiers: modifiers, timeout: 0.05)
+        page.mouse.click(x: x, y: y, modifiers: modifiers)
       end
 
       self
@@ -53,10 +53,6 @@ module Ferrum
       raise NotImplementedError
     end
 
-    def trigger(event)
-      raise NotImplementedError
-    end
-
     def select_file(value)
       page.command("DOM.setFileInputFiles", nodeId: node_id, files: Array(value))
     end
@@ -81,6 +77,11 @@ module Ferrum
       evaluate("this.textContent")
     end
 
+    # FIXME: clear API for text and inner_text
+    def inner_text
+      evaluate("this.innerText")
+    end
+
     def value
       evaluate("this.value")
     end
@@ -108,5 +109,36 @@ module Ferrum
     def inspect
       %(#<#{self.class} @target_id=#{@target_id.inspect} @node_id=#{@node_id} @description=#{@description.inspect}>)
     end
+
+    def find_position(offset_x = nil, offset_y = nil)
+      quads = get_content_quads
+      offset_x, offset_y = offset_x.to_i, offset_y.to_i
+
+      if offset_x > 0 || offset_y > 0
+        point = quads.first
+        [point[:x] + offset_x, point[:y] + offset_y]
+      else
+        x, y = quads.inject([0, 0]) do |memo, point|
+          [memo[0] + point[:x],
+           memo[1] + point[:y]]
+        end
+        [x / 4, y / 4]
+      end
+    end
+
+    private
+
+    def get_content_quads
+      result = page.command("DOM.getContentQuads", nodeId: node_id)
+      raise "Node is either not visible or not an HTMLElement" if result["quads"].size == 0
+
+      # FIXME: Case when a few quads returned
+      result["quads"].map do |quad|
+        [{x: quad[0], y: quad[1]},
+         {x: quad[2], y: quad[3]},
+         {x: quad[4], y: quad[5]},
+         {x: quad[6], y: quad[7]}]
+      end.first
+    end
   end
 end

data/lib/ferrum/page.rb

@@ -4,8 +4,8 @@ require "ferrum/mouse"
 require "ferrum/keyboard"
 require "ferrum/headers"
 require "ferrum/cookies"
+require "ferrum/dialog"
 require "ferrum/page/dom"
-require "ferrum/page/input"
 require "ferrum/page/runtime"
 require "ferrum/page/frame"
 require "ferrum/page/net"
@@ -35,9 +35,23 @@ require "ferrum/network/intercepted_request"
 # details (DOM.describeNode).
 module Ferrum
   class Page
-    NEW_WINDOW_BUG_SLEEP = 0.3
+    NEW_WINDOW_WAIT = ENV.fetch("FERRUM_NEW_WINDOW_WAIT", 0.3).to_f
 
-    include Input, DOM, Runtime, Frame, Net, Screenshot
+    class Event < Concurrent::Event
+      def iteration
+        synchronize { @iteration }
+      end
+
+      def reset
+        synchronize do
+          @iteration += 1
+          @set = false if @set
+          @iteration
+        end
+      end
+    end
+
+    include DOM, Runtime, Frame, Net, Screenshot
 
     attr_accessor :referrer
     attr_reader :target_id, :status,
@@ -48,16 +62,14 @@ module Ferrum
     def initialize(target_id, browser, new_window = false)
       @target_id, @browser = target_id, browser
       @network_traffic = []
-      @event = Concurrent::Event.new.tap(&:set)
+      @event = Event.new.tap(&:set)
 
       @frames = {}
       @waiting_frames ||= Set.new
       @frame_stack = []
-      @accept_modal = []
-      @modal_messages = []
 
       # Dirty hack because new window doesn't have events at all
-      sleep(NEW_WINDOW_BUG_SLEEP) if new_window
+      sleep(NEW_WINDOW_WAIT) if new_window
 
       @session_id = @browser.command("Target.attachToTarget", targetId: @target_id)["sessionId"]
 
@@ -80,7 +92,7 @@ module Ferrum
     def goto(url = nil)
       options = { url: combine_url!(url) }
       options.merge!(referrer: referrer) if referrer
-      response = command("Page.navigate", timeout: timeout, **options)
+      response = command("Page.navigate", wait: timeout, **options)
       # https://cs.chromium.org/chromium/src/net/base/net_error_list.h
       if %w[net::ERR_NAME_NOT_RESOLVED
             net::ERR_NAME_RESOLUTION_FAILED
@@ -116,7 +128,7 @@ module Ferrum
     end
 
     def refresh
-      command("Page.reload", timeout: timeout)
+      command("Page.reload", wait: timeout)
     end
 
     def network_traffic(type = nil)
@@ -142,58 +154,31 @@ module Ferrum
       history_navigate(delta: 1)
     end
 
-    def accept_confirm
-      @accept_modal << true
-    end
-
-    def dismiss_confirm
-      @accept_modal << false
-    end
-
-    def accept_prompt(modal_response)
-      @accept_modal << true
-      @modal_response = modal_response
-    end
-
-    def dismiss_prompt
-      @accept_modal << false
-    end
-
-    def find_modal(options)
-      start_time    = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      timeout_sec   = options.fetch(:wait) { session_wait_time }
-      expect_text   = options[:text]
-      expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
-      not_found_msg = "Unable to find modal dialog"
-      not_found_msg += " with #{expect_text}" if expect_text
-
-      begin
-        modal_text = @modal_messages.shift
-        raise ModalNotFoundError if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
-      rescue ModalNotFoundError => e
-        raise e, not_found_msg if (::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start_time) >= timeout_sec
-        sleep(0.05)
-        retry
+    def command(method, wait: 0, **params)
+      iteration = @event.reset if wait > 0
+      result = @client.command(method, params)
+      if wait > 0
+        @event.wait(wait)
+        @event.wait(@browser.timeout) if iteration != @event.iteration
       end
-
-      modal_text
-    end
-
-    def reset_modals
-      @accept_modal = []
-      @modal_response = nil
-      @modal_messages = []
+      result
     end
 
-    def command(method, timeout: 0, **params)
-      result = @client.command(method, params)
-
-      if timeout > 0
-        @event.reset
-        @event.wait(timeout)
+    def on(name, &block)
+      case name
+      when :dialog
+        @client.on("Page.javascriptDialogOpening") do |params, index, total|
+          dialog = Dialog.new(self, params)
+          block.call(dialog, index, total)
+        end
+      when :request_intercepted
+        @client.on("Network.requestIntercepted") do |params, index, total|
+          request = Network::InterceptedRequest.new(self, params)
+          block.call(request, index, total)
+        end
+      else
+        @client.on(name, &block)
       end
-
-      result
     end
 
     private
@@ -209,28 +194,11 @@ module Ferrum
 
       if @browser.js_errors
         @client.on("Runtime.exceptionThrown") do |params|
+          # FIXME https://jvns.ca/blog/2015/11/27/why-rubys-timeout-is-dangerous-and-thread-dot-raise-is-terrifying/
           Thread.main.raise JavaScriptError.new(params.dig("exceptionDetails", "exception"))
         end
       end
 
-      @client.on("Page.javascriptDialogOpening") do |params|
-        accept_modal = @accept_modal.last
-        if accept_modal == true || accept_modal == false
-          @accept_modal.pop
-          @modal_messages << params["message"]
-          options = { accept: accept_modal }
-          response = @modal_response || params["defaultPrompt"]
-          options.merge!(promptText: response) if response
-          command("Page.handleJavaScriptDialog", **options)
-        else
-          warn "Modal window has been opened, but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` | `dismiss_confirm` | `accept_alert`), accepting by default"
-          options = { accept: true }
-          response = params["defaultPrompt"]
-          options.merge!(promptText: response) if response
-          command("Page.handleJavaScriptDialog", **options)
-        end
-      end
-
       @client.on("Page.windowOpen") do
         @browser.targets.refresh
       end
@@ -352,7 +320,7 @@ module Ferrum
 
       if entry = entries[index + delta]
         # Potential wait because of network event
-        command("Page.navigateToHistoryEntry", timeout: 0.05, entryId: entry["id"])
+        command("Page.navigateToHistoryEntry", wait: Mouse::CLICK_WAIT, entryId: entry["id"])
       end
     end
 

data/lib/ferrum/page/net.rb

@@ -3,40 +3,28 @@
 module Ferrum
   class Page
     module Net
+      AUTHORIZE_TYPE = %i[server proxy]
       RESOURCE_TYPES = %w[Document Stylesheet Image Media Font Script TextTrack
                           XHR Fetch EventSource WebSocket Manifest
                           SignedExchange Ping CSPViolationReport Other]
 
-      def proxy_authorize(user, password)
-        @proxy_authorized_ids ||= []
-
-        if user && password
-          intercept_request do |request, index, total|
-            if request.auth_challenge?(:proxy)
-              response = authorized_response(@proxy_authorized_ids,
-                                             request.interception_id,
-                                             user, password)
-              @proxy_authorized_ids << request.interception_id
-              request.continue(authChallengeResponse: response)
-            elsif index + 1 < total
-              next # There are other callbacks that can handle this, skip
-            else
-              request.continue
-            end
-          end
+      def authorize(user:, password:, type: :server)
+        unless AUTHORIZE_TYPE.include?(type)
+          raise ArgumentError, ":type should be in #{AUTHORIZE_TYPE}"
         end
-      end
 
-      def authorize(user, password)
-        @authorized_ids ||= []
+        @authorized_ids ||= {}
+        @authorized_ids[type] ||= []
+
+        intercept_request
 
-        intercept_request do |request, index, total|
-          if request.auth_challenge?(:server)
-            response = authorized_response(@authorized_ids,
+        on(:request_intercepted) do |request, index, total|
+          if request.auth_challenge?(type)
+            response = authorized_response(@authorized_ids[type],
                                            request.interception_id,
                                            user, password)
 
-            @authorized_ids << request.interception_id
+            @authorized_ids[type] << request.interception_id
             request.continue(authChallengeResponse: response)
           elsif index + 1 < total
             next # There are other callbacks that can handle this, skip
@@ -46,22 +34,13 @@ module Ferrum
         end
       end
 
-      def intercept_request(pattern: "*", resource_type: nil, &block)
+      def intercept_request(pattern: "*", resource_type: nil)
         pattern = { urlPattern: pattern }
         if resource_type && RESOURCE_TYPES.include?(resource_type.to_s)
           pattern[:resourceType] = resource_type
         end
 
         command("Network.setRequestInterception", patterns: [pattern])
-
-        on_request_intercepted(&block) if block_given?
-      end
-
-      def on_request_intercepted(&block)
-        @client.on("Network.requestIntercepted") do |params, index, total|
-          request = Network::InterceptedRequest.new(self, params)
-          block.call(request, index, total)
-        end
       end
 
       def continue_request(interception_id, options = nil)

data/lib/ferrum/page/runtime.rb

@@ -3,6 +3,9 @@
 module Ferrum
   class Page
     module Runtime
+      INTERMITTENT_ATTEMPTS = ENV.fetch("FERRUM_INTERMITTENT_ATTEMPTS", 6).to_i
+      INTERMITTENT_SLEEP = ENV.fetch("FERRUM_INTERMITTENT_SLEEP", 0.1).to_f
+
       EXECUTE_OPTIONS = {
         returnByValue: true,
         functionDeclaration: %(function() { %s })
@@ -41,12 +44,11 @@ module Ferrum
         true
       end
 
-      def evaluate_on(node:, expression:, by_value: true, timeout: 0)
+      def evaluate_on(node:, expression:, by_value: true, wait: 0)
         errors = [NodeNotFoundError, NoExecutionContextError]
-        max = ENV.fetch("FERRUM_INTERMITTENT_ATTEMPTS", 6).to_i
-        wait = ENV.fetch("FERRUM_INTERMITTENT_SLEEP", 0.1).to_f
+        attempts, sleep = INTERMITTENT_ATTEMPTS, INTERMITTENT_SLEEP
 
-        Ferrum.with_attempts(errors: errors, max: max, wait: wait) do
+        Ferrum.with_attempts(errors: errors, max: attempts, wait: sleep) do
           response = command("DOM.resolveNode", nodeId: node.node_id)
           object_id = response.dig("object", "objectId")
           options = DEFAULT_OPTIONS.merge(objectId: object_id)
@@ -54,8 +56,8 @@ module Ferrum
           options.merge!(returnByValue: by_value)
 
           response = command("Runtime.callFunctionOn",
-                             timeout: timeout,
-                             **options)["result"].tap { |r| handle_error(r) }
+                             wait: wait, **options)["result"]
+                            .tap { |r| handle_error(r) }
 
           by_value ? response.dig("value") : handle_response(response)
         end
@@ -65,10 +67,9 @@ module Ferrum
 
       def call(*args, expression:, wait_time: nil, handle: true, **options)
         errors = [NodeNotFoundError, NoExecutionContextError]
-        max = ENV.fetch("FERRUM_INTERMITTENT_ATTEMPTS", 6).to_i
-        wait = ENV.fetch("FERRUM_INTERMITTENT_SLEEP", 0.1).to_f
+        attempts, sleep = INTERMITTENT_ATTEMPTS, INTERMITTENT_SLEEP
 
-        Ferrum.with_attempts(errors: errors, max: max, wait: wait) do
+        Ferrum.with_attempts(errors: errors, max: attempts, wait: sleep) do
           arguments = prepare_args(args)
           params = DEFAULT_OPTIONS.merge(options)
           expression = [wait_time, expression] if wait_time
@@ -172,12 +173,24 @@ module Ferrum
                       return false;
                     }
 
-                    try {
-                      JSON.stringify(this);
+                    const seen = [];
+                    function detectCycle(obj) {
+                      if (typeof obj === 'object') {
+                        if (seen.indexOf(obj) !== -1) {
+                          return true;
+                        }
+                        seen.push(obj);
+                        for (let key in obj) {
+                          if (obj.hasOwnProperty(key) && detectCycle(obj[key])) {
+                            return true;
+                          }
+                        }
+                      }
+
                       return false;
-                    } catch (e) {
-                      return true;
                     }
+
+                    return detectCycle(this);
                   }
                 JS
                )

data/lib/ferrum/targets.rb

@@ -11,7 +11,7 @@ module Ferrum
       @browser = browser
       @_default = targets.first["targetId"]
 
-      @browser.on("Target.detachedFromTarget") do |params|
+      @browser.client.on("Target.detachedFromTarget") do |params|
         page = remove_page(params["targetId"])
         page&.close_connection
       end

data/lib/ferrum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ferrum
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -129,61 +129,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: image_size
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: pdf-reader
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: chunky_png
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10.0'
 description: Ferrum allows you to control headless Chrome browser
 email:
 - d.vorotilin@gmail.com
@@ -200,6 +200,7 @@ files:
 - lib/ferrum/browser/subscriber.rb
 - lib/ferrum/browser/web_socket.rb
 - lib/ferrum/cookies.rb
+- lib/ferrum/dialog.rb
 - lib/ferrum/headers.rb
 - lib/ferrum/keyboard.json
 - lib/ferrum/keyboard.rb
@@ -212,7 +213,6 @@ files:
 - lib/ferrum/page.rb
 - lib/ferrum/page/dom.rb
 - lib/ferrum/page/frame.rb
-- lib/ferrum/page/input.rb
 - lib/ferrum/page/net.rb
 - lib/ferrum/page/runtime.rb
 - lib/ferrum/page/screenshot.rb

data/lib/ferrum/page/input.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-
-module Ferrum
-  class Page
-    module Input
-      def scroll_to(top, left)
-        execute("window.scrollTo(#{top}, #{left})")
-      end
-
-      def find_position(node, offset_x = nil, offset_y = nil)
-        quads = get_content_quads(node)
-        offset_x, offset_y = offset_x.to_i, offset_y.to_i
-
-        if offset_x > 0 || offset_y > 0
-          point = quads.first
-          [point[:x] + offset_x, point[:y] + offset_y]
-        else
-          x, y = quads.inject([0, 0]) do |memo, point|
-            [memo[0] + point[:x],
-             memo[1] + point[:y]]
-          end
-          [x / 4, y / 4]
-        end
-      end
-
-      private
-
-      def get_content_quads(node)
-        result = command("DOM.getContentQuads", nodeId: node.node_id)
-        raise "Node is either not visible or not an HTMLElement" if result["quads"].size == 0
-
-        # FIXME: Case when a few quads returned
-        result["quads"].map do |quad|
-          [{x: quad[0], y: quad[1]},
-           {x: quad[2], y: quad[3]},
-           {x: quad[4], y: quad[5]},
-           {x: quad[6], y: quad[7]}]
-        end.first
-      end
-    end
-  end
-end