ferrum 0.6 → 0.9

data/lib/ferrum/page.rb

@@ -13,6 +13,8 @@ require "ferrum/browser/client"
 
 module Ferrum
   class Page
+    GOTO_WAIT = ENV.fetch("FERRUM_GOTO_WAIT", 0.1).to_f
+
     class Event < Concurrent::Event
       def iteration
         synchronize { @iteration }
@@ -29,7 +31,7 @@ module Ferrum
 
     extend Forwardable
     delegate %i[at_css at_xpath css xpath
-                current_url current_title url title body doctype
+                current_url current_title url title body doctype set_content
                 execution_id evaluate evaluate_on evaluate_async execute
                 add_script_tag add_style_tag] => :main_frame
 
@@ -42,13 +44,14 @@ module Ferrum
 
     def initialize(target_id, browser)
       @frames = {}
+      @main_frame = Frame.new(nil, self)
       @target_id, @browser = target_id, browser
       @event = Event.new.tap(&:set)
 
       host = @browser.process.host
       port = @browser.process.port
       ws_url = "ws://#{host}:#{port}/devtools/page/#{@target_id}"
-      @client = Browser::Client.new(browser, ws_url, 1000)
+      @client = Browser::Client.new(browser, ws_url, id_starts_with: 1000)
 
       @mouse, @keyboard = Mouse.new(self), Keyboard.new(self)
       @headers, @cookies = Headers.new(self), Cookies.new(self)
@@ -65,7 +68,7 @@ module Ferrum
     def goto(url = nil)
       options = { url: combine_url!(url) }
       options.merge!(referrer: referrer) if referrer
-      response = command("Page.navigate", wait: timeout, **options)
+      response = command("Page.navigate", wait: GOTO_WAIT, **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
@@ -74,6 +77,9 @@ module Ferrum
         raise StatusError, options[:url]
       end
       response["frameId"]
+    rescue TimeoutError
+      pendings = network.traffic.select(&:pending?).map { |e| e.request.url }
+      raise StatusError.new(options[:url], pendings) unless pendings.empty?
     end
 
     def close
@@ -94,7 +100,8 @@ module Ferrum
         @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { width: width, height: height, windowState: "normal" })
       end
 
