apparition 0.1.0 → 0.6.0

data/lib/capybara/apparition/node/drag.rb

@@ -2,26 +2,29 @@
 
 module Capybara::Apparition
   module Drag
-    def drag_to(other, delay: 0.1)
-      return html5_drag_to(other) if html5_draggable?
+    def drag_to(other, delay: 0.1, html5: nil, drop_modifiers: [])
+      drop_modifiers = Array(drop_modifiers)
 
-      pos = visible_center
-      raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['drag_to']) if pos.nil?
-
-      test = mouse_event_test(pos)
-      raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['drag', test.selector, pos]) unless test.success
-
-      begin
-        @page.mouse.move_to(pos).down
-        sleep delay
-
-        other_pos = other.visible_center
-        raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['drag_to']) if other_pos.nil?
-
-        @page.mouse.move_to(other_pos.merge(button: 'left'))
-        sleep delay
-      ensure
-        @page.mouse.up
+      driver.execute_script MOUSEDOWN_TRACKER
+      scroll_if_needed
+      m = @page.mouse
+      m.move_to(**visible_center)
+      sleep delay
+      m.down
+      html5 = !driver.evaluate_script(LEGACY_DRAG_CHECK, self) if html5.nil?
+      if html5
+        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, other, delay, drop_modifiers
+        m.up(**other.visible_center)
+      else
+        @page.keyboard.with_keys(drop_modifiers) do
+          other.scroll_if_needed
+          sleep delay
+          m.move_to(**other.visible_center)
+          sleep delay
+        ensure
+          m.up
+          sleep delay
+        end
       end
     end
 
@@ -30,43 +33,109 @@ module Capybara::Apparition
       raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['hover']) if pos.nil?
 
       other_pos = { x: pos[:x] + x, y: pos[:y] + y }
-      raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['drag', test['selector'], pos]) unless mouse_event_test?(pos)
+      raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['drag', test['selector'], pos]) unless mouse_event_test?(**pos)
 
-      @page.mouse.move_to(pos).down
+      @page.mouse.move_to(**pos).down
       sleep delay
-      @page.mouse.move_to(other_pos.merge(button: 'left'))
+      @page.mouse.move_to(**other_pos)
       sleep delay
       @page.mouse.up
     end
 
