Merge branch 'trunk' into webkit_service

Author: Delta456

.github/workflows/ci-java.yml

@@ -22,6 +22,7 @@ jobs:
       # https://github.com/bazelbuild/rules_jvm_external/issues/1046
       java-version: 17
       run: |
+        fsutil 8dot3name set 0
         bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
             //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
             //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `

common/extensions/webextensions-selenium-example.crx

@@ -14,6 +14,14 @@
       ]
     }
   ],
+  "permissions": [
+    "storage",
+    "scripting"
+  ],
+  "host_permissions": [
+    "https://*/*",
+    "http://*/*"
+  ],
   "browser_specific_settings": {
     "gecko": {
       "id": "[email protected]"

common/extensions/webextensions-selenium-example/manifest.json

@@ -106,7 +106,7 @@
   </Target>
 
   <Target Name="GenerateCdp" BeforeTargets="CoreCompile">
-    <Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" WorkingDirectory="../../.." />
+    <Exec Command="bazel build //dotnet/src/webdriver/cdp/..." WorkingDirectory="../../.." />
 
     <ItemGroup>
       <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />

dotnet/src/webdriver/WebDriver.csproj

@@ -52,9 +52,4 @@ perform the following steps, where `<N>` is the major version of the protocol:
 remove the entry for version `<N>` from the `SupportedDevToolsVersions` dictionary initialization.
 3. Remove the version string (`v<N>`) from the `SUPPORTED_DEVTOOLS_VERSIONS` list in
 [`//dotnet:selenium-dotnet-version.bzl`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/selenium-dotnet-version.bzl).
-4. In [`//dotnet/src/webdriver:WebDriver.csproj.prebuild.cmd`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd),
-remove the `if not exist` block for version `<N>`.
-5. In [`//dotnet/src/webdriver:WebDriver.csproj.prebuild.sh`](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh),
-remove the `if-fi` block for version `<N>`.
-6. Commit the changes.
-
+4. Commit the changes.

dotnet/src/webdriver/cdp/README.md

@@ -48,7 +48,39 @@ function Overview (): JSX.Element {
     fetchPolicy: 'network-only'
   })
 
-  const [sortOption, setSortOption] = useState('osInfo.name')
+  function compareSlotStereotypes(a: NodeInfo, b: NodeInfo, attribute: string): number {
+    const joinA = a.slotStereotypes.length === 1
+      ? a.slotStereotypes[0][attribute]
+      : a.slotStereotypes.slice().map(st => st[attribute]).reverse().join(',')
+    const joinB = b.slotStereotypes.length === 1
+      ? b.slotStereotypes[0][attribute]
+      : b.slotStereotypes.slice().map(st => st[attribute]).reverse().join(',')
+    return joinA.localeCompare(joinB)
+  }
+
+  const sortProperties = {
+    'platformName': (a, b) => compareSlotStereotypes(a, b, 'platformName'),
+    'status': (a, b) => a.status.localeCompare(b.status),
+    'browserName': (a, b) => compareSlotStereotypes(a, b, 'browserName'),
+    'browserVersion': (a, b) => compareSlotStereotypes(a, b, 'browserVersion'),
+    'slotCount': (a, b) => {
+      const valueA = a.slotStereotypes.reduce((sum, st) => sum + st.slotCount, 0)
+      const valueB = b.slotStereotypes.reduce((sum, st) => sum + st.slotCount, 0)
+      return valueA < valueB ? -1 : 1
+    },
+    'id': (a, b) => (a.id < b.id ? -1 : 1)
+  }
+
+  const sortPropertiesLabel = {
+    'platformName': 'Platform Name',
+    'status': 'Status',
+    'browserName': 'Browser Name',
+    'browserVersion': 'Browser Version',
+    'slotCount': 'Slot Count',
+    'id': 'ID'
+  }
+
+  const [sortOption, setSortOption] = useState(Object.keys(sortProperties)[0])
   const [sortOrder, setSortOrder] = useState(1)
   const [sortedNodes, setSortedNodes] = useState<NodeInfo[]>([])
   const [isDescending, setIsDescending] = useState(false)
@@ -62,12 +94,6 @@ function Overview (): JSX.Element {
     setSortOrder(event.target.checked ? -1 : 1)
   }
 
-  const sortProperties = {
-    'osInfo.name': (a, b) => a.osInfo.name.localeCompare(b.osInfo.name),
-    'status': (a, b) => a.status.localeCompare(b.status),
-    'id': (a, b) => (a.id < b.id ? -1 : 1)
-  }
-
   const sortNodes = useMemo(() => {
     return (nodes: NodeInfo[], option: string, order: number) => {
       const sortFn = sortProperties[option] || (() => 0)
@@ -156,10 +182,12 @@ function Overview (): JSX.Element {
           <InputLabel>Sort By</InputLabel>
           <Box display="flex" alignItems="center">
             <Select value={sortOption} onChange={handleSortChange}
-                    label="Sort By" style={{ minWidth: '150px' }}>
-              <MenuItem value="osInfo.name">Platform</MenuItem>
-              <MenuItem value="status">Status</MenuItem>
-              <MenuItem value="id">ID</MenuItem>
+                    label="Sort By" style={{ minWidth: '170px' }}>
+              {Object.keys(sortProperties).map((key) => (
+                <MenuItem value={key}>
+                  {sortPropertiesLabel[key]}
+                </MenuItem>
+              ))}
             </Select>
             <FormControlLabel
               control={<Checkbox checked={isDescending}

javascript/grid-ui/src/screens/Overview/Overview.tsx

@@ -305,7 +305,7 @@ def execute(self, command, params):
         LOGGER.debug("%s %s %s", command_info[0], url, str(trimmed))
         return self._request(command_info[0], url, body=data)
 
-    def _request(self, method, url, body=None):
+    def _request(self, method, url, body=None, timeout=120):
         """Send an HTTP request to the remote server.
 
         :Args:
@@ -323,12 +323,12 @@ def _request(self, method, url, body=None):
             body = None
 
         if self.keep_alive:
-            response = self._conn.request(method, url, body=body, headers=headers)
+            response = self._conn.request(method, url, body=body, headers=headers, timeout=timeout)
             statuscode = response.status
         else:
             conn = self._get_connection_manager()
             with conn as http:
-                response = http.request(method, url, body=body, headers=headers)
+                response = http.request(method, url, body=body, headers=headers, timeout=timeout)
             statuscode = response.status
         data = response.data.decode("UTF-8")
         LOGGER.debug("Remote response: status=%s | data=%s | headers=%s", response.status, data, response.headers)

py/selenium/webdriver/remote/remote_connection.py

@@ -7,13 +7,17 @@ module Selenium
 
       def initialize: (url: String) -> void
 
+      def add_callback: -> Integer
+
       def close: () -> nil
 
       def callbacks: () -> Hash[untyped, untyped]
 
+      def remove_callback: -> Array[Integer]
+
       def session: () -> Session
 
-      def send_cmd: (untyped method, **untyped params) -> untyped
+      def send_cmd: (String method, **untyped params) -> untyped
 
       def error_message: (Hash[String,String] message) -> String
     end

rb/sig/lib/selenium/webdriver/bidi.rbs

@@ -0,0 +1,27 @@
+module Selenium
+  module WebDriver
+    class BiDi
+      class LogHandler
+        @bidi: BiDi
+
+        @log_entry_subscribed: bool
+
+        ConsoleLogEntry: Struct
+
+        JavaScriptLogEntry: Struct
+
+        def initialize: (BiDi bidi) -> void
+
+        def add_message_handler: (String type) { (untyped) -> untyped } -> Integer
+
+        def remove_message_handler: (Integer id) -> false
+
+        private
+
+        def subscribe_log_entry: () -> false
+
+        def unsubscribe_log_entry: () -> false
+      end
+    end
+  end
+end

rb/sig/lib/selenium/webdriver/bidi/log_handler.rbs

@@ -0,0 +1,11 @@
+module Selenium
+  module WebDriver
+    class BiDi
+      class Struct < ::Struct
+        def self.new: (*untyped args) { (?) -> untyped } -> void
+
+        def self.camel_to_snake: (String camel_str) -> String
+      end
+    end
+  end
+end