Merge pull request TooTallNate#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 @@
 importjava.net.InetSocketAddress;
+importjava.net.Proxy;
 importjava.net.URI;
 importjava.net.URISyntaxException;
-importjava.nio.channels.ByteChannel;
-
-publicclassProxyClientExampleextendsExampleClient{
-
-publicProxyClientExample( URIserverURI , InetSocketAddressproxy ){
-super( serverURI );
-setProxy( proxy );
- }
-
-@Override
-publicByteChannelcreateProxyChannel( ByteChanneltowrap ){
-/*
- * You can create custom proxy handshake here. 
- * For more infos see: WebSocketClient.DefaultClientProxyChannel and http://tools.ietf.org/html/rfc6455#section-4.1
- */
-returnsuper.createProxyChannel( towrap );
- }
 
+publicclassProxyClientExample{
 publicstaticvoidmain( String[] args ) throwsURISyntaxException{
-ProxyClientExamplec = newProxyClientExample( newURI( "ws://echo.websocket.org" ), newInetSocketAddress( "proxyaddress", 80 ) );// don't forget to change "proxyaddress"
+ExampleClientc = newExampleClient( newURI( "ws://echo.websocket.org" ) );
+c.setProxy( newProxy( Proxy.Type.HTTP, newInetSocketAddress( "proxyaddress", 80 ) ) );
 c.connect();
  }
 }

src/main/example/SSLClientExample.java

@@ -7,10 +7,10 @@
 
 importjavax.net.ssl.KeyManagerFactory;
 importjavax.net.ssl.SSLContext;
+importjavax.net.ssl.SSLSocketFactory;
 importjavax.net.ssl.TrustManagerFactory;
 
 importorg.java_websocket.WebSocketImpl;
-importorg.java_websocket.client.DefaultSSLWebSocketClientFactory;
 importorg.java_websocket.client.WebSocketClient;
 importorg.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( newDefaultSSLWebSocketClientFactory( sslContext ) );
+SSLSocketFactoryfactory = sslContext.getSocketFactory();// (SSLSocketFactory) SSLSocketFactory.getDefault();
+
+chatclient.setSocket( factory.createSocket() );
 
 chatclient.connectBlocking();
 

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

@@ -5,6 +5,8 @@
 importjava.nio.channels.ByteChannel;
 importjava.nio.channels.spi.AbstractSelectableChannel;
 
+importorg.java_websocket.WebSocket.Role;
+
 publicclassSocketChannelIOHelper{
 
 publicstaticbooleanread( finalByteBufferbuf, WebSocketImplws, ByteChannelchannel ) throwsIOException{
@@ -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();
  }
  }
 returnc != null ? !( (WrappedByteChannel) sockchannel ).isNeedWrite() : true;
  }
-
-publicstaticvoidwriteBlocking( WebSocketImplws, ByteChannelchannel ) throwsInterruptedException , IOException{
-assert ( channelinstanceofAbstractSelectableChannel == true ? ( (AbstractSelectableChannel) channel ).isBlocking() : true );
-assert ( channelinstanceofWrappedByteChannel == true ? ( (WrappedByteChannel) channel ).isBlocking() : true );
-
-ByteBufferbuf = ws.outQueue.take();
-while ( buf.hasRemaining() )
-channel.write( buf );
- }
-
 }

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

@@ -1,7 +1,10 @@
 packageorg.java_websocket;
 
+importjava.net.InetSocketAddress;
+
 importorg.java_websocket.drafts.Draft;
 importorg.java_websocket.exceptions.InvalidDataException;
+importorg.java_websocket.exceptions.InvalidHandshakeException;
 importorg.java_websocket.framing.Framedata;
 importorg.java_websocket.framing.Framedata.Opcode;
 importorg.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
-publicStringgetFlashPolicy( WebSocketconn ){
-return"<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" + conn.getLocalSocketAddress().getPort() + "\" /></cross-domain-policy>\0";
+publicStringgetFlashPolicy( WebSocketconn ) throwsInvalidDataException{
+InetSocketAddressadr = conn.getLocalSocketAddress();
+if(null == adr){
+thrownewInvalidHandshakeException( "socket not bound" );
+ }
+
+StringBuffersb = newStringBuffer( 90 );
+sb.append( "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" );
+sb.append(adr.getPort());
+sb.append( "\" /></cross-domain-policy>\0" );
+
+returnsb.toString();
  }
 
 }

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

@@ -151,15 +151,11 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 publicvoiddecode( ByteBuffersocketBuffer ){
 assert ( socketBuffer.hasRemaining() );
 
-if( flushandclosestate ){
-return;
- }
-
 if( DEBUG )
 System.out.println( "process(" + socketBuffer.remaining() + "):{" + ( socketBuffer.remaining() > 1000 ? "too big to display" : newString( 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 ){
 HandshakeStateisflashedgecase = 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 ( InvalidDataExceptione ){
+close( CloseFrame.ABNORMAL_CLOSE, "remote peer closed connection before flashpolicy could be transmitted", true );
+ }
 returnfalse;
  }
  }
@@ -315,17 +315,13 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ){
  }
 
 privatevoiddecodeFrames( ByteBuffersocketBuffer ){
-if( flushandclosestate )
-return;
 
 List<Framedata> frames;
 try{
 frames = draft.translateFrame( socketBuffer );
 for( Framedataf : frames ){
 if( DEBUG )
 System.out.println( "matched frame: " + f );
-if( flushandclosestate )
-return;
 Opcodecurop = f.getOpcode();
 booleanfin = 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.
  */
-publicStringgetFlashPolicy( WebSocketconn );
+publicStringgetFlashPolicy( WebSocketconn )throwsInvalidDataException;
 
 /** This method is used to inform the selector thread that there is data queued to be written to the socket. */
 publicvoidonWriteDemand( WebSocketconn );