puppeteer-ruby 0.40.4 → 0.40.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c608c27cbcee1c2038a3ecb2ba5244ef75906136fdd7aa868c521cd8248053
-  data.tar.gz: 9535f70cb9b6056324c9828fff4c9e4412e0fbd48c2ac7a7bd8308bc51d1d26c
+  metadata.gz: 2f6c1abfbf66f645ac208cf5f3f0ad24c4ae421e576c5b1516803cdc897bad22
+  data.tar.gz: a40b422147eff9261720975d8009ecc3fbd24a1f0d2d828f1fe3b5dce31f5c24
 SHA512:
-  metadata.gz: 4d9da0c4e2820117bff76f55bf5c9141c1b2ac8af351f6c27951df5bb20c5825a321c33f4ddde13b1e77864fd1c29803d5eb5f014df80d1b596a850a2d7f0ac3
-  data.tar.gz: f6159e8906c6f35b67057ef47e4e675bfeeb824ee7abaee0d52f5d25ef7bea6f6c7fe699af3a8fee9bbd1020a7894966ee4826d38d01d74e4860f8ead4b759c7
+  metadata.gz: f532e2ff58c283c0904d5c76c0e9254d5b91be1f6ff7c576b728d91a727b0bb246f9d0eefe1461b1a7ba28607f33ac7a541d9d9a9ee3da0e5742c330f3c01b6e
+  data.tar.gz: c0dab5bca1e3ae23c6c2f3866cb3127024a9fd9663e01ff20d7edd68ef60060fc2203ffe81d80f322a10428ea4632193e1eef8b502e3375ea0c8413a3172dc61

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-### main [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.40.4...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:

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)
@@ -508,7 +508,6 @@ class Puppeteer::Page
   end
 
   private def handle_console_api(event)
-    puts "~~~~~~~~~~~~~~#{event}"
     if event['executionContextId'] == 0
       # DevTools protocol stores the last 1000 console messages. These
       # messages are always reported even for removed execution contexts. In

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.40.4'
+  VERSION = '0.40.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.40.4
+  version: 0.40.5
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby