Wiring up extension chain on server side

7 files changed, 128 insertions, 60 deletions

diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java
index 2d21972720..f29d2391d2 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java
@@ -36,8 +36,8 @@ import org.eclipse.jetty.websocket.api.WebSocketPolicy;
 import org.eclipse.jetty.websocket.io.IncomingFrames;
 import org.eclipse.jetty.websocket.io.MessageInputStream;
 import org.eclipse.jetty.websocket.io.MessageReader;
-import org.eclipse.jetty.websocket.io.RawConnection;
 import org.eclipse.jetty.websocket.io.StreamAppender;
+import org.eclipse.jetty.websocket.io.WebSocketSession;
 import org.eclipse.jetty.websocket.protocol.CloseInfo;
 import org.eclipse.jetty.websocket.protocol.Frame;
 import org.eclipse.jetty.websocket.protocol.OpCode;
@@ -58,7 +58,7 @@ public class WebSocketEventDriver implements IncomingFrames
     private final WebSocketPolicy policy;
     private final EventMethods events;
     private final ByteBufferPool bufferPool;
-    private RawConnection connection;
+    private WebSocketSession connection;
     private ByteBuffer activeMessage;
     private StreamAppender activeStream;
 
@@ -347,7 +347,7 @@ public class WebSocketEventDriver implements IncomingFrames
      * @param conn
      *            the connection
      */
-    public void setConnection(RawConnection conn)
+    public void setConnection(WebSocketSession conn)
     {
         this.connection = conn;
     }
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java
index 52d5746172..e90d7089e0 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java
@@ -9,17 +9,29 @@ import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.WebSocketConnection;
+import org.eclipse.jetty.websocket.api.WebSocketException;
 import org.eclipse.jetty.websocket.api.WebSocketPolicy;
+import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
 import org.eclipse.jetty.websocket.protocol.OpCode;
 import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
 
-public class WebSocketSession implements WebSocketConnection
+public class WebSocketSession implements WebSocketConnection, IncomingFrames, OutgoingFrames
 {
     private static final Logger LOG = Log.getLogger(WebSocketSession.class);
-    private RawConnection connection;
+    private final RawConnection connection;
+    private final WebSocketPolicy policy;
+    private final String subprotocol;
+    private final WebSocketEventDriver websocket;
     private OutgoingFrames outgoing;
-    private String subprotocol;
-    private WebSocketPolicy policy;
+
+    public WebSocketSession(WebSocketEventDriver websocket, RawConnection connection, WebSocketPolicy policy, String subprotocol)
+    {
+        super();
+        this.websocket = websocket;
+        this.connection = connection;
+        this.policy = policy;
+        this.subprotocol = subprotocol;
+    }
 
     @Override
     public void close() throws IOException
@@ -33,6 +45,16 @@ public class WebSocketSession implements WebSocketConnection
         connection.close(statusCode,reason);
     }
 
+    public IncomingFrames getIncoming()
+    {
+        return websocket;
+    }
+
+    public OutgoingFrames getOutgoing()
+    {
+        return outgoing;
+    }
+
     @Override
     public WebSocketPolicy getPolicy()
     {
@@ -52,11 +74,32 @@ public class WebSocketSession implements WebSocketConnection
     }
 
     @Override
+    public void incoming(WebSocketException e)
+    {
+        // pass on incoming to websocket itself
+        websocket.incoming(e);
+    }
+
+    @Override
+    public void incoming(WebSocketFrame frame)
+    {
+        // pass on incoming to websocket itself
+        websocket.incoming(frame);
+    }
+
+    @Override
     public boolean isOpen()
     {
         return connection.isOpen();
     }
 
+    @Override
+    public <C> void output(C context, Callback<C> callback, WebSocketFrame frame)
+    {
+        // forward on to chain
+        outgoing.output(context,callback,frame);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -68,6 +111,11 @@ public class WebSocketSession implements WebSocketConnection
         outgoing.output(context,callback,frame);
     }
 
+    public void setOutgoing(OutgoingFrames outgoing)
+    {
+        this.outgoing = outgoing;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
index bbc7179046..2dcd1601bb 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
@@ -397,7 +397,7 @@ public class WebSocketFrame implements Frame
         }
 
         data = ByteBuffer.allocate(len);
-        BufferUtil.clear(data);
+        BufferUtil.clearToFill(data);
         data.put(buf,0,len);
         BufferUtil.flipToFlush(data,0);
         return this;
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java
index 8680f1ee1b..70c044a421 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java
+++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java
@@ -24,7 +24,7 @@ import org.eclipse.jetty.websocket.examples.AnnotatedBinaryArraySocket;
 import org.eclipse.jetty.websocket.examples.AnnotatedBinaryStreamSocket;
 import org.eclipse.jetty.websocket.examples.AnnotatedFramesSocket;
 import org.eclipse.jetty.websocket.examples.ListenerBasicSocket;
-import org.eclipse.jetty.websocket.io.LocalWebSocketConnection;
+import org.eclipse.jetty.websocket.io.LocalWebSocketSession;
 import org.eclipse.jetty.websocket.protocol.CloseInfo;
 import org.eclipse.jetty.websocket.protocol.OpCode;
 import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
@@ -57,7 +57,7 @@ public class WebSocketEventDriverTest
         AdapterConnectCloseSocket socket = new AdapterConnectCloseSocket();
         WebSocketEventDriver driver = newDriver(socket);
 
-        LocalWebSocketConnection conn = new LocalWebSocketConnection(testname);
+        LocalWebSocketSession conn = new LocalWebSocketSession(testname);
         driver.setConnection(conn);
         driver.onConnect();
         driver.incoming(new CloseInfo(StatusCode.NORMAL).asFrame());
@@ -73,7 +73,7 @@ public class WebSocketEventDriverTest
         AnnotatedBinaryArraySocket socket = new AnnotatedBinaryArraySocket();
         WebSocketEventDriver driver = newDriver(socket);
 
-        LocalWebSocketConnection conn = new LocalWebSocketConnection(testname);
+        LocalWebSocketSession conn = new LocalWebSocketSession(testname);
         driver.setConnection(conn);
         driver.onConnect();
         driver.incoming(makeBinaryFrame("Hello World",true));
@@ -91,7 +91,7 @@ public class WebSocketEventDriverTest
         AnnotatedFramesSocket socket = new AnnotatedFramesSocket();
         WebSocketEventDriver driver = newDriver(socket);
 
-        LocalWebSocketConnection conn = new LocalWebSocketConnection(testname);
+        LocalWebSocketSession conn = new LocalWebSocketSession(testname);
         driver.setConnection(conn);
         driver.onConnect();
         driver.incoming(new WebSocketFrame(OpCode.PING).setPayload("PING"));
@@ -114,7 +114,7 @@ public class WebSocketEventDriverTest
         AnnotatedBinaryStreamSocket socket = new AnnotatedBinaryStreamSocket();
         WebSocketEventDriver driver = newDriver(socket);
 
-        LocalWebSocketConnection conn = new LocalWebSocketConnection(testname);
+        LocalWebSocketSession conn = new LocalWebSocketSession(testname);
         driver.setConnection(conn);
         driver.onConnect();
         driver.incoming(makeBinaryFrame("Hello World",true));
@@ -132,7 +132,7 @@ public class WebSocketEventDriverTest
         ListenerBasicSocket socket = new ListenerBasicSocket();
         WebSocketEventDriver driver = newDriver(socket);
 
-        LocalWebSocketConnection conn = new LocalWebSocketConnection(testname);
+        LocalWebSocketSession conn = new LocalWebSocketSession(testname);
         driver.setConnection(conn);
         driver.onConnect();
         driver.incoming(WebSocketFrame.text("Hello World"));
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java
index c3471d80fa..45b3340a7e 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java
+++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java
@@ -15,17 +15,13 @@
 //========================================================================
 package org.eclipse.jetty.websocket.io;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.api.WebSocketConnection;
-import org.eclipse.jetty.websocket.api.WebSocketPolicy;
 import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
 import org.junit.rules.TestName;
 
-public class LocalWebSocketConnection implements RawConnection, WebSocketConnection
+public class LocalWebSocketConnection implements RawConnection
 {
     private final String id;
 
@@ -60,24 +56,12 @@ public class LocalWebSocketConnection implements RawConnection, WebSocketConnect
     }
 
     @Override
-    public WebSocketPolicy getPolicy()
-    {
-        return null;
-    }
-
-    @Override
     public InetSocketAddress getRemoteAddress()
     {
         return null;
     }
 
     @Override
-    public String getSubProtocol()
-    {
-        return null;
-    }
-
-    @Override
     public boolean isOpen()
     {
         return false;
@@ -89,28 +73,8 @@ public class LocalWebSocketConnection implements RawConnection, WebSocketConnect
     }
 
     @Override
-    public <C> void ping(C context, Callback<C> callback, byte[] payload) throws IOException
-    {
-    }
-
-    @Override
     public String toString()
     {
-        return String.format("LocalWebSocketConnection[%s]",id);
-    }
-
-    @Override
-    public <C> void write(C context, Callback<C> callback, byte[] buf, int offset, int len) throws IOException
-    {
-    }
-
-    @Override
-    public <C> void write(C context, Callback<C> callback, ByteBuffer buffer) throws IOException
-    {
-    }
-
-    @Override
-    public <C> void write(C context, Callback<C> callback, String message) throws IOException
-    {
+        return String.format("%s[%s]",LocalWebSocketConnection.class.getSimpleName(),id);
     }
 }
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java
new file mode 100644
index 0000000000..3282c790fa
--- /dev/null
+++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java
@@ -0,0 +1,27 @@
+package org.eclipse.jetty.websocket.io;
+
+import org.eclipse.jetty.websocket.api.WebSocketPolicy;
+import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
+import org.junit.rules.TestName;
+
+public class LocalWebSocketSession extends WebSocketSession
+{
+    private String id;
+
+    public LocalWebSocketSession(TestName testname)
+    {
+        this(testname,null);
+    }
+
+    public LocalWebSocketSession(TestName testname, WebSocketEventDriver driver)
+    {
+        super(driver,new LocalWebSocketConnection(testname),WebSocketPolicy.newServerPolicy(),"testing");
+        this.id = testname.getMethodName();
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s[%s]",LocalWebSocketSession.class.getSimpleName(),id);
+    }
+}
diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index 15d233dc90..0ea33f5dc8 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -48,7 +49,9 @@ import org.eclipse.jetty.websocket.driver.EventMethodsCache;
 import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
 import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry;
 import org.eclipse.jetty.websocket.io.IncomingFrames;
+import org.eclipse.jetty.websocket.io.OutgoingFrames;
 import org.eclipse.jetty.websocket.io.WebSocketAsyncConnection;
+import org.eclipse.jetty.websocket.io.WebSocketSession;
 import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
 import org.eclipse.jetty.websocket.server.handshake.HandshakeHixie76;
 import org.eclipse.jetty.websocket.server.handshake.HandshakeRFC6455;
@@ -285,12 +288,6 @@ public class WebSocketServerFactory extends AbstractLifeCycle implements WebSock
         this.creator = creator;
     }
 
-    private IncomingFrames setupExtensionChain(WebSocketEventDriver websocket, List<Extension> extensions)
-    {
-        // TODO Auto-generated method stub
-        return websocket;
-    }
-
     /**
      * Upgrade the request/response to a WebSocket Connection.
      * <p>
@@ -348,8 +345,40 @@ public class WebSocketServerFactory extends AbstractLifeCycle implements WebSock
         LOG.debug("AsyncWebSocketConnection: {}",connection);
 
         // Initialize / Negotiate Extensions
+        WebSocketSession session = new WebSocketSession(websocket,connection,getPolicy(),response.getAcceptedSubProtocol());
         List<Extension> extensions = initExtensions(request.getExtensions());
-        IncomingFrames incoming = setupExtensionChain(websocket,extensions);
+
+        // Start with default routing.
+        IncomingFrames incoming = session;
+        OutgoingFrames outgoing = connection;
+
+        // Connect extensions
+        if (extensions != null)
+        {
+            Iterator<Extension> extIter;
+            // Connect outgoings
+            extIter = extensions.iterator();
+            while (extIter.hasNext())
+            {
+                Extension ext = extIter.next();
+                ext.setNextOutgoingFrames(outgoing);
+                outgoing = ext;
+            }
+
+            // Connect incomings
+            Collections.reverse(extensions);
+            extIter = extensions.iterator();
+            while (extIter.hasNext())
+            {
+                Extension ext = extIter.next();
+                ext.setNextIncomingFrames(incoming);
+                incoming = ext;
+            }
+        }
+
+        // configure session for outgoing flows
+        session.setOutgoing(outgoing);
+        // configure connection for incoming flows
         connection.getParser().setIncomingFramesHandler(incoming);
 
         // Process (version specific) handshake response
@@ -361,7 +390,7 @@ public class WebSocketServerFactory extends AbstractLifeCycle implements WebSock
 
         // Notify POJO of connection
         // TODO move to WebSocketAsyncConnection.onOpen
-        websocket.setConnection(connection);
+        websocket.setConnection(session);
         websocket.onConnect();
 
         LOG.debug("Websocket upgrade {} {} {} {}",request.getRequestURI(),version,response.getAcceptedSubProtocol(),connection);