puppeteer-ruby 0.37.2 → 0.39.0

data/lib/puppeteer/http_request.rb

@@ -72,7 +72,15 @@ class Puppeteer::HTTPRequest
   end
 
   attr_reader :internal
-  attr_reader :url, :resource_type, :method, :post_data, :headers, :response, :frame
+  attr_reader :url, :resource_type, :method, :post_data, :headers, :response, :frame, :initiator
+
+  def inspect
+    values = %i[request_id method url].map do |sym|
+      value = instance_variable_get(:"@#{sym}")
+      "@#{sym}=#{value}"
+    end
+    "#<Puppeteer::HTTPRequest #{values.join(' ')}>"
+  end
 
   private def assert_interception_allowed
     unless @allow_interception

data/lib/puppeteer/launcher/chrome.rb

@@ -27,31 +27,41 @@ module Puppeteer::Launcher
           @chrome_arg_options.args.dup
         end
 
-      #
-      # let temporaryUserDataDir = null;
-
       if chrome_arguments.none? { |arg| arg.start_with?('--remote-debugging-') }
         if @launch_options.pipe?
           chrome_arguments << '--remote-debugging-pipe'
         else
-          chrome_arguments << '--remote-debugging-port=0'
+          chrome_arguments << "--remote-debugging-port=#{@chrome_arg_options.debugging_port}"
         end
       end
 
-      temporary_user_data_dir = nil
-      if chrome_arguments.none? { |arg| arg.start_with?('--user-data-dir') }
-        temporary_user_data_dir = Dir.mktmpdir('puppeteer_dev_chrome_profile-')
-        chrome_arguments << "--user-data-dir=#{temporary_user_data_dir}"
+      user_data_dir = chrome_arguments.find { |arg| arg.start_with?('--user-data-dir') }
+      if user_data_dir
+        user_data_dir = user_data_dir.split('=').last
+        unless File.exist?(user_data_dir)
+          raise ArgumentError.new("Chrome user data dir not found at '#{user_data_dir}'")
+        end
+        using_temp_user_data_dir = false
+      else
+        user_data_dir = Dir.mktmpdir('puppeteer_dev_chrome_profile-', ENV['PUPPETEER_TMP_DIR'])
+        chrome_arguments << "--user-data-dir=#{user_data_dir}"
+        using_temp_user_data_dir = true
       end
 
       chrome_executable =
         if @launch_options.channel
           executable_path_for_channel(@launch_options.channel.to_s)
         else
-          @launch_options.executable_path || executable_path_for_channel('chrome')
+          @launch_options.executable_path || fallback_executable_path
         end
       use_pipe = chrome_arguments.include?('--remote-debugging-pipe')
-      runner = Puppeteer::BrowserRunner.new(chrome_executable, chrome_arguments, temporary_user_data_dir)
+      runner = Puppeteer::BrowserRunner.new(
+        false,
+        chrome_executable,
+        chrome_arguments,
+        user_data_dir,
+        using_temp_user_data_dir,
+      )
       runner.start(
         handle_SIGHUP: @launch_options.handle_SIGHUP?,
         handle_SIGTERM: @launch_options.handle_SIGTERM?,
@@ -61,30 +71,39 @@ module Puppeteer::Launcher
         pipe: use_pipe,
       )
 
+      browser =
+        begin
+          connection = runner.setup_connection(
+            use_pipe: use_pipe,
+            timeout: @launch_options.timeout,
+            slow_mo: @browser_options.slow_mo,
+            preferred_revision: @preferred_revision,
+          )
+
+          Puppeteer::Browser.create(
+            connection: connection,
+            context_ids: [],
+            ignore_https_errors: @browser_options.ignore_https_errors?,
+            default_viewport: @browser_options.default_viewport,
+            process: runner.proc,
+            close_callback: -> { runner.close },
+          )
+        rescue
+          runner.kill
+          raise
+        end
+
       begin
-        connection = runner.setup_connection(
-          use_pipe: use_pipe,
+        browser.wait_for_target(
+          predicate: ->(target) { target.type == 'page' },
           timeout: @launch_options.timeout,
-          slow_mo: @browser_options.slow_mo,
-          preferred_revision: @preferred_revision,
-        )
-
-        browser = Puppeteer::Browser.create(
-          connection: connection,
-          context_ids: [],
-          ignore_https_errors: @browser_options.ignore_https_errors?,
-          default_viewport: @browser_options.default_viewport,
-          process: runner.proc,
-          close_callback: -> { runner.close },
         )
-
-        browser.wait_for_target(predicate: ->(target) { target.type == 'page' })
-
-        browser
       rescue
-        runner.kill
+        browser.close
         raise
       end
+
+      browser
     end
 
     class DefaultArgs
@@ -216,10 +235,14 @@ module Puppeteer::Launcher
       if channel
         executable_path_for_channel(channel.to_s)
       else
-        executable_path_for_channel('chrome')
+        fallback_executable_path
       end
     end
 
+    private def fallback_executable_path
+      executable_path_for_channel('chrome')
+    end
+
     CHROMIUM_CHANNELS = {
       windows: {
         'chrome' => "#{ENV['PROGRAMFILES']}\\Google\\Chrome\\Application\\chrome.exe",
@@ -236,7 +259,16 @@ module Puppeteer::Launcher
         'msedge' => '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
       },
       linux: {
-        'chrome' => '/opt/google/chrome/chrome',
+        'chrome' => -> {
+          Puppeteer::ExecutablePathFinder.new(
+            'google-chrome-stable',
+            'google-chrome',
+            'chrome',
+            'chromium-freeworld',
+            'chromium-browser',
+            'chromium',
+          ).find_first
+        },
         'chrome-beta' => '/opt/google/chrome-beta/chrome',
         'chrome-dev' => '/opt/google/chrome-unstable/chrome',
       },
@@ -254,6 +286,10 @@ module Puppeteer::Launcher
         end
 
       chrome_path = chrome_path_map[channel]
+      if chrome_path.is_a?(Proc)
+        chrome_path = chrome_path.call
+      end
+
       unless chrome_path
         raise ArgumentError.new("Invalid channel: '#{channel}'. Allowed channel is #{chrome_path_map.keys}")
       end

data/lib/puppeteer/launcher/chrome_arg_options.rb

@@ -34,9 +34,10 @@ module Puppeteer::Launcher
       if @headless.nil?
         @headless = !@devtools
       end
+      @debugging_port = options[:debugging_port] || 0
     end
 
-    attr_reader :args, :user_data_dir
+    attr_reader :args, :user_data_dir, :debugging_port
 
     def headless?
       @headless