puppeteer-ruby 0.40.3 → 0.40.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b55d70dfff58f262d0385b5cb3c30b14d61dee0b4e62b6159240fd4b108da11
-  data.tar.gz: a61ebc455d7149b1e20422ab86545c7aea4753ce41bfe27c8dead388b9595ba2
+  metadata.gz: 51b26b6b3710f06e7a7cfb7e9f5730bbb9517396fd30a7f271161820bb6902c6
+  data.tar.gz: 528fd6520a029cf9d85424a105cf19a156f428435dc795a8b8753c8cbfa442db
 SHA512:
-  metadata.gz: b58e74d4397fa2954df3a5ef90f3e3dc55702e058b2a5a0c84dff1cb236d012019a1f98626972ec3d11afb70708e760846ece034ec8e7dcf41bac1ded218c53c
-  data.tar.gz: 315fdc4a2e7743bf21daf38e260a0c8876c77d8d19ee81797b083ddbb7628a1287e618ee812311995d270e5ee95b7febd4b1ca8e43deea0e33ade601b2b361dd
+  metadata.gz: ad616ae1574e76f71cb7e7cb1dae5cba4ae4ad65865ab6a5e6cb92c6033b9ce654de2b364b5d5351e69302f88fc48231c2a9bd97765af9ed827862e762f9d748
+  data.tar.gz: 9a194d8df09c6c6eda97ef095d67dafd693b7ff386e612d926925bdbcf41b3b2a21c06862eff90525e39f85c7d8a5ded419bb8c4b4a3ecb33413c7ccdf47215e

data/CHANGELOG.md

@@ -1,7 +1,23 @@
-### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.3...main)]
+### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.6...main)]
 
 - xxx
 
+### 0.40.6 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.5...0.40.6)]
+
+- Port Puppeteer v13.1-v13.5 features mainly for request interception.
+
+### 0.40.5 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.4...0.40.5)]
+
+Bugfix:
+
+- Port Puppeteer v13.1-v13.5 bugfixes mainly for OOPIFs.
+
+### 0.40.4 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.3...0.40.4)]
+
+Bugfix:
+
+- Fix warning on handling console message.
+
 ### 0.40.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.2...0.40.3)]
 
 Bugfix:

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
-- Puppeteer version: v13.0.1
-- puppeteer-ruby version: 0.40.3
+- Puppeteer version: v13.5.2
+- puppeteer-ruby version: 0.40.6
 
 ## Puppeteer
 
@@ -204,7 +204,7 @@
 
 * args
 * location
-* ~~stackTrace~~
+* stackTrace => `#stack_trace`
 * text
 * ~~type~~
 
@@ -310,8 +310,8 @@
 * frame
 * headers
 * initiator
-* ~~interceptResolutionState~~
-* ~~isInterceptResolutionHandled~~
+* interceptResolutionState => `#intercept_resolution_state`
+* isInterceptResolutionHandled => `#intercept_resolution_handled?`
 * isNavigationRequest => `#navigation_request?`
 * method
 * postData => `#post_data`
@@ -337,6 +337,7 @@
 * status
 * statusText => `#status_text`
 * text
+* ~~timing~~
 * url
 
 ## ~~SecurityDetails~~

data/lib/puppeteer/console_message.rb

@@ -12,13 +12,23 @@ class Puppeteer::ConsoleMessage
   # @param log_type [String]
   # @param text [String]
   # @param args [Array<Puppeteer::JSHandle>]
-  # @param location [Location]
-  def initialize(log_type, text, args, location)
+  # @param stack_trace_locations [Array<Location>]
+  def initialize(log_type, text, args, stack_trace_locations)
     @log_type = log_type
     @text = text
     @args = args
-    @location = location
+    @stack_trace_locations = stack_trace_locations
   end
 
-  attr_reader :log_type, :text, :args, :location
+  attr_reader :log_type, :text, :args
+
+  # @return [Location]
+  def location
+    @stack_trace_locations.first
+  end
+
+  # @return [Array<Location>]
+  def stack_trace
+    @stack_trace_locations
+  end
 end

data/lib/puppeteer/devices.rb

@@ -262,6 +262,58 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'iPad (gen 6)',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 768,
+        height: 1024,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPad (gen 6) landscape',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 1024,
+        height: 768,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPad (gen 7)',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 810,
+        height: 1080,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPad (gen 7) landscape',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 1080,
+        height: 810,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
     {
       name: 'iPad Mini',
       userAgent:
@@ -314,6 +366,32 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'iPad Pro 11',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 834,
+        height: 1194,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPad Pro 11 landscape',
+      userAgent:
+        'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 1194,
+        height: 834,
+        deviceScaleFactor: 2,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
     {
       name: 'iPhone 4',
       userAgent:
@@ -678,6 +756,214 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'iPhone 12',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 390,
+        height: 844,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 12 landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 844,
+        height: 390,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 12 Pro',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 390,
+        height: 844,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 12 Pro landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 844,
+        height: 390,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 12 Pro Max',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 428,
+        height: 926,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 12 Pro Max landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 926,
+        height: 428,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 12 Mini',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 375,
+        height: 812,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 12 Mini landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 812,
+        height: 375,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 13',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 390,
+        height: 844,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 13 landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 844,
+        height: 390,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 13 Pro',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 390,
+        height: 844,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 13 Pro landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 844,
+        height: 390,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 13 Pro Max',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 428,
+        height: 926,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 13 Pro Max landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 926,
+        height: 428,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'iPhone 13 Mini',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 375,
+        height: 812,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'iPhone 13 Mini landscape',
+      userAgent:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      viewport: {
+        width: 812,
+        height: 375,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
     {
       name: 'JioPhone 2',
       userAgent:
@@ -1133,6 +1419,84 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'Pixel 4a (5G)',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 353,
+        height: 745,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Pixel 4a (5G) landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 745,
+        height: 353,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'Pixel 5',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 393,
+        height: 851,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Pixel 5 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 851,
+        height: 393,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'Moto G4',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 360,
+        height: 640,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Moto G4 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4812.0 Mobile Safari/537.36',
+      viewport: {
+        width: 640,
+        height: 360,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
   ].map do |json|
     [
       json[:name],

data/lib/puppeteer/element_handle/box_model.rb

@@ -2,12 +2,13 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   class BoxModel
     QUAD_ATTRIBUTE_NAMES = %i(content padding border margin)
     # @param result [Hash]
-    def initialize(result_model)
+    # @param offset [Point]
+    def initialize(result_model, offset:)
       QUAD_ATTRIBUTE_NAMES.each do |attr_name|
         quad = result_model[attr_name.to_s]
         instance_variable_set(
           :"@#{attr_name}",
-          quad.each_slice(2).map { |x, y| Point.new(x: x, y: y) },
+          quad.each_slice(2).map { |x, y| Point.new(x: x, y: y) + offset },
         )
       end
       @width = result_model['width']

data/lib/puppeteer/element_handle.rb

@@ -11,10 +11,12 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   # @param context [Puppeteer::ExecutionContext]
   # @param client [Puppeteer::CDPSession]
   # @param remote_object [Puppeteer::RemoteObject]
+  # @param frame [Puppeteer::Frame]
   # @param page [Puppeteer::Page]
   # @param frame_manager [Puppeteer::FrameManager]
-  def initialize(context:, client:, remote_object:, page:, frame_manager:)
+  def initialize(context:, client:, remote_object:, frame:, page:, frame_manager:)
     super(context: context, client: client, remote_object: remote_object)
+    @frame = frame
     @page = page
     @frame_manager = frame_manager
     @disposed = false
@@ -134,6 +136,37 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
     end
   end
 
+  class ElementNotClickableError < StandardError
+    def initialize
+      super("Node is either not clickable or not an HTMLElement")
+    end
+  end
+
+  # @param quad [Array<Array<Point>>]]
+  # @param offset [Point]
+  private def apply_offsets_to_quad(quad, offset)
+    quad.map { |part| part + offset }
+  end
+
+  # @param frame [Puppeteer::Frame]
+  # @return [Point]
+  private def oopif_offsets(frame)
+    offset = Point.new(x: 0, y: 0)
+    while frame.parent_frame
+      parent = frame.parent_frame
+      unless frame.oop_frame?
+        frame = parent
+        next
+      end
+      backend_node_id = parent._client.send_message('DOM.getFrameOwner', frameId: frame.id)['backendNodeId']
+      result = parent._client.send_message('DOM.getBoxModel', backendNodeId: backend_node_id)
+      break unless result
+      offset = BoxModel.new(result['model'], offset: offset).content.first
+      frame = parent
+    end
+    offset
+  end
+
   def clickable_point(offset = nil)
     offset_param = Offset.from(offset)
 
@@ -150,12 +183,22 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
     end
 
     # Filter out quads that have too small area to click into.
-    layout_metrics = @client.send_message('Page.getLayoutMetrics')
-    client_width = layout_metrics["layoutViewport"]["clientWidth"]
-    client_height = layout_metrics["layoutViewport"]["clientHeight"]
+    layout_metrics = @page.client.send_message('Page.getLayoutMetrics')
+
+    if result.empty? || result["quads"].empty?
+      raise ElementNotClickableError.new
+    end
+
+    # Filter out quads that have too small area to click into.
+    # Fallback to `layoutViewport` in case of using Firefox.
+    layout_viewport = layout_metrics["cssLayoutViewport"] || layout_metrics["layoutViewport"]
+    client_width = layout_viewport["clientWidth"]
+    client_height = layout_viewport["clientHeight"]
 
+    oopif_offset = oopif_offsets(@frame)
     quads = result["quads"].
               map { |quad| from_protocol_quad(quad) }.
+              map { |quad| apply_offsets_to_quad(quad, oopif_offset) }.
               map { |quad| intersect_quad_with_viewport(quad, client_width, client_height) }.
               select { |quad| compute_quad_area(quad) > 1 }
     if quads.empty?
@@ -357,13 +400,14 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   # @return [BoundingBox|nil]
   def bounding_box
     if_present(box_model) do |result_model|
+      offset = oopif_offsets(@frame)
       quads = result_model.border
 
       x = quads.map(&:x).min
       y = quads.map(&:y).min
       BoundingBox.new(
-        x: x,
-        y: y,
+        x: x + offset.x,
+        y: y + offset.y,
         width: quads.map(&:x).max - x,
         height: quads.map(&:y).max - y,
       )
@@ -373,7 +417,7 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   # @return [BoxModel|nil]
   def box_model
     if_present(@remote_object.box_model(@client)) do |result|
-      BoxModel.new(result['model'])
+      BoxModel.new(result['model'], offset: oopif_offsets(@frame))
     end
   end
 

data/lib/puppeteer/events.rb

@@ -96,6 +96,7 @@ module FrameManagerEmittedEvents ; end
   FrameAttached: EventsDefinitionUtils.symbol('FrameManager.FrameAttached'),
   FrameNavigated: EventsDefinitionUtils.symbol('FrameManager.FrameNavigated'),
   FrameDetached: EventsDefinitionUtils.symbol('FrameManager.FrameDetached'),
+  FrameSwapped: EventsDefinitionUtils.symbol('FrameManager.FrameSwapped'),
   LifecycleEvent: EventsDefinitionUtils.symbol('FrameManager.LifecycleEvent'),
   FrameNavigatedWithinDocument: EventsDefinitionUtils.symbol('FrameManager.FrameNavigatedWithinDocument'),
   ExecutionContextCreated: EventsDefinitionUtils.symbol('FrameManager.ExecutionContextCreated'),

data/lib/puppeteer/frame_manager.rb

@@ -178,7 +178,7 @@ class Puppeteer::FrameManager
     frame = @frames[event['targetInfo']['targetId']]
     session = Puppeteer::Connection.from_session(@client).session(event['sessionId'])
 
-    frame.send(:update_client, session)
+    frame&.send(:update_client, session)
     setup_listeners(session)
     async_init(session)
   end
@@ -353,6 +353,8 @@ class Puppeteer::FrameManager
       if frame
         remove_frame_recursively(frame)
       end
+    elsif reason == 'swap'
+      emit_event(FrameManagerEmittedEvents::FrameSwapped, frame)
     end
   end
 

data/lib/puppeteer/http_request.rb

@@ -2,6 +2,8 @@ class Puppeteer::HTTPRequest
   include Puppeteer::DebugPrint
   include Puppeteer::IfPresent
 
+  DEFAULT_INTERCEPT_RESOLUTION_PRIORITY = 0
+
   # defines some methods used only in NetworkManager, Response
   class InternalAccessor
     def initialize(request)
@@ -38,6 +40,43 @@ class Puppeteer::HTTPRequest
     end
   end
 
+  class InterceptResolutionState
+    def self.abort(priority: nil)
+      new(action: 'abort', priority: priority)
+    end
+
+    def self.respond(priority: nil)
+      new(action: 'respond', priority: priority)
+    end
+
+    def self.continue(priority: nil)
+      new(action: 'continue', priority: priority)
+    end
+
+    def self.disabled(priority: nil)
+      new(action: 'disabled', priority: priority)
+    end
+
+    def self.none(priority: nil)
+      new(action: 'none', priority: priority)
+    end
+
+    def self.already_handled(priority: nil)
+      new(action: 'already-handled', priority: priority)
+    end
+
+    private def initialize(action:, priority:)
+      @action = action
+      @priority = priority
+    end
+
+    def priority_unspecified?
+      @priority.nil?
+    end
+
+    attr_reader :action, :priority
+  end
+
   # @param client [Puppeteer::CDPSession]
   # @param frame [Puppeteer::Frame]
   # @param interception_id [string|nil]
@@ -57,9 +96,8 @@ class Puppeteer::HTTPRequest
     @frame = frame
     @redirect_chain = redirect_chain
     @continue_request_overrides = {}
-    @current_strategy = 'none'
-    @current_priority = nil
-    @intercept_actions = []
+    @intercept_resolution_state = InterceptResolutionState.none
+    @intercept_handlers = []
     @initiator = event['initiator']
 
     @headers = {}
@@ -115,19 +153,29 @@ class Puppeteer::HTTPRequest
     @abort_error_reason
   end
 
-  # @returns An array of the current intercept resolution strategy and priority
-  # `[strategy,priority]`. Strategy is one of: `abort`, `respond`, `continue`,
-  #  `disabled`, `none`, or `already-handled`.
-  def intercept_resolution
+  # @returns An InterceptResolutionState object describing the current resolution
+  #  action and priority.
+  #
+  #  InterceptResolutionState contains:
+  #    action: InterceptResolutionAction
+  #    priority?: number
+  #
+  #  InterceptResolutionAction is one of: `abort`, `respond`, `continue`,
+  #  `disabled`, `none`, or `alreay-handled`
+  def intercept_resolution_state
     if !@allow_interception
-      ['disabled']
+      InterceptResolutionState.disabled
     elsif @interception_handled
-      ['already-handled']
+      InterceptResolutionState.already_handled
     else
-      [@current_strategy, @current_priority]
+      @intercept_resolution_state.dup
     end
   end
 
+  def intercept_resolution_handled?
+    @interception_handled
+  end
+
   # Adds an async request handler to the processing queue.
   # Deferred handlers are not guaranteed to execute in any particular order,
   # but they are guarnateed to resolve before the request interception
@@ -135,19 +183,19 @@ class Puppeteer::HTTPRequest
   #
   # @param pending_handler [Proc]
   def enqueue_intercept_action(pending_handler)
-    @intercept_actions << pending_handler
+    @intercept_handlers << pending_handler
   end
 
   # Awaits pending interception handlers and then decides how to fulfill
   # the request interception.
   def finalize_interceptions
-    @intercept_actions.each(&:call)
-    case @intercept_resolution
-    when :abort
+    @intercept_handlers.each(&:call)
+    case @intercept_resolution.action
+    when 'abort'
       abort_impl(**@abort_error_reason)
-    when :respond
+    when 'respond'
       respond_impl(**@response_for_request)
-    when :continue
+    when 'continue'
       continue_impl(@continue_request_overrides)
     end
   end
@@ -220,17 +268,16 @@ class Puppeteer::HTTPRequest
     end
 
     @continue_request_overrides = overrides
-    if @current_priority.nil? || priority > @current_priority
-      @current_strategy = :continue
-      @current_priority = priority
+    if @intercept_resolution_state.priority_unspecified? || priority > @intercept_resolution_state.priority
+      @intercept_resolution_state = InterceptResolutionState.continue(priority: priority)
       return
     end
 
-    if priority == @current_priority
-      if @current_strategy == :abort || @current_strategy == :respond
+    if priority == @intercept_resolution_state.priority
+      if @intercept_resolution_state.action == :abort || @intercept_resolution_state.action == :respond
         return
       end
-      @current_strategy = :continue
+      @intercept_resolution_state = InterceptResolutionState.continue(priority: priority)
     end
   end
 
@@ -284,17 +331,16 @@ class Puppeteer::HTTPRequest
       body: body,
     }
 
-    if @current_priority.nil? || priority > @current_priority
-      @current_strategy = :respond
-      @current_priority = priority
+    if @intercept_resolution_state.priority_unspecified? || priority > @intercept_resolution_state.priority
+      @intercept_resolution_state = InterceptResolutionState.respond(priority: priority)
       return
     end
 
-    if priority == @current_priority
-      if @current_strategy == :abort
+    if priority == @intercept_resolution_state.priority
+      if @intercept_resolution_state.action == :abort
         return
       end
-      @current_strategy = :respond
+      @intercept_resolution_state = InterceptResolutionState.respond(priority: priority)
     end
   end
 
@@ -360,9 +406,8 @@ class Puppeteer::HTTPRequest
     end
     @abort_error_reason = error_reason
 
-    if @current_priority.nil? || priority > @current_priority
-      @current_strategy = :abort
-      @current_priority = priority
+    if @intercept_resolution_state.priority_unspecified? || priority > @intercept_resolution_state.priority
+      @intercept_resolution_state = InterceptResolutionState.abort(priority: priority)
     end
   end
 

data/lib/puppeteer/js_handle.rb

@@ -12,6 +12,7 @@ class Puppeteer::JSHandle
         context: context,
         client: context.client,
         remote_object: remote_object,
+        frame: frame,
         page: frame_manager.page,
         frame_manager: frame_manager,
       )

data/lib/puppeteer/lifecycle_watcher.rb

@@ -77,6 +77,7 @@ class Puppeteer::LifecycleWatcher
         check_lifecycle_complete
       end,
       @frame_manager.add_event_listener(FrameManagerEmittedEvents::FrameNavigatedWithinDocument, &method(:navigated_within_document)),
+      @frame_manager.add_event_listener(FrameManagerEmittedEvents::FrameSwapped, &method(:handle_frame_swapped)),
       @frame_manager.add_event_listener(FrameManagerEmittedEvents::FrameDetached, &method(:handle_frame_detached)),
     ]
     @listener_ids['network_manager'] = @frame_manager.network_manager.add_event_listener(NetworkManagerEmittedEvents::Request, &method(:handle_request))
@@ -142,11 +143,21 @@ class Puppeteer::LifecycleWatcher
     check_lifecycle_complete
   end
 
+  private def handle_frame_swapped(frame)
+    return if frame != @frame
+    @swapped = true
+    check_lifecycle_complete
+  end
+
   private def check_lifecycle_complete
     # We expect navigation to commit.
     return unless @expected_lifecycle.completed?(@frame)
     @lifecycle_promise.fulfill(true) if @lifecycle_promise.pending?
     if @frame.loader_id == @initial_loader_id && !@has_same_document_navigation
+      if @swapped
+        @swapped = false
+        @new_document_navigation_promise.fulfill(true)
+      end
       return
     end
     if @has_same_document_navigation && @same_document_navigation_promise.pending?

data/lib/puppeteer/network_manager.rb

@@ -217,6 +217,7 @@ class Puppeteer::NetworkManager
       # CDP may have sent a Fetch.requestPaused event already. Check for it.
       if_present(@network_event_manager.get_request_paused(network_request_id)) do |request_paused_event|
         fetch_request_id = request_paused_event['requestId']
+        patch_request_event_headers(event, request_paused_event)
         handle_request(event, fetch_request_id)
         @network_event_manager.forget_request_paused(network_request_id)
       end
@@ -277,12 +278,19 @@ class Puppeteer::NetworkManager
     end
 
     if request_will_be_sent_event
+      patch_request_event_headers(request_will_be_sent_event, event)
       handle_request(request_will_be_sent_event, fetch_request_id)
     else
       @network_event_manager.store_request_paused(network_request_id, event)
     end
   end
 
+  private def patch_request_event_headers(request_will_be_sent_event, request_paused_event)
+    request_will_be_sent_event['request']['headers'].merge!(
+      # includes extra headers, like: Accept, Origin
+      request_paused_event['request']['headers'])
+  end
+
   private def handle_request(event, fetch_request_id)
     redirect_chain = []
     if event['redirectResponse']

data/lib/puppeteer/page.rb

@@ -227,7 +227,7 @@ class Puppeteer::Page
     @client.send_message('Emulation.setGeolocationOverride', geolocation.to_h)
   end
 
-  attr_reader :javascript_enabled, :target
+  attr_reader :javascript_enabled, :target, :client
   alias_method :javascript_enabled?, :javascript_enabled
 
   def browser
@@ -389,7 +389,18 @@ class Puppeteer::Page
     @client.send_message('Network.getCookies', urls: (urls.empty? ? [url] : urls))['cookies']
   end
 
+  # check if each cookie element has required fields ('name' and 'value')
+  private def assert_cookie_params(cookies, requires:)
+    return if cookies.all? do |cookie|
+      requires.all? { |field_name| cookie[field_name] || cookie[field_name.to_s] }
+    end
+
+    raise ArgumentError.new("Each coookie must have #{requires.join(" and ")} attribute.")
+  end
+
   def delete_cookie(*cookies)
+    assert_cookie_params(cookies, requires: %i(name))
+
     page_url = url
     starts_with_http = page_url.start_with?("http")
     cookies.each do |cookie|
@@ -399,12 +410,14 @@ class Puppeteer::Page
   end
 
   def set_cookie(*cookies)
+    assert_cookie_params(cookies, requires: %i(name value))
+
     page_url = url
     starts_with_http = page_url.start_with?("http")
     items = cookies.map do |cookie|
       (starts_with_http ? { url: page_url } : {}).merge(cookie).tap do |item|
         raise ArgumentError.new("Blank page can not have cookie \"#{item[:name]}\"") if item[:url] == "about:blank"
-        raise ArgumetnError.new("Data URL page can not have cookie \"#{item[:name]}\"") if item[:url]&.start_with?("data:")
+        raise ArgumentError.new("Data URL page can not have cookie \"#{item[:name]}\"") if item[:url]&.start_with?("data:")
       end
     end
     delete_cookie(*items)
@@ -582,18 +595,19 @@ class Puppeteer::Page
   private def add_console_message(type, args, stack_trace)
     text_tokens = args.map { |arg| arg.remote_object.value }
 
-    call_frame = stack_trace['callFrames']&.first
-    location =
-      if call_frame
-        Puppeteer::ConsoleMessage::Location.new(
-          url: call_frame['url'],
-          line_number: call_frame['lineNumber'],
-          column_number: call_frame['columnNumber'],
-        )
+    stack_trace_locations =
+      if stack_trace && stack_trace['callFrames']
+        stack_trace['callFrames'].map do |call_frame|
+          Puppeteer::ConsoleMessage::Location.new(
+            url: call_frame['url'],
+            line_number: call_frame['lineNumber'],
+            column_number: call_frame['columnNumber'],
+          )
+        end
       else
-        nil
+        []
       end
-    console_message = Puppeteer::ConsoleMessage.new(type, text_tokens.join(' '), args, location)
+    console_message = Puppeteer::ConsoleMessage.new(type, text_tokens.join(' '), args, stack_trace_locations)
     emit_event(PageEmittedEvents::Console, console_message)
   end
 

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.40.3'
+  VERSION = '0.40.6'
 end

data/puppeteer-ruby.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 13.0.3'
   spec.add_development_dependency 'rollbar'
-  spec.add_development_dependency 'rspec', '~> 3.10.0 '
+  spec.add_development_dependency 'rspec', '~> 3.11.0'
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 1.24.0'
+  spec.add_development_dependency 'rubocop', '~> 1.27.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'webrick'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.40.3
+  version: 0.40.6
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -347,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A ruby port of puppeteer