diff options
author | Florian Vallee <f.vallee@oberthur.com> | 2014-09-12 11:17:12 +0200 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2014-09-26 14:15:46 -0700 |
commit | 5679a4a319c907c76e828c6e106b06f6cea02974 (patch) | |
tree | bf6765d1f71fadef66c63cbd5fa5d1ff62f5091a | |
parent | 0b91f83055a513d83ba21077e38709c4bf6c8a75 (diff) | |
download | AndroidAsync-5679a4a319c907c76e828c6e106b06f6cea02974.tar.gz AndroidAsync-5679a4a319c907c76e828c6e106b06f6cea02974.tar.bz2 AndroidAsync-5679a4a319c907c76e828c6e106b06f6cea02974.zip |
expose initial http request to WebSocket handlers
replace headers object with the complete AsyncHttpServerRequest in callback
see #232
-rw-r--r-- | AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java | 4 | ||||
-rw-r--r-- | AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java | 3 | ||||
-rw-r--r-- | README.md | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java index b1b393d..41bbfe0 100644 --- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java +++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java @@ -285,7 +285,7 @@ public class AsyncHttpServer { } 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,7 +318,7 @@ public class AsyncHttpServer { response.end(); return; } - callback.onConnected(new WebSocketImpl(request, response), request.getHeaders()); + callback.onConnected(new WebSocketImpl(request, response), request); } }); } diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java index a5a7f92..5784e38 100644 --- a/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java +++ b/AndroidAsync/test/src/com/koushikdutta/async/test/WebSocketTests.java @@ -9,6 +9,7 @@ import com.koushikdutta.async.http.WebSocket.StringCallback; 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 class WebSocketTests extends TestCase { 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) { @@ -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
|