worked on proxy support #88

Author: Davidiusdadi

src/main/example/ProxyClientExample.java

@@ -0,0 +1,26 @@
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.channels.ByteChannel;
+
+public class ProxyClientExample extends ExampleClient {
+
+	public ProxyClientExample( URI serverURI , InetSocketAddress proxy ) {
+		super( serverURI );
+		setProxy( proxy );
+	}
+
+	@Override
+	public ByteChannel createProxyChannel( ByteChannel towrap ) {
+		/*
+		 * You can create custom proxy handshake here. 
+		 * For more infos see: WebSocketClient.DefaultClientProxyChannel and http://tools.ietf.org/html/rfc6455#section-4.1
+		 */
+		return super.createProxyChannel( towrap );
+	}
+
+	public static void main( String[] args ) throws URISyntaxException {
+		ProxyClientExample c = new ProxyClientExample( new URI( "ws://echo.websocket.org" ), new InetSocketAddress( "proxyaddress", 80 ) );// don't forget to change "proxyaddress"
+		c.connect();
+	}
+}

src/main/java/org/java_websocket/AbstractWrappedByteChannel.java

@@ -0,0 +1,75 @@
+package org.java_websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.SocketChannel;
+
+import javax.net.ssl.SSLException;
+
+
+public class AbstractWrappedByteChannel implements WrappedByteChannel {
+
+	private final ByteChannel channel;
+
+	public AbstractWrappedByteChannel( ByteChannel towrap ) {
+		this.channel = towrap;
+	}
+
+	public AbstractWrappedByteChannel( WrappedByteChannel towrap ) {
+		this.channel = towrap;
+	}
+
+	@Override
+	public int read( ByteBuffer dst ) throws IOException {
+		return channel.read( dst );
+	}
+
+	@Override
+	public boolean isOpen() {
+		return channel.isOpen();
+	}
+
+	@Override
+	public void close() throws IOException {
+		channel.close();
+	}
+
+	@Override
+	public int write( ByteBuffer src ) throws IOException {
+		return channel.write( src );
+	}
+
+	@Override
+	public boolean isNeedWrite() {
+		return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).isNeedWrite() : false;
+	}
+
+	@Override
+	public void writeMore() throws IOException {
+		if( channel instanceof WrappedByteChannel )
+			( (WrappedByteChannel) channel ).writeMore();
+
+	}
+
+	@Override
+	public boolean isNeedRead() {
+		return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).isNeedRead() : false;
+
+	}
+
+	@Override
+	public int readMore( ByteBuffer dst ) throws SSLException {
+		return channel instanceof WrappedByteChannel ? ( (WrappedByteChannel) channel ).readMore( dst ) : 0;
+	}
+
+	@Override
+	public boolean isBlocking() {
+		if( channel instanceof SocketChannel )
+			return ( (SocketChannel) channel ).isBlocking();
+		else if( channel instanceof WrappedByteChannel )
+			return ( (WrappedByteChannel) channel ).isBlocking();
+		return false;
+	}
+
+}

src/main/java/org/java_websocket/client/AbstractClientProxyChannel.java

@@ -0,0 +1,38 @@
+package org.java_websocket.client;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+
+import org.java_websocket.AbstractWrappedByteChannel;
+
+public abstract class AbstractClientProxyChannel extends AbstractWrappedByteChannel {
+	protected final ByteBuffer proxyHandshake;
+
+
+	/**
+	 * @param towrap
+	 *            The channel to the proxy server
+	 **/
+	public AbstractClientProxyChannel( ByteChannel towrap ) {
+		super( towrap );
+		try {
+			proxyHandshake = ByteBuffer.wrap( buildHandShake().getBytes( "ASCII" ) );
+		} catch ( UnsupportedEncodingException e ) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	@Override
+	public int write( ByteBuffer src ) throws IOException {
+		if( !proxyHandshake.hasRemaining() ) {
+			return super.write( src );
+		} else {
+			return super.write( proxyHandshake );
+		}
+	}
+
+	public abstract String buildHandShake();
+
+}

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
@@ -12,7 +11,6 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
@@ -46,7 +44,7 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 	/**
 	 * The URI this channel is supposed to connect to.
 	 */
-	private URI uri = null;
+	protected URI uri = null;
 
 	private WebSocketImpl conn = null;
 	/**
@@ -70,24 +68,9 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private int timeout = 0;
 
-	WebSocketClientFactory wsfactory = new WebSocketClientFactory() {
-		@Override
-		public WebSocket createWebSocket( WebSocketAdapter a, Draft d, Socket s ) {
-			return new WebSocketImpl( WebSocketClient.this, d );
-		}
+	private WebSocketClientFactory wsfactory = new DefaultWebSocketClientFactory( this );
 
-		@Override
-		public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
-			return new WebSocketImpl( WebSocketClient.this, d );
-		}
-
-		@Override
-		public ByteChannel wrapChannel( SocketChannel channel, SelectionKey c, String host, int port ) {
-			if( c == null )
-				return channel;
-			return channel;
-		}
-	};
+	private InetSocketAddress proxyAddress = null;
 
 	public WebSocketClient( URI serverURI ) {
 		this( serverURI, new Draft_10() );
@@ -198,12 +181,6 @@ public void send( byte[] data ) throws NotYetConnectedException {
 			conn.send( data );
 	}
 
-	private void tryToConnect( InetSocketAddress remote ) throws IOException , InvalidHandshakeException {
-
-		channel.connect( remote );
-
-	}
-
 	// Runnable IMPLEMENTATION /////////////////////////////////////////////////
 	public void run() {
 		if( writethread == null )
@@ -220,10 +197,19 @@ private final void interruptableRun() {
 		}
 
 		try {
-			String host = uri.getHost();
-			int port = getPort();
-			tryToConnect( new InetSocketAddress( host, port ) );
-			conn.channel = wrappedchannel = wsfactory.wrapChannel( channel, null, host, port );
+			String host;
+			int port ;
+
+			if( proxyAddress != null ) {
+				host = proxyAddress.getHostName();
+				port = proxyAddress.getPort();
+			} else {
+				host = uri.getHost();
+				port = getPort();
+			}
+			channel.connect( new InetSocketAddress( host, port ) );
+			conn.channel = wrappedchannel = createProxyChannel( wsfactory.wrapChannel( channel, null, host, port ) );
+
 			timeout = 0; // since connect is over
 			sendHandshake();
 			readthread = new Thread( new WebsocketWriteThread() );
@@ -420,6 +406,26 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 	public void onMessage( ByteBuffer bytes ) {
 	};
 
+	public class DefaultClientProxyChannel extends AbstractClientProxyChannel {
+		public DefaultClientProxyChannel( ByteChannel towrap ) {
+			super( towrap );
+		}
+		@Override
+		public String buildHandShake() {
+			StringBuilder b = new StringBuilder();
+			String host = uri.getHost();
+			b.append( "CONNECT " );
+			b.append( host );
+			b.append( ":" );
+			b.append( getPort() );
+			b.append( " HTTP/1.1\n" );
+			b.append( "Host: " );
+			b.append( host );
+			b.append( "\n" );
+			return b.toString();
+		}
+	}
+
 	public interface WebSocketClientFactory extends WebSocketFactory {
 		public ByteChannel wrapChannel( SocketChannel channel, SelectionKey key, String host, int port ) throws IOException;
 	}
@@ -439,4 +445,15 @@ public void run() {
 			}
 		}
 	}
+	
+	public ByteChannel createProxyChannel( ByteChannel towrap ) {
+		if( proxyAddress != null ){
+			return new DefaultClientProxyChannel( towrap );
+		}
+		return towrap;//no proxy in use
+	}
+
+	public void setProxy( InetSocketAddress proxyaddress ) {
+		proxyAddress = proxyaddress;
+	}
 }