first bunch (crossbario#228)

* first bunch

* move android websocket support to subpackage

* more polish, add event details etc

autobahn/src/main/java/io/crossbar/autobahn/wamp/Session.java

@@ -27,11 +27,15 @@
 
 import io.crossbar.autobahn.wamp.exceptions.ApplicationError;
 import io.crossbar.autobahn.wamp.exceptions.ProtocolError;
+
 import io.crossbar.autobahn.wamp.interfaces.IMessage;
 import io.crossbar.autobahn.wamp.interfaces.ISession;
 import io.crossbar.autobahn.wamp.interfaces.ITransport;
 import io.crossbar.autobahn.wamp.interfaces.ITransportHandler;
 import io.crossbar.autobahn.wamp.interfaces.ISerializer;
+import io.crossbar.autobahn.wamp.interfaces.IEventHandler;
+import io.crossbar.autobahn.wamp.interfaces.IInvocationHandler;
+
 import io.crossbar.autobahn.wamp.messages.Call;
 import io.crossbar.autobahn.wamp.messages.Error;
 import io.crossbar.autobahn.wamp.messages.Event;
@@ -47,15 +51,16 @@
 import io.crossbar.autobahn.wamp.messages.Subscribed;
 import io.crossbar.autobahn.wamp.messages.Welcome;
 import io.crossbar.autobahn.wamp.messages.Yield;
+
 import io.crossbar.autobahn.wamp.requests.CallRequest;
 import io.crossbar.autobahn.wamp.requests.PublishRequest;
 import io.crossbar.autobahn.wamp.requests.RegisterRequest;
 import io.crossbar.autobahn.wamp.requests.SubscribeRequest;
+
 import io.crossbar.autobahn.wamp.types.CallOptions;
 import io.crossbar.autobahn.wamp.types.CallResult;
 import io.crossbar.autobahn.wamp.types.CloseDetails;
-import io.crossbar.autobahn.wamp.types.IEventHandler;
-import io.crossbar.autobahn.wamp.types.IInvocationHandler;
+import io.crossbar.autobahn.wamp.types.EventDetails;
 import io.crossbar.autobahn.wamp.types.InvocationDetails;
 import io.crossbar.autobahn.wamp.types.InvocationResult;
 import io.crossbar.autobahn.wamp.types.Publication;
@@ -246,11 +251,22 @@ private void onMessage(IMessage message) {
                 Event msg = (Event) message;
                 List<Subscription> subscriptions = mSubscriptions.getOrDefault(msg.subscription, null);
                 if (subscriptions != null) {
+
                     List<CompletableFuture<?>> futures = new ArrayList<>();
+
                     subscriptions.forEach(
-                            subscription -> futures.add(
-                                    CompletableFuture.runAsync(() -> subscription.handler.run(msg.args, msg.kwargs),
-                                    getExecutor())));
+                            subscription -> {
+                                EventDetails details = new EventDetails(
+                                        subscription, subscription.topic, -1, null, null, this);
+                                futures.add(
+                                    CompletableFuture.runAsync(
+                                        () -> subscription.handler.run(msg.args, msg.kwargs, details)
+                                        , getExecutor()
+                                    )
+                                );
+                            }
+                    );
+
                     // Not really doing anything with the combined futures.
                     combineFutures(futures);
                 } else {

autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/IAuthenticator.java

@@ -17,6 +17,7 @@
 import io.crossbar.autobahn.wamp.types.Challenge;
 import io.crossbar.autobahn.wamp.types.ChallengeResponse;
 
+
 public interface IAuthenticator {
     CompletableFuture<ChallengeResponse> onChallenge(Session session, Challenge challenge);
 }

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/IEventHandler.java → autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/IEventHandler.java

@@ -9,12 +9,17 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn.wamp.types;
+package io.crossbar.autobahn.wamp.interfaces;
 
 import java.util.List;
 import java.util.Map;
 
+import io.crossbar.autobahn.wamp.types.EventDetails;
+
+
 @FunctionalInterface
 public interface IEventHandler<R> {
-    R run(List<Object> args, Map<String, Object> kwargs);
+    R run(List<Object> args,
+          Map<String, Object> kwargs,
+          EventDetails details);
 }

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/IInvocationHandler.java → autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/IInvocationHandler.java

@@ -9,14 +9,19 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn.wamp.types;
+package io.crossbar.autobahn.wamp.interfaces;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
+import io.crossbar.autobahn.wamp.types.InvocationDetails;
+import io.crossbar.autobahn.wamp.types.InvocationResult;
+
+
 @FunctionalInterface
 public interface IInvocationHandler {
-    CompletableFuture<InvocationResult> run(List<Object> args, Map<String, Object> kwargs,
+    CompletableFuture<InvocationResult> run(List<Object> args,
+                                            Map<String, Object> kwargs,
                                             InvocationDetails details);
 }

autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/IMessage.java

@@ -13,6 +13,7 @@
 
 import java.util.List;
 
+
 public interface IMessage {
     List<Object> marshal();
 }

autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/ISession.java

@@ -18,11 +18,13 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import io.crossbar.autobahn.wamp.Session;
+
+import io.crossbar.autobahn.wamp.interfaces.IEventHandler;
+import io.crossbar.autobahn.wamp.interfaces.IInvocationHandler;
+
 import io.crossbar.autobahn.wamp.types.CallOptions;
 import io.crossbar.autobahn.wamp.types.CallResult;
 import io.crossbar.autobahn.wamp.types.CloseDetails;
-import io.crossbar.autobahn.wamp.types.IEventHandler;
-import io.crossbar.autobahn.wamp.types.IInvocationHandler;
 import io.crossbar.autobahn.wamp.types.Publication;
 import io.crossbar.autobahn.wamp.types.PublishOptions;
 import io.crossbar.autobahn.wamp.types.RegisterOptions;
@@ -31,6 +33,7 @@
 import io.crossbar.autobahn.wamp.types.SubscribeOptions;
 import io.crossbar.autobahn.wamp.types.Subscription;
 
+
 public interface ISession {
 
     CompletableFuture<Subscription> subscribe(String topic, IEventHandler handler, SubscribeOptions options);

autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/ITransportHandler.java

@@ -11,6 +11,7 @@
 
 package io.crossbar.autobahn.wamp.interfaces;
 
+
 public interface ITransportHandler {
 
     void onConnect(ITransport transport, ISerializer serializer);

autobahn/src/main/java/io/crossbar/autobahn/wamp/requests/PublishRequest.java

@@ -15,6 +15,7 @@
 
 import io.crossbar.autobahn.wamp.types.Publication;
 
+
 public class PublishRequest extends Request {
 
     public final CompletableFuture<Publication> onReply;

autobahn/src/main/java/io/crossbar/autobahn/wamp/requests/RegisterRequest.java

@@ -13,9 +13,10 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import io.crossbar.autobahn.wamp.types.IInvocationHandler;
+import io.crossbar.autobahn.wamp.interfaces.IInvocationHandler;
 import io.crossbar.autobahn.wamp.types.Registration;
 
+
 public class RegisterRequest extends Request {
     public final CompletableFuture<Registration> onReply;
     public final String procedure;

autobahn/src/main/java/io/crossbar/autobahn/wamp/requests/Request.java

@@ -11,6 +11,7 @@
 
 package io.crossbar.autobahn.wamp.requests;
 
+
 public class Request {
 
     public final long request;

autobahn/src/main/java/io/crossbar/autobahn/wamp/requests/SubscribeRequest.java

@@ -13,9 +13,10 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import io.crossbar.autobahn.wamp.types.IEventHandler;
+import io.crossbar.autobahn.wamp.interfaces.IEventHandler;
 import io.crossbar.autobahn.wamp.types.Subscription;
 
+
 public class SubscribeRequest extends Request {
     public final String topic;
     public final CompletableFuture<Subscription> onReply;

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/CBORSerializer.java → autobahn/src/main/java/io/crossbar/autobahn/wamp/serializers/CBORSerializer.java

@@ -9,7 +9,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn.wamp.types;
+package io.crossbar.autobahn.wamp.serializers;
 
 import java.io.IOException;
 import java.util.List;

autobahn/src/main/java/io/crossbar/autobahn/wamp/NettyTransport.java → autobahn/src/main/java/io/crossbar/autobahn/wamp/transports/NettyTransport.java

@@ -9,7 +9,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn.wamp;
+package io.crossbar.autobahn.wamp.transports;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -45,7 +45,7 @@
 import io.crossbar.autobahn.wamp.interfaces.ISerializer;
 import io.crossbar.autobahn.wamp.interfaces.ITransport;
 import io.crossbar.autobahn.wamp.interfaces.ITransportHandler;
-import io.crossbar.autobahn.wamp.types.CBORSerializer;
+import io.crossbar.autobahn.wamp.serializers.CBORSerializer;
 
 
 public class NettyTransport implements ITransport {

autobahn/src/main/java/io/crossbar/autobahn/wamp/NettyWebSocketClientHandler.java → autobahn/src/main/java/io/crossbar/autobahn/wamp/transports/NettyWebSocketClientHandler.java

@@ -9,14 +9,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn.wamp;
+package io.crossbar.autobahn.wamp.transports;
 
 import java.util.List;
 
-import io.crossbar.autobahn.wamp.interfaces.IMessage;
-import io.crossbar.autobahn.wamp.interfaces.ISerializer;
-import io.crossbar.autobahn.wamp.interfaces.ITransport;
-import io.crossbar.autobahn.wamp.interfaces.ITransportHandler;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
@@ -30,8 +26,14 @@
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.util.CharsetUtil;
 
+import io.crossbar.autobahn.wamp.interfaces.IMessage;
+import io.crossbar.autobahn.wamp.interfaces.ISerializer;
+import io.crossbar.autobahn.wamp.interfaces.ITransport;
+import io.crossbar.autobahn.wamp.interfaces.ITransportHandler;
+
 import static io.crossbar.autobahn.wamp.messages.MessageMap.MESSAGE_TYPE_MAP;
 
+
 public class NettyWebSocketClientHandler extends SimpleChannelInboundHandler<Object> {
 
     private final WebSocketClientHandshaker mHandshaker;

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/EventDetails.java

@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//   AutobahnJava - http://crossbar.io/autobahn
+//
+//   Copyright (c) Crossbar.io Technologies GmbH and contributors
+//
+//   Licensed under the MIT License.
+//   http://www.opensource.org/licenses/mit-license.php
+//
+///////////////////////////////////////////////////////////////////////////////
+
+package io.crossbar.autobahn.wamp.types;
+
+import io.crossbar.autobahn.wamp.Session;
+
+
+public class EventDetails {
+
+    // The subscription on which this event is delivered to.
+    public final Subscription subscription;
+
+    // The URI of the topic under the subscription.
+    public final String topic;
+
+    // The WAMP sessionid of the publisher.
+    public final long publisherSessionID;
+
+    // The WAMP authid of the publisher.
+    public final String publisherAuthID;
+
+    // The WAMP authrole of the publisher.
+    public final String publisherAuthRole;
+
+    // The WAMP session on which this event is delivered.
+    public final Session session;
+
+    public EventDetails(Subscription subscription, String topic, long publisherSessionID,
+                             String publisherAuthID, String publisherAuthRole, Session session) {
+        this.subscription = subscription;
+        this.topic = topic;
+        this.publisherSessionID = publisherSessionID;
+        this.publisherAuthID = publisherAuthID;
+        this.publisherAuthRole = publisherAuthRole;
+        this.session = session;
+    }
+}

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/InvocationDetails.java

@@ -30,6 +30,7 @@ public class InvocationDetails {
     // The WAMP authrole of the caller.
     public final String callerAuthRole;
 
+    // The WAMP session on which this event is delivered.
     public final Session session;
 
     // FIXME

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/Registration.java

@@ -11,6 +11,9 @@
 
 package io.crossbar.autobahn.wamp.types;
 
+import io.crossbar.autobahn.wamp.interfaces.IInvocationHandler;
+
+
 public class Registration {
     public final long registration;
     public final String procedure;

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/Subscription.java

@@ -11,6 +11,9 @@
 
 package io.crossbar.autobahn.wamp.types;
 
+import io.crossbar.autobahn.wamp.interfaces.IEventHandler;
+
+
 public class Subscription {
     public final long subscription;
     public final String topic;

autobahn/src/main/java/io/crossbar/autobahn/Utf8Validator.java → autobahn/src/main/java/io/crossbar/autobahn/websocket/Utf8Validator.java

@@ -9,7 +9,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn;
+package io.crossbar.autobahn.websocket;
 
 
 /**

autobahn/src/main/java/io/crossbar/autobahn/WebSocket.java → autobahn/src/main/java/io/crossbar/autobahn/websocket/WebSocket.java

@@ -9,7 +9,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn;
+package io.crossbar.autobahn.websocket;
+
 
 public interface WebSocket {
 

autobahn/src/main/java/io/crossbar/autobahn/WebSocketConnection.java → autobahn/src/main/java/io/crossbar/autobahn/websocket/WebSocketConnection.java

@@ -9,15 +9,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn;
+package io.crossbar.autobahn.websocket;
 
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.util.Log;
-
-import org.apache.http.message.BasicNameValuePair;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -29,6 +22,15 @@
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+
+import org.apache.http.message.BasicNameValuePair;
+
+
 public class WebSocketConnection implements WebSocket {
 
     private static final boolean DEBUG = true;

autobahn/src/main/java/io/crossbar/autobahn/WebSocketConnectionHandler.java → autobahn/src/main/java/io/crossbar/autobahn/websocket/WebSocketConnectionHandler.java

@@ -9,7 +9,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn;
+package io.crossbar.autobahn.websocket;
+
 
 /**
  * WebSockets event handler. Users will usually provide an instance of a class

autobahn/src/main/java/io/crossbar/autobahn/WebSocketException.java → autobahn/src/main/java/io/crossbar/autobahn/websocket/WebSocketException.java

@@ -9,7 +9,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-package io.crossbar.autobahn;
+package io.crossbar.autobahn.websocket;
+
 
 public class WebSocketException extends Exception {