Merge pull request #1286 from nats-io/websocket-never-resolve-hosts

[BUG] Hosts should never be resolved on websocket URI's

Author: scottf

src/main/java/io/nats/client/impl/NatsConnection.java

@@ -1901,23 +1901,26 @@ public Collection<String> getServers() {
     }
 
     protected List<NatsUri> resolveHost(NatsUri nuri) {
-        // 1. If the host is not an ip address, let the pool resolve it.
+        // 1. If the nuri host is not already an ip address or the nuri is not for websocket
+        //    let the pool resolve it.
         List<NatsUri> results = new ArrayList<>();
-        if (!nuri.hostIsIpAddress()) {
+        if (!nuri.hostIsIpAddress() && !nuri.isWebsocket()) {
             List<String> ips = serverPool.resolveHostToIps(nuri.getHost());
             if (ips != null) {
                 for (String ip : ips) {
                     try {
                         results.add(nuri.reHost(ip));
-                    } catch (URISyntaxException u) {
+                    }
+                    catch (URISyntaxException u) {
                         // ??? should never happen
                     }
                 }
             }
         }
 
         // 2. If there were no results,
-        //    - host was an ip address or
+        //    - host was already an ip address or
+        //    - host was for websocket or
         //    - pool returned nothing or
         //    - resolving failed...
         //    so the list just becomes the original host.

src/main/java/io/nats/client/support/NatsConstants.java

@@ -32,7 +32,7 @@ public interface NatsConstants {
 
     List<String> KNOWN_PROTOCOLS = Arrays.asList(NATS_PROTOCOL, TLS_PROTOCOL, OPENTLS_PROTOCOL, WEBSOCKET_PROTOCOL, SECURE_WEBSOCKET_PROTOCOL);
     List<String> SECURE_PROTOCOLS = Arrays.asList(TLS_PROTOCOL, OPENTLS_PROTOCOL, SECURE_WEBSOCKET_PROTOCOL);
-    List<String> WSS_PROTOCOLS = Arrays.asList(WEBSOCKET_PROTOCOL, SECURE_WEBSOCKET_PROTOCOL);
+    List<String> WEBSOCKET_PROTOCOLS = Arrays.asList(WEBSOCKET_PROTOCOL, SECURE_WEBSOCKET_PROTOCOL);
 
     String SPACE = " ";
     String EMPTY = "";
@@ -94,4 +94,7 @@ public interface NatsConstants {
     String OUTPUT_QUEUE_IS_FULL = "Output queue is full ";
 
     long NANOS_PER_MILLI = 1_000_000L;
+
+    @Deprecated
+    List<String> WSS_PROTOCOLS = WEBSOCKET_PROTOCOLS;
 }

src/main/java/io/nats/client/support/NatsUri.java

@@ -221,7 +221,7 @@ public NatsUri(String url, String defaultScheme) throws URISyntaxException {
     private void postConstruct() {
         String s = uri.getScheme().toLowerCase();
         isSecure = SECURE_PROTOCOLS.contains(s);
-        isWebsocket = WSS_PROTOCOLS.contains(s);
+        isWebsocket = WEBSOCKET_PROTOCOLS.contains(s);
         s = uri.getHost();
         hostIsIpAddress = IPV4_RE.matcher(s).matches() || s.startsWith("[") && s.endsWith("]");
     }