Merge branch 'trunk' into response-type

Author: nvborisenko

java/src/org/openqa/selenium/grid/distributor/GridModel.java

@@ -114,7 +114,9 @@ public void add(NodeStatus node) {
                   "Re-adding node with id %s and URI %s.",
                   node.getNodeId(), node.getExternalUri()));
 
-          events.fire(new NodeRestartedEvent(node));
+          // Send the previous state to allow cleaning up the old node related resources.
+          // Nodes are initially added in the "down" state, so the new state must be ignored.
+          events.fire(new NodeRestartedEvent(next));
           iterator.remove();
           break;
         }
@@ -226,7 +228,8 @@ public void purgeDeadNodes() {
         if (nodeHealthCount.getOrDefault(id, 0) > UNHEALTHY_THRESHOLD) {
           LOG.info(
               String.format(
-                  "Removing Node %s, unhealthy threshold has been reached", node.getExternalUri()));
+                  "Removing Node %s (uri: %s), unhealthy threshold has been reached",
+                  node.getNodeId(), node.getExternalUri()));
           toRemove.add(node);
           break;
         }
@@ -239,11 +242,17 @@ public void purgeDeadNodes() {
             lastTouched.plus(node.getHeartbeatPeriod().multipliedBy(PURGE_TIMEOUT_MULTIPLIER));
 
         if (node.getAvailability() == UP && lostTime.isBefore(now)) {
-          LOG.info(String.format("Switching Node %s from UP to DOWN", node.getExternalUri()));
+          LOG.info(
+              String.format(
+                  "Switching Node %s (uri: %s) from UP to DOWN",
+                  node.getNodeId(), node.getExternalUri()));
           replacements.put(node, rewrite(node, DOWN));
           nodePurgeTimes.put(id, Instant.now());
         } else if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
-          LOG.info(String.format("Removing Node %s, DOWN for too long", node.getExternalUri()));
+          LOG.info(
+              String.format(
+                  "Removing Node %s (uri: %s), DOWN for too long",
+                  node.getNodeId(), node.getExternalUri()));
           toRemove.add(node);
         }
       }

java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java

@@ -206,7 +206,8 @@ public LocalDistributor(
 
     bus.addListener(NodeStatusEvent.listener(this::register));
     bus.addListener(NodeStatusEvent.listener(model::refresh));
-    bus.addListener(NodeRestartedEvent.listener(this::handleNodeRestarted));
+    bus.addListener(
+        NodeRestartedEvent.listener(previousNodeStatus -> remove(previousNodeStatus.getNodeId())));
     bus.addListener(NodeRemovedEvent.listener(nodeStatus -> remove(nodeStatus.getNodeId())));
     bus.addListener(
         NodeHeartBeatEvent.listener(
@@ -329,25 +330,6 @@ private void register(NodeStatus status) {
     }
   }
 
-  private void handleNodeRestarted(NodeStatus status) {
-    Require.nonNull("Node", status);
-    Lock writeLock = lock.writeLock();
-    writeLock.lock();
-    try {
-      if (!nodes.containsKey(status.getNodeId())) {
-        return;
-      }
-      if (!getNodeFromURI(status.getExternalUri()).isDraining()) {
-        LOG.info(
-            String.format(
-                "Node %s has restarted. Setting availability to DOWN.", status.getNodeId()));
-        model.setAvailability(status.getNodeId(), DOWN);
-      }
-    } finally {
-      writeLock.unlock();
-    }
-  }
-
   @Override
   public LocalDistributor add(Node node) {
     Require.nonNull("Node", node);
@@ -499,15 +481,13 @@ public void remove(NodeId nodeId) {
     Lock writeLock = lock.writeLock();
     writeLock.lock();
     try {
-      Node node = nodes.get(nodeId);
+      Node node = nodes.remove(nodeId);
+      model.remove(nodeId);
+      allChecks.remove(nodeId);
 
       if (node instanceof RemoteNode) {
         ((RemoteNode) node).close();
       }
-
-      nodes.remove(nodeId);
-      model.remove(nodeId);
-      allChecks.remove(nodeId);
     } finally {
       writeLock.unlock();
     }

java/src/org/openqa/selenium/grid/sessionmap/jdbc/JdbcBackedSessionMap.java

@@ -92,7 +92,8 @@ public JdbcBackedSessionMap(Tracer tracer, Connection jdbcConnection, EventBus b
                     .forEach(this::remove)));
 
     bus.addListener(
-        NodeRestartedEvent.listener(nodeStatus -> this.removeByUri(nodeStatus.getExternalUri())));
+        NodeRestartedEvent.listener(
+            previousNodeStatus -> this.removeByUri(previousNodeStatus.getExternalUri())));
   }
 
   public static SessionMap create(Config config) {

java/src/org/openqa/selenium/grid/sessionmap/local/LocalSessionMap.java

@@ -67,10 +67,11 @@ public LocalSessionMap(Tracer tracer, EventBus bus) {
 
     bus.addListener(
         NodeRestartedEvent.listener(
-            nodeStatus -> {
+            previousNodeStatus -> {
               List<SessionId> toRemove =
                   knownSessions.entrySet().stream()
-                      .filter((e) -> e.getValue().getUri().equals(nodeStatus.getExternalUri()))
+                      .filter(
+                          (e) -> e.getValue().getUri().equals(previousNodeStatus.getExternalUri()))
                       .map(Map.Entry::getKey)
                       .collect(Collectors.toList());
 

java/src/org/openqa/selenium/grid/sessionmap/redis/RedisBackedSessionMap.java

@@ -87,7 +87,8 @@ public RedisBackedSessionMap(Tracer tracer, URI serverUri, EventBus bus) {
                     .forEach(this::remove)));
 
     bus.addListener(
-        NodeRestartedEvent.listener(nodeStatus -> this.removeByUri(nodeStatus.getExternalUri())));
+        NodeRestartedEvent.listener(
+            previousNodeStatus -> this.removeByUri(previousNodeStatus.getExternalUri())));
   }
 
   public static SessionMap create(Config config) {

javascript/grid-ui/BUILD.bazel

@@ -79,7 +79,6 @@ esbuild(
         "os",
         "path",
         "util",
-        "@novnc/novnc/core/rfb",
     ],
     format = "iife",
     minify = True,

javascript/grid-ui/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "dependencies": {
     "@apollo/client": "3.12.4",
-    "@emotion/react": "11.13.3",
-    "@emotion/styled": "11.13.0",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.0",
     "@mui/icons-material": "5.15.18",
     "@mui/material": "5.15.18",
     "@novnc/novnc": "1.5.0",
@@ -16,10 +16,10 @@
     "@types/react-dom": "18.2.22",
     "@types/react-modal": "3.16.3",
     "@types/react-router-dom": "5.3.3",
-    "graphql": "16.9.0",
+    "graphql": "16.10.0",
     "graphql.macro": "1.4.2",
     "path-browserify": "1.0.1",
-    "pretty-ms": "9.1.0",
+    "pretty-ms": "9.2.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-modal": "3.16.3",
@@ -47,13 +47,13 @@
     ]
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "14.3.1",
     "@testing-library/user-event": "14.5.2",
     "esbuild": "0.24.2",
     "ts-standard": "12.0.2",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
   },
   "jest": {
     "testMatch": [

javascript/grid-ui/src/components/LiveView/LiveView.tsx

@@ -16,7 +16,7 @@
 // under the License.
 
 import React, { useEffect, useState, useImperativeHandle, forwardRef } from 'react'
-import RFB from '@novnc/novnc/core/rfb'
+import RFB from '@novnc/novnc/lib/rfb'
 import PasswordDialog from './PasswordDialog'
 import MuiAlert, { AlertProps } from '@mui/material/Alert'
 import Snackbar from '@mui/material/Snackbar'

javascript/node/selenium-webdriver/package.json

@@ -29,25 +29,25 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.14.0",
+    "@eslint/js": "^9.17.0",
     "clean-jsdoc-theme": "^4.3.0",
-    "eslint": "^9.14.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-mocha": "^10.5.0",
-    "eslint-plugin-n": "^17.13.1",
+    "eslint-plugin-n": "^17.15.1",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "express": "^4.21.1",
-    "globals": "^15.12.0",
+    "express": "^4.21.2",
+    "globals": "^15.14.0",
     "has-flag": "^5.0.1",
     "jsdoc": "^4.0.4",
-    "mocha": "^10.8.2",
+    "mocha": "^11.0.1",
     "mocha-junit-reporter": "^2.2.1",
     "multer": "1.4.5-lts.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "serve-index": "^1.9.1",
     "sinon": "^19.0.2",
-    "supports-color": "^9.4.0"
+    "supports-color": "^10.0.0"
   },
   "scripts": {
     "lint": "eslint .",