puppeteer-ruby 0.42.0 → 0.43.0

data/lib/puppeteer/launcher/chrome.rb

@@ -81,6 +81,7 @@ module Puppeteer::Launcher
           )
 
           Puppeteer::Browser.create(
+            product: product,
             connection: connection,
             context_ids: [],
             ignore_https_errors: @browser_options.ignore_https_errors?,
@@ -126,7 +127,8 @@ module Puppeteer::Launcher
           '--disable-extensions',
           # TODO: remove AvoidUnnecessaryBeforeUnloadCheckSync below
           # once crbug.com/1324138 is fixed and released.
-          '--disable-features=Translate,BackForwardCache,AvoidUnnecessaryBeforeUnloadCheckSync',
+          # AcceptCHFrame disabled because of crbug.com/1348106.
+          '--disable-features=Translate,BackForwardCache,AcceptCHFrame,AvoidUnnecessaryBeforeUnloadCheckSync',
           '--disable-hang-monitor',
           '--disable-ipc-flooding-protection',
           '--disable-popup-blocking',
@@ -181,61 +183,6 @@ module Puppeteer::Launcher
       DefaultArgs.new(ChromeArgOptions.new(options || {}))
     end
 
-    # @return [Puppeteer::Browser]
-    def connect(options = {})
-      @browser_options = BrowserOptions.new(options)
-      browser_ws_endpoint = options[:browser_ws_endpoint]
-      browser_url = options[:browser_url]
-      transport = options[:transport]
-
-      connection =
-        if browser_ws_endpoint && browser_url.nil? && transport.nil?
-          connect_with_browser_ws_endpoint(browser_ws_endpoint)
-        elsif browser_ws_endpoint.nil? && browser_url && transport.nil?
-          connect_with_browser_url(browser_url)
-        elsif browser_ws_endpoint.nil? && browser_url.nil? && transport
-          connect_with_transport(transport)
-        else
-          raise ArgumentError.new("Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect")
-        end
-
-      result = connection.send_message('Target.getBrowserContexts')
-      browser_context_ids = result['browserContextIds']
-
-      Puppeteer::Browser.create(
-        connection: connection,
-        context_ids: browser_context_ids,
-        ignore_https_errors: @browser_options.ignore_https_errors?,
-        default_viewport: @browser_options.default_viewport,
-        process: nil,
-        close_callback: -> { connection.send_message('Browser.close') },
-        target_filter_callback: @browser_options.target_filter,
-        is_page_target_callback: @browser_options.is_page_target,
-      )
-    end
-
-    # @return [Puppeteer::Connection]
-    private def connect_with_browser_ws_endpoint(browser_ws_endpoint)
-      transport = Puppeteer::WebSocketTransport.create(browser_ws_endpoint)
-      Puppeteer::Connection.new(browser_ws_endpoint, transport, @browser_options.slow_mo)
-    end
-
-    # @return [Puppeteer::Connection]
-    private def connect_with_browser_url(browser_url)
-      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]
-    private def connect_with_transport(transport)
-      Puppeteer::Connection.new('', transport, @browser_options.slow_mo)
-    end
-
     # @return {string}
     def executable_path(channel: nil)
       if channel

data/lib/puppeteer/launcher/firefox.rb

@@ -79,6 +79,7 @@ module Puppeteer::Launcher
           )
 
           Puppeteer::Browser.create(
+            product: product,
             connection: connection,
             context_ids: [],
             ignore_https_errors: @browser_options.ignore_https_errors?,
@@ -106,61 +107,6 @@ module Puppeteer::Launcher
       browser
     end
 
-    # @return [Puppeteer::Browser]
-    def connect(options = {})
-      @browser_options = BrowserOptions.new(options)
-      browser_ws_endpoint = options[:browser_ws_endpoint]
-      browser_url = options[:browser_url]
-      transport = options[:transport]
-
-      connection =
-        if browser_ws_endpoint && browser_url.nil? && transport.nil?
-          connect_with_browser_ws_endpoint(browser_ws_endpoint)
-        elsif browser_ws_endpoint.nil? && browser_url && transport.nil?
-          connect_with_browser_url(browser_url)
-        elsif browser_ws_endpoint.nil? && browser_url.nil? && transport
-          connect_with_transport(transport)
-        else
-          raise ArgumentError.new("Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect")
-        end
-
-      result = connection.send_message('Target.getBrowserContexts')
-      browser_context_ids = result['browserContextIds']
-
-      Puppeteer::Browser.create(
-        connection: connection,
-        context_ids: browser_context_ids,
-        ignore_https_errors: @browser_options.ignore_https_errors?,
-        default_viewport: @browser_options.default_viewport,
-        process: nil,
-        close_callback: -> { connection.send_message('Browser.close') },
-        target_filter_callback: nil,
-        is_page_target_callback: nil,
-      )
-    end
-
-    # @return [Puppeteer::Connection]
-    private def connect_with_browser_ws_endpoint(browser_ws_endpoint)
-      transport = Puppeteer::WebSocketTransport.create(browser_ws_endpoint)
-      Puppeteer::Connection.new(browser_ws_endpoint, transport, @browser_options.slow_mo)
-    end
-
-    # @return [Puppeteer::Connection]
-    private def connect_with_browser_url(browser_url)
-      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]
-    private def connect_with_transport(transport)
-      Puppeteer::Connection.new('', transport, @browser_options.slow_mo)
-    end
-
     # @return {string}
     def executable_path(channel: nil)
       if channel

data/lib/puppeteer/lifecycle_watcher.rb

@@ -65,6 +65,7 @@ class Puppeteer::LifecycleWatcher
     @expected_lifecycle = ExpectedLifecycle.new(wait_until)
     @frame_manager = frame_manager
     @frame = frame
+    @initial_loader_id = frame.loader_id
     @timeout = timeout
 
     @listener_ids = {}
@@ -162,7 +163,7 @@ class Puppeteer::LifecycleWatcher
     if @has_same_document_navigation && @same_document_navigation_promise.pending?
       @same_document_navigation_promise.fulfill(true)
     end
-    if (@swapped || @new_document_navigation) && @new_document_navigation_promise.pending?
+    if (@swapped || @frame.loader_id != @initial_loader_id) && @new_document_navigation_promise.pending?
       @new_document_navigation_promise.fulfill(true)
     end
   end

data/lib/puppeteer/page.rb

@@ -50,33 +50,11 @@ class Puppeteer::Page
     @workers = {}
     @user_drag_interception_enabled = false
 
-    @client.add_event_listener('Target.attachedToTarget') do |event|
-      if event['targetInfo']['type'] != 'worker' && event['targetInfo']['type'] != 'iframe'
-        # If we don't detach from service workers, they will never die.
-        # We still want to attach to workers for emitting events.
-        # We still want to attach to iframes so sessions may interact with them.
-        # We detach from all other types out of an abundance of caution.
-        # See https://source.chromium.org/chromium/chromium/src/+/main:content/browser/devtools/devtools_agent_host_impl.cc?ss=chromium&q=f:devtools%20-f:out%20%22::kTypePage%5B%5D%22
-        # for the complete list of available types.
-        @client.async_send_message('Target.detachFromTarget', sessionId: event['sessionId'])
-        next
-      end
-
-      if event['targetInfo']['type'] == 'worker'
-        session = Puppeteer::Connection.from_session(@client).session(event['sessionId']) # rubocop:disable Lint/UselessAssignment
-        #   const worker = new Worker(session, event.targetInfo.url, this._addConsoleMessage.bind(this), this._handleException.bind(this));
-        #   this._workers.set(event.sessionId, worker);
-        #   this.emit(PageEmittedEvents::WorkerCreated, worker);
-      end
-    end
-    @client.add_event_listener('Target.detachedFromTarget') do |event|
-      session_id = event['sessionId']
-      worker = @workers[session_id]
-      next unless worker
-
-      emit_event(PageEmittedEvents::WorkerDestroyed, worker)
-      @workers.delete(session_id)
-    end
+    @target.target_manager.add_target_interceptor(@client, method(:handle_attached_to_target))
+    @target_gone_listener_id = @target.target_manager.add_event_listener(
+      TargetManagerEmittedEvents::TargetGone,
+      &method(:handle_detached_from_target)
+    )
 
     @frame_manager.on_event(FrameManagerEmittedEvents::FrameAttached) do |event|
       emit_event(PageEmittedEvents::FrameAttached, event)
@@ -135,15 +113,46 @@ class Puppeteer::Page
       handle_file_chooser(event)
     end
     @target.is_closed_promise.then do
+      @target.target_manager.remove_target_interceptor(@client, method(:handle_attached_to_target))
+      @target.target_manager.remove_event_listener(@target_gone_listener_id)
+
       emit_event(PageEmittedEvents::Close)
       @closed = true
     end
   end
 
+  private def handle_detached_from_target(target)
+    session_id = target.session&.id
+    @frame_manager.handle_detached_from_target(target)
+    return unless session_id
+    worker = @workers.delete(session_id)
+    return unless worker
+    emit_event(PageEmittedEvents::WorkerDestroyed, worker)
+  end
+
+  private def handle_attached_to_target(target, _)
+    @frame_manager.handle_attached_to_target(target)
+    if target.raw_type == 'worker'
+      #   const session = createdTarget._session();
+      #   assert(session);
+      #   const worker = new WebWorker(
+      #     session,
+      #     createdTarget.url(),
+      #     this.#addConsoleMessage.bind(this),
+      #     this.#handleException.bind(this)
+      #   );
+      #   this.#workers.set(session.id(), worker);
+      #   this.emit(PageEmittedEvents.WorkerCreated, worker);
+    end
+
+    if target.session
+      @target.target_manager.add_target_interceptor(target.session, method(:handle_attached_to_target))
+    end
+  end
+
   def init
     await_all(
-      @frame_manager.async_init,
-      @client.async_send_message('Target.setAutoAttach', autoAttach: true, waitForDebuggerOnStart: false, flatten: true),
+      @frame_manager.async_init(@target.target_id),
       @client.async_send_message('Performance.enable'),
       @client.async_send_message('Log.enable'),
     )

data/lib/puppeteer/puppeteer.rb

@@ -110,7 +110,7 @@ class Puppeteer::Puppeteer
       default_viewport: default_viewport,
       slow_mo: slow_mo,
     }.compact
-    browser = launcher.connect(options)
+    browser = Puppeteer::BrowserConnector.new(options).connect_to_browser
     if block_given?
       begin
         yield(browser)

data/lib/puppeteer/target.rb

@@ -19,11 +19,15 @@ class Puppeteer::Target
   # @param {boolean} ignoreHTTPSErrors
   # @param {?Puppeteer.Viewport} defaultViewport
   def initialize(target_info:,
+                 session:,
                  browser_context:,
+                 target_manager:,
                  session_factory:,
                  ignore_https_errors:,
                  default_viewport:,
                  is_page_target_callback:)
+    @session = session
+    @target_manager = target_manager
     @target_info = target_info
     @browser_context = browser_context
     @target_id = target_info.target_id
@@ -83,13 +87,22 @@ class Puppeteer::Target
     @is_initialized
   end
 
+  # @return [CDPSession|nil]
+  def session
+    @session
+  end
+
   def create_cdp_session
     @session_factory.call
   end
 
+  def target_manager
+    @target_manager
+  end
+
   def page
     if @is_page_target_callback.call(@target_info) && @page.nil?
-      client = @session_factory.call
+      client = @session || @session_factory.call
       @page = Puppeteer::Page.create(client, self, @ignore_https_errors, @default_viewport)
     end
     @page

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.42.0'
+  VERSION = '0.43.0'
 end

data/lib/puppeteer.rb

@@ -22,7 +22,9 @@ require 'puppeteer/aria_query_handler'
 require 'puppeteer/browser'
 require 'puppeteer/browser_context'
 require 'puppeteer/browser_runner'
+require 'puppeteer/browser_connector'
 require 'puppeteer/cdp_session'
+require 'puppeteer/chrome_target_manager'
 require 'puppeteer/connection'
 require 'puppeteer/console_message'
 require 'puppeteer/coverage'
@@ -36,6 +38,7 @@ require 'puppeteer/exception_details'
 require 'puppeteer/executable_path_finder'
 require 'puppeteer/execution_context'
 require 'puppeteer/file_chooser'
+require 'puppeteer/firefox_target_manager'
 require 'puppeteer/frame'
 require 'puppeteer/frame_manager'
 require 'puppeteer/http_request'

data/puppeteer-ruby.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rollbar'
   spec.add_development_dependency 'rspec', '~> 3.11.0'
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 1.35.0'
+  spec.add_development_dependency 'rubocop', '~> 1.36.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'webrick'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -255,10 +255,12 @@ files:
 - lib/puppeteer.rb
 - lib/puppeteer/aria_query_handler.rb
 - lib/puppeteer/browser.rb
+- lib/puppeteer/browser_connector.rb
 - lib/puppeteer/browser_context.rb
 - lib/puppeteer/browser_fetcher.rb
 - lib/puppeteer/browser_runner.rb
 - lib/puppeteer/cdp_session.rb
+- lib/puppeteer/chrome_target_manager.rb
 - lib/puppeteer/concurrent_ruby_utils.rb
 - lib/puppeteer/connection.rb
 - lib/puppeteer/console_message.rb
@@ -285,6 +287,7 @@ files:
 - lib/puppeteer/executable_path_finder.rb
 - lib/puppeteer/execution_context.rb
 - lib/puppeteer/file_chooser.rb
+- lib/puppeteer/firefox_target_manager.rb
 - lib/puppeteer/frame.rb
 - lib/puppeteer/frame_manager.rb
 - lib/puppeteer/geolocation.rb