ferrum 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 703207ec942dcaa7a09a6a2436e9a358da43a4f44e195150814ff1d00e05e3f8
-  data.tar.gz: 27e7a22921a96e1fbf4d36215170fb884e4ec72e904686cb12eae014f6dfd0a6
+  metadata.gz: 4f657c088b22a9ff5809b6ecd0d7005cd0c2252645b262e76faee1b6e3af94c8
+  data.tar.gz: d22842188425c753e0a0e113be52e0176e8a7e1a97211c44bf3016e90aa0d1d4
 SHA512:
-  metadata.gz: b241f4500a4d330b2da5209e789a20c0df95f37963a6031846f51e8950378885749a2c3217116ef37dc09a5efcc421eaf4b1301536a38b9eb0747f2e1037f904
-  data.tar.gz: 60abc95e3633224aa08923da5b78026a687d21f380b3a818b99dcc1f32950fce83a7de574276f21973360ea257aaa8560490202e735953cbd6b714466eeefee8
+  metadata.gz: a519e80c6b1450ba85c555d4c5eb547ffb62f129e7873515ba2f5bad4726548289bcc3b4db95932873620e4b645f2f9b7f12c8bd0fdbe0ddada4f0faae080720
+  data.tar.gz: 91a8f95433f9630dd0f2b36c42ea14bf28b49ee9504738c664399eeb7fc3d192bd26c14ae7de707dcaa8273ec65d7b1a8e9bcaeeff4287392a5e1b312ea03b0d

data/README.md

@@ -221,20 +221,20 @@ browser.xpath("//a[@aria-label='Issues you created']") # => [Node]
 
 #### current_url : `String`
 
-Returns current window location href.
+Returns current top window location href.
 
 ```ruby
 browser.goto("https://google.com/")
 browser.current_url # => "https://www.google.com/"
 ```
 
-#### title : `String`
+#### current_title : `String`
 
-Returns current window title
+Returns current top window title
 
 ```ruby
 browser.goto("https://google.com/")
-browser.title # => "Google"
+browser.current_title # => "Google"
 ```
 
 #### body : `String`
@@ -285,6 +285,8 @@ Saves PDF on a disk or returns it as base64.
     Base64
   * :landscape `Boolean` paper orientation. Defaults to false.
   * :scale `Float` zoom in/out