-      command("Emulation.setDeviceMetricsOverride", width: width,
+      command("Emulation.setDeviceMetricsOverride", slowmoable: true,
+                                                    width: width,
                                                     height: height,
                                                     deviceScaleFactor: 1,
                                                     mobile: false,
@@ -102,7 +109,12 @@ module Ferrum
     end
 
     def refresh
-      command("Page.reload", wait: timeout)
+      command("Page.reload", wait: timeout, slowmoable: true)
+    end
+    alias_method :reload, :refresh
+
+    def stop
+      command("Page.stopLoading", slowmoable: true)
     end
 
     def back
@@ -113,12 +125,31 @@ module Ferrum
       history_navigate(delta: 1)
     end
 
-    def command(method, wait: 0, **params)
+    def wait_for_reload(sec = 1)
+      @event.reset if @event.set?
+      @event.wait(sec)
+      @event.set
+    end
+
+    def bypass_csp(value = true)
+      enabled = !!value
+      command("Page.setBypassCSP", enabled: enabled)
+      enabled
+    end
+
+    def command(method, wait: 0, slowmoable: false, **params)
       iteration = @event.reset if wait > 0
+      sleep(@browser.slowmo) if slowmoable && @browser.slowmo > 0
       result = @client.command(method, params)
+
       if wait > 0
-        @event.wait(wait)
-        @event.wait(@browser.timeout) if iteration != @event.iteration
+        @event.wait(wait) # Wait a bit after command and check if iteration has
+                          # changed which means there was some network event for
+                          # the main frame and it started to load new content.
+        if iteration != @event.iteration
+          set = @event.wait(@browser.timeout)
+          raise TimeoutError unless set
+        end
       end
       result
     end
@@ -133,6 +164,9 @@ module Ferrum
       when :request
         @client.on("Fetch.requestPaused") do |params, index, total|
           request = Network::InterceptedRequest.new(self, params)
+          exchange = network.select(request.network_id).last
+          exchange ||= network.build_exchange(request.network_id)
+          exchange.intercepted_request = request
           block.call(request, index, total)
         end
       when :auth
@@ -163,14 +197,6 @@ module Ferrum
           Thread.main.raise JavaScriptError.new(params.dig("exceptionDetails", "exception"))
         end
       end
-
-      on("Page.domContentEventFired") do |params|
-        # `frameStoppedLoading` doesn't occur if status isn't success
-        if network.status != 200
-          @event.set
-          get_document_id
-        end
-      end
     end
 
     def prepare_page
@@ -224,7 +250,9 @@ module Ferrum
 
       if entry = entries[index + delta]
         # Potential wait because of network event
-        command("Page.navigateToHistoryEntry", wait: Mouse::CLICK_WAIT, entryId: entry["id"])
+        command("Page.navigateToHistoryEntry", wait: Mouse::CLICK_WAIT,
+                                               slowmoable: true,
+                                               entryId: entry["id"])
       end
     end
 

data/lib/ferrum/page/frames.rb

@@ -11,11 +11,9 @@ module Ferrum
         @frames.values
       end
 
-      def frame_by(id: nil, execution_id: nil, name: nil)
+      def frame_by(id: nil, name: nil)
         if id
           @frames[id]
-        elsif execution_id
-          frames.find { |f| f.execution_id == execution_id }
         elsif name
           frames.find { |f| f.name == name }
         else
@@ -42,18 +40,6 @@ module Ferrum
           frame.name = name unless name.to_s.empty?
         end
 
-        on("Page.frameScheduledNavigation") do |params|
-          frame = @frames[params["frameId"]]
-          frame.state = :scheduled_navigation
-          @event.reset
-        end
-
-        on("Page.frameClearedScheduledNavigation") do |params|
-          frame = @frames[params["frameId"]]
-          frame.state = :cleared_scheduled_navigation
-          @event.set if idling?
-        end
-
         on("Page.frameStoppedLoading") do |params|
           # `DOM.performSearch` doesn't work without getting #document node first.
           # It returns node with nodeId 1 and nodeType 9 from which descend the
@@ -87,21 +73,27 @@ module Ferrum
         on("Runtime.executionContextCreated") do |params|
           context_id = params.dig("context", "id")
           frame_id = params.dig("context", "auxData", "frameId")
+
+          unless @main_frame.id
+            @main_frame.id = frame_id
+            @frames[frame_id] = @main_frame
+          end
+
           frame = @frames[frame_id] || Frame.new(frame_id, self)
-          frame.execution_id = context_id
+          frame.set_execution_id(context_id)
 
-          @main_frame ||= frame
           @frames[frame_id] ||= frame
         end
 
         on("Runtime.executionContextDestroyed") do |params|
           execution_id = params["executionContextId"]
-          frame = frame_by(execution_id: execution_id)
-          frame.execution_id = nil
+          frame = frames.find { |f| f.execution_id?(execution_id) }
+          frame.reset_execution_id
         end
 
         on("Runtime.executionContextsCleared") do
           @frames.delete_if { |_, f| !f.main? }
+          @main_frame.reset_execution_id
         end
       end
 

data/lib/ferrum/page/screenshot.rb

@@ -48,8 +48,8 @@ module Ferrum
 
       def document_size
         evaluate <<~JS
-          [document.documentElement.offsetWidth,
-           document.documentElement.offsetHeight]
+          [document.documentElement.scrollWidth,
+           document.documentElement.scrollHeight]
         JS
       end
 
@@ -136,7 +136,7 @@ module Ferrum
 
       def capture_screenshot(options, full)
         maybe_resize_fullscreen(full) do
-          command("Page.captureScreenshot", options)
+          command("Page.captureScreenshot", **options)
         end.fetch("data")
       end
 

data/lib/ferrum/target.rb

@@ -4,6 +4,10 @@ module Ferrum
   class Target
     NEW_WINDOW_WAIT = ENV.fetch("FERRUM_NEW_WINDOW_WAIT", 0.3).to_f
 
+    # You can create page yourself and assign it to target, used in cuprite
+    # where we enhance page class and build page ourselves.
+    attr_writer :page
+
     def initialize(browser, params = nil)
       @browser = browser
       @params = params
@@ -19,8 +23,7 @@ module Ferrum
 
     def page
       @page ||= begin
-        # Dirty hack because new window doesn't have events at all
-        sleep(NEW_WINDOW_WAIT) if window?
+        maybe_sleep_if_new_window
         Page.new(id, @browser)
       end
     end
@@ -52,5 +55,10 @@ module Ferrum
     def window?
       !!opener_id
     end
+
+    def maybe_sleep_if_new_window
+      # Dirty hack because new window doesn't have events at all
+      sleep(NEW_WINDOW_WAIT) if window?
+    end
   end
 end

data/lib/ferrum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.9'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,9 +182,14 @@ files:
 - lib/ferrum.rb
 - lib/ferrum/browser.rb
 - lib/ferrum/browser/client.rb
+- lib/ferrum/browser/command.rb
+- lib/ferrum/browser/options/base.rb
+- lib/ferrum/browser/options/chrome.rb
+- lib/ferrum/browser/options/firefox.rb
 - lib/ferrum/browser/process.rb
 - lib/ferrum/browser/subscriber.rb
 - lib/ferrum/browser/web_socket.rb
+- lib/ferrum/browser/xvfb.rb
 - lib/ferrum/context.rb
 - lib/ferrum/contexts.rb
 - lib/ferrum/cookies.rb
@@ -228,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby headless Chrome driver