puppeteer-ruby 0.0.10 → 0.0.11

data/docs/top-level-namespace.html

@@ -116,7 +116,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jun 12 12:38:32 2020 by
+  Generated on Sat Jun 20 17:15:05 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.24 (ruby-2.6.3).
 </div>

data/lib/puppeteer/browser.rb

@@ -46,7 +46,7 @@ class Puppeteer::Browser
       @contexts[context_id] = Puppeteer::BrowserContext.new(@connection, self. context_id)
     end
     @targets = {}
-    @connection.on_event 'Events.CDPSession.Disconnected' do
+    @connection.on_event 'Events.Connection.Disconnected' do
       emit_event 'Events.Browser.Disconnected'
     end
     @connection.on_event 'Target.targetCreated', &method(:handle_target_created)
@@ -54,6 +54,22 @@ class Puppeteer::Browser
     @connection.on_event 'Target.targetInfoChanged', &method(:handle_target_info_changed)
   end
 
+  EVENT_MAPPINGS = {
+    disconnected: 'Events.Browser.Disconnected',
+    targetcreated: 'Events.Browser.TargetCreated',
+    targetchanged: 'Events.Browser.TargetChanged',
+    targetdestroyed: 'Events.Browser.TargetDestroyed',
+  }
+
+  # @param event_name [Symbol] either of :disconnected, :targetcreated, :targetchanged, :targetdestroyed
+  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
+
   # @return [Puppeteer::BrowserRunner::BrowserProcess]
   def process
     @process

data/lib/puppeteer/connection.rb

@@ -44,7 +44,9 @@ class Puppeteer::Connection
 
     @transport = transport
     @transport.on_message do |data|
-      async_handle_message(JSON.parse(data))
+      message = JSON.parse(data)
+      sleep_before_handling_message(message)
+      async_handle_message(message)
     end
     @transport.on_close do |reason, code|
       handle_close(reason, code)
@@ -54,6 +56,16 @@ class Puppeteer::Connection
     @closed = false
   end
 
+  private def sleep_before_handling_message(message)
+    # Puppeteer doesn't handle any Network monitoring responses.
+    # So we don't have to sleep.
+    return if message['method']&.start_with?('Network.')
+
+    # For some reasons, sleeping a bit reduces trivial errors...
+    # 4ms is an interval of internal shared timer of WebKit.
+    sleep 0.004
+  end
+
   def self.from_session(session)
     session.connection
   end

data/lib/puppeteer/dom_world.rb

@@ -97,17 +97,18 @@ class Puppeteer::DOMWorld
     document.S(selector)
   end
 
-  class DocumentEvaluationError < StandardError; end
-
   private def evaluate_document
     # sometimes execution_context.evaluate_handle('document') returns null object.
     # D, [2020-04-24T02:17:51.023631 #220] DEBUG -- : RECV << {"id"=>20, "result"=>{"result"=>{"type"=>"object", "subtype"=>"null", "value"=>nil}}, "sessionId"=>"78E9CF1E14D81294E320E7C20E5CDE06"}
     # retry if so.
-    5.times do
-      handle = execution_context.evaluate_handle('document')
-      return handle if handle.is_a?(Puppeteer::ElementHandle)
+    Timeout.timeout(3) do
+      loop do
+        handle = execution_context.evaluate_handle('document')
+        return handle if handle.is_a?(Puppeteer::ElementHandle)
+      end
     end
-    raise DocumentEvaluationError.new("'document' object cannot be evaluated as an Element")
+  rescue Timeout::Error
+    raise 'Bug of puppeteer-ruby...'
   end
 
   private def document

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"

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

@@ -651,7 +651,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]

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -208,6 +208,8 @@ files:
 - docs/Puppeteer/Device.html
 - docs/Puppeteer/Devices.html
 - docs/Puppeteer/ElementHandle.html
+- docs/Puppeteer/ElementHandle/BoundingBox.html
+- docs/Puppeteer/ElementHandle/BoxModel.html
 - docs/Puppeteer/ElementHandle/ElementNotFoundError.html
 - docs/Puppeteer/ElementHandle/ElementNotVisibleError.html
 - docs/Puppeteer/ElementHandle/Point.html
@@ -263,6 +265,7 @@ files:
 - docs/Puppeteer/WaitTask/TimeoutError.html
 - docs/Puppeteer/WebSocket.html
 - docs/Puppeteer/WebSocket/DriverImpl.html
+- docs/Puppeteer/WebSocket/TransportError.html
 - docs/Puppeteer/WebSocketTransport.html
 - docs/Puppeteer/WebSocktTransportError.html
 - docs/_index.html