puppeteer-ruby 0.0.8 → 0.0.13

data/lib/puppeteer/element_handle/bounding_box.rb

@@ -0,0 +1,12 @@
+class Puppeteer::ElementHandle < Puppeteer::JSHandle
+  class BoundingBox
+    def initialize(x:, y:, width:, height:)
+      @x = x
+      @y = y
+      @width = width
+      @height = height
+    end
+
+    attr_reader :x, :y, :width, :height
+  end
+end

data/lib/puppeteer/element_handle/box_model.rb

@@ -0,0 +1,19 @@
+class Puppeteer::ElementHandle < Puppeteer::JSHandle
+  class BoxModel
+    QUAD_ATTRIBUTE_NAMES = %i(content padding border margin)
+    # @param result [Hash]
+    def initialize(result_model)
+      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) },
+        )
+      end
+      @width = result_model['width']
+      @height = result_model['height']
+    end
+    attr_reader(*QUAD_ATTRIBUTE_NAMES)
+    attr_reader :width, :height
+  end
+end

data/lib/puppeteer/element_handle/point.rb

@@ -0,0 +1,26 @@
+class Puppeteer::ElementHandle < Puppeteer::JSHandle
+  # A class to represent (x, y)-coordinates
+  # supporting + and / operators.
+  class Point
+    def initialize(x:, y:)
+      @x = x
+      @y = y
+    end
+
+    def +(other)
+      Point.new(
+        x: @x + other.x,
+        y: @y + other.y,
+      )
+    end
+
+    def /(num)
+      Point.new(
+        x: @x / num,
+        y: @y / num,
+      )
+    end
+
+    attr_reader :x, :y
+  end
+end

data/lib/puppeteer/errors.rb

@@ -1,4 +1,2 @@
-# ref: https://github.com/puppeteer/puppeteer/blob/master/lib/Errors.js
+# ref: https://github.com/puppeteer/puppeteer/blob/master/src/Errors.ts
 class Puppeteer::TimeoutError < StandardError; end
-
-class Puppeteer::WebSocktTransportError < StandardError; end

data/lib/puppeteer/event_callbackable.rb

@@ -39,6 +39,17 @@ module Puppeteer::EventCallbackable
     end
   end
 
+  def observe_first(event_name, &block)
+    listener_id = add_event_listener(event_name) do |*args, **kwargs|
+      if kwargs.empty?
+        block.call(*args)
+      else
+        block.call(*args, **kwargs)
+      end
+      remove_event_listener(listener_id)
+    end
+  end
+
   def on_event(event_name, &block)
     @event_callbackable_handlers ||= {}
     @event_callbackable_handlers[event_name] = block

data/lib/puppeteer/frame.rb

@@ -1,4 +1,6 @@
 class Puppeteer::Frame
+  using Puppeteer::AsyncAwaitBehavior
+
   # @param {!FrameManager} frameManager
   # @param {!Puppeteer.CDPSession} client
   # @param {?Frame} parentFrame
@@ -33,10 +35,17 @@ class Puppeteer::Frame
 
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
-  def wait_for_navigation(timeout: nil, wait_until: nil)
+  private def wait_for_navigation(timeout: nil, wait_until: nil)
     @frame_manager.wait_for_frame_navigation(self, timeout: timeout, wait_until: wait_until)
   end
 
+  # @param timeout [number|nil]
+  # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
+  # @return [Future]
+  async def async_wait_for_navigation(timeout: nil, wait_until: nil)
+    wait_for_navigation(timeout: timeout, wait_until: wait_until)
+  end
+
   def execution_context
     @main_world.execution_context
   end
@@ -143,6 +152,15 @@ class Puppeteer::Frame
     @main_world.add_style_tag(style_tag)
   end
 
+  # @param selector [String]
+  # @param delay [Number]
+  # @param button [String] "left"|"right"|"middle"
+  # @param click_count [Number]
+  # @return [Future]
+  async def async_click(selector, delay: nil, button: nil, click_count: nil)
+    click(selector, delay: delay, button: button, click_count: click_count)
+  end
+
   # @param selector [String]
   # @param delay [Number]
   # @param button [String] "left"|"right"|"middle"