+  * :format `symbol` standard paper sizes :letter, :legal, :tabloid, :ledger, :A0, :A1, :A2, :A3, :A4, :A5, :A6
+
   * :paper_width `Float` set paper width
   * :paper_height `Float` set paper height
   * See other [native options](https://chromedevtools.github.io/devtools-protocol/tot/Page#method-printToPDF) you can pass
@@ -368,6 +370,8 @@ browser.network.intercept
 browser.on(:request) do |request|
   if request.match?(/bla-bla/)
     request.abort
+  elsif request.match?(/lorem/)
+    request.respond(body: "Lorem ipsum")
   else
     request.continue
   end
@@ -601,22 +605,43 @@ simple value.
 browser.execute(%(1 + 1)) # => true
 ```
 
+#### add_script_tag(\*\*options) : `Boolean`
+
+* options `Hash`
+  * :url `String`
+  * :path `String`
+  * :content `String`
+  * :type `String` - `text/javascript` by default
+
+```ruby
+browser.add_script_tag(url: "http://example.com/stylesheet.css") # => true
+```
+
+#### add_style_tag(\*\*options) : `Boolean`
+
+* options `Hash`
+  * :url `String`
+  * :path `String`
+  * :content `String`
+
+```ruby
+browser.add_style_tag(content: "h1 { font-size: 40px; }") # => true
+```
+
 
 ## Frames
 
-#### frame_url
-#### frame_title
-#### within_frame(frame, &block)
+#### frames
+#### main_frame
+#### frame_by
 
 Play around inside given frame
 
 ```ruby
 browser.goto("https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe")
-frame = browser.at_xpath("//iframe")
-browser.within_frame(frame) do
-  puts browser.frame_title # => HTML Demo: <iframe>
-  puts browser.frame_url # => https://interactive-examples.mdn.mozilla.net/pages/tabbed/iframe.html
-end
+frame = browser.frames[1]
+puts frame.title # => HTML Demo: <iframe>
+puts frame.url # => https://interactive-examples.mdn.mozilla.net/pages/tabbed/iframe.html
 ```
 
 

data/lib/ferrum/browser.rb

@@ -17,12 +17,13 @@ module Ferrum
     delegate %i[default_context] => :contexts
     delegate %i[targets create_target create_page page pages windows] => :default_context
     delegate %i[goto back forward refresh
-                at_css at_xpath css xpath current_url title body
+                at_css at_xpath css xpath current_url title body doctype
                 headers cookies network
                 mouse keyboard
                 screenshot pdf viewport_size
+                frames frame_by main_frame
                 evaluate evaluate_on evaluate_async execute
-                frame_url frame_title within_frame
+                add_script_tag add_style_tag
                 on] => :page
 
     attr_reader :client, :process, :contexts, :logger, :js_errors,

data/lib/ferrum/frame.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "ferrum/frame/dom"
+require "ferrum/frame/runtime"
+
+module Ferrum
+  class Frame
+    include DOM, Runtime
+
+    attr_reader :id, :page, :parent_id, :state
+    attr_writer :execution_id
+    attr_accessor :name
+
+    def initialize(id, page, parent_id = nil)
+      @id, @page, @parent_id = id, page, parent_id
+    end
+
+    # Can be one of:
+    # * started_loading
+    # * navigated
+    # * scheduled_navigation
+    # * cleared_scheduled_navigation
+    # * stopped_loading
+    def state=(value)
+      @state = value
+    end
+
+    def url
+      evaluate("document.location.href")
+    end
+
+    def title
+      evaluate("document.title")
+    end
+
+    def main?
+      @parent_id.nil?
+    end
+
+    def execution_id
+      raise NoExecutionContextError unless @execution_id
+      @execution_id
+    rescue NoExecutionContextError
+      @page.event.reset
+      @page.event.wait(@page.timeout) ? retry : raise
+    end
+
+    def inspect
+      %(#<#{self.class} @id=#{@id.inspect} @parent_id=#{@parent_id.inspect} @name=#{@name.inspect} @state=#{@state.inspect} @execution_id=#{@execution_id.inspect}>)
+    end
+  end
+end

data/lib/ferrum/{page → frame}/dom.rb

@@ -18,16 +18,20 @@
 # inspected node (DOM.pushNodesByBackendIdsToFrontend) or described in more
 # details (DOM.describeNode).
 module Ferrum
-  class Page
+  class Frame
     module DOM
       def current_url
         evaluate("window.top.location.href")
       end
 
-      def title
+      def current_title
         evaluate("window.top.document.title")
       end
 
+      def doctype
+        evaluate("new XMLSerializer().serializeToString(document.doctype)")
+      end
+
       def body
         evaluate("document.documentElement.outerHTML")
       end
@@ -57,22 +61,23 @@ module Ferrum
             } else {
               throw error;
             }
-          }), timeout, selector, within)
+          }), @page.timeout, selector, within)
       end
 
+      # FIXME css doesn't work for a frame w/o execution_id
       def css(selector, within: nil)
-        node_id = within&.node_id || @document_id
+        node_id = within&.node_id || @page.document_id
 
-        ids = command("DOM.querySelectorAll",
-                      nodeId: node_id,
-                      selector: selector)["nodeIds"]
+        ids = @page.command("DOM.querySelectorAll",
+                            nodeId: node_id,
+                            selector: selector)["nodeIds"]
         ids.map { |id| build_node(id) }.compact
       end
 
       def at_css(selector, within: nil)
-        node_id = within&.node_id || @document_id
+        node_id = within&.node_id || @page.document_id
 
-        id = command("DOM.querySelector",
+        id = @page.command("DOM.querySelector",
                      nodeId: node_id,
                      selector: selector)["nodeId"]
         build_node(id)
@@ -81,8 +86,8 @@ module Ferrum
       private
 
       def build_node(node_id)
-        description = command("DOM.describeNode", nodeId: node_id)
-        Node.new(self, target_id, node_id, description["node"])
+        description = @page.command("DOM.describeNode", nodeId: node_id)
+        Node.new(self, @page.target_id, node_id, description["node"])
       end
     end
   end

data/lib/ferrum/{page → frame}/runtime.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ferrum
-  class Page
+  class Frame
     module Runtime
       INTERMITTENT_ATTEMPTS = ENV.fetch("FERRUM_INTERMITTENT_ATTEMPTS", 6).to_i
       INTERMITTENT_SLEEP = ENV.fetch("FERRUM_INTERMITTENT_SLEEP", 0.1).to_f
@@ -31,6 +31,35 @@ module Ferrum
         )
       }.freeze
 
+      SCRIPT_SRC_TAG = <<~JS
+        const script = document.createElement("script");
+        script.src = arguments[0];
+        script.type = arguments[1];
+        script.onload = arguments[2];
+        document.head.appendChild(script);
+      JS
+      SCRIPT_TEXT_TAG = <<~JS
+        const script = document.createElement("script");
+        script.text = arguments[0];
+        script.type = arguments[1];
+        document.head.appendChild(script);
+        arguments[2]();
+      JS
+      STYLE_TAG = <<~JS
+        const style = document.createElement("style");
+        style.type = "text/css";
+        style.appendChild(document.createTextNode(arguments[0]));
+        document.head.appendChild(style);
+        arguments[1]();
+      JS
+      LINK_TAG = <<~JS
+        const link = document.createElement("link");
+        link.rel = "stylesheet";
+        link.href = arguments[0];
+        link.onload = arguments[1];
+        document.head.appendChild(link);
+      JS
+
       def evaluate(expression, *args)
         call(*args, expression: expression)
       end
@@ -49,13 +78,13 @@ module Ferrum
         attempts, sleep = INTERMITTENT_ATTEMPTS, INTERMITTENT_SLEEP
 
         Ferrum.with_attempts(errors: errors, max: attempts, wait: sleep) do
-          response = command("DOM.resolveNode", nodeId: node.node_id)
+          response = @page.command("DOM.resolveNode", nodeId: node.node_id)
           object_id = response.dig("object", "objectId")
           options = DEFAULT_OPTIONS.merge(objectId: object_id)
           options[:functionDeclaration] = options[:functionDeclaration] % expression
           options.merge!(returnByValue: by_value)
 
-          response = command("Runtime.callFunctionOn",
+          response = @page.command("Runtime.callFunctionOn",
                              wait: wait, **options)["result"]
                             .tap { |r| handle_error(r) }
 
@@ -63,6 +92,34 @@ module Ferrum
         end
       end
 
+      def add_script_tag(url: nil, path: nil, content: nil, type: "text/javascript")
+        expr, *args = if url
+                        [SCRIPT_SRC_TAG, url, type]
+                      elsif path || content
+                        if path
+                          content = File.read(path)
+                          content += "\n//# sourceURL=#{path}"
+                        end
+                        [SCRIPT_TEXT_TAG, content, type]
+                      end
+
+        evaluate_async(expr, @page.timeout, *args)
+      end
+
+      def add_style_tag(url: nil, path: nil, content: nil)
+        expr, *args = if url
+                        [LINK_TAG, url]
+                      elsif path || content
+                        if path
+                          content = File.read(path)
+                          content += "\n//# sourceURL=#{path}"
+                        end
+                        [STYLE_TAG, content]
+                      end
+
+        evaluate_async(expr, @page.timeout, *args)
+      end
+
       private
 
       def call(*args, expression:, wait_time: nil, handle: true, **options)
@@ -76,10 +133,10 @@ module Ferrum
           params[:functionDeclaration] = params[:functionDeclaration] % expression
           params = params.merge(arguments: arguments)
           unless params[:executionContextId]
-            params = params.merge(executionContextId: execution_context_id)
+            params = params.merge(executionContextId: execution_id)
           end
 
-          response = command("Runtime.callFunctionOn",
+          response = @page.command("Runtime.callFunctionOn",
                              **params)["result"].tap { |r| handle_error(r) }
 
           handle ? handle_response(response) : response
@@ -115,9 +172,9 @@ module Ferrum
               # and node destroyed so we need to retrieve it each time for given id.
               # Though we can try to subscribe to `DOM.childNodeRemoved` and
               # `DOM.childNodeInserted` in the future.
-              node_id = command("DOM.requestNode", objectId: object_id)["nodeId"]
-              description = command("DOM.describeNode", nodeId: node_id)["node"]
-              Node.new(self, target_id, node_id, description)
+              node_id = @page.command("DOM.requestNode", objectId: object_id)["nodeId"]
+              description = @page.command("DOM.describeNode", nodeId: node_id)["node"]
+              Node.new(self, @page.target_id, node_id, description)
           when "array"
             reduce_props(object_id, []) do |memo, key, value|
               next(memo) unless (Integer(key) rescue nil)
@@ -140,7 +197,7 @@ module Ferrum
       def prepare_args(args)
         args.map do |arg|
           if arg.is_a?(Node)
-            resolved = command("DOM.resolveNode", nodeId: arg.node_id)
+            resolved = @page.command("DOM.resolveNode", nodeId: arg.node_id)
             { objectId: resolved["object"]["objectId"] }
           elsif arg.is_a?(Hash) && arg["objectId"]
             { objectId: arg["objectId"] }
@@ -154,7 +211,7 @@ module Ferrum
         if cyclic?(object_id).dig("result", "value")
           return "(cyclic structure)"
         else
-          props = command("Runtime.getProperties", objectId: object_id)
+          props = @page.command("Runtime.getProperties", ownProperties: true, objectId: object_id)
           props["result"].reduce(to) do |memo, prop|
             next(memo) unless prop["enumerable"]
             yield(memo, prop["name"], prop["value"])
@@ -163,7 +220,7 @@ module Ferrum
       end
 
       def cyclic?(object_id)
-        command("Runtime.callFunctionOn",
+        @page.command("Runtime.callFunctionOn",
                 objectId: object_id,
                 returnByValue: true,
                 functionDeclaration: <<~JS

data/lib/ferrum/network.rb

@@ -2,6 +2,7 @@
 
 require "ferrum/network/exchange"
 require "ferrum/network/intercepted_request"
+require "ferrum/network/auth_request"
 
 module Ferrum
   class Network
@@ -51,7 +52,7 @@ module Ferrum
         pattern[:resourceType] = resource_type
       end
 
-      @page.command("Network.setRequestInterception", patterns: [pattern])
+      @page.command("Fetch.enable", handleAuthRequests: true, patterns: [pattern])
     end
 
     def authorize(user:, password:, type: :server)
@@ -64,18 +65,22 @@ module Ferrum
 
       intercept
 
-      @page.on(:request) do |request, index, total|
+      @page.on(:request) do |request|
+        request.continue
+      end
+
+      @page.on(:auth) do |request, index, total|
         if request.auth_challenge?(type)
           response = authorized_response(@authorized_ids[type],
-                                         request.interception_id,
+                                         request.request_id,
                                          user, password)
 
-          @authorized_ids[type] << request.interception_id
+          @authorized_ids[type] << request.request_id
           request.continue(authChallengeResponse: response)
         elsif index + 1 < total
           next # There are other callbacks that can handle this
         else
-          request.continue
+          request.abort
         end
       end
     end
@@ -90,8 +95,8 @@ module Ferrum
           exchange.build_response(params)
         end
 
-        exchange = Network::Exchange.new(params)
-        @exchange = exchange if exchange.navigation_request?(@page.frame_id)
+        exchange = Network::Exchange.new(@page, params)
+        @exchange = exchange if exchange.navigation_request?(@page.main_frame.id)
         @traffic << exchange
       end
 
@@ -118,8 +123,8 @@ module Ferrum
       end
     end
 
-    def authorized_response(ids, interception_id, username, password)
-      if ids.include?(interception_id)
+    def authorized_response(ids, request_id, username, password)
+      if ids.include?(request_id)
         { response: "CancelAuth" }
       elsif username && password
         { response: "ProvideCredentials",

data/lib/ferrum/network/auth_request.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Ferrum
+  class Network
+    class AuthRequest
+      attr_accessor :request_id, :frame_id, :resource_type
+
+      def initialize(page, params)
+        @page, @params = page, params
+        @request_id = params["requestId"]
+        @frame_id = params["frameId"]
+        @resource_type = params["resourceType"]
+        @request = params["request"]
+      end
+
+      def navigation_request?
+        @params["isNavigationRequest"]
+      end
+
+      def auth_challenge?(source)
+        @params.dig("authChallenge", "source")&.downcase&.to_s == source.to_s
+      end
+
+      def match?(regexp)
+        !!url.match(regexp)
+      end
+
+      def continue(**options)
+        options = options.merge(requestId: request_id)
+        @page.command("Fetch.continueWithAuth", **options)
+      end
+
+      def abort
+        @page.command("Fetch.failRequest", requestId: request_id, errorReason: "BlockedByClient")
+      end
+
+      def url
+        @request["url"]
+      end
+
+      def method
+        @request["method"]
+      end
+
+      def headers
+        @request["headers"]
+      end
+
+      def initial_priority
+        @request["initialPriority"]
+      end
+
+      def referrer_policy
+        @request["referrerPolicy"]
+      end
+
+      def inspect
+        %(#<#{self.class} @request_id=#{@request_id.inspect} @frame_id=#{@frame_id.inspect} @resource_type=#{@resource_type.inspect} @request=#{@request.inspect}>)
+      end
+    end
+  end
+end

data/lib/ferrum/network/exchange.rb

@@ -9,7 +9,8 @@ module Ferrum
     class Exchange
       attr_reader :request, :response, :error
 
-      def initialize(params)
+      def initialize(page, params)
+        @page = page
         @response = @error = nil
         build_request(params)
       end
@@ -19,7 +20,7 @@ module Ferrum
       end
 
       def build_response(params)
-        @response = Network::Response.new(params)
+        @response = Network::Response.new(@page, params)
       end
 
       def build_error(params)
@@ -38,6 +39,10 @@ module Ferrum
       def to_a
         [request, response, error]
       end
+
+      def inspect
+        %(#<#{self.class} @id=#{@id.inspect} @request=#{@request.inspect} @response=#{@response.inspect} @error=#{@error.inspect}>)
+      end
     end
   end
 end

data/lib/ferrum/network/intercepted_request.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require "base64"
+
 module Ferrum
   class Network
     class InterceptedRequest
-      attr_accessor :interception_id, :frame_id, :resource_type
+      attr_accessor :request_id, :frame_id, :resource_type
 
       def initialize(page, params)
         @page, @params = page, params
-        @interception_id = params["interceptionId"]
+        @request_id = params["requestId"]
         @frame_id = params["frameId"]
         @resource_type = params["resourceType"]
         @request = params["request"]
@@ -17,21 +19,32 @@ module Ferrum
         @params["isNavigationRequest"]
       end
 
-      def auth_challenge?(source)
-        @params.dig("authChallenge", "source")&.downcase&.to_s == source.to_s
-      end
-
       def match?(regexp)
         !!url.match(regexp)
       end
 
+      def respond(**options)
+        has_body = options.has_key?(:body)
+        headers = has_body ? { "content-length" => options.fetch(:body, '').length } : {}
+        headers = headers.merge(options.fetch(:responseHeaders, {}))
+
+        options = {responseCode: 200}.merge(options)
+        options = options.merge({
+          requestId: request_id,
+          responseHeaders: header_array(headers),
+        })
+        options = options.merge(body: Base64.encode64(options.fetch(:body, '')).strip) if has_body
+
+        @page.command("Fetch.fulfillRequest", **options)
+      end
+
       def continue(**options)
-        options = options.merge(interceptionId: interception_id)
-        @page.command("Network.continueInterceptedRequest", **options)
+        options = options.merge(requestId: request_id)
+        @page.command("Fetch.continueRequest", **options)
       end
 
       def abort
-        continue(errorReason: "Aborted")
+        @page.command("Fetch.failRequest", requestId: request_id, errorReason: "BlockedByClient")
       end
 
       def url
@@ -55,7 +68,15 @@ module Ferrum
       end
 
       def inspect
-        %(#<#{self.class} @interception_id=#{@interception_id.inspect} @frame_id=#{@frame_id.inspect} @resource_type=#{@resource_type.inspect} @request=#{@request.inspect}>)
+        %(#<#{self.class} @request_id=#{@request_id.inspect} @frame_id=#{@frame_id.inspect} @resource_type=#{@resource_type.inspect} @request=#{@request.inspect}>)
+      end
+
+      private
+
+      def header_array(values)
+        values.map do |key, value|
+          { name: String(key), value: String(value) }
+        end
       end
     end
   end

data/lib/ferrum/network/response.rb

@@ -5,9 +5,10 @@ module Ferrum
     class Response
       attr_reader :body_size
 
-      def initialize(params)
+      def initialize(page, params)
+        @page = page
         @params = params
-        @response = params["response"] || @params["redirectResponse"]
+        @response = params["response"] || params["redirectResponse"]
       end
 
       def id
@@ -35,7 +36,7 @@ module Ferrum
       end
 
       def content_type
-        @content_type ||= @response.dig("headers", "contentType")&.sub(/;.*\z/, "")
+        @content_type ||= headers.find { |k, _| k.downcase == "content-type" }&.last&.sub(/;.*\z/, "")
       end
 
       # See https://crbug.com/883475
@@ -46,6 +47,27 @@ module Ferrum
       def body_size=(size)
         @body_size = size - headers_size
       end
+
+      def body
+        @body ||= begin
+          body, encoded = @page
+                            .command("Network.getResponseBody", requestId: id)
+                            .values_at("body", "base64Encoded")
+          encoded ? Base64.decode64(body) : body
+        end
+      end
+
+      def main?
+        @page.network.response == self
+      end
+
+      def ==(other)
+        id == other.id
+      end
+
+      def inspect
+        %(#<#{self.class} @params=#{@params.inspect} @response=#{@response.inspect}>)
+      end
     end
   end
 end

data/lib/ferrum/node.rb

@@ -4,8 +4,9 @@ module Ferrum
   class Node
     attr_reader :page, :target_id, :node_id, :description, :tag_name
 
-    def initialize(page, target_id, node_id, description)
-      @page, @target_id = page, target_id
+    def initialize(frame, target_id, node_id, description)
+      @page = frame.page
+      @target_id = target_id
       @node_id, @description = node_id, description
       @tag_name = description["nodeName"].downcase
     end
@@ -14,6 +15,14 @@ module Ferrum
       description["nodeType"] == 1 # nodeType: 3, nodeName: "#text" e.g.
     end
 
+    def frame_id
+      description["frameId"]
+    end
+
+    def frame
+      page.frame_by(id: frame_id)
+    end
+
     def focus
       tap { page.command("DOM.focus", nodeId: node_id) }
     end

data/lib/ferrum/page.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require "ferrum/mouse"
 require "ferrum/keyboard"
 require "ferrum/headers"
 require "ferrum/cookies"
 require "ferrum/dialog"
 require "ferrum/network"
-require "ferrum/page/dom"
-require "ferrum/page/runtime"
-require "ferrum/page/frame"
+require "ferrum/page/frames"
 require "ferrum/page/screenshot"
 require "ferrum/browser/client"
 
@@ -28,21 +27,24 @@ module Ferrum
       end
     end
 
-    include DOM, Runtime, Frame, Screenshot
+    extend Forwardable
+    delegate %i[at_css at_xpath css xpath
+                current_url current_title url title body doctype
+                execution_id evaluate evaluate_on evaluate_async execute
+                add_script_tag add_style_tag] => :main_frame
+
+    include Frames, Screenshot
 
     attr_accessor :referrer
     attr_reader :target_id, :browser,
                 :headers, :cookies, :network,
-                :mouse, :keyboard
+                :mouse, :keyboard, :event, :document_id
 
     def initialize(target_id, browser)
+      @frames = {}
       @target_id, @browser = target_id, browser
       @event = Event.new.tap(&:set)
 
-      @frames = {}
-      @waiting_frames ||= Set.new
-      @frame_stack = []
-
       host = @browser.process.host
       port = @browser.process.port
       ws_url = "ws://#{host}:#{port}/devtools/page/#{@target_id}"
@@ -85,12 +87,18 @@ module Ferrum
       @window_id, @bounds = result.values_at("windowId", "bounds")
 
       if fullscreen
+        width, height = document_size
         @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { windowState: "fullscreen" })
       else
         @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { windowState: "normal" })
         @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { width: width, height: height, windowState: "normal" })
-        command("Emulation.setDeviceMetricsOverride", width: width, height: height, deviceScaleFactor: 1, mobile: false)
       end
+
+      command("Emulation.setDeviceMetricsOverride", width: width,
+                                                    height: height,
+                                                    deviceScaleFactor: 1,
+                                                    mobile: false,
+                                                    fitWindow: false)
     end
 
     def refresh
@@ -123,10 +131,15 @@ module Ferrum
           block.call(dialog, index, total)
         end
       when :request
-        @client.on("Network.requestIntercepted") do |params, index, total|
+        @client.on("Fetch.requestPaused") do |params, index, total|
           request = Network::InterceptedRequest.new(self, params)
           block.call(request, index, total)
         end
+      when :auth
+        @client.on("Fetch.authRequired") do |params, index, total|
+          request = Network::AuthRequest.new(self, params)
+          block.call(request, index, total)
+        end
       else
         @client.on(name, &block)
       end
@@ -135,19 +148,9 @@ module Ferrum
     private
 
     def subscribe
-      super
-
+      frames_subscribe
       network.subscribe
 
-      on("Network.loadingFailed") do |params|
-        id, canceled = params.values_at("requestId", "canceled")
-        # Set event as we aborted main request we are waiting for
-        if network.request&.id == id && canceled == true
-          @event.set
-          @document_id = get_document_id
-        end
-      end
-
       if @browser.logger
         on("Runtime.consoleAPICalled") do |params|
           params["args"].each { |r| @browser.logger.puts(r["value"]) }
@@ -161,24 +164,20 @@ module Ferrum
         end
       end
 
-      on("Page.navigatedWithinDocument") do
-        @event.set if @waiting_frames.empty?
-      end
-
       on("Page.domContentEventFired") do |params|
         # `frameStoppedLoading` doesn't occur if status isn't success
         if network.status != 200
           @event.set
-          @document_id = get_document_id
+          get_document_id
         end
       end
     end
 
     def prepare_page
       command("Page.enable")
+      command("Runtime.enable")
       command("DOM.enable")
       command("CSS.enable")
-      command("Runtime.enable")
       command("Log.enable")
       command("Network.enable")
 
@@ -202,7 +201,7 @@ module Ferrum
         # occurs and thus search for nodes cannot be completed. Here we check
         # the history and if the transitionType for example `link` then
         # content is already loaded and we can try to get the document.
-        @document_id = get_document_id
+        get_document_id
       end
     end
 
@@ -214,7 +213,7 @@ module Ferrum
         # We also evaluate script just in case because
         # `Page.addScriptToEvaluateOnNewDocument` doesn't work in popups.
         command("Runtime.evaluate", expression: extension,
-                                    contextId: execution_context_id,
+                                    contextId: execution_id,
                                     returnByValue: true)
       end
     end
@@ -241,7 +240,7 @@ module Ferrum
     end
 
     def get_document_id
-      command("DOM.getDocument", depth: 0).dig("root", "nodeId")
+      @document_id = command("DOM.getDocument", depth: 0).dig("root", "nodeId")
     end
   end
 end

data/lib/ferrum/page/frames.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "ferrum/frame"
+
+module Ferrum
+  class Page
+    module Frames
+      attr_reader :main_frame
+
+      def frames
+        @frames.values
+      end
+
+      def frame_by(id: nil, execution_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
+          raise ArgumentError
+        end
+      end
+
+      def frames_subscribe
+        on("Page.frameAttached") do |params|
+          parent_frame_id, frame_id = params.values_at("parentFrameId", "frameId")
+          @frames[frame_id] = Frame.new(frame_id, self, parent_frame_id)
+        end
+
+        on("Page.frameStartedLoading") do |params|
+          frame = @frames[params["frameId"]]
+          frame.state = :started_loading
+          @event.reset
+        end
+
+        on("Page.frameNavigated") do |params|
+          frame_id, name = params["frame"]&.values_at("id", "name")
+          frame = @frames[frame_id]
+          frame.state = :navigated
+          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
+          # tree and we save it in a variable because if we call that again root
+          # node will change the id and all subsequent nodes have to change id too.
+          if @main_frame.id == params["frameId"]
+            @event.set if idling?
+            get_document_id
+          end
+
+          frame = @frames[params["frameId"]]
+          frame.state = :stopped_loading
+
+          @event.set if idling?
+        end
+
+        on("Page.navigatedWithinDocument") do
+          @event.set if idling?
+        end
+
+        on("Network.requestWillBeSent") do |params|
+          if params["frameId"] == @main_frame.id
+            # Possible types:
+            # Document, Stylesheet, Image, Media, Font, Script, TextTrack, XHR,
+            # Fetch, EventSource, WebSocket, Manifest, SignedExchange, Ping,
+            # CSPViolationReport, Other
+            @event.reset if params["type"] == "Document"
+          end
+        end
+
+        on("Runtime.executionContextCreated") do |params|
+          context_id = params.dig("context", "id")
+          frame_id = params.dig("context", "auxData", "frameId")
+          frame = @frames[frame_id] || Frame.new(frame_id, self)
+          frame.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
+        end
+
+        on("Runtime.executionContextsCleared") do
+          @frames.delete_if { |_, f| !f.main? }
+        end
+      end
+
+      private
+
+      def idling?
+        @frames.all? { |_, f| f.state == :stopped_loading }
+      end
+    end
+  end
+end

data/lib/ferrum/page/screenshot.rb

@@ -3,10 +3,31 @@
 module Ferrum
   class Page
     module Screenshot
+      DEFAULT_PDF_OPTIONS = {
+        landscape: false,
+        paper_width: 8.5,
+        paper_height: 11,
+        scale: 1.0
+      }.freeze
+
+      PAPEP_FORMATS = {
+        letter:   { width:  8.50, height: 11.00 },
+        legal:    { width:  8.50, height: 14.00 },
+        tabloid:  { width: 11.00, height: 17.00 },
+        ledger:   { width: 17.00, height: 11.00 },
+        A0:       { width: 33.10, height: 46.80 },
+        A1:       { width: 23.40, height: 33.10 },
+        A2:       { width: 16.54, height: 23.40 },
+        A3:       { width: 11.70, height: 16.54 },
+        A4:       { width:  8.27, height: 11.70 },
+        A5:       { width:  5.83, height:  8.27 },
+        A6:       { width:  4.13, height:  5.83 },
+      }.freeze
+
       def screenshot(**opts)
         path, encoding = common_options(**opts)
         options = screenshot_options(path, **opts)
-        data = command("Page.captureScreenshot", **options).fetch("data")
+        data = capture_screenshot(options, opts[:full])
         return data if encoding == :base64
         save_file(path, data)
       end
@@ -46,13 +67,21 @@ module Ferrum
         [path, encoding]
       end
 
-      def pdf_options(landscape: false, paper_width: 8.5, paper_height: 11, scale: 1.0, **opts)
-        options = {}
-        options[:landscape] = landscape
-        options[:paperWidth] = paper_width.to_f
-        options[:paperHeight] = paper_height.to_f
-        options[:scale] = scale.to_f
-        options.merge(opts)
+      def pdf_options(**opts)
+        format = opts.delete(:format)
+        options = DEFAULT_PDF_OPTIONS.merge(opts)
+
+        if format
+          if opts[:paper_width] || opts[:paper_height]
+            raise ArgumentError, "Specify :format or :paper_width, :paper_height"
+          end
+
+          dimension = PAPEP_FORMATS.fetch(format)
+          options.merge!(paper_width: dimension[:width],
+                         paper_height: dimension[:height])
+        end
+
+        options.map { |k, v| [to_camel_case(k), v] }.to_h
       end
 
       def screenshot_options(path = nil, format: nil, scale: 1.0, **opts)
@@ -73,8 +102,7 @@ module Ferrum
           width, height = document_size
           options.merge!(clip: { x: 0, y: 0, width: width, height: height, scale: scale }) if width > 0 && height > 0
         elsif opts[:selector]
-          rect = evaluate("document.querySelector('#{opts[:selector]}').getBoundingClientRect()")
-          options.merge!(clip: { x: rect["x"], y: rect["y"], width: rect["width"], height: rect["height"], scale: scale })
+          options.merge!(clip: get_bounding_rect(opts[:selector]).merge(scale: scale))
         end
 
         if scale != 1.0
@@ -88,6 +116,40 @@ module Ferrum
 
         options
       end
+
+      def get_bounding_rect(selector)
+        rect = evaluate_async(%Q(
+          const rect = document
+                         .querySelector('#{selector}')
+                         .getBoundingClientRect();
+          const {x, y, width, height} = rect;
+          arguments[0]([x, y, width, height])
+        ), timeout)
+
+        { x: rect[0], y: rect[1], width: rect[2], height: rect[3] }
+      end
+
+      def to_camel_case(option)
+        return :preferCSSPageSize if option == :prefer_css_page_size
+        option.to_s.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.to_sym
+      end
+
+      def capture_screenshot(options, full)
+        maybe_resize_fullscreen(full) do
+          command("Page.captureScreenshot", options)
+        end.fetch("data")
+      end
+
+      def maybe_resize_fullscreen(full)
+        if full
+          width, height = viewport_size.dup
+          resize(fullscreen: true)
+        end
+
+        yield
+      ensure
+        resize(width: width, height: height) if full
+      end
     end
   end
 end

data/lib/ferrum/target.rb

@@ -13,6 +13,10 @@ module Ferrum
       @params = params
     end
 
+    def attached?
+      !!@page
+    end
+
     def page
       @page ||= begin
         # Dirty hack because new window doesn't have events at all

data/lib/ferrum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -189,11 +189,15 @@ files:
 - lib/ferrum/contexts.rb
 - lib/ferrum/cookies.rb
 - lib/ferrum/dialog.rb
+- lib/ferrum/frame.rb
+- lib/ferrum/frame/dom.rb
+- lib/ferrum/frame/runtime.rb
 - lib/ferrum/headers.rb
 - lib/ferrum/keyboard.json
 - lib/ferrum/keyboard.rb
 - lib/ferrum/mouse.rb
 - lib/ferrum/network.rb
+- lib/ferrum/network/auth_request.rb
 - lib/ferrum/network/error.rb
 - lib/ferrum/network/exchange.rb
 - lib/ferrum/network/intercepted_request.rb
@@ -201,9 +205,7 @@ files:
 - lib/ferrum/network/response.rb
 - lib/ferrum/node.rb
 - lib/ferrum/page.rb
-- lib/ferrum/page/dom.rb
-- lib/ferrum/page/frame.rb
-- lib/ferrum/page/runtime.rb
+- lib/ferrum/page/frames.rb
 - lib/ferrum/page/screenshot.rb
 - lib/ferrum/target.rb
 - lib/ferrum/version.rb

data/lib/ferrum/page/frame.rb

@@ -1,135 +0,0 @@
-# frozen_string_literal: true
-
-module Ferrum
-  class Page
-    module Frame
-      attr_reader :frame_id
-
-      def execution_context_id
-        context_id = current_execution_context_id
-        raise NoExecutionContextError unless context_id
-        context_id
-      rescue NoExecutionContextError
-        @event.reset
-        @event.wait(timeout) ? retry : raise
-      end
-
-      def frame_name
-        evaluate("window.name")
-      end
-
-      def frame_url
-        evaluate("window.location.href")
-      end
-
-      def frame_title
-        evaluate("document.title")
-      end
-
-      def within_frame(frame)
-        unless frame.is_a?(Node)
-          raise ArgumentError, "Node is expected, but #{frame.class} is given"
-        end
-
-        frame_id = frame.description["frameId"]
-        @frame_stack << frame_id
-        inject_extensions
-        yield
-      ensure
-        @frame_stack.pop
-      end
-
-      private
-
-      def subscribe
-        super if defined?(super)
-
-        on("Page.frameAttached") do |params|
-          @frames[params["frameId"]] = { "parent_id" => params["parentFrameId"] }
-        end
-
-        on("Page.frameStartedLoading") do |params|
-          @waiting_frames << params["frameId"]
-          @event.reset
-        end
-
-        on("Page.frameNavigated") do |params|
-          id = params["frame"]["id"]
-          if frame = @frames[id]
-            frame.merge!(params["frame"].select { |k, _| k == "name" || k == "url" })
-          end
-        end
-
-        on("Page.frameScheduledNavigation") do |params|
-          @waiting_frames << params["frameId"]
-          @event.reset
-        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
-          # tree and we save it in a variable because if we call that again root
-          # node will change the id and all subsequent nodes have to change id too.
-          if params["frameId"] == @frame_id
-            @event.set if @waiting_frames.empty?
-            @document_id = get_document_id
-          end
-
-          if @waiting_frames.include?(params["frameId"])
-            @waiting_frames.delete(params["frameId"])
-            @event.set if @waiting_frames.empty?
-          end
-        end
-
-        on("Network.requestWillBeSent") do |params|
-          if params["frameId"] == @frame_id
-            # Possible types:
-            # Document, Stylesheet, Image, Media, Font, Script, TextTrack, XHR,
-            # Fetch, EventSource, WebSocket, Manifest, SignedExchange, Ping,
-            # CSPViolationReport, Other
-            @event.reset if params["type"] == "Document"
-          end
-        end
-
-        on("Runtime.executionContextCreated") do |params|
-          context_id = params.dig("context", "id")
-          @execution_context_id ||= context_id
-
-          frame_id = params.dig("context", "auxData", "frameId")
-          @frame_id ||= frame_id # Remember the very first frame since it's the main one
-
-          if @frames[frame_id]
-            @frames[frame_id].merge!("execution_context_id" => context_id)
-          else
-            @frames[frame_id] = { "execution_context_id" => context_id }
-          end
-        end
-
-        on("Runtime.executionContextDestroyed") do |params|
-          context_id = params["executionContextId"]
-
-          if @execution_context_id == context_id
-            @execution_context_id = nil
-          end
-
-          _id, frame = @frames.find { |_, p| p["execution_context_id"] == context_id }
-          frame["execution_context_id"] = nil if frame
-        end
-
-        on("Runtime.executionContextsCleared") do
-          # If we didn't have time to set context id at the beginning we have
-          # to set lock and release it when we set something.
-          @execution_context_id = nil
-        end
-      end
-
-      def current_execution_context_id
-        if @frame_stack.empty?
-          @execution_context_id
-        else
-          @frames.dig(@frame_stack.last, "execution_context_id")
-        end
-      end
-    end
-  end
-end