made websocket callback functions provide more informations.

InvalidDataException will now be thrown in cases a CharacterCodingException had been thrown before
TooTallNate · Feb 4, 2012 · d23d08f · d23d08f
1 parent 1201512
commit d23d08f
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 77 deletions.
diff --git a/example/AutobahnClientTest.java b/example/AutobahnClientTest.java
@@ -4,6 +4,7 @@
 import java.net.URI;
 
 import net.tootallnate.websocket.Draft;
+import net.tootallnate.websocket.Handshakedata;
 import net.tootallnate.websocket.WebSocket;
 import net.tootallnate.websocket.WebSocketClient;
 import net.tootallnate.websocket.drafts.Draft_17;
@@ -149,11 +150,11 @@ public void onError( Exception ex ) {
 	}
 
 	@Override
-	public void onOpen() {
+	public void onOpen( Handshakedata handshake ) {
 	}
 
 	@Override
-	public void onClose( int code, String reason ) {
+	public void onClose( int code, String reason, boolean remote ) {
 		System.out.println( "Closed: " + code + " " + reason );
 	}
 

diff --git a/example/AutobahnServerTest.java b/example/AutobahnServerTest.java
@@ -1,8 +1,8 @@
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
 import net.tootallnate.websocket.Draft;
+import net.tootallnate.websocket.Handshakedata;
 import net.tootallnate.websocket.WebSocket;
 import net.tootallnate.websocket.WebSocketServer;
 import net.tootallnate.websocket.drafts.Draft_17;
@@ -11,21 +11,21 @@ public class AutobahnServerTest extends WebSocketServer {
 	private static int counter = 0;
 
 	public AutobahnServerTest( int port, Draft d ) throws UnknownHostException {
-		super( new InetSocketAddress( InetAddress.getLocalHost(), port ),d );
+		super( new InetSocketAddress( "localhost", port ), d );
 	}
 
 	public AutobahnServerTest( InetSocketAddress address, Draft d ) {
 		super( address, d );
 	}
 
 	@Override
-	public void onClientOpen( WebSocket conn ) {
+	public void onClientOpen( WebSocket conn, Handshakedata handshake ) {
 		counter++;
-		System.out.println( "Opened connection number" + counter );
+		System.out.println( "///////////Opened connection number" + counter );
 	}
 
 	@Override
-	public void onClientClose( WebSocket conn ) {
+	public void onClientClose( WebSocket conn, int code, String reason, boolean remote ) {
 	}
 
 	@Override
@@ -56,12 +56,12 @@ public void onMessage( WebSocket conn, byte[] blob ) {
 	}
 
 	public static void main( String[] args ) throws  UnknownHostException {
-		WebSocket.DEBUG = true;
+		WebSocket.DEBUG = false;
 		int port;
 		try {
 			port = new Integer( args[ 0 ] );
 		} catch ( Exception e ) {
-			System.out.println( "No port specified. Defaulting to 9001" );
+			System.out.println( "No port specified. Defaulting to 9003" );
 			port = 9003;
 		}
 		new AutobahnServerTest( port, new Draft_17() ).start();

diff --git a/example/ChatClient.java b/example/ChatClient.java
@@ -14,6 +14,7 @@
 import javax.swing.JTextField;
 
 import net.tootallnate.websocket.Draft;
+import net.tootallnate.websocket.Handshakedata;
 import net.tootallnate.websocket.WebSocket;
 import net.tootallnate.websocket.WebSocketClient;
 import net.tootallnate.websocket.drafts.Draft_10;
@@ -108,12 +109,12 @@ public void onMessage( String message ) {
 						ta.setCaretPosition( ta.getDocument().getLength() );
 					}
 
-					public void onOpen() {
+					public void onOpen( Handshakedata handshake ) {
 						ta.append( "You are connected to ChatServer: " + getURI() + "\n" );
 						ta.setCaretPosition( ta.getDocument().getLength() );
 					}
 
-					public void onClose( int code, String reason ) {
+					public void onClose( int code, String reason, boolean remote ) {
 						ta.append( "You have been disconnected from: " + getURI() + "; Code: " + code + " " + reason + "\n" );
 						ta.setCaretPosition( ta.getDocument().getLength() );
 						connect.setEnabled( true );

diff --git a/example/ChatServer.java b/example/ChatServer.java
@@ -5,6 +5,7 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
+import net.tootallnate.websocket.Handshakedata;
 import net.tootallnate.websocket.WebSocket;
 import net.tootallnate.websocket.WebSocketServer;
 
@@ -21,7 +22,7 @@ public ChatServer( InetSocketAddress address ) {
 		super( address );
 	}
 
-	public void onClientOpen( WebSocket conn ) {
+	public void onClientOpen( WebSocket conn, Handshakedata handshake ) {
 		try {
 			this.sendToAll( conn + " entered the room!" );
 		} catch ( InterruptedException ex ) {
@@ -30,7 +31,7 @@ public void onClientOpen( WebSocket conn ) {
 		System.out.println( conn + " entered the room!" );
 	}
 
-	public void onClientClose( WebSocket conn ) {
+	public void onClientClose( WebSocket conn, int code, String reason, boolean remote ) {
 		try {
 			this.sendToAll( conn + " has left the room!" );
 		} catch ( InterruptedException ex ) {

diff --git a/src/net/tootallnate/websocket/Charsetfunctions.java b/src/net/tootallnate/websocket/Charsetfunctions.java
@@ -7,6 +7,8 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
 
+import net.tootallnate.websocket.exeptions.InvalidDataException;
+
 public class Charsetfunctions {
 
 	public static CodingErrorAction codingErrorAction = CodingErrorAction.REPORT;
@@ -45,16 +47,21 @@ public static String stringAscii( byte[] bytes, int offset, int length ){
 		}
 	}
 
-	public static String stringUtf8( byte[] bytes ) throws CharacterCodingException {
+	public static String stringUtf8( byte[] bytes ) throws InvalidDataException {
 		return stringUtf8( bytes, 0, bytes.length );
 	}
 
-	public static String stringUtf8( byte[] bytes, int off, int length ) throws CharacterCodingException {
+	public static String stringUtf8( byte[] bytes, int off, int length ) throws InvalidDataException {
 		CharsetDecoder decode = Charset.forName( "UTF8" ).newDecoder();
 		decode.onMalformedInput( codingErrorAction );
 		decode.onUnmappableCharacter( codingErrorAction );
 		//decode.replaceWith( "X" );
-		String s = decode.decode( ByteBuffer.wrap( bytes, off, length ) ).toString();
+		String s;
+		try {
+			s = decode.decode( ByteBuffer.wrap( bytes, off, length ) ).toString();
+		} catch ( CharacterCodingException e ) {
+			throw new InvalidDataException( CloseFrame.NO_UTF8, e );
+		}
 		return s;
 	}
 }
diff --git a/src/net/tootallnate/websocket/CloseFrame.java b/src/net/tootallnate/websocket/CloseFrame.java
@@ -1,7 +1,6 @@
 package net.tootallnate.websocket;
 
-import java.nio.charset.CharacterCodingException;
-
+import net.tootallnate.websocket.exeptions.InvalidDataException;
 import net.tootallnate.websocket.exeptions.InvalidFrameException;
 
 public interface CloseFrame extends Framedata {
@@ -80,5 +79,5 @@ public interface CloseFrame extends Framedata {
 	public static final int BUGGYCLOSE = -2;
 
 	public int getCloseCode() throws InvalidFrameException;
-	public String getMessage() throws CharacterCodingException , InvalidFrameException;
+	public String getMessage() throws InvalidDataException;
 }
diff --git a/src/net/tootallnate/websocket/CloseFrameBuilder.java b/src/net/tootallnate/websocket/CloseFrameBuilder.java
@@ -1,7 +1,6 @@
 package net.tootallnate.websocket;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
 
 import net.tootallnate.websocket.exeptions.InvalidDataException;
 import net.tootallnate.websocket.exeptions.InvalidFrameException;
@@ -61,7 +60,7 @@ public int getCloseCode() {
 		return code;
 	}
 
-	private void initMessage() throws CharacterCodingException , InvalidFrameException {
+	private void initMessage() throws InvalidDataException {
 		if( code == CloseFrame.NOCODE ) {
 			reason = Charsetfunctions.stringUtf8( getPayloadData() );
 		} else {
@@ -84,11 +83,7 @@ public String toString() {
 	public void setPayload( byte[] payload ) throws InvalidDataException {
 		super.setPayload( payload );
 		initCloseCode();
-		try {
-			initMessage();
-		} catch ( CharacterCodingException e ) {
-			throw new InvalidDataException( CloseFrame.NO_UTF8 );
-		}
+		initMessage();
 	}
 	@Override
 	public byte[] getPayloadData() {

diff --git a/src/net/tootallnate/websocket/WebSocket.java b/src/net/tootallnate/websocket/WebSocket.java
@@ -5,7 +5,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SocketChannel;
-import java.nio.charset.CharacterCodingException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -171,7 +170,7 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel sockch
 										HandshakeBuilder response = wsl.onHandshakeRecievedAsServer( this, d, handshake );
 										writeDirect( d.createHandshake( d.postProcessHandshakeResponseAsServer( handshake, response ), role ) );
 										draft = d;
-										open();
+										open( handshake );
 										handleRead();
 										return;
 									} else if( handshakestate == HandshakeState.MATCHING ) {
@@ -202,7 +201,7 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel sockch
 							handshakestate = draft.acceptHandshakeAsServer( handshake );
 
 							if( handshakestate == HandshakeState.MATCHED ) {
-								open();
+								open( handshake );
 								handleRead();
 							} else if( handshakestate != HandshakeState.MATCHING ) {
 								close( CloseFrame.PROTOCOL_ERROR, "the handshake did finaly not match" );
@@ -214,7 +213,7 @@ private void init( WebSocketListener listener, Draft draft, SocketChannel sockch
 						handshake = draft.translateHandshake( socketBuffer );
 						handshakestate = draft.acceptHandshakeAsClient( handshakerequest, handshake );
 						if( handshakestate == HandshakeState.MATCHED ) {
-							open();
+							open( handshake );
 							handleRead();
 						} else if( handshakestate == HandshakeState.MATCHING ) {
 							return;
@@ -313,6 +312,8 @@ public void closeDirect( int code, String message ) throws IOException {
 					wsl.onError( this, e );
 					closeConnection( CloseFrame.ABNROMAL_CLOSE, "generated frame is invalid", false );
 				}
+			} else {
+				closeConnection( CloseFrame.NEVERCONNECTED, false );
 			}
 			if( code == CloseFrame.PROTOCOL_ERROR )// this endpoint found a PROTOCOL_ERROR
 				closeConnection( code, false );
@@ -342,7 +343,7 @@ public void closeConnection( int code, String message, boolean remote ) {
 		} catch ( IOException e ) {
 			wsl.onError( this, e );
 		}
-		this.wsl.onClose( this, code, message );
+		this.wsl.onClose( this, code, message, remote );
 		if( draft != null )
 			draft.reset();
 		currentframe = null;
@@ -380,11 +381,11 @@ public void send( byte[] bytes ) throws IllegalArgumentException , NotYetConnect
 		send( draft.createFrames( bytes, role == Role.CLIENT ) );
 	}
 
-	private void send( Collection<Framedata> frames ) throws InterruptedException { // TODO instead of throwing or returning an error this method maybe should block on queue jams
+	private void send( Collection<Framedata> frames ) throws InterruptedException {
 		if( !this.handshakeComplete )
 			throw new NotYetConnectedException();
 		for( Framedata f : frames ) {
-			sendFrame( f ); // TODO high frequently calls to sendFrame are inefficient.
+			sendFrame( f );
 		}
 	}
 
@@ -464,7 +465,7 @@ private void writeDirect( List<ByteBuffer> bufs ) throws IOException {
 			channelWriteDirect( b );
 		}
 	}
-	private void deliverMessage( Framedata d ) throws CharacterCodingException {
+	private void deliverMessage( Framedata d ) throws InvalidDataException {
 		if( d.getOpcode() == Opcode.TEXT ) {
 			wsl.onMessage( this, Charsetfunctions.stringUtf8( d.getPayloadData() ) );
 		} else if( d.getOpcode() == Opcode.BINARY ) {
@@ -476,11 +477,11 @@ private void deliverMessage( Framedata d ) throws CharacterCodingException {
 		}
 	}
 
-	private void open() throws IOException {
+	private void open( Handshakedata d ) throws IOException {
 		if( DEBUG )
 			System.out.println( "open using draft: " + draft.getClass().getSimpleName() );
 		handshakeComplete = true;
-		wsl.onOpen( this );
+		wsl.onOpen( this, d );
 	}
 
 	public InetSocketAddress getRemoteSocketAddress() {

diff --git a/src/net/tootallnate/websocket/WebSocketAdapter.java b/src/net/tootallnate/websocket/WebSocketAdapter.java
@@ -21,11 +21,11 @@ public void onMessage( WebSocket conn, String message ) {
 	}
 
 	@Override
-	public void onOpen( WebSocket conn ) {
+	public void onOpen( WebSocket conn, Handshakedata handshake ) {
 	}
 
 	@Override
-	public void onClose( WebSocket conn, int code, String reason ) {
+	public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
 	}
 
 	@Override

diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -9,7 +9,6 @@
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
-import java.nio.charset.CharacterCodingException;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -156,31 +155,27 @@ protected void interruptableRun() {
 				Set<SelectionKey> keys = selector.selectedKeys();
 				Iterator<SelectionKey> i = keys.iterator();
 				while ( i.hasNext() ) {
-					try {
-						key = i.next();
-						i.remove();
-						if( key.isReadable() ) {
-							conn.handleRead();
-						}
-						if( !key.isValid() ) {
-							continue;
-						}
-						if( key.isWritable() ) {
+					key = i.next();
+					i.remove();
+					if( key.isReadable() ) {
+						conn.handleRead();
+					}
+					if( !key.isValid() ) {
+						continue;
+					}
+					if( key.isWritable() ) {
+						conn.flush();
+					}
+					if( key.isConnectable() ) {
+						try {
+							finishConnect();
+						} catch ( InterruptedException e ) {
+							conn.close( CloseFrame.NEVERCONNECTED );// report error to only
+							break;
+						} catch ( InvalidHandshakeException e ) {
+							conn.close( e ); // http error
 							conn.flush();
 						}
-						if( key.isConnectable() ) {
-							try {
-								finishConnect();
-							} catch ( InterruptedException e ) {
-								conn.close( CloseFrame.NEVERCONNECTED );// report error to only
-								break;
-							} catch ( InvalidHandshakeException e ) {
-								conn.close( e ); // http error
-								conn.flush();
-							}
-						}
-					} catch ( CharacterCodingException e ) {
-						conn.close( CloseFrame.NO_UTF8 );
 					}
 				}
 			}
@@ -261,8 +256,8 @@ public void onMessage( WebSocket conn, String message ) {
 	 * @param conn
 	 */
 	@Override
-	public void onOpen( WebSocket conn ) {
-		onOpen();
+	public void onOpen( WebSocket conn, Handshakedata handshake ) {
+		onOpen( handshake );
 	}
 
 	/**
@@ -271,9 +266,9 @@ public void onOpen( WebSocket conn ) {
 	 * @param conn
 	 */
 	@Override
-	public void onClose( WebSocket conn, int code, String reason ) {
+	public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
 		thread.interrupt();
-		onClose( code, reason );
+		onClose( code, reason, remote );
 	}
 
 	/**
@@ -293,7 +288,7 @@ public void onWriteDemand( WebSocket conn ) {
 
 	// ABTRACT METHODS /////////////////////////////////////////////////////////
 	public abstract void onMessage( String message );
-	public abstract void onOpen();
-	public abstract void onClose( int code, String reason );
+	public abstract void onOpen( Handshakedata handshakedata );
+	public abstract void onClose( int code, String reason, boolean remote );
 	public abstract void onError( Exception ex );
 }