@@ -240,6 +258,7 @@ class Puppeteer::Frame
     @main_world.wait_for_function(page_function, options, *args)
   end
 
+  # @return [String]
   def title
     @secondary_world.title
   end

data/lib/puppeteer/launcher.rb

@@ -4,13 +4,13 @@ require_relative './launcher/chrome'
 require_relative './launcher/chrome_arg_options'
 require_relative './launcher/launch_options'
 
-# https://github.com/puppeteer/puppeteer/blob/master/lib/Launcher.js
+# https://github.com/puppeteer/puppeteer/blob/main/src/node/Launcher.ts
 module Puppeteer::Launcher
-  # @param {string} projectRoot
-  # @param {string} preferredRevision
-  # @param {boolean} isPuppeteerCore
-  # @param {string=} product
-  # @return {!Puppeteer.ProductLauncher}
+  # @param project_root [String]
+  # @param prefereed_revision [String]
+  # @param is_puppeteer_core [String]
+  # @param product [String] 'chrome' or 'firefox' (not implemented yet)
+  # @return [Puppeteer::Launcher::Chrome]
   module_function def new(project_root:, preferred_revision:, is_puppeteer_core:, product:)
     if product == 'firefox'
       raise NotImplementedError.new('FirefoxLauncher is not implemented yet.')

data/lib/puppeteer/launcher/chrome.rb

@@ -1,6 +1,6 @@
 require 'tmpdir'
 
-# https://github.com/puppeteer/puppeteer/blob/master/lib/Launcher.js
+# https://github.com/puppeteer/puppeteer/blob/main/src/node/Launcher.ts
 module Puppeteer::Launcher
   class Chrome < Base
     # @param {!(Launcher.LaunchOptions & Launcher.ChromeArgOptions & Launcher.BrowserOptions)=} options
@@ -139,6 +139,7 @@ module Puppeteer::Launcher
       end
     end
 
+    # @return [DefaultArgs]
     def default_args(options = nil)
       if options.nil?
         @default_args ||= DefaultArgs.new(@chrome_arg_options)
@@ -147,8 +148,7 @@ module Puppeteer::Launcher
       end
     end
 
-    # @param {!(Launcher.BrowserOptions & {browserWSEndpoint?: string, browserURL?: string, transport?: !Puppeteer.ConnectionTransport})} options
-    # @return {!Promise<!Browser>}
+    # @return [Puppeteer::Browser]
     def connect(options = {})
       @browser_options = BrowserOptions.new(options)
       browser_ws_endpoint = options[:browser_ws_endpoint]
@@ -187,11 +187,13 @@ module Puppeteer::Launcher
 
     # @return [Puppeteer::Connection]
     private def connect_with_browser_url(browser_url)
-      raise NotImplementedError.new('Puppeteer#connect with browserUrl is not implemented yet.')
-      # const connectionURL = await getWSEndpoint(browserURL);
-      # const connectionTransport = await WebSocketTransport.create(
-      #   connectionURL
-      # );
+      require 'net/http'
+      uri = URI(browser_url)
+      uri.path = '/json/version'
+      response_body = Net::HTTP.get(uri)
+      json = JSON.parse(response_body)
+      connection_url = json['webSocketDebuggerUrl']
+      connect_with_browser_ws_endpoint(connection_url)
     end
 
     # @return [Puppeteer::Connection]

data/lib/puppeteer/mouse.rb

@@ -61,18 +61,13 @@ class Puppeteer::Mouse
     # D, [2020-04-15T17:09:47.898422 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mouseReleased","button":"left","x":0,"y":0,"modifiers":0,"clickCount":1},"id":24}
     # D, [2020-04-15T17:09:47.899711 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mousePressed","button":"left","x":0,"y":0,"modifiers":0,"clickCount":1},"id":25}
     # D, [2020-04-15T17:09:47.900237 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mouseMoved","button":"left","x":187,"y":283,"modifiers":0},"id":26}
-    # So we execute move in advance.
+    # So we execute them sequential
     move(x, y)
+    down(button: button, click_count: click_count)
     if delay
-      down(button: button, click_count: click_count)
       sleep(delay / 1000.0)
