Merge pull request koush#242 from ey3ball/master

Expose initial http request to WebSocket handlers

Author: koush

AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java

@@ -285,7 +285,7 @@ public void addAction(String action, String regex, HttpServerRequestCallback cal
     }
 
     public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, RequestHeaders headers);
+        public void onConnected(WebSocket webSocket, AsyncHttpServerRequest request);
     }
 
     public void websocket(String regex, final WebSocketRequestCallback callback) {
@@ -318,15 +318,11 @@ public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServe
                     response.end();
                     return;
                 }
-                callback.onConnected(createWebSocket(request, response), request.getHeaders());
+                callback.onConnected(new WebSocketImpl(request, response), request);
             }
         });
     }
 
-    protected WebSocket createWebSocket(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
-        return new WebSocketImpl(request, response);
-    }
-    
     public void get(String regex, HttpServerRequestCallback callback) {
         addAction(AsyncHttpGet.METHOD, regex, callback);
     }

AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java

@@ -9,6 +9,7 @@
 import com.koushikdutta.async.http.libcore.RequestHeaders;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServer.WebSocketRequestCallback;
+import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
 
 import junit.framework.TestCase;
 
@@ -34,7 +35,7 @@ public void onCompleted(Exception ex) {
 
         httpServer.websocket("/ws", new WebSocketRequestCallback() {
             @Override
-            public void onConnected(final WebSocket webSocket, RequestHeaders headers) {
+            public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
                 webSocket.setStringCallback(new StringCallback() {
                     @Override
                     public void onStringAvailable(String s) {

README.md

@@ -216,7 +216,7 @@ server.listen(5000);
 ```java
 server.websocket("/live", new WebSocketRequestCallback() {
     @Override
-    public void onConnected(final WebSocket webSocket, RequestHeaders headers) {
+    public void onConnected(final WebSocket webSocket, AsyncHttpServerRequest request) {
         _sockets.add(webSocket);
         
         //Use this to clean up any references to your websocket