puppeteer-ruby 0.40.2 → 0.40.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88033f07007a1841f99535a96497bef2aa35b58e0599d51886ec760ef8f8201
-  data.tar.gz: 3b4b69f023861cc24a4ecf402e2b6eff0cba0d57fbef37991996964a1b57007b
+  metadata.gz: 2f6c1abfbf66f645ac208cf5f3f0ad24c4ae421e576c5b1516803cdc897bad22
+  data.tar.gz: a40b422147eff9261720975d8009ecc3fbd24a1f0d2d828f1fe3b5dce31f5c24
 SHA512:
-  metadata.gz: 6e63bd3b526e4cc09f309fc206f9395618393ab104438e93eebc190e3efa36a7e12e3037388480b9dd735121f752cbbd0bd5dc1152ae39a57be6f855dc41b41f
-  data.tar.gz: fe6dff5b5b82813c003e67725868a467e2e9b43e16c4bf4bca1eb48c588daa2efd782d4c1c6b351117a3cfbf7daea4feb37b36fde3637abacea33cd2e3244cb4
+  metadata.gz: f532e2ff58c283c0904d5c76c0e9254d5b91be1f6ff7c576b728d91a727b0bb246f9d0eefe1461b1a7ba28607f33ac7a541d9d9a9ee3da0e5742c330f3c01b6e
+  data.tar.gz: c0dab5bca1e3ae23c6c2f3866cb3127024a9fd9663e01ff20d7edd68ef60060fc2203ffe81d80f322a10428ea4632193e1eef8b502e3375ea0c8413a3172dc61

data/CHANGELOG.md

@@ -1,7 +1,26 @@
-### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.2...main)]
+### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.5...main)]
 
 - xxx
 
+### 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:
+
+- Prevent `Ctrl+C` from stopping Chrome [#196](https://github.com/YusukeIwaki/puppeteer-ruby/pull/196)
+
+
 ### 0.40.2 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.1...0.40.2)]
 
 Bugfix:

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
-- Puppeteer version: v13.0.1
-- puppeteer-ruby version: 0.40.2
+- Puppeteer version: v13.5.1
+- puppeteer-ruby version: 0.40.4
 
 ## Puppeteer
 
@@ -204,7 +204,7 @@
 
 * args
 * location
-* ~~stackTrace~~
+* stackTrace => `#stack_trace`
 * text
 * ~~type~~
 
@@ -337,6 +337,7 @@
 * status
 * statusText => `#status_text`
 * text
+* ~~timing~~
 * url
 
 ## ~~SecurityDetails~~

data/lib/puppeteer/browser_runner.rb

@@ -31,7 +31,9 @@ class Puppeteer::BrowserRunner
           [executable_path]
         end
 
-      stdin, @stdout, @stderr, @thread = Open3.popen3(env, executable_path, *args)
+      popen3_args = args || []
+      popen3_args << { pgroup: true } unless Puppeteer.env.windows?
+      stdin, @stdout, @stderr, @thread = Open3.popen3(env, executable_path, *popen3_args)
       stdin.close
       @pid = @thread.pid
     rescue Errno::ENOENT => err

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/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/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
@@ -404,7 +404,7 @@ class Puppeteer::Page
     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 +582,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.2'
+  VERSION = '0.40.5'
 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.26.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.2
+  version: 0.40.5
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-03-26 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.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.26.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