-      up(button: button, click_count: click_count)
-    else
-      await_all(
-        async_down(button: button, click_count: click_count),
-        async_up(button: button, click_count: click_count),
-      )
     end
+    up(button: button, click_count: click_count)
   end
 
   # @param x [number]

data/lib/puppeteer/page.rb

@@ -109,7 +109,7 @@ class Puppeteer::Page
     @client.on_event 'Page.fileChooserOpened' do |event|
       handle_file_chooser(event)
     end
-    @target.on_close do
+    @target.is_closed_promise.then do
       emit_event 'Events.Page.Close'
       @closed = true
     end
@@ -124,6 +124,45 @@ class Puppeteer::Page
     )
   end
 
+  EVENT_MAPPINGS = {
+    close: 'Events.Page.Close',
+    # console: 'Events.Page.Console',
+    # dialog: 'Events.Page.Dialog',
+    domcontentloaded: 'Events.Page.DOMContentLoaded',
+    # error:
+    frameattached: 'Events.Page.FrameAttached',
+    framedetached: 'Events.Page.FrameDetached',
+    framenavigated: 'Events.Page.FrameNavigated',
+    load: 'Events.Page.Load',
+    # metrics: 'Events.Page.Metrics',
+    # pageerror: 'Events.Page.PageError',
+    popup: 'Events.Page.Popup',
+    request: 'Events.Page.Request',
+    requestfailed: 'Events.Page.RequestFailed',
+    requestfinished: 'Events.Page.RequestFinished',
+    response: 'Events.Page.Response',
+    # workercreated: 'Events.Page.WorkerCreated',
+    # workerdestroyed: 'Events.Page.WorkerDestroyed',
+  }
+
+  # @param event_name [Symbol]
+  def on(event_name, &block)
+    unless EVENT_MAPPINGS.has_key?(event_name.to_sym)
+      raise ArgumentError.new("Unknown event name: #{event_name}. Known events are #{EVENT_MAPPINGS.keys.join(", ")}")
+    end
+
+    add_event_listener(EVENT_MAPPINGS[event_name.to_sym], &block)
+  end
+
+  # @param event_name [Symbol]
+  def once(event_name, &block)
+    unless EVENT_MAPPINGS.has_key?(event_name.to_sym)
+      raise ArgumentError.new("Unknown event name: #{event_name}. Known events are #{EVENT_MAPPINGS.keys.join(", ")}")
+    end
+
+    observe_first(EVENT_MAPPINGS[event_name.to_sym], &block)
+  end
+
   def handle_file_chooser(event)
     return if @file_chooser_interceptors.empty?
 
@@ -651,7 +690,7 @@ class Puppeteer::Page
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
   private def wait_for_navigation(timeout: nil, wait_until: nil)
-    main_frame.wait_for_navigation(timeout: timeout, wait_until: wait_until)
+    main_frame.send(:wait_for_navigation, timeout: timeout, wait_until: wait_until)
   end
 
   # @param timeout [number|nil]
@@ -806,9 +845,9 @@ class Puppeteer::Page
     @frame_manager.network_manager.cache_enabled = enabled
   end
 
-  # @return {!Promise<string>}
+  # @return [String]
   def title
-    @title
+    main_frame.title
   end
 
   # /**

data/lib/puppeteer/remote_object.rb

@@ -62,6 +62,15 @@ class Puppeteer::RemoteObject
     client.send_message('DOM.getContentQuads', objectId: @object_id)
   end
 
+  # used in ElementHandle#_box_model
+  def box_model(client)
+    client.send_message('DOM.getBoxModel', objectId: @object_id)
+  rescue => err
+    debug_puts(err)
+    nil
+  end
+
+
   # helper#valueFromRemoteObject
   def value
     if @unserializable_value

data/lib/puppeteer/target.rb

@@ -33,47 +33,47 @@ class Puppeteer::Target
     #    this._pagePromise = null;
     #    /** @type {?Promise<!Worker>} */
     #    this._workerPromise = null;
-    @initialized_promise = resolvable_future
-    #    this._isClosedPromise = new Promise(fulfill => this._closedCallback = fulfill);
+    @initialize_callback_promise = resolvable_future
+    @initialized_promise = @initialize_callback_promise.then do |success|
+      handle_initialized(success)
+    end
+    @is_closed_promise = resolvable_future
 
     @is_initialized = @target_info.type != 'page' || !@target_info.url.empty?
 
     if @is_initialized
