Introduced method sendFragmentedFrame() to send fragmented frames more

Davidiusdadi · Davidiusdadi · commit d4d99ed6dde4 · 2013-08-08T22:38:05.000+02:00
convenient.
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java
@@ -6,6 +6,7 @@
 
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.framing.Framedata;
+import org.java_websocket.framing.Framedata.Opcode;
 
 public interface WebSocket {
 	public enum Role {
@@ -62,6 +63,21 @@ public enum READYSTATE {
 
 	public abstract void sendFrame( Framedata framedata );
 
+	/**
+	 * Allows to send continuous/fragmented frames conveniently. <br>
+	 * For more into on this frame type see http://tools.ietf.org/html/rfc6455#section-5.4<br>
+	 * 
+	 * If the first frame you send is also the last then it is not a fragmented frame and will received via onMessage instead of onFragmented even though it was send by this method.
+	 * 
+	 * @param op
+	 *            This is only important for the first frame in the sequence. Opcode.TEXT, Opcode.BINARY are allowed.
+	 * @param buffer
+	 *            The buffer which contains the payload. It may have no bytes remaining.
+	 * @param fin
+	 *            true means the current frame is the last in the sequence.
+	 **/
+	public abstract void sendFragmentedFrame( Opcode op, ByteBuffer buffer, boolean fin );
+
 	public abstract boolean hasBufferedData();
 
 	/**
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -577,6 +577,11 @@ private void send( Collection<Framedata> frames ) {
 		}
 	}
 
+	@Override
+	public void sendFragmentedFrame( Opcode op, ByteBuffer buffer, boolean fin ) {
+		send( draft.continuousFrame( op, buffer, fin ) );
+	}
+
 	@Override
 	public void sendFrame( Framedata framedata ) {
 		if( DEBUG )
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -12,7 +12,10 @@
 import org.java_websocket.exceptions.InvalidHandshakeException;
 import org.java_websocket.exceptions.LimitExedeedException;
 import org.java_websocket.framing.CloseFrame;
+import org.java_websocket.framing.FrameBuilder;
 import org.java_websocket.framing.Framedata;
+import org.java_websocket.framing.Framedata.Opcode;
+import org.java_websocket.framing.FramedataImpl1;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.ClientHandshakeBuilder;
 import org.java_websocket.handshake.HandshakeBuilder;
@@ -46,6 +49,8 @@ public enum CloseHandshakeType {
 	/** In some cases the handshake will be parsed different depending on whether */
 	protected Role role = null;
 
+	protected Opcode continuousFrameType = null;
+
 	public static ByteBuffer readLine( ByteBuffer buf ) {
 		ByteBuffer sbuf = ByteBuffer.allocate( buf.remaining() );
 		byte prev = '0';
@@ -123,6 +128,34 @@ protected boolean basicAccept( Handshakedata handshakedata ) {
 
 	public abstract List<Framedata> createFrames( String text, boolean mask );
 
+	public List<Framedata> continuousFrame( Opcode op, ByteBuffer buffer, boolean fin ) {
+		if( op != Opcode.BINARY && op != Opcode.TEXT && op != Opcode.TEXT ) {
+			throw new IllegalArgumentException( "Only Opcode.BINARY or  Opcode.TEXT are allowed" );
+		}
+
+		if( continuousFrameType != null ) {
+			continuousFrameType = Opcode.CONTINUOUS;
+		} else if( fin ) {
+			throw new IllegalArgumentException( "There is no continious frame to continue" );
+		} else {
+			continuousFrameType = op;
+		}
+
+		FrameBuilder bui = new FramedataImpl1( continuousFrameType );
+		try {
+			bui.setPayload( buffer );
+		} catch ( InvalidDataException e ) {
+			throw new RuntimeException( e ); // can only happen when one builds close frames(Opcode.Close)
+		}
+		bui.setFin( fin );
+		if( fin ) {
+			continuousFrameType = null;
+		} else {
+			continuousFrameType = op;
+		}
+		return Collections.singletonList( (Framedata) bui );
+	}
+
 	public abstract void reset();
 
 	public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownrole ) {

Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,11 @@ private void send( Collection<Framedata> frames ) {`
`577`	`577`	`}`
`578`	`578`	`}`
`579`	`579`
	`580`	`+ @Override`
	`581`	`+ public void sendFragmentedFrame( Opcode op, ByteBuffer buffer, boolean fin ) {`
	`582`	`+ send( draft.continuousFrame( op, buffer, fin ) );`
	`583`	`+ }`
	`584`	`+`
`580`	`585`	`@Override`
`581`	`586`	`public void sendFrame( Framedata framedata ) {`
`582`	`587`	`if( DEBUG )`