-added full framing support fot draft 10 including large messages

-tested on Firefox 6.02 and Crome 14.0.835.187

Author: Davidiusdadi

src/net/tootallnate/websocket/Draft.java

@@ -16,8 +16,8 @@ public abstract class Draft{
 	public final static Charset  UTF8_CHARSET = Charset.forName ( "UTF-8" );
 
 	public abstract boolean acceptHandshakeAsServer( Handshakedata handshakedata ) throws InvalidHandshakeException;
-	public abstract boolean acceptHandshakeAsClient( Handshakedata request , Handshakedata response );
-	public abstract List<Framedata> translateFrame( byte[] buffer, int read );
+	public abstract boolean acceptHandshakeAsClient( Handshakedata request , Handshakedata response ) throws InvalidHandshakeException;
+	public abstract List<Framedata> translateFrame( ByteBuffer buffer, int read );
 	public abstract ByteBuffer createBinaryFrame( Framedata framedata ); //TODO Allow to send data on the base of an Iterator or InputStream 
 	public abstract List<Framedata> createFrames(  String text , boolean mask );
 	public abstract List<Framedata> createFrames(  byte[] binary , boolean mask );
@@ -31,7 +31,7 @@ public HandshakeBuilder postProcessHandshakeRequestAsClient( HandshakeBuilder re
 	public HandshakeBuilder postProcessHandshakeResponseAsServer(  Handshakedata request , HandshakeBuilder response ) throws InvalidHandshakeException{
 		//sb.append ( "HTTP/1.1 101 Switching Protocols\r\n" );
 		response.put ( "Upgrade" , "websocket" );
-		response.put ( "Connection" , "Upgrade" );
+		response.put ( "Connection" , /*"Upgrade"*/request.getFieldValue ( "Connection" ) ); //to respond a Connection keep alives
 		return response;
 	}
 

src/net/tootallnate/websocket/FramedataImpl1.java

@@ -2,14 +2,21 @@
 
 import java.nio.ByteBuffer;
 
+import net.tootallnate.websocket.exeptions.InvalidFrameException;
+
 public class FramedataImpl1 implements FrameBuilder {
+	private static byte[] emptyarray = {};
 	private boolean fin;
 	private Opcode optcode;
 	private ByteBuffer unmaskedpayload;
 	private boolean transferemasked;
 
 	public FramedataImpl1() {
 	}
+	public FramedataImpl1( Opcode op ) {
+		this.optcode = op;
+		unmaskedpayload = ByteBuffer.wrap ( emptyarray );
+	}
 
 	@Override
 	public boolean isFin( ) {
@@ -56,7 +63,7 @@ public void setTransferemasked( boolean transferemasked ) {
 
 
 	@Override
-	public void append( Framedata nextframe ) {
+	public void append( Framedata nextframe ) throws InvalidFrameException {
 		if( unmaskedpayload == null ){
 			unmaskedpayload = ByteBuffer.wrap ( nextframe.getPayloadData () );
 		}
@@ -67,6 +74,9 @@ public void append( Framedata nextframe ) {
 		}
 	}
 
-	
+	@Override
+	public String toString( ) {
+		return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", masked:" + getTransfereMasked() +", payload:" + new String ( unmaskedpayload.array () , Draft.UTF8_CHARSET ) + "}" ;
+	}
 
 }

src/net/tootallnate/websocket/WebSocket.java

@@ -7,8 +7,9 @@
 import java.nio.charset.Charset;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+
+import net.tootallnate.websocket.Framedata.Opcode;
 import net.tootallnate.websocket.drafts.*;
 import net.tootallnate.websocket.exeptions.InvalidFrameException;
 import net.tootallnate.websocket.exeptions.InvalidHandshakeException;
@@ -59,7 +60,7 @@ public enum Role{
    */
   public static final byte END_OF_FRAME = (byte)0xFF;
 
-  public static final boolean DEBUG = true;
+  public static final boolean DEBUG = false;
 
 
   // INSTANCE PROPERTIES /////////////////////////////////////////////////////
@@ -102,6 +103,8 @@ public enum Role{
   private Handshakedata handshakerequest = null;
 
   public List<Draft> known_drafts;
+  
+  private final int maxpayloadsize;
 
 
   // CONSTRUCTOR /////////////////////////////////////////////////////////////
@@ -115,24 +118,26 @@ public enum Role{
    * @param listener The {@link WebSocketListener} to notify of events when
    *                 they occur.
    */
-  WebSocket(SocketChannel socketChannel, BlockingQueue<ByteBuffer> bufferQueue, WebSocketListener listener, Draft draft) {
+  WebSocket(SocketChannel socketChannel, BlockingQueue<ByteBuffer> bufferQueue, WebSocketListener listener, Draft draft, int maxpayloadsize) {
     this.socketChannel = socketChannel;
     this.bufferQueue = bufferQueue;
     this.handshakeComplete = false;
     this.socketBuffer = ByteBuffer.allocate(8192);
     this.wsl = listener;
     this.role = Role.CLIENT;
     this.draft = draft; 
+    this.maxpayloadsize = maxpayloadsize;
   }
 
-  WebSocket(SocketChannel socketChannel, BlockingQueue<ByteBuffer> bufferQueue, WebSocketListener listener,  List<Draft> drafts ) {
+  WebSocket(SocketChannel socketChannel, BlockingQueue<ByteBuffer> bufferQueue, WebSocketListener listener,  List<Draft> drafts , int maxpayloadsize ) {
 	    this.socketChannel = socketChannel;
 	    this.bufferQueue = bufferQueue;
 	    this.handshakeComplete = false;
 	    this.socketBuffer = ByteBuffer.allocate(8192);
 	    this.wsl = listener;
 	    this.role = Role.SERVER;
 	    this.draft = null;
+	    this.maxpayloadsize = maxpayloadsize;
 	    if( known_drafts == null || known_drafts.isEmpty () ){
 	    	known_drafts = new ArrayList<Draft> ( 1 );
 	    	known_drafts.add ( new Draft_10 () );
@@ -158,9 +163,14 @@ void handleRead() throws IOException, NoSuchAlgorithmException {
     bytesRead = this.socketChannel.read(this.socketBuffer);
 
 
-    if (bytesRead == -1)  {
+    if ( bytesRead == -1 )  {
       close();
-    } else if (bytesRead > 0) {
+    } 
+    else if( bytesRead > maxpayloadsize ){
+    	wsl.onError ( new RuntimeException("recived packet to big") );
+    	abort ( "recived packet to big" );
+    }
+    else if ( bytesRead > 0) {
 		if(DEBUG) System.out.println( "got: {" + new String( socketBuffer.array() , 0 , bytesRead ) + "}" );
 		if( !handshakeComplete ){
 			try{
@@ -199,17 +209,38 @@ else if( role == Role.CLIENT){
 			}
 		}
 		else{
-			List<Framedata> frames = draft.translateFrame ( socketBuffer.array () , bytesRead );
+			List<Framedata> frames = draft.translateFrame ( socketBuffer , bytesRead );
 			for( Framedata f : frames){
+				Opcode curop = f.getOpcode ();
+				if( curop == null )// Ignore undefined opcodes
+					continue;
+				else if( curop == Opcode.CLOSING){
+					sendFrame ( new FramedataImpl1 ( Opcode.CLOSING ) );
+					close();
+				}
+				else if( curop == Opcode.PING){
+					sendFrame ( new FramedataImpl1 ( Opcode.PONG ) );
+				}
+				else if( curop == Opcode.PONG){
+					wsl.onPong ();
+				}
 				if( currentframe == null){
 					if( f.isFin () ){
-						wsl.onMessage ( this , new String ( f.getPayloadData () , UTF8_CHARSET ) );
+						if( f.getOpcode () == Opcode.TEXT ){
+							wsl.onMessage ( this , new String ( f.getPayloadData () , UTF8_CHARSET ) );
+						}
+						else if( f.getOpcode () == Opcode.BINARY ){
+							wsl.onMessage ( this , f.getPayloadData () );
+						}
+						else{
+							if(DEBUG) System.out.println ( "Ignoring frame:" + f.toString() );
+						}
 					}
 					else{
 						currentframe = f;
 					}
 				}
-				else{
+				else if( f.getOpcode() == Opcode.CONTINIOUS ){
 					try {
 						currentframe.append ( f );
 					} catch ( InvalidFrameException e ) {

src/net/tootallnate/websocket/WebSocketAdapter.java

@@ -30,4 +30,12 @@ public void onClose( WebSocket conn ) {
 	@Override
 	public void onError( Throwable ex ) {
 	}
+
+	@Override
+	public void onMessage( WebSocket conn , byte[] blob ) {
+	}
+
+	@Override
+	public void onPong( ) {
+	}
 }

src/net/tootallnate/websocket/WebSocketClient.java

@@ -179,7 +179,7 @@ private boolean tryToConnect(InetSocketAddress remote) {
 
       selector = Selector.open();
 
-      this.conn = new WebSocket( client , new LinkedBlockingQueue<ByteBuffer>() , this , draft );
+      this.conn = new WebSocket( client , new LinkedBlockingQueue<ByteBuffer>() , this , draft , Integer.MAX_VALUE );
       // the client/selector can be null when closing the connection before its start
       // so we have to call this part inside IF
       if (client != null)

src/net/tootallnate/websocket/WebSocketListener.java

@@ -26,6 +26,8 @@ interface WebSocketListener {
    */
   public void onMessage(WebSocket conn, String message);
 
+  public void onMessage( WebSocket conn , byte[] blob );
+  
   /**
    * Called after <var>onHandshakeRecieved</var> returns <var>true</var>.
    * Indicates that a complete WebSocket connection has been established,
@@ -47,4 +49,6 @@ interface WebSocketListener {
    * @param ex
    */
   public void onError( Throwable ex );
+  
+  public void onPong();
 }

src/net/tootallnate/websocket/WebSocketServer.java

@@ -221,7 +221,7 @@ public void run() {
           if (key.isAcceptable()) {
             SocketChannel client = server.accept();
             client.configureBlocking(false);
-            WebSocket c = new WebSocket(client, new LinkedBlockingQueue<ByteBuffer>(), this, Collections.singletonList ( draft ) );
+            WebSocket c = new WebSocket(client, new LinkedBlockingQueue<ByteBuffer>(), this, Collections.singletonList ( draft ) , Integer.MAX_VALUE );
             client.register(selector, SelectionKey.OP_READ, c);
           }