Merge branch 'trunk' into rb_add_support_for_chrome_beta

aguspe · web-flow · commit a423f491bf54 · 2025-03-15T00:23:35.000+01:00
diff --git a/common/src/web/service-worker.js b/common/src/web/service-worker.js
diff --git a/common/src/web/service_worker.html b/common/src/web/service_worker.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Service Worker Test Page</title>
+  <script>
+    if (navigator.serviceWorker) {
+      navigator.serviceWorker.register("/service-worker.js", { scope: "/" })
+        .then(() => navigator.serviceWorker.ready)
+        .then(() => console.debug("[Companion]", "Service worker registered!"));
+    }
+  </script>
+</head>
+<body>
+  <h1>This page loads a service worker</h1>
+</body>
+</html>
diff --git a/dotnet/src/webdriver/BiDi/BiDi.cs b/dotnet/src/webdriver/BiDi/BiDi.cs
@@ -20,13 +20,11 @@
 using System;
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Transport;
 
 namespace OpenQA.Selenium.BiDi;
 
 public class BiDi : IAsyncDisposable
 {
-    private readonly ITransport _transport;
     private readonly Broker _broker;
 
     private readonly Lazy<Modules.Session.SessionModule> _sessionModule;
@@ -42,8 +40,7 @@ internal BiDi(string url)
     {
         var uri = new Uri(url);
 
-        _transport = new WebSocketTransport(new Uri(url));
-        _broker = new Broker(this, _transport);
+        _broker = new Broker(this, uri);
 
         _sessionModule = new Lazy<Modules.Session.SessionModule>(() => new Modules.Session.SessionModule(_broker));
         _browsingContextModule = new Lazy<Modules.BrowsingContext.BrowsingContextModule>(() => new Modules.BrowsingContext.BrowsingContextModule(_broker));
@@ -83,10 +80,14 @@ public Task EndAsync(Modules.Session.EndOptions? options = null)
         return SessionModule.EndAsync(options);
     }
 
-    public async ValueTask DisposeAsync()
+    public virtual async ValueTask DisposeAsyncCore()
     {
         await _broker.DisposeAsync().ConfigureAwait(false);
+    }
 
-        _transport?.Dispose();
+    public async ValueTask DisposeAsync()
+    {
+        await DisposeAsyncCore();
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -54,10 +54,10 @@ public class Broker : IAsyncDisposable
 
     private readonly BiDiJsonSerializerContext _jsonSerializerContext;
 
-    internal Broker(BiDi bidi, ITransport transport)
+    internal Broker(BiDi bidi, Uri url)
     {
         _bidi = bidi;
-        _transport = transport;
+        _transport = new WebSocketTransport(url);
 
         var jsonSerializerOptions = new JsonSerializerOptions
         {
@@ -298,7 +298,7 @@ public async Task UnsubscribeAsync(Modules.Session.Subscription subscription, Ev
         }
     }
 
-    public async ValueTask DisposeAsync()
+    public virtual async ValueTask DisposeAsyncCore()
     {
         _pendingEvents.CompleteAdding();
 
@@ -308,5 +308,13 @@ public async ValueTask DisposeAsync()
         {
             await _eventEmitterTask.ConfigureAwait(false);
         }
+
+        _transport.Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await DisposeAsyncCore();
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/rb/lib/selenium/webdriver/common/driver.rb b/rb/lib/selenium/webdriver/common/driver.rb
@@ -188,7 +188,7 @@ def quit
         bridge.quit
       ensure
         @service_manager&.stop
-        @devtools&.close
+        @devtools&.each_value(&:close)
       end
 
       #
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
@@ -27,12 +27,13 @@ module HasDevTools
         # @return [DevTools]
         #
 
-        def devtools
-          @devtools ||= begin
+        def devtools(target_type: 'page')
+          @devtools ||= {}
+          @devtools[target_type] ||= begin
             require 'selenium/devtools'
             Selenium::DevTools.version ||= devtools_version
             Selenium::DevTools.load_version
-            Selenium::WebDriver::DevTools.new(url: devtools_url)
+            Selenium::WebDriver::DevTools.new(url: devtools_url, target_type: target_type)
           end
         end
       end # HasDevTools
diff --git a/rb/lib/selenium/webdriver/devtools.rb b/rb/lib/selenium/webdriver/devtools.rb
@@ -28,10 +28,10 @@ class DevTools
       autoload :Request, 'selenium/webdriver/devtools/request'
       autoload :Response, 'selenium/webdriver/devtools/response'
 
-      def initialize(url:)
+      def initialize(url:, target_type:)
         @ws = WebSocketConnection.new(url: url)
         @session_id = nil
-        start_session
+        start_session(target_type: target_type)
       end
 
       def close
@@ -81,10 +81,12 @@ def respond_to_missing?(method, *_args)
 
       private
 
-      def start_session
+      def start_session(target_type:)
         targets = target.get_targets.dig('result', 'targetInfos')
-        page_target = targets.find { |target| target['type'] == 'page' }
-        session = target.attach_to_target(target_id: page_target['targetId'], flatten: true)
+        found_target = targets.find { |target| target['type'] == target_type }
+        raise Error::WebDriverError, "Target type '#{target_type}' not found" unless found_target
+
+        session = target.attach_to_target(target_id: found_target['targetId'], flatten: true)
         @session_id = session.dig('result', 'sessionId')
       end
 
diff --git a/rb/spec/integration/selenium/webdriver/devtools_spec.rb b/rb/spec/integration/selenium/webdriver/devtools_spec.rb
@@ -54,6 +54,26 @@ module WebDriver
         }.to raise_error(RuntimeError, 'This is fine!')
       end
 
+      describe '#target' do
+        it 'target type defaults to page' do
+          driver.devtools.page.navigate(url: url_for('xhtmlTest.html'))
+          expect(driver.devtools.target.get_target_info.dig('result', 'targetInfo', 'type')).to eq 'page'
+        end
+
+        it 'target type is service_worker' do
+          driver.devtools.page.navigate(url: url_for('service_worker.html'))
+          sleep 0.5 # wait for service worker to register
+          target = driver.devtools(target_type: 'service_worker').target
+          expect(target.get_target_info.dig('result', 'targetInfo', 'type')).to eq 'service_worker'
+        end
+
+        it 'throws an error for unknown target type' do
+          driver.devtools.page.navigate(url: url_for('xhtmlTest.html'))
+          expect { driver.devtools(target_type: 'unknown') }
+            .to raise_error(Selenium::WebDriver::Error::WebDriverError, "Target type 'unknown' not found")
+        end
+      end
+
       describe '#register' do
         let(:username) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.first }
         let(:password) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.last }
diff --git a/rust/src/chrome.rs b/rust/src/chrome.rs
@@ -35,7 +35,7 @@ use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::option::Option;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::mpsc;
 use std::sync::mpsc::{Receiver, Sender};
 
@@ -50,6 +50,8 @@ const CFT_MACOS_APP_NAME: &str =
     "Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing";
 const MIN_CHROME_VERSION_CFT: i32 = 113;
 const MIN_CHROMEDRIVER_VERSION_CFT: i32 = 115;
+const CHROMIUM_SNAP_LINK: &str = "/snap/bin/chromium";
+const CHROMIUM_SNAP_BINARY: &str = "/snap/chromium/current/usr/lib/chromium-browser/chrome";
 
 pub struct ChromeManager {
     pub browser_name: &'static str,
@@ -587,6 +589,15 @@ impl SeleniumManager for ChromeManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, browser_path: &str) -> bool {
+        LINUX.is(self.get_os())
+            && (browser_path.eq(CHROMIUM_SNAP_LINK) || browser_path.eq(CHROMIUM_SNAP_BINARY))
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        Some(Path::new(CHROMIUM_SNAP_BINARY).to_path_buf())
+    }
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/rust/src/edge.rs b/rust/src/edge.rs
@@ -551,6 +551,14 @@ impl SeleniumManager for EdgeManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, _browser_path: &str) -> bool {
+        false
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        None
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
diff --git a/rust/src/firefox.rs b/rust/src/firefox.rs
@@ -34,7 +34,7 @@ use serde::Deserialize;
 use serde::Serialize;
 use serde_json::Value;
 use std::collections::HashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::mpsc;
 use std::sync::mpsc::{Receiver, Sender};
 
@@ -66,6 +66,8 @@ const MIN_DOWNLOADABLE_FIREFOX_VERSION_MAC: i32 = 4;
 const MIN_DOWNLOADABLE_FIREFOX_VERSION_LINUX: i32 = 4;
 const UNAVAILABLE_DOWNLOAD_ERROR_MESSAGE: &str =
     "{} {} not available for downloading (minimum version: {})";
+const FIREFOX_SNAP_LINK: &str = "/snap/bin/firefox";
+const FIREFOX_SNAP_BINARY: &str = "/snap/firefox/current/usr/lib/firefox/firefox";
 
 pub struct FirefoxManager {
     pub browser_name: &'static str,
@@ -629,6 +631,15 @@ impl SeleniumManager for FirefoxManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, browser_path: &str) -> bool {
+        LINUX.is(self.get_os())
+            && (browser_path.eq(FIREFOX_SNAP_LINK) || browser_path.eq(FIREFOX_SNAP_BINARY))
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        Some(Path::new(FIREFOX_SNAP_BINARY).to_path_buf())
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
diff --git a/rust/src/grid.rs b/rust/src/grid.rs
@@ -296,4 +296,12 @@ impl SeleniumManager for GridManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, _browser_path: &str) -> bool {
+        false
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        None
+    }
 }
diff --git a/rust/src/iexplorer.rs b/rust/src/iexplorer.rs
@@ -292,4 +292,12 @@ impl SeleniumManager for IExplorerManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, _browser_path: &str) -> bool {
+        false
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        None
+    }
 }
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -180,6 +180,10 @@ pub trait SeleniumManager {
 
     fn set_download_browser(&mut self, download_browser: bool);
 
+    fn is_snap(&self, browser_path: &str) -> bool;
+
+    fn get_snap_path(&self) -> Option<PathBuf>;
+
     // ----------------------------------------------------------
     // Shared functions
     // ----------------------------------------------------------
@@ -605,6 +609,18 @@ pub trait SeleniumManager {
             if let Some(path) = browser_path {
                 self.get_logger()
                     .debug(format!("Found {} in PATH: {}", browser_name, &path));
+                if self.is_snap(&path) {
+                    if let Some(snap_path) = self.get_snap_path() {
+                        if snap_path.exists() {
+                            self.get_logger().debug(format!(
+                                "Using {} snap: {}",
+                                browser_name,
+                                path_to_string(snap_path.as_path())
+                            ));
+                            return Some(snap_path);
+                        }
+                    }
+                }
                 return Some(Path::new(&path).to_path_buf());
             }
         }
@@ -825,6 +841,7 @@ pub trait SeleniumManager {
 
                 // Display warning if the discovered driver version is not the same as the driver in PATH
                 if !self.get_driver_version().is_empty()
+                    && !self.is_snap(self.get_browser_path())
                     && (self.is_firefox() && !version.eq(self.get_driver_version()))
                     || (!self.is_firefox() && !major_version.eq(&self.get_major_browser_version()))
                 {
diff --git a/rust/src/safari.rs b/rust/src/safari.rs
@@ -185,4 +185,12 @@ impl SeleniumManager for SafariManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, _browser_path: &str) -> bool {
+        false
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        None
+    }
 }
diff --git a/rust/src/safaritp.rs b/rust/src/safaritp.rs
@@ -193,4 +193,12 @@ impl SeleniumManager for SafariTPManager {
     fn set_download_browser(&mut self, download_browser: bool) {
         self.download_browser = download_browser;
     }
+
+    fn is_snap(&self, _browser_path: &str) -> bool {
+        false
+    }
+
+    fn get_snap_path(&self) -> Option<PathBuf> {
+        None
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,11 @@`
`20`	`20`	`using System;`
`21`	`21`	`using System.Threading.Tasks;`
`22`	`22`	`using OpenQA.Selenium.BiDi.Communication;`
`23`		`-using OpenQA.Selenium.BiDi.Communication.Transport;`
`24`	`23`
`25`	`24`	`namespace OpenQA.Selenium.BiDi;`
`26`	`25`
`27`	`26`	`public class BiDi : IAsyncDisposable`
`28`	`27`	`{`
`29`		`- private readonly ITransport _transport;`
`30`	`28`	`private readonly Broker _broker;`
`31`	`29`
`32`	`30`	`private readonly Lazy<Modules.Session.SessionModule> _sessionModule;`
`@@ -42,8 +40,7 @@ internal BiDi(string url)`
`42`	`40`	`{`
`43`	`41`	`var uri = new Uri(url);`
`44`	`42`
`45`		`- _transport = new WebSocketTransport(new Uri(url));`
`46`		`- _broker = new Broker(this, _transport);`
	`43`	`+ _broker = new Broker(this, uri);`
`47`	`44`
`48`	`45`	`_sessionModule = new Lazy<Modules.Session.SessionModule>(() => new Modules.Session.SessionModule(_broker));`
`49`	`46`	`_browsingContextModule = new Lazy<Modules.BrowsingContext.BrowsingContextModule>(() => new Modules.BrowsingContext.BrowsingContextModule(_broker));`
`@@ -83,10 +80,14 @@ public Task EndAsync(Modules.Session.EndOptions? options = null)`
`83`	`80`	`return SessionModule.EndAsync(options);`
`84`	`81`	`}`
`85`	`82`
`86`		`- public async ValueTask DisposeAsync()`
	`83`	`+ public virtual async ValueTask DisposeAsyncCore()`
`87`	`84`	`{`
`88`	`85`	`await _broker.DisposeAsync().ConfigureAwait(false);`
	`86`	`+ }`
`89`	`87`
`90`		`- _transport?.Dispose();`
	`88`	`+ public async ValueTask DisposeAsync()`
	`89`	`+ {`
	`90`	`+ await DisposeAsyncCore();`
	`91`	`+ GC.SuppressFinalize(this);`
`91`	`92`	`}`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ public class Broker : IAsyncDisposable`
`54`	`54`
`55`	`55`	`private readonly BiDiJsonSerializerContext _jsonSerializerContext;`
`56`	`56`
`57`		`- internal Broker(BiDi bidi, ITransport transport)`
	`57`	`+ internal Broker(BiDi bidi, Uri url)`
`58`	`58`	`{`
`59`	`59`	`_bidi = bidi;`
`60`		`- _transport = transport;`
	`60`	`+ _transport = new WebSocketTransport(url);`
`61`	`61`
`62`	`62`	`var jsonSerializerOptions = new JsonSerializerOptions`
`63`	`63`	`{`
`@@ -298,7 +298,7 @@ public async Task UnsubscribeAsync(Modules.Session.Subscription subscription, Ev`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`- public async ValueTask DisposeAsync()`
	`301`	`+ public virtual async ValueTask DisposeAsyncCore()`
`302`	`302`	`{`
`303`	`303`	`_pendingEvents.CompleteAdding();`
`304`	`304`
`@@ -308,5 +308,13 @@ public async ValueTask DisposeAsync()`
`308`	`308`	`{`
`309`	`309`	`await _eventEmitterTask.ConfigureAwait(false);`
`310`	`310`	`}`
	`311`	`+`
	`312`	`+ _transport.Dispose();`
	`313`	`+ }`
	`314`	`+`
	`315`	`+ public async ValueTask DisposeAsync()`
	`316`	`+ {`
	`317`	`+ await DisposeAsyncCore();`
	`318`	`+ GC.SuppressFinalize(this);`
`311`	`319`	`}`
`312`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ def quit`
`188`	`188`	`bridge.quit`
`189`	`189`	`ensure`
`190`	`190`	`@service_manager&.stop`
`191`		`- @devtools&.close`
	`191`	`+ @devtools&.each_value(&:close)`
`192`	`192`	`end`
`193`	`193`
`194`	`194`	`#`
Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,14 @@ impl SeleniumManager for EdgeManager {`
`551`	`551`	`fn set_download_browser(&mut self, download_browser: bool) {`
`552`	`552`	`self.download_browser = download_browser;`
`553`	`553`	`}`
	`554`	`+`
	`555`	`+ fn is_snap(&self, _browser_path: &str) -> bool {`
	`556`	`+ false`
	`557`	`+ }`
	`558`	`+`
	`559`	`+ fn get_snap_path(&self) -> Option<PathBuf> {`
	`560`	`+ None`
	`561`	`+ }`
`554`	`562`	`}`
`555`	`563`
`556`	`564`	`#[derive(Serialize, Deserialize, Debug)]`