-  private
-
-    def html5_drag_to(element)
-      driver.execute_script MOUSEDOWN_TRACKER
-      scroll_if_needed
-      @page.mouse.move_to(visible_center).down
-      if driver.evaluate_script('window.capybara_mousedown_prevented')
-        element.scroll_if_needed
-        @page.mouse.move_to(element.visible_center).up
+    def drop(*args)
+      if args[0].is_a? String
+        input = evaluate_on ATTACH_FILE
+        tag_name = input['description'].split(/[.#]/, 2)[0]
+        input = Capybara::Apparition::Node.new(driver, @page, input['objectId'], tag_name: tag_name)
+        input.set(args)
+        evaluate_on DROP_FILE, objectId: input.id
       else
-        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
-        @page.mouse.up(element.visible_center)
+        items = args.each_with_object([]) do |arg, arr|
+          arg.each_with_object(arr) do |(type, data), arr_|
+            arr_ << { type: type, data: data }
+          end
+        end
+        evaluate_on DROP_STRING, value: items
       end
     end
 
-    def html5_draggable?
-      native.property('draggable')
-    end
+    DROP_STRING = <<~JS
+      function(strings){
+        var dt = new DataTransfer(),
+            opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+        for (var i=0; i < strings.length; i++){
+          if (dt.items) {
+            dt.items.add(strings[i]['data'], strings[i]['type']);
+          } else {
+            dt.setData(strings[i]['type'], strings[i]['data']);
+          }
+        }
+        var dropEvent = new DragEvent('drop', opts);
+        this.dispatchEvent(dropEvent);
+      }
+    JS
+
+    DROP_FILE = <<~JS
+      function(input){
+        var files = input.files,
+            dt = new DataTransfer(),
+            opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+        input.parentElement.removeChild(input);
+        if (dt.items){
+          for (var i=0; i<files.length; i++){
+            dt.items.add(files[i]);
+          }
+        } else {
+          Object.defineProperty(dt, "files", {
+            value: files,
+            writable: false
+          });
+        }
+        var dropEvent = new DragEvent('drop', opts);
+        this.dispatchEvent(dropEvent);
+      }
+    JS
+
+    ATTACH_FILE = <<~JS
+      function(){
+        var input = document.createElement('INPUT');
+        input.type = "file";
+        input.id = "_capybara_drop_file";
+        input.multiple = true;
+        document.body.appendChild(input);
+        return input;
+      }
+    JS
 
     MOUSEDOWN_TRACKER = <<~JS
+      window.capybara_mousedown_prevented = null;
       document.addEventListener('mousedown', ev => {
         window.capybara_mousedown_prevented = ev.defaultPrevented;
       }, { once: true, passive: true })
     JS
 
+    LEGACY_DRAG_CHECK = <<~JS
+      (function(el){
+        if ([true, null].includes(window.capybara_mousedown_prevented)){
+          return true;
+        }
+        do {
+          if (el.draggable) return false;
+        } while (el = el.parentElement );
+        return true;
+      })(arguments[0])
+    JS
+
     HTML5_DRAG_DROP_SCRIPT = <<~JS
-      var source = arguments[0];
-      var target = arguments[1];
+      let source = arguments[0];
+      const target = arguments[1];
+      const step_delay = arguments[2] * 1000;
+      const drop_modifiers = arguments[3];
+      const key_aliases = {
+        'cmd': 'meta',
+        'command': 'meta',
+        'control': 'ctrl',
+      };
 
       function rectCenter(rect){
         return new DOMPoint(
@@ -106,8 +175,63 @@ module Capybara::Apparition
         return new DOMPoint(pt.x,pt.y);
       }
 
-      var dt = new DataTransfer();
-      var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+      function dragStart() {
+        return new Promise( resolve => {
+          var dragEvent = new DragEvent('dragstart', opts);
+          source.dispatchEvent(dragEvent);
+          setTimeout(resolve, step_delay)
+        })
+      }
+
+      function dragEnter() {
+        return new Promise( resolve => {
+          target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+          let targetRect = target.getBoundingClientRect(),
+          sourceCenter = rectCenter(source.getBoundingClientRect());
+
+          drop_modifiers.map(key => key_aliases[key] || key)
+                        .forEach(key => opts[key + 'Key'] = true);
+
+          // fire 2 dragover events to simulate dragging with a direction
+          let entryPoint = pointOnRect(sourceCenter, targetRect);
+          let dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
+          let dragOverEvent = new DragEvent('dragover', dragOverOpts);
+          target.dispatchEvent(dragOverEvent);
+          setTimeout(resolve, step_delay)
+        })
+      }
+
+      function dragOnto() {
+        return new Promise( resolve => {
+          var targetCenter = rectCenter(target.getBoundingClientRect());
+          dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
+          dragOverEvent = new DragEvent('dragover', dragOverOpts);
+          target.dispatchEvent(dragOverEvent);
+          setTimeout(resolve, step_delay, { drop: dragOverEvent.defaultPrevented, opts: dragOverOpts});
+        })
+      }
+
+      function dragLeave({ drop, opts: dragOverOpts }) {
+        return new Promise( resolve => {
+          var dragLeaveOptions = { ...opts, ...dragOverOpts };
+          var dragLeaveEvent = new DragEvent('dragleave', dragLeaveOptions);
+          target.dispatchEvent(dragLeaveEvent);
+          if (drop) {
+            var dropEvent = new DragEvent('drop', dragLeaveOptions);
+            target.dispatchEvent(dropEvent);
+          }
+          var dragEndEvent = new DragEvent('dragend', dragLeaveOptions);
+          source.dispatchEvent(dragEndEvent);
+          setTimeout(resolve, step_delay);
+        })
+      }
+
+      const dt = new DataTransfer();
+      const opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+
+      while (source && !source.draggable) {
+        source = source.parentElement;
+      }
 
       if (source.tagName == 'A'){
         dt.setData('text/uri-list', source.href);
@@ -118,31 +242,7 @@ module Capybara::Apparition
         dt.setData('text', source.src);
       }
 
-      var dragEvent = new DragEvent('dragstart', opts);
-      source.dispatchEvent(dragEvent);
-      target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-      var targetRect = target.getBoundingClientRect();
-      var sourceCenter = rectCenter(source.getBoundingClientRect());
-
-      // fire 2 dragover events to simulate dragging with a direction
-      var entryPoint = pointOnRect(sourceCenter, targetRect)
-      var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
-      var dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var targetCenter = rectCenter(targetRect);
-      dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
-      dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var dragLeaveEvent = new DragEvent('dragleave', opts);
-      target.dispatchEvent(dragLeaveEvent);
-      if (dragOverEvent.defaultPrevented) {
-        var dropEvent = new DragEvent('drop', opts);
-        target.dispatchEvent(dropEvent);
-      }
-      var dragEndEvent = new DragEvent('dragend', opts);
-      source.dispatchEvent(dragEndEvent);
+      dragStart().then(dragEnter).then(dragOnto).then(dragLeave)
     JS
   end
 end

data/lib/capybara/apparition/page.rb

@@ -10,44 +10,43 @@ module Capybara::Apparition
     attr_reader :modal_messages
     attr_reader :mouse, :keyboard
     attr_reader :viewport_size
+    attr_reader :browser_context_id
     attr_accessor :perm_headers, :temp_headers, :temp_no_redirect_headers
     attr_reader :network_traffic
+    attr_reader :target_id
 
-    def self.create(browser, session, id, ignore_https_errors: false, screenshot_task_queue: nil, js_errors: false)
-      session.command 'Page.enable'
+    def self.create(browser, session, id, browser_context_id,
+                    ignore_https_errors: false, **options)
+      session.async_command 'Page.enable'
 
       # Provides a lot of info - but huge overhead
       # session.command 'Page.setLifecycleEventsEnabled', enabled: true
 
-      page = Page.new(browser, session, id, ignore_https_errors, screenshot_task_queue, js_errors)
+      page = Page.new(browser, session, id, browser_context_id, **options)
 
       session.async_commands 'Network.enable', 'Runtime.enable', 'Security.enable', 'DOM.enable'
-      # session.command 'Network.enable'
-      # session.command 'Runtime.enable'
-      # session.command 'Security.enable'
-      # session.command 'Security.setOverrideCertificateErrors', override: true if ignore_https_errors
-      session.command 'Security.setIgnoreCertificateErrors', ignore: !!ignore_https_errors
-      # session.command 'DOM.enable'
-      # session.command 'Log.enable'
+      session.async_command 'Security.setIgnoreCertificateErrors', ignore: !!ignore_https_errors
       if Capybara.save_path
-        session.command 'Page.setDownloadBehavior', behavior: 'allow', downloadPath: Capybara.save_path
+        session.async_command 'Page.setDownloadBehavior', behavior: 'allow', downloadPath: Capybara.save_path
       end
       page
     end
 
-    def initialize(browser, session, id, _ignore_https_errors, _screenshot_task_queue, js_errors)
-      @target_id = id
+    def initialize(browser, session, target_id, browser_context_id,
+                   js_errors: false, url_blacklist: [], url_whitelist: [], extensions: [])
+      @target_id = target_id
+      @browser_context_id = browser_context_id
       @browser = browser
       @session = session
       @keyboard = Keyboard.new(self)
       @mouse = Mouse.new(self, @keyboard)
       @modals = []
       @modal_messages = []
-      @frames = Capybara::Apparition::FrameManager.new(id)
+      @frames = Capybara::Apparition::FrameManager.new(@target_id)
       @response_headers = {}
       @status_code = 0
-      @url_blacklist = []
-      @url_whitelist = []
+      @url_blacklist = url_blacklist || []
+      @url_whitelist = url_whitelist || []
       @credentials = nil
       @auth_attempts = []
       @proxy_credentials = nil
@@ -67,6 +66,10 @@ module Capybara::Apparition
 
       register_js_error_handler # if js_errors
 
+      extensions.each do |name|
+        add_extension(name)
+      end
+
       setup_network_interception if browser.proxy_auth
     end
 
@@ -84,6 +87,12 @@ module Capybara::Apparition
       @perm_headers = {}
     end
 
+    def add_extension(filename)
+      command('Page.addScriptToEvaluateOnNewDocument', source: File.read(filename))
+    rescue Errno::ENOENT
+      raise ::Capybara::Apparition::BrowserError.new('name' => "Unable to load extension: #{filename}", 'args' => nil)
+    end
+
     def add_modal(modal_response)
       @last_modal_message = nil
       @modals.push(modal_response)
@@ -136,11 +145,12 @@ module Capybara::Apparition
       pixel_ratio = evaluate('window.devicePixelRatio')
       scale = (@browser.zoom_factor || 1).to_f / pixel_ratio
       if options[:format].to_s == 'pdf'
-        params = {}
-        params[:paperWidth] = @browser.paper_size[:width].to_f if @browser.paper_size
-        params[:paperHeight] = @browser.paper_size[:height].to_f if @browser.paper_size
-        params[:scale] = scale
-        command('Page.printToPDF', params)
+        params = { scale: scale }
+        if @browser.paper_size
+          params[:paperWidth] = @browser.paper_size[:width].to_f
+          params[:paperHeight] = @browser.paper_size[:height].to_f
+        end
+        command('Page.printToPDF', **params)
       else
         clip_options = if options[:selector]
           pos = evaluate("document.querySelector('#{options.delete(:selector)}').getBoundingClientRect().toJSON();")
@@ -155,7 +165,7 @@ module Capybara::Apparition
           JS
         end
         options[:clip] = { x: 0, y: 0, scale: scale }.merge(clip_options)
-        command('Page.captureScreenshot', options)
+        command('Page.captureScreenshot', **options)
       end['data']
     end
 
@@ -164,15 +174,14 @@ module Capybara::Apparition
       frame_id = node['node']['frameId']
 
       timer = Capybara::Helpers.timer(expire_in: 10)
-      while (frame = @frames.get(frame_id)).nil? || frame.loading?
+      while (frame = @frames[frame_id]).nil? || frame.loading?
         # Wait for the frame creation messages to be processed
         if timer.expired?
-          puts 'Timed out waiting from frame to be ready'
+          puts 'Timed out waiting for frame to be ready'
           raise TimeoutError.new('push_frame')
         end
         sleep 0.1
       end
-      return unless frame
 
       frame.element_id = frame_el.base.id
       @frames.push_frame(frame.id)
@@ -187,12 +196,12 @@ module Capybara::Apparition
       wait_for_loaded
       js_escaped_selector = selector.gsub('\\', '\\\\\\').gsub('"', '\"')
       query = method == :css ? CSS_FIND_JS : XPATH_FIND_JS
-      result = _raw_evaluate(query % js_escaped_selector)
-      (result || []).map { |r_o| [self, r_o['objectId']] }
+      result = _raw_evaluate(format(query, selector: js_escaped_selector))
+      (result || []).map { |r_o| [self, r_o['objectId'], tag_name: r_o['description'].split(/[.#]/, 2)[0]] }
     rescue ::Capybara::Apparition::BrowserError => e
-      raise unless e.name =~ /is not a valid (XPath expression|selector)/
+      raise unless /is not a valid (XPath expression|selector)/.match? e.name
 
-      raise Capybara::Apparition::InvalidSelector, [method, selector]
+      raise Capybara::Apparition::InvalidSelector, 'args' => [method, selector]
     end
 
     def execute(script, *args)
@@ -225,20 +234,36 @@ module Capybara::Apparition
       go_history(+1)
     end
 
-    attr_reader :response_headers
+    def response_headers
+      @response_headers[current_frame.id] || {}
+    end
 
     attr_reader :status_code
 
     def wait_for_loaded(allow_obsolete: false)
-      timer = Capybara::Helpers.timer(expire_in: 10)
-      cf = current_frame
-      until cf.usable? || (allow_obsolete && cf.obsolete?) || @js_error
-        if timer.expired?
-          puts 'Timedout waiting for page to be loaded'
-          raise TimeoutError.new('wait_for_loaded')
+      # We can't reliably detect if the page is loaded, so just ensure the context
+      # is usable
+      timer = Capybara::Helpers.timer(expire_in: 30)
+      page_function = '(function(){ return 1 == 1; })()'
+      begin
+        response = command('Runtime.evaluate',
+                           expression: page_function,
+                           contextId: current_frame.context_id,
+                           returnByValue: false,
+                           awaitPromise: true)
+        process_response(response)
+        current_frame.loaded!
+      rescue # rubocop:disable Style/RescueStandardError
+        return if allow_obsolete && current_frame.obsolete?
+
+        unless timer.expired?
+          sleep 0.05
+          retry
         end
-        sleep 0.05
+        puts 'Timedout waiting for page to be loaded' if ENV['DEBUG']
+        raise TimeoutError.new('wait_for_loaded')
       end
+
       raise JavascriptError.new(js_error) if @js_error
     end
 
@@ -259,8 +284,7 @@ module Capybara::Apparition
       @status_code = 0
       navigate_opts = { url: url, transitionType: 'reload' }
       navigate_opts[:referrer] = extra_headers['Referer'] if extra_headers['Referer']
-      response = command('Page.navigate', navigate_opts)
-
+      response = command('Page.navigate', **navigate_opts)
       raise StatusFailError, 'args' => [url, response['errorText']] if response['errorText']
 
       main_frame.loading(response['loaderId'])
@@ -276,7 +300,7 @@ module Capybara::Apparition
 
     def element_from_point(x:, y:)
       r_o = _raw_evaluate("document.elementFromPoint(#{x}, #{y})", context_id: main_frame.context_id)
-      while r_o && (r_o['description'] =~ /^iframe/)
+      while r_o&.[]('description')&.start_with?('iframe')
         frame_node = command('DOM.describeNode', objectId: r_o['objectId'])
         frame = @frames.get(frame_node.dig('node', 'frameId'))
         fo = frame_offset(frame)
@@ -291,7 +315,7 @@ module Capybara::Apparition
     end
 
     def set_viewport(width:, height:, screen: nil)
-      wait_for_loaded
+      # wait_for_loaded
       @viewport_size = { width: width, height: height }
       result = @browser.command('Browser.getWindowForTarget', targetId: @target_id)
       begin
@@ -311,7 +335,7 @@ module Capybara::Apparition
       }
       metrics[:screenWidth], metrics[:screenHeight] = *screen if screen
 
-      command('Emulation.setDeviceMetricsOverride', metrics)
+      command('Emulation.setDeviceMetricsOverride', **metrics)
     end
 
     def fullscreen
@@ -350,11 +374,9 @@ module Capybara::Apparition
     end
 
     def update_headers(async: false)
-      method = async ? :async_command : :command
-      if (ua = extra_headers.find { |k, _v| k =~ /^User-Agent$/i })
-        send(method, 'Network.setUserAgentOverride', userAgent: ua[1])
+      if (ua = extra_headers.find { |k, _v| /^User-Agent$/i.match? k })
+        send(async ? :async_command : :command, 'Network.setUserAgentOverride', userAgent: ua[1])
       end
-      send(method, 'Network.setExtraHTTPHeaders', headers: extra_headers)
       setup_network_interception
     end
 
@@ -362,7 +384,7 @@ module Capybara::Apparition
       if page
         self.url_whitelist = page.url_whitelist.dup
         self.url_blacklist = page.url_blacklist.dup
-        set_viewport(page.viewport_size) if page.viewport_size
+        set_viewport(**page.viewport_size) if page.viewport_size
       end
       self
     end
@@ -377,6 +399,14 @@ module Capybara::Apparition
 
     attr_reader :url_blacklist, :url_whitelist
 
+    def current_frame
+      @frames.current
+    end
+
+    def main_frame
+      @frames.main
+    end
+
   private
 
     def eval_wrapped_script(wrapper, script, args)
@@ -393,9 +423,9 @@ module Capybara::Apparition
     end
 
     def register_event_handlers
-      @session.on 'Page.javascriptDialogOpening' do |params|
-        type = params['type'].to_sym
-        accept = accept_modal?(type, message: params['message'], manual: params['hasBrowserHandler'])
+      @session.on 'Page.javascriptDialogOpening' do |type:, message:, has_browser_handler:, **params|
+        type = type.to_sym
+        accept = accept_modal?(type, message: message, manual: has_browser_handler)
         next if accept.nil?
 
         if type == :prompt
@@ -403,7 +433,7 @@ module Capybara::Apparition
           when false
             async_command('Page.handleJavaScriptDialog', accept: false)
           when true
-            async_command('Page.handleJavaScriptDialog', accept: true, promptText: params['defaultPrompt'])
+            async_command('Page.handleJavaScriptDialog', accept: true, promptText: params[:default_prompt])
           else
             async_command('Page.handleJavaScriptDialog', accept: true, promptText: accept)
           end
@@ -418,37 +448,38 @@ module Capybara::Apparition
         end
       end
 
-      @session.on 'Page.windowOpen' do |params|
+      @session.on 'Page.windowOpen' do |**params|
         puts "**** windowOpen was called with: #{params}" if ENV['DEBUG']
-        # TODO: find a better way to handle this
-        sleep 0.4 # wait a bit so the window has time to start loading
+        @browser.refresh_pages(opener: self)
       end
 
-      @session.on 'Page.frameAttached' do |params|
+      @session.on 'Page.frameAttached' do |**params|
         puts "**** frameAttached called with #{params}" if ENV['DEBUG']
         # @frames.get(params["frameId"]) = Frame.new(params)
       end
 
-      @session.on 'Page.frameDetached' do |params|
-        @frames.delete(params['frameId'])
-        puts "**** frameDetached called with #{params}" if ENV['DEBUG']
+      @session.on 'Page.frameDetached' do |frame_id:, **params|
+        @frames.delete(frame_id)
+        puts "**** frameDetached called with #{frame_id} : #{params}" if ENV['DEBUG']
       end
 
-      @session.on 'Page.frameNavigated' do |params|
-        puts "**** frameNavigated called with #{params}" if ENV['DEBUG']
-        frame_params = params['frame']
-        unless @frames.exists?(frame_params['id'])
-          puts "**** creating frome for #{frame_params['id']}" if ENV['DEBUG']
-          @frames.add(frame_params['id'], frame_params)
+      @session.on 'Page.frameNavigated' do |frame:|
+        puts "**** frameNavigated called with #{frame}" if ENV['DEBUG']
+        unless @frames.exists?(frame['id'])
+          puts "**** creating frame for #{frame['id']}" if ENV['DEBUG']
+          @frames.add(frame['id'], frame)
         end
+        @frames.get(frame['id'])&.loading(frame['loaderId'] || -1)
       end
 
-      @session.on 'Page.frameStartedLoading' do |params|
-        @frames.get(params['frameId'])&.loading(-1)
+      @session.on 'Page.frameStartedLoading' do |frame_id:|
+        puts "Setting loading for #{frame_id}" if ENV['DEBUG']
+        @frames.get(frame_id)&.loading(-1)
       end
 
-      @session.on 'Page.frameStoppedLoading' do |params|
-        @frames.get(params['frameId'])&.loaded!
+      @session.on 'Page.frameStoppedLoading' do |frame_id:|
+        puts "Setting loaded for #{frame_id}" if ENV['DEBUG']
+        @frames.get(frame_id)&.loaded!
       end
 
       # @session.on 'Page.lifecycleEvent' do |params|
@@ -470,16 +501,12 @@ module Capybara::Apparition
         main_frame.loaded! if @status_code != 200
       end
 
-      @session.on 'Page.navigatedWithinDocument' do |params|
-        puts "**** navigatedWithinDocument called with #{params}" if ENV['DEBUG']
-        frame_id = params['frameId']
-        # @frames.get(frame_id).state = :loaded if frame_id == main_frame.id
+      @session.on 'Page.navigatedWithinDocument' do |frame_id:, **params|
+        puts "**** navigatedWithinDocument called with #{frame_id}: #{params}" if ENV['DEBUG']
         @frames.get(frame_id).loaded! if frame_id == main_frame.id
       end
 
-      @session.on 'Runtime.executionContextCreated' do |params|
-        puts "**** executionContextCreated: #{params}" if ENV['DEBUG']
-        context = params['context']
+      @session.on 'Runtime.executionContextCreated' do |context:|
         frame_id = context.dig('auxData', 'frameId')
         if context.dig('auxData', 'isDefault') && frame_id
           if (frame = @frames.get(frame_id))
@@ -490,63 +517,78 @@ module Capybara::Apparition
         end
       end
 
-      @session.on 'Runtime.executionContextDestroyed' do |params|
-        puts "executionContextDestroyed: #{params}" if ENV['DEBUG']
-        @frames.destroy_context(params['executionContextId'])
+      @session.on 'Runtime.executionContextDestroyed' do |execution_context_id:, **params|
+        puts "executionContextDestroyed: #{execution_context_id} : #{params}" if ENV['DEBUG']
+        @frames.destroy_context(execution_context_id)
       end
 
-      @session.on 'Network.requestWillBeSent' do |params|
-        @open_resource_requests[params['requestId']] = params.dig('request', 'url')
+      @session.on 'Network.requestWillBeSent' do |request_id:, request: nil, **|
+        @open_resource_requests[request_id] = request&.dig('url')
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        @open_resource_requests.delete(params['requestId'])
+      @session.on 'Network.responseReceived' do |request_id:, **|
+        @open_resource_requests.delete(request_id)
         temp_headers.clear
         update_headers(async: true)
       end
 
-      @session.on 'Network.requestWillBeSent' do |params|
+      @session.on 'Network.requestWillBeSent' do |**params|
         @network_traffic.push(NetworkTraffic::Request.new(params))
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        req = @network_traffic.find { |request| request.request_id == params['requestId'] }
-        req.response = NetworkTraffic::Response.new(params['response']) if req
+      @session.on 'Network.responseReceived' do |request_id:, response:, **|
+        req = @network_traffic.find { |request| request.request_id == request_id }
+        req.response = NetworkTraffic::Response.new(response) if req
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        if params['type'] == 'Document'
-          @response_headers = params['response']['headers']
-          @status_code = params['response']['status']
+      @session.on 'Network.responseReceived' do |type:, frame_id: nil, response: nil, **|
+        if type == 'Document'
+          @response_headers[frame_id] = response['headers']
+          @status_code = response['status']
         end
       end
 
-      @session.on 'Network.loadingFailed' do |params|
-        req = @network_traffic.find { |request| request.request_id == params['requestId'] }
-        req&.blocked_params = params if params['blockedReason']
-        if params['type'] == 'Document'
-          puts "Loading Failed - request: #{params['requestId']} : #{params['errorText']}" if ENV['DEBUG']
+      @session.on 'Network.loadingFailed' do |type:, request_id:, blocked_reason: nil, error_text: nil, **params|
+        req = @network_traffic.find { |request| request.request_id == request_id }
+        req&.blocked_params = params if blocked_reason
+        if type == 'Document'
+          puts "Loading Failed - request: #{request_id} : #{error_text}" if ENV['DEBUG']
         end
       end
 
-      @session.on 'Network.requestIntercepted' do |params|
-        request, interception_id = *params.values_at('request', 'interceptionId')
-        if params['authChallenge']
-          if params['authChallenge']['source'] == 'Proxy'
-            handle_proxy_auth(interception_id)
+      @session.on 'Fetch.requestPaused' do |request:, request_id:, resource_type:, **|
+        process_intercepted_fetch(request_id, request, resource_type)
+      end
+
+      @session.on 'Fetch.authRequired' do |request_id:, auth_challenge: nil, **|
+        next unless auth_challenge
+
+        credentials_response = if auth_challenge['source'] == 'Proxy'
+          if @proxy_auth_attempts.include?(request_id)
+            puts 'Cancelling proxy auth' if ENV['DEBUG']
+            { response: 'CancelAuth' }
           else
-            handle_user_auth(interception_id)
+            puts 'Replying with proxy auth credentials' if ENV['DEBUG']
+            @proxy_auth_attempts.push(request_id)
+            { response: 'ProvideCredentials' }.merge(@browser.proxy_auth || {})
           end
+        elsif @auth_attempts.include?(request_id)
+          puts 'Cancelling auth' if ENV['DEBUG']
+          { response: 'CancelAuth' }
         else
-          process_intercepted_request(interception_id, request, params['isNavigationRequest'])
+          @auth_attempts.push(request_id)
+          puts 'Replying with auth credentials' if ENV['DEBUG']
+          { response: 'ProvideCredentials' }.merge(@credentials || {})
         end
+
+        async_command('Fetch.continueWithAuth', requestId: request_id, authChallengeResponse: credentials_response)
       end
 
-      @session.on 'Runtime.consoleAPICalled' do |params|
+      @session.on 'Runtime.consoleAPICalled' do |**params|
         # {"type"=>"log", "args"=>[{"type"=>"string", "value"=>"hello"}], "executionContextId"=>2, "timestamp"=>1548722854903.285, "stackTrace"=>{"callFrames"=>[{"functionName"=>"", "scriptId"=>"15", "url"=>"http://127.0.0.1:53977/", "lineNumber"=>6, "columnNumber"=>22}]}}
-        details = params.dig('stackTrace', 'callFrames')&.first
-        @browser.console.log(params['type'],
-                             params['args'].map { |arg| arg['description'] || arg['value'] }.join(' ').to_s,
+        details = params.dig(:stack_trace, 'callFrames')&.first
+        @browser.console.log(params[:type],
+                             params[:args].map { |arg| arg['description'] || arg['value'] }.join(' ').to_s,
                              source: details['url'].empty? ? nil : details['url'],
                              line_number: details['lineNumber'].zero? ? nil : details['lineNumber'],
                              columnNumber: details['columnNumber'].zero? ? nil : details['columnNumber'])
@@ -565,15 +607,16 @@ module Capybara::Apparition
     end
 
     def register_js_error_handler
-      @session.on 'Runtime.exceptionThrown' do |params|
-        @js_error ||= params.dig('exceptionDetails', 'exception', 'description') if @raise_js_errors
+      @session.on 'Runtime.exceptionThrown' do |exception_details: nil, **|
+        @js_error ||= exception_details&.dig('exception', 'description') if @raise_js_errors
 
-        details = params.dig('exceptionDetails', 'stackTrace', 'callFrames')&.first
+        details = exception_details&.dig('stackTrace', 'callFrames')&.first ||
+                  exception_details || {}
         @browser.console.log('error',
-                             params.dig('exceptionDetails', 'exception', 'description'),
-                             source: details['url'].empty? ? nil : details['url'],
-                             line_number: details['lineNumber'].zero? ? nil : details['lineNumber'],
-                             columnNumber: details['columnNumber'].zero? ? nil : details['columnNumber'])
+                             exception_details&.dig('exception', 'description'),
+                             source: details['url'].to_s.empty? ? nil : details['url'],
+                             line_number: details['lineNumber'].to_i.zero? ? nil : details['lineNumber'],
+                             columnNumber: details['columnNumber'].to_i.zero? ? nil : details['columnNumber'])
       end
     end
 
@@ -584,11 +627,13 @@ module Capybara::Apparition
 
     def setup_network_interception
       async_command 'Network.setCacheDisabled', cacheDisabled: true
-      async_command 'Network.setRequestInterception', patterns: [{ urlPattern: '*' }]
+      async_command 'Fetch.enable', handleAuthRequests: true
     end
 
-    def process_intercepted_request(interception_id, request, navigation)
+    def process_intercepted_fetch(interception_id, request, resource_type)
+      navigation = (resource_type == 'Document')
       headers, url = request.values_at('headers', 'url')
+      headers = headers.merge(extra_headers)
 
       unless @temp_headers.empty? || navigation # rubocop:disable Style/IfUnlessModifier
         headers.delete_if { |name, value| @temp_headers[name] == value }
@@ -596,39 +641,27 @@ module Capybara::Apparition
       unless @temp_no_redirect_headers.empty? || !navigation
         headers.delete_if { |name, value| @temp_no_redirect_headers[name] == value }
       end
-      if (accept = perm_headers.keys.find { |k| k =~ /accept/i })
+      if (accept = perm_headers.keys.find { |k| /accept/i.match? k })
         headers[accept] = perm_headers[accept]
       end
 
       if @url_blacklist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
-        block_request(interception_id, 'Failed')
+        async_command('Fetch.failRequest', errorReason: 'Failed', requestId: interception_id)
       elsif @url_whitelist.any?
         if @url_whitelist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
-          continue_request(interception_id, headers: headers)
+          async_command('Fetch.continueRequest',
+                        requestId: interception_id,
+                        headers: headers.map { |k, v| { name: k, value: v } })
         else
-          block_request(interception_id, 'Failed')
+          async_command('Fetch.failRequest', errorReason: 'Failed', requestId: interception_id)
         end
       else
-        continue_request(interception_id, headers: headers)
+        async_command('Fetch.continueRequest',
+                      requestId: interception_id,
+                      headers: headers.map { |k, v| { name: k, value: v } })
       end
     end
 
-    def continue_request(id, **params)
-      async_command 'Network.continueInterceptedRequest', interceptionId: id, **params
-    end
-
-    def block_request(id, reason)
-      async_command 'Network.continueInterceptedRequest', errorReason: reason, interceptionId: id
-    end
-
-    def current_frame
-      @frames.current
-    end
-
-    def main_frame
-      @frames.main
-    end
-
     def go_history(delta)
       history = command('Page.getNavigationHistory')
       entry = history['entries'][history['currentIndex'] + delta]
@@ -667,7 +700,8 @@ module Capybara::Apparition
                          executionContextId: context_id,
                          arguments: args,
                          returnByValue: false,
-                         awaitPromise: true)
+                         awaitPromise: true,
+                         userGesture: true)
       process_response(response)
     end
 
@@ -688,8 +722,8 @@ module Capybara::Apparition
     def process_response(response)
       return nil if response.nil?
 
-      exception_details = response['exceptionDetails']
-      if (exception = exception_details&.dig('exception'))
+      exception = response['exceptionDetails']&.dig('exception')
+      if exception
         case exception['className']
         when 'DOMException'
           raise ::Capybara::Apparition::BrowserError.new('name' => exception['description'], 'args' => nil)
@@ -754,7 +788,11 @@ module Capybara::Apparition
       function(){
         let apparitionId=0;
         return (function ider(obj){
-          if (obj && (typeof obj == 'object') && !(obj instanceof HTMLElement) && !obj.apparitionId){
+          if (obj &&
+              (typeof obj == 'object') &&
+              !(obj instanceof HTMLElement) &&
+              !(obj instanceof CSSStyleDeclaration) &&
+              !obj.apparitionId){
             obj.apparitionId = ++apparitionId;
             Reflect.ownKeys(obj).forEach(key => ider(obj[key]))
           }
@@ -780,12 +818,12 @@ module Capybara::Apparition
     JS
 
     CSS_FIND_JS = <<~JS
-      Array.from(document.querySelectorAll("%s"));
+      Array.from(document.querySelectorAll("%<selector>s"));
     JS
 
     XPATH_FIND_JS = <<~JS
       (function(){
-        const xpath = document.evaluate("%s", document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+        const xpath = document.evaluate("%<selector>s", document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
         let results = [];
         for (let i=0; i < xpath.snapshotLength; i++){
           results.push(xpath.snapshotItem(i))