To be useful, need to interpret this.webSocketHeaders on every reconnect

Author: jglick

src/main/java/hudson/remoting/Engine.java

@@ -415,7 +415,7 @@ public void setWebSocket(boolean webSocket) {
         this.webSocket = webSocket;
     }
 
-    @CheckForNull
+    @NonNull
     public Map<String, String> getWebSocketHeaders() {
         return webSocketHeaders != null ? Collections.unmodifiableMap(new LinkedHashMap<>(webSocketHeaders)) : Map.of();
     }
@@ -635,11 +635,6 @@ private void runWebSocket() {
             addedHeaders.put(JnlpConnectionState.CLIENT_NAME_KEY, List.of(agentName));
             addedHeaders.put(JnlpConnectionState.SECRET_KEY, List.of(secretKey));
             addedHeaders.put(Capability.KEY, List.of(localCap));
-            if (webSocketHeaders != null) {
-                for (Map.Entry<String, String> entry : webSocketHeaders.entrySet()) {
-                    addedHeaders.put(entry.getKey(), List.of(entry.getValue()));
-                }
-            }
             while (true) {
                 AtomicReference<Channel> ch = new AtomicReference<>();
                 class HeaderHandler extends ClientEndpointConfig.Configurator {
@@ -648,6 +643,11 @@ class HeaderHandler extends ClientEndpointConfig.Configurator {
                     @Override
                     public void beforeRequest(Map<String, List<String>> headers) {
                         headers.putAll(addedHeaders);
+                        if (webSocketHeaders != null) {
+                            for (var entry : webSocketHeaders.entrySet()) {
+                                headers.put(entry.getKey(), List.of(entry.getValue()));
+                            }
+                        }
                         LOGGER.fine(() -> "Sending: " + headers);
                     }