-      handle_initialized(true)
+      @initialize_callback_promise.fulfill(true)
     end
   end
 
-  attr_reader :target_id, :initialized_promise
+  attr_reader :target_id, :initialized_promise, :is_closed_promise
+
+  def closed_callback
+    @is_closed_promise.fulfill(true)
+  end
 
   class InitializeFailure < StandardError; end
 
-  def handle_initialized(success)
+  def ignore_initialize_callback_promise
+    unless @initialize_callback_promise.fulfilled?
+      @initialize_callback_promise.fulfill(false)
+    end
+  end
+
+  private def handle_initialized(success)
     unless success
-      @initialized_promise.reject(InitializeFailure.new('Failed to create target for page'))
+      raise InitializeFailure.new('Failed to create target for page')
     end
-    @on_initialize_succeeded&.call
-    @initialized_promise.fulfill(true)
     opener_page = opener&.page
     if opener_page.nil? || type != 'page'
-      return
+      return true
     end
     #      if (!openerPage.listenerCount(Events.Page.Popup))
     #        return true;
     popup_page = page
     opener_page.emit_event('Events.Page.Popup', popup_page)
-  end
-
-  def on_initialize_succeeded(&block)
-    @on_initialize_succeeded = block
-  end
-
-  def handle_closed
-    @closed = true
-    @on_close&.call
-  end
 
-  def on_close(&block)
-    @on_close = block
+    true
   end
 
   def initialized?
@@ -85,7 +85,7 @@ class Puppeteer::Target
   end
 
   def page
-    if ['page', 'background_page'].include?(@target_info.type) && @page.nil?
+    if ['page', 'background_page', 'webview'].include?(@target_info.type) && @page.nil?
       client = @session_factory.call
       @page = Puppeteer::Page.create(client, self, @ignore_https_errors, @default_viewport, @screenshot_task_queue)
     end
@@ -135,16 +135,16 @@ class Puppeteer::Target
   def opener
     opener_id = @target_info.opener_id
     return nil if opener_id.nil?
-    browser.targets[opener_id]
+    browser.send(:find_target_by_id, opener_id)
   end
 
   # @param {!Protocol.Target.TargetInfo} targetInfo
   def handle_target_info_changed(target_info)
     @target_info = target_info
 
-    if !@is_initialized && (@target_info.type != 'page' || !target_info.url.empty?)
+    if !@is_initialized && (@target_info.type != 'page' || !@target_info.url.empty?)
       @is_initialized = true
-      handle_initialized(true)
+      @initialize_callback_promise.fulfill(true)
     end
   end
 end

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.8'
+  VERSION = '0.0.13'
 end

data/lib/puppeteer/viewport.rb

@@ -33,4 +33,22 @@ class Puppeteer::Viewport
   def landscape?
     @is_landscape
   end
+
+  def merge(
+        width: nil,
+        height: nil,
+        device_scale_factor: nil,
+        is_mobile: nil,
+        has_touch: nil,
+        is_landscape: nil)
+
+    Puppeteer::Viewport.new(
+      width: width || @width,
+      height: height || @height,
+      device_scale_factor: device_scale_factor || @device_scale_factor,
+      is_mobile: is_mobile.nil? ? @is_mobile : is_mobile,
+      has_touch: has_touch.nil? ? @has_touch : has_touch,
+      is_landscape: is_landscape.nil? ? @is_landscape : is_landscape,
+    )
+  end
 end

data/lib/puppeteer/web_socket.rb

@@ -43,6 +43,8 @@ class Puppeteer::WebSocket
     end
   end
 
+  class TransportError < StandardError; end
+
   private def setup
     @ready_state = STATE_CONNECTING
     @driver.on(:open) do
@@ -55,7 +57,7 @@ class Puppeteer::WebSocket
     end
     @driver.on(:error) do |event|
       if !handle_on_error(error_message: event.message)
-        raise Puppeteer::WebSocktTransportError.new(event.message)
+        raise TransportError.new(event.message)
       end
     end
     @driver.on(:message) do |event|