Add WebSocket.getLocal/RemoteAddress, close AsyncHttpClient#855

Author: slandelle

api/src/main/java/org/asynchttpclient/ws/WebSocket.java

@@ -13,14 +13,32 @@
 package org.asynchttpclient.ws;
 
 import java.io.Closeable;
+import java.net.SocketAddress;
 
 /**
  * A Websocket client
  */
 public interface WebSocket extends Closeable {
 
+    /**
+     * Get remote address client initiated request to.
+     * 
+     * @return remote address client initiated request to, may be {@code null}
+     *         if asynchronous provider is unable to provide the remote address
+     */
+    SocketAddress getRemoteAddress();
+
+    /**
+     * Get local address client initiated request from.
+     * 
+     * @return local address client initiated request from, may be {@code null}
+     *         if asynchronous provider is unable to provide the local address
+     */
+    SocketAddress getLocalAddress();
+
     /**
      * Send a byte message.
+     * 
      * @param message a byte message
      * @return this
      */
@@ -30,75 +48,78 @@ public interface WebSocket extends Closeable {
      * Allows streaming of multiple binary fragments.
      * 
      * @param fragment binary fragment.
-     * @param last     flag indicating whether or not this is the last fragment.
-     *             
+     * @param last flag indicating whether or not this is the last fragment.
+     * 
      * @return this.
      */
     WebSocket stream(byte[] fragment, boolean last);
 
     /**
      * Allows streaming of multiple binary fragments.
-     *
+     * 
      * @param fragment binary fragment.
-     * @param offset   starting offset.
-     * @param len      length.
-     * @param last     flag indicating whether or not this is the last fragment.
+     * @param offset starting offset.
+     * @param len length.
+     * @param last flag indicating whether or not this is the last fragment.
      * @return this.
      */
     WebSocket stream(byte[] fragment, int offset, int len, boolean last);
 
     /**
      * Send a text message
+     * 
      * @param message a text message
      * @return this.
      */
     WebSocket sendMessage(String message);
 
     /**
      * Allows streaming of multiple text fragments.
-     *
+     * 
      * @param fragment text fragment.
-     * @param last     flag indicating whether or not this is the last fragment.
+     * @param last flag indicating whether or not this is the last fragment.
      * @return this.
      */
     WebSocket stream(String fragment, boolean last);
 
     /**
      * Send a <code>ping</ping> with an optional payload
      * (limited to 125 bytes or less).
-     *
+     * 
      * @param payload the ping payload.
-     *
+     * 
      * @return this.
      */
     WebSocket sendPing(byte[] payload);
 
     /**
      * Send a <code>ping</ping> with an optional payload
      * (limited to 125 bytes or less).
-     *
+     * 
      * @param payload the pong payload.
      * @return this.
      */
     WebSocket sendPong(byte[] payload);
 
     /**
      * Add a {@link WebSocketListener}
+     * 
      * @param l a {@link WebSocketListener}
      * @return this
      */
     WebSocket addWebSocketListener(WebSocketListener l);
 
     /**
      * Add a {@link WebSocketListener}
+     * 
      * @param l a {@link WebSocketListener}
      * @return this
      */
     WebSocket removeWebSocketListener(WebSocketListener l);
 
     /**
      * Returns <code>true</code> if the WebSocket is open/connected.
-     *
+     * 
      * @return <code>true</code> if the WebSocket is open/connected.
      */
     boolean isOpen();
@@ -108,4 +129,3 @@ public interface WebSocket extends Closeable {
      */
     void close();
 }
-

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/ws/NettyWebSocket.java

@@ -17,6 +17,7 @@
 import static org.asynchttpclient.providers.netty3.util.ChannelBufferUtils.channelBuffer2bytes;
 import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
 
+import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -67,6 +68,16 @@ public NettyWebSocket(Channel channel, NettyAsyncHttpProviderConfig nettyConfig,
         maxBufferSize = nettyConfig.getWebSocketMaxBufferSize();
     }
 
+    @Override
+    public SocketAddress getRemoteAddress() {
+        return channel.getRemoteAddress();
+    }
+    
+    @Override
+    public SocketAddress getLocalAddress() {
+        return channel.getLocalAddress();
+    }
+    
     @Override
     public WebSocket sendMessage(byte[] message) {
         channel.write(new BinaryWebSocketFrame(wrappedBuffer(message)));

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/ws/NettyWebSocket.java

@@ -25,6 +25,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -67,6 +68,16 @@ public NettyWebSocket(Channel channel, NettyAsyncHttpProviderConfig nettyConfig,
         maxBufferSize = nettyConfig.getWebSocketMaxBufferSize();
     }
 
+    @Override
+    public SocketAddress getRemoteAddress() {
+        return channel.remoteAddress();
+    }
+
+    @Override
+    public SocketAddress getLocalAddress() {
+        return channel.localAddress();
+    }
+
     @Override
     public WebSocket sendMessage(byte[] message) {
         channel.writeAndFlush(new BinaryWebSocketFrame(wrappedBuffer(message)));