puppeteer-ruby 0.0.5 → 0.0.11

data/lib/puppeteer/remote_object.rb

@@ -52,7 +52,7 @@ class Puppeteer::RemoteObject
     client.send_message('Runtime.getProperties', objectId: @object_id, ownProperties: true)
   end
 
-  # used in ElementHandle#content_frame
+  # used in ElementHandle#content_frame, ElementHandle#upload_file
   def node_info(client)
     client.send_message('DOM.describeNode', objectId: @object_id)
   end
@@ -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
@@ -126,4 +135,9 @@ class Puppeteer::RemoteObject
       { value: value }
     end
   end
+
+  # used in ElementHandle#upload_file
+  def set_file_input_files(client, files, backend_node_id)
+    client.send_message('DOM.setFileInputFiles', objectId: @object_id, files: files, backendNodeId: backend_node_id)
+  end
 end

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
@@ -142,9 +142,9 @@ class Puppeteer::Target
   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.5'
+  VERSION = '0.0.11'
 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/wait_task.rb

@@ -1,6 +1,188 @@
 class Puppeteer::WaitTask
+  using Puppeteer::AsyncAwaitBehavior
+
   class TerminatedError < StandardError; end
 
-  def initialize
+  class TimeoutError < StandardError
+    def initialize(title:, timeout:)
+      super("waiting for #{title} failed: timeout #{timeout}ms exceeded")
+    end
+  end
+
+  def initialize(dom_world:, predicate_body:, title:, polling:, timeout:, args: [])
+    if polling.is_a?(String)
+      if polling != 'raf' && polling != 'mutation'
+        raise ArgumentError.new("Unknown polling option: #{polling}")
+      end
+    elsif polling.is_a?(Numeric)
+      unless polling.positive?
+        raise ArgumentError.new("Cannot poll with non-positive interval: #{polling}")
+      end
+    else
+      raise ArgumentError.new("Unknown polling options: #{polling}")
+    end
+
+    @dom_world = dom_world
+    @polling = polling
+    @timeout = timeout
+    @predicate_body = predicate_body
+    @args = args
+    @run_count = 0
+    @dom_world._wait_tasks.add(self)
+    @promise = resolvable_future
+
+    # Since page navigation requires us to re-install the pageScript, we should track
+    # timeout on our end.
+    if timeout
+      timeout_error = TimeoutError.new(title: title, timeout: timeout)
+      Concurrent::Promises.schedule(timeout / 1000.0) { terminate(timeout_error) unless @timeout_cleared }
+    end
+    async_rerun
+  end
+
+  # @return [Puppeteer::JSHandle]
+  def await_promise
+    @promise.value!
+  end
+
+  def terminate(error)
+    @terminated = true
+    @promise.reject(error)
+    cleanup
+  end
+
+  def rerun
+    run_count = (@run_count += 1)
+    begin
+      success = @dom_world.execution_context.evaluate_handle(
+        WAIT_FOR_PREDICATE_PAGE_FUNCTION,
+        @predicate_body,
+        @polling,
+        @timeout,
+        *@args,
+      )
+    rescue => err
+      error = err
+    end
+
+    if @terminated || run_count != @run_count
+      if success
+        success.dispose
+      end
+      return
+    end
+
+    # Ignore timeouts in pageScript - we track timeouts ourselves.
+    # If the frame's execution context has already changed, `frame.evaluate` will
+    # throw an error - ignore this predicate run altogether.
+    if !error && (@dom_world.evaluate("s => !s", success) rescue true)
+      success.dispose
+      return
+    end
+
+    # When the page is navigated, the promise is rejected.
+    # We will try again in the new execution context.
+    if error && error.message.include?('Execution context was destroyed')
+      return
+    end
+
+    # We could have tried to evaluate in a context which was already
+    # destroyed.
+    if error && error.message.include?('Cannot find context with specified id')
+      return
+    end
+
+    if error
+      @promise.reject(error)
+    else
+      @promise.fulfill(success)
+    end
+
+    cleanup
   end
+
+  private def cleanup
+    @timeout_cleared = true
+    @dom_world._wait_tasks.delete(self)
+  end
+
+  private async def async_rerun
+    rerun
+  end
+
+  WAIT_FOR_PREDICATE_PAGE_FUNCTION = <<~JAVASCRIPT
+  async function _(predicateBody, polling, timeout, ...args) {
+      const predicate = new Function('...args', predicateBody);
+      let timedOut = false;
+      if (timeout)
+          setTimeout(() => (timedOut = true), timeout);
+      if (polling === 'raf')
+          return await pollRaf();
+      if (polling === 'mutation')
+          return await pollMutation();
+      if (typeof polling === 'number')
+          return await pollInterval(polling);
+      /**
+       * @return {!Promise<*>}
+       */
+      function pollMutation() {
+          const success = predicate(...args);
+          if (success)
+              return Promise.resolve(success);
+          let fulfill;
+          const result = new Promise((x) => (fulfill = x));
+          const observer = new MutationObserver(() => {
+              if (timedOut) {
+                  observer.disconnect();
+                  fulfill();
+              }
+              const success = predicate(...args);
+              if (success) {
+                  observer.disconnect();
+                  fulfill(success);
+              }
+          });
+          observer.observe(document, {
+              childList: true,
+              subtree: true,
+              attributes: true,
+          });
+          return result;
+      }
+      function pollRaf() {
+          let fulfill;
+          const result = new Promise((x) => (fulfill = x));
+          onRaf();
+          return result;
+          function onRaf() {
+              if (timedOut) {
+                  fulfill();
+                  return;
+              }
+              const success = predicate(...args);
+              if (success)
+                  fulfill(success);
+              else
+                  requestAnimationFrame(onRaf);
+          }
+      }
+      function pollInterval(pollInterval) {
+          let fulfill;
+          const result = new Promise((x) => (fulfill = x));
+          onTimeout();
+          return result;
+          function onTimeout() {
+              if (timedOut) {
+                  fulfill();
+                  return;
+              }
+              const success = predicate(...args);
+              if (success)
+                  fulfill(success);
+              else
+                  setTimeout(onTimeout, pollInterval);
+          }
+      }
+  }
+  JAVASCRIPT
 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|

data/lib/puppeteer/web_socket_transport.rb

@@ -11,7 +11,7 @@ class Puppeteer::WebSocketTransport
       promise.fulfill(Puppeteer::WebSocketTransport.new(ws))
     end
     ws.on_error do |error_message|
-      promise.reject(Puppeteer::WebSocktTransportError.new(error_message))
+      promise.reject(Puppeteer::WebSocket::TransportError.new(error_message))
     end
     promise.value!
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.11
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-29 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
@@ -219,6 +221,7 @@ files:
 - docs/Puppeteer/ExecutionContext/EvaluationError.html
 - docs/Puppeteer/ExecutionContext/JavaScriptExpression.html
 - docs/Puppeteer/ExecutionContext/JavaScriptFunction.html
+- docs/Puppeteer/FileChooser.html
 - docs/Puppeteer/Frame.html
 - docs/Puppeteer/FrameManager.html
 - docs/Puppeteer/FrameManager/NavigationError.html
@@ -244,6 +247,7 @@ files:
 - docs/Puppeteer/NetworkManager.html
 - docs/Puppeteer/NetworkManager/Credentials.html
 - docs/Puppeteer/Page.html
+- docs/Puppeteer/Page/FileChooserTimeoutError.html
 - docs/Puppeteer/Page/ScreenshotOptions.html
 - docs/Puppeteer/Page/ScriptTag.html
 - docs/Puppeteer/Page/StyleTag.html
@@ -258,8 +262,10 @@ files:
 - docs/Puppeteer/Viewport.html
 - docs/Puppeteer/WaitTask.html
 - docs/Puppeteer/WaitTask/TerminatedError.html
+- 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
@@ -291,10 +297,14 @@ files:
 - lib/puppeteer/devices.rb
 - lib/puppeteer/dom_world.rb
 - lib/puppeteer/element_handle.rb
+- lib/puppeteer/element_handle/bounding_box.rb
+- lib/puppeteer/element_handle/box_model.rb
+- lib/puppeteer/element_handle/point.rb
 - lib/puppeteer/emulation_manager.rb
 - lib/puppeteer/errors.rb
 - lib/puppeteer/event_callbackable.rb
 - lib/puppeteer/execution_context.rb
+- lib/puppeteer/file_chooser.rb
 - lib/puppeteer/frame.rb
 - lib/puppeteer/frame_manager.rb
 - lib/puppeteer/if_present.rb