Merge pull request #205 from Davidiusdadi/master

made websocket client use java.net instead of java.nio

Author: Davidiusdadi

src/main/example/ProxyClientExample.java

@@ -1,26 +1,12 @@
 import java.net.InetSocketAddress;
+import java.net.Proxy;
 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 class ProxyClientExample {
 	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"
+		ExampleClient c = new ExampleClient( new URI( "ws://echo.websocket.org" ) );
+		c.setProxy( new Proxy( Proxy.Type.HTTP, new InetSocketAddress( "proxyaddress", 80 ) ) );
 		c.connect();
 	}
 }

src/main/example/SSLClientExample.java

@@ -7,10 +7,10 @@
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.java_websocket.WebSocketImpl;
-import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 
@@ -79,7 +79,9 @@ public static void main( String[] args ) throws Exception {
 		sslContext.init( kmf.getKeyManagers(), tmf.getTrustManagers(), null );
 		// sslContext.init( null, null, null ); // will use java's default key and trust store which is sufficient unless you deal with self-signed certificates
 
-		chatclient.setWebSocketFactory( new DefaultSSLWebSocketClientFactory( sslContext ) );
+		SSLSocketFactory factory = sslContext.getSocketFactory();// (SSLSocketFactory) SSLSocketFactory.getDefault();
+
+		chatclient.setSocket( factory.createSocket() );
 
 		chatclient.connectBlocking();
 

src/main/java/org/java_websocket/SocketChannelIOHelper.java

@@ -5,6 +5,8 @@
 import java.nio.channels.ByteChannel;
 import java.nio.channels.spi.AbstractSelectableChannel;
 
+import org.java_websocket.WebSocket.Role;
+
 public class SocketChannelIOHelper {
 
 	public static boolean read( final ByteBuffer buf, WebSocketImpl ws, ByteChannel channel ) throws IOException {
@@ -59,21 +61,11 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
 			} while ( buffer != null );
 		}
 
-		if( ws.outQueue.isEmpty() && ws.isFlushAndClose() /*&& ( c == null || c.isNeedWrite() )*/) {
+		if( ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft().getRole() == Role.SERVER ) {//
 			synchronized ( ws ) {
 				ws.closeConnection();
 			}
 		}
 		return c != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
 	}
-
-	public static void writeBlocking( WebSocketImpl ws, ByteChannel channel ) throws InterruptedException , IOException {
-		assert ( channel instanceof AbstractSelectableChannel == true ? ( (AbstractSelectableChannel) channel ).isBlocking() : true );
-		assert ( channel instanceof WrappedByteChannel == true ? ( (WrappedByteChannel) channel ).isBlocking() : true );
-
-		ByteBuffer buf = ws.outQueue.take();
-		while ( buf.hasRemaining() )
-			channel.write( buf );
-	}
-
 }

src/main/java/org/java_websocket/WebSocketAdapter.java

@@ -1,7 +1,10 @@
 package org.java_websocket;
 
+import java.net.InetSocketAddress;
+
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.exceptions.InvalidDataException;
+import org.java_websocket.exceptions.InvalidHandshakeException;
 import org.java_websocket.framing.Framedata;
 import org.java_websocket.framing.Framedata.Opcode;
 import org.java_websocket.framing.FramedataImpl1;
@@ -79,12 +82,23 @@ public void onWebsocketPong( WebSocket conn, Framedata f ) {
 	 * This is specifically implemented for gitime's WebSocket client for Flash:
 	 * http://github.com/gimite/web-socket-js
 	 * 
-	 * @return An XML String that comforms to Flash's security policy. You MUST
+	 * @return An XML String that comforts to Flash's security policy. You MUST
 	 *         not include the null char at the end, it is appended automatically.
+	 * @throws InvalidDataException thrown when some data that is required to generate the flash-policy like the websocket local port could not be obtained e.g because the websocket is not connected.
 	 */
 	@Override
-	public String getFlashPolicy( WebSocket conn ) {
-		return "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" + conn.getLocalSocketAddress().getPort() + "\" /></cross-domain-policy>\0";
+	public String getFlashPolicy( WebSocket conn ) throws InvalidDataException {
+		InetSocketAddress adr = conn.getLocalSocketAddress();
+		if(null == adr){
+			throw new InvalidHandshakeException( "socket not bound" );
+		}
+		
+		StringBuffer sb = new StringBuffer( 90 );
+		sb.append( "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" );
+		sb.append(adr.getPort());
+		sb.append( "\" /></cross-domain-policy>\0" );
+		
+		return sb.toString();
 	}
 
 }

src/main/java/org/java_websocket/WebSocketImpl.java

@@ -151,15 +151,11 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 	public void decode( ByteBuffer socketBuffer ) {
 		assert ( socketBuffer.hasRemaining() );
 
-		if( flushandclosestate ) {
-			return;
-		}
-
 		if( DEBUG )
 			System.out.println( "process(" + socketBuffer.remaining() + "): {" + ( socketBuffer.remaining() > 1000 ? "too big to display" : new String( socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining() ) ) + "}" );
 
-		if( readystate == READYSTATE.OPEN ) {
-			decodeFrames( socketBuffer );
+		if( readystate != READYSTATE.NOT_YET_CONNECTED ) {
+			decodeFrames( socketBuffer );;
 		} else {
 			if( decodeHandshake( socketBuffer ) ) {
 				assert ( tmpHandshakeBytes.hasRemaining() != socketBuffer.hasRemaining() || !socketBuffer.hasRemaining() ); // the buffers will never have remaining bytes at the same time
@@ -198,8 +194,12 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 			if( draft == null ) {
 				HandshakeState isflashedgecase = isFlashEdgeCase( socketBuffer );
 				if( isflashedgecase == HandshakeState.MATCHED ) {
-					write( ByteBuffer.wrap( Charsetfunctions.utf8Bytes( wsl.getFlashPolicy( this ) ) ) );
-					close( CloseFrame.FLASHPOLICY, "" );
+					try {
+						write( ByteBuffer.wrap( Charsetfunctions.utf8Bytes( wsl.getFlashPolicy( this ) ) ) );
+						close( CloseFrame.FLASHPOLICY, "" );
+					} catch ( InvalidDataException e ) {
+						close( CloseFrame.ABNORMAL_CLOSE, "remote peer closed connection before flashpolicy could be transmitted", true );
+					}
 					return false;
 				}
 			}
@@ -315,17 +315,13 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 	}
 
 	private void decodeFrames( ByteBuffer socketBuffer ) {
-		if( flushandclosestate )
-			return;
 
 		List<Framedata> frames;
 		try {
 			frames = draft.translateFrame( socketBuffer );
 			for( Framedata f : frames ) {
 				if( DEBUG )
 					System.out.println( "matched frame: " + f );
-				if( flushandclosestate )
-					return;
 				Opcode curop = f.getOpcode();
 				boolean fin = f.isFin();
 

src/main/java/org/java_websocket/WebSocketListener.java

@@ -139,8 +139,9 @@ public interface WebSocketListener {
 	/**
 	 * Gets the XML string that should be returned if a client requests a Flash
 	 * security policy.
+	 * @throws InvalidDataException thrown when some data that is required to generate the flash-policy like the websocket local port could not be obtained.
 	 */
-	public String getFlashPolicy( WebSocket conn );
+	public String getFlashPolicy( WebSocket conn ) throws InvalidDataException;
 
 	/** This method is used to inform the selector thread that there is data queued to be written to the socket. */
 	public void onWriteDemand( WebSocket conn );