puppeteer-ruby 0.45.6 → 0.50.0.alpha6

data/lib/puppeteer/launcher/launch_options.rb

@@ -31,6 +31,7 @@ module Puppeteer::Launcher
     # @property {boolean=} dumpio
     # @property {!Object<string, string | undefined>=} env
     # @property {boolean=} pipe
+    # @property {boolean=} wait_for_initial_page
     def initialize(options)
       @channel = options[:channel]
       @executable_path = options[:executable_path]
@@ -42,10 +43,10 @@ module Puppeteer::Launcher
       @dumpio = options[:dumpio] || false
       @env = options[:env] || ENV
       @pipe = options[:pipe] || false
-      @extra_prefs_firefox = options[:extra_prefs_firefox] || {}
+      @wait_for_initial_page = options.fetch(:wait_for_initial_page, true)
     end
 
-    attr_reader :channel, :executable_path, :ignore_default_args, :timeout, :env, :extra_prefs_firefox
+    attr_reader :channel, :executable_path, :ignore_default_args, :timeout, :env
 
     def handle_SIGINT?
       @handle_SIGINT
@@ -66,5 +67,9 @@ module Puppeteer::Launcher
     def pipe?
       @pipe
     end
+
+    def wait_for_initial_page?
+      @wait_for_initial_page
+    end
   end
 end

data/lib/puppeteer/launcher.rb

@@ -1,7 +1,6 @@
 require_relative './launcher/browser_options'
 require_relative './launcher/chrome'
 require_relative './launcher/chrome_arg_options'
-require_relative './launcher/firefox'
 require_relative './launcher/launch_options'
 
 # https://github.com/puppeteer/puppeteer/blob/main/src/node/Launcher.ts
@@ -9,19 +8,16 @@ module Puppeteer::Launcher
   # @param project_root [String]
   # @param prefereed_revision [String]
   # @param is_puppeteer_core [String]
-  # @param product [String] 'chrome' or 'firefox'
+  # @param product [String] 'chrome'
   # @return [Puppeteer::Launcher::Chrome]
   module_function def new(project_root:, preferred_revision:, is_puppeteer_core:, product:)
     unless is_puppeteer_core
       product ||= ENV['PUPPETEER_PRODUCT']
     end
 
-    if product == 'firefox'
-      return Firefox.new(
-        project_root: project_root,
-        preferred_revision: preferred_revision,
-        is_puppeteer_core: is_puppeteer_core,
-      )
+    product = product.to_s if product
+    if product && product != 'chrome'
+      raise ArgumentError.new("Unsupported product: #{product}. Only 'chrome' is supported.")
     end
 
     Chrome.new(

data/lib/puppeteer/lifecycle_watcher.rb

@@ -50,12 +50,12 @@ class Puppeteer::LifecycleWatcher
     end
   end
 
-  class FrameDetachedError < StandardError
+  class FrameDetachedError < Puppeteer::Error
     def initialize
       super('Navigating frame was detached')
     end
   end
-  class TerminatedError < StandardError; end
+  class TerminatedError < Puppeteer::Error; end
 
   #  * @param {!Puppeteer.FrameManager} frameManager
   #  * @param {!Puppeteer.Frame} frame
@@ -72,6 +72,12 @@ class Puppeteer::LifecycleWatcher
     @listener_ids['client'] = @frame_manager.client.add_event_listener(CDPSessionEmittedEvents::Disconnected) do
       terminate(TerminatedError.new('Navigation failed because browser has disconnected!'))
     end
+    connection = @frame_manager.client.respond_to?(:connection) ? @frame_manager.client.connection : nil
+    if connection
+      @listener_ids['connection'] = connection.add_event_listener(ConnectionEmittedEvents::Disconnected) do
+        terminate(TerminatedError.new('Navigation failed because browser has disconnected!'))
+      end
+    end
     @listener_ids['frame_manager'] = [
       @frame_manager.add_event_listener(FrameManagerEmittedEvents::LifecycleEvent) do |_|
         check_lifecycle_complete
@@ -87,24 +93,28 @@ class Puppeteer::LifecycleWatcher
       @frame_manager.network_manager.add_event_listener(NetworkManagerEmittedEvents::RequestFailed, &method(:handle_request_failed)),
     ]
 
-    @same_document_navigation_promise = resolvable_future
-    @lifecycle_promise = resolvable_future
-    @new_document_navigation_promise = resolvable_future
-    @termination_promise = resolvable_future
+    @same_document_navigation_promise = Async::Promise.new
+    @lifecycle_promise = Async::Promise.new
+    @new_document_navigation_promise = Async::Promise.new
+    @termination_promise = Async::Promise.new
+    @navigation_response_received = Async::Promise.new.tap { |promise| promise.resolve(nil) }
     check_lifecycle_complete
   end
 
   # @param [Puppeteer::HTTPRequest] request
   def handle_request(request)
     return if request.frame != @frame || !request.navigation_request?
+    if @navigation_request && request.redirect_chain.empty?
+      return
+    end
     @navigation_request = request
     # Resolve previous navigation response in case there are multiple
     # navigation requests reported by the backend. This generally should not
     # happen by it looks like it's possible.
-    @navigation_response_received.fulfill(nil) if @navigation_response_received && !@navigation_response_received.resolved?
-    @navigation_response_received = resolvable_future
+    @navigation_response_received.resolve(nil) if @navigation_response_received && !@navigation_response_received.resolved?
+    @navigation_response_received = Async::Promise.new
     if request.response && !@navigation_response_received.resolved?
-      @navigation_response_received.fulfill(nil)
+      @navigation_response_received.resolve(nil)
     end
   end
 
@@ -112,14 +122,14 @@ class Puppeteer::LifecycleWatcher
   def handle_request_failed(request)
     return if @navigation_request&.internal&.request_id != request.internal.request_id
 
-    @navigation_response_received.fulfill(nil) unless @navigation_response_received.resolved?
+    @navigation_response_received.resolve(nil) unless @navigation_response_received.resolved?
   end
 
   # @param [Puppeteer::HTTPResponse] response
   def handle_response(response)
     return if @navigation_request&.internal&.request_id != response.request.internal.request_id
 
-    @navigation_response_received.fulfill(nil) unless @navigation_response_received.resolved?
+    @navigation_response_received.resolve(nil) unless @navigation_response_received.resolved?
   end
 
   # @param frame [Puppeteer::Frame]
@@ -134,7 +144,7 @@ class Puppeteer::LifecycleWatcher
   # @return [Puppeteer::HTTPResponse]
   def navigation_response
     # Continue with a possibly null response.
-    @navigation_response_received.value! rescue nil
+    @navigation_response_received.wait rescue nil
     if_present(@navigation_request) do |request|
       request.response
     end
@@ -142,6 +152,8 @@ class Puppeteer::LifecycleWatcher
 
   # @param error [TerminatedError]
   private def terminate(error)
+    return if @termination_promise.resolved?
+
     @termination_promise.reject(error)
   end
 
@@ -153,12 +165,12 @@ class Puppeteer::LifecycleWatcher
 
   def timeout_or_termination_promise
     if @timeout > 0
-      future do
-        Timeout.timeout(@timeout / 1000.0) do
-          @termination_promise.value!
+      -> do
+        begin
+          Puppeteer::AsyncUtils.async_timeout(@timeout, @termination_promise).wait
+        rescue Async::TimeoutError
+          raise Puppeteer::TimeoutError.new("Navigation timeout of #{@timeout} ms exceeded")
         end
-      rescue Timeout::Error
-        raise Puppeteer::TimeoutError.new("Navigation timeout of #{@timeout}ms exceeded")
       end
     else
       @termination_promise
@@ -187,12 +199,12 @@ class Puppeteer::LifecycleWatcher
   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 @has_same_document_navigation && @same_document_navigation_promise.pending?
-      @same_document_navigation_promise.fulfill(true)
+    @lifecycle_promise.resolve(true) unless @lifecycle_promise.resolved?
+    if @has_same_document_navigation && !@same_document_navigation_promise.resolved?
+      @same_document_navigation_promise.resolve(true)
     end
-    if (@swapped || @frame.loader_id != @initial_loader_id) && @new_document_navigation_promise.pending?
-      @new_document_navigation_promise.fulfill(true)
+    if (@swapped || @frame.loader_id != @initial_loader_id) && !@new_document_navigation_promise.resolved?
+      @new_document_navigation_promise.resolve(true)
     end
   end
 
@@ -203,6 +215,10 @@ class Puppeteer::LifecycleWatcher
     if_present(@listener_ids['frame_manager']) do |ids|
       @frame_manager.remove_event_listener(*ids)
     end
+    if_present(@listener_ids['connection']) do |id|
+      connection = @frame_manager.client.respond_to?(:connection) ? @frame_manager.client.connection : nil
+      connection&.remove_event_listener(id)
+    end
     if_present(@listener_ids['network_manager']) do |ids|
       @frame_manager.network_manager.remove_event_listener(*ids)
     end