Fixing Issue #263

darkl · darkl · commit 7d2d20e66c00 · 2018-08-11T22:46:18.000-04:00
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Server/InMemoryWampHost.cs b/src/net45/WampSharp/WAMP2/V2/Api/Server/InMemoryWampHost.cs
@@ -15,22 +15,17 @@ internal class InMemoryWampHost : WampHostBase
         private readonly WampChannelFactory mChannelFactory = 
             new WampChannelFactory();
 
-        /// <summary>
-        /// Initializes a new instance of <see cref="InMemoryWampHost"/>.
-        /// </summary>
-        public InMemoryWampHost() : this(new WampRealmContainer(), new LooseUriValidator())
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of <see cref="InMemoryWampHost"/> given the
         /// <see cref="IWampRealmContainer"/> associated with this host.
         /// </summary>
         /// <param name="realmContainer"></param>
         /// <param name="uriValidator"></param>
+        /// <param name="sessionIdMap"></param>
         public InMemoryWampHost(IWampRealmContainer realmContainer,
-                                IWampUriValidator uriValidator) :
-                                    base(realmContainer, uriValidator)
+                                IWampUriValidator uriValidator,
+                                IWampSessionMapper sessionIdMap) :
+                                    base(realmContainer, uriValidator, sessionIdMap)
         {
             mInternalBinding = new InMemoryBinding();
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Server/WampBindingHost.cs b/src/net45/WampSharp/WAMP2/V2/Api/Server/WampBindingHost.cs
@@ -5,6 +5,7 @@
 using WampSharp.Core.Proxy;
 using WampSharp.Core.Serialization;
 using WampSharp.V2.Binding;
+using WampSharp.V2.Core;
 using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Core.Dispatch;
 using WampSharp.V2.Core.Listener;
@@ -32,7 +33,8 @@ public class WampBindingHost<TMessage> : IWampBindingHost
         /// <param name="connectionListener">The <see cref="IWampConnectionListener{TMessage}"/> this 
         /// binding host listens to.</param>
         /// <param name="binding">The <see cref="IWampBinding{TMessage}"/> associated with this binding host.</param>
-        public WampBindingHost(IWampHostedRealmContainer realmContainer, IWampRouterBuilder builder, IWampConnectionListener<TMessage> connectionListener, IWampBinding<TMessage> binding)
+        /// <param name="sessionIdMap"></param>
+        public WampBindingHost(IWampHostedRealmContainer realmContainer, IWampRouterBuilder builder, IWampConnectionListener<TMessage> connectionListener, IWampBinding<TMessage> binding, IWampSessionMapper sessionIdMap)
         {
             IWampOutgoingRequestSerializer outgoingRequestSerializer =
                 new WampOutgoingRequestSerializer<TMessage>(binding.Formatter);
@@ -44,7 +46,7 @@ public WampBindingHost(IWampHostedRealmContainer realmContainer, IWampRouterBuil
 
             mSession = session;
 
-            mListener = GetWampListener(connectionListener, binding, outgoingRequestSerializer);
+            mListener = GetWampListener(connectionListener, binding, outgoingRequestSerializer, sessionIdMap);
         }
 
         private static IWampEventSerializer GetEventSerializer(
@@ -56,13 +58,13 @@ private static IWampEventSerializer GetEventSerializer(
             return serializerGenerator.GetSerializer<IWampEventSerializer>();
         }
 
-        private WampListener<TMessage> GetWampListener(IWampConnectionListener<TMessage> connectionListener, IWampBinding<TMessage> binding, IWampOutgoingRequestSerializer outgoingRequestSerializer)
+        private WampListener<TMessage> GetWampListener(IWampConnectionListener<TMessage> connectionListener, IWampBinding<TMessage> binding, IWampOutgoingRequestSerializer outgoingRequestSerializer, IWampSessionMapper sessionIdMap)
         {
             IWampClientBuilderFactory<TMessage, IWampClientProxy<TMessage>> clientBuilderFactory =
                 GetWampClientBuilder(binding, outgoingRequestSerializer);
 
             IWampClientContainer<TMessage, IWampClientProxy<TMessage>> clientContainer =
-                new WampClientContainer<TMessage>(clientBuilderFactory);
+                new WampClientContainer<TMessage>(clientBuilderFactory, sessionIdMap);
 
             IWampRequestMapper<TMessage> requestMapper =
                 new WampRequestMapper<TMessage>(typeof(WampServer<TMessage>),
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Server/WampHost.cs b/src/net45/WampSharp/WAMP2/V2/Api/Server/WampHost.cs
@@ -4,6 +4,7 @@
 using WampSharp.V2.Binding;
 using WampSharp.V2.Binding.Transports;
 using WampSharp.V2.Core;
+using WampSharp.V2.Core.Listener;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2
@@ -29,10 +30,12 @@ public WampHost(IWampRealmContainer realmContainer = null, IWampUriValidator uri
 
             UriValidator = uriValidator ?? new LooseUriValidator();
 
-            mInternalHost = new InMemoryWampHost(realmContainer, UriValidator);
+            WampSessionMapper sessionIdMap = new WampSessionMapper();
+
+            mInternalHost = new InMemoryWampHost(realmContainer, UriValidator, sessionIdMap);
             mInternalHost.Open();
 
-            mExternalHost = new WampHostBase(realmContainer, UriValidator);
+            mExternalHost = new WampHostBase(realmContainer, UriValidator, sessionIdMap);
 
             mRealmContainer =
                 new ServiceHostedRealmContainer(mExternalHost.RealmContainer,
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Server/WampHostBase.cs b/src/net45/WampSharp/WAMP2/V2/Api/Server/WampHostBase.cs
@@ -5,6 +5,7 @@
 using WampSharp.V2.Binding;
 using WampSharp.V2.Binding.Transports;
 using WampSharp.V2.Core;
+using WampSharp.V2.Core.Listener;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2
@@ -20,12 +21,13 @@ internal class WampHostBase : IWampHost
             new List<WampTransportDefinition>();
 
         private readonly IWampUriValidator mUriValidator;
+        private readonly IWampSessionMapper mSessionIdMap;
 
         /// <summary>
         /// Initializes a new instance of <see cref="WampHostBase"/>.
         /// </summary>
-        public WampHostBase() : 
-            this(new WampRealmContainer(), new LooseUriValidator())
+        public WampHostBase() :
+            this(new WampRealmContainer(), new LooseUriValidator(), new WampSessionMapper())
         {
         }
 
@@ -35,10 +37,12 @@ public WampHostBase() :
         /// </summary>
         /// <param name="realmContainer"></param>
         /// <param name="uriValidator"></param>
-        public WampHostBase(IWampRealmContainer realmContainer, IWampUriValidator uriValidator)
+        /// <param name="sessionIdMap"></param>
+        public WampHostBase(IWampRealmContainer realmContainer, IWampUriValidator uriValidator, IWampSessionMapper sessionIdMap)
         {
             mUriValidator = uriValidator;
             RealmContainer = new HostedRealmContainer(realmContainer);
+            mSessionIdMap = sessionIdMap;
         }
 
         public IWampHostedRealmContainer RealmContainer { get; }
@@ -98,7 +102,7 @@ private IWampBindingHost GetBindingHost<TMessage>
                 new CompositeListener<TMessage>(listeners);
 
             IWampBindingHost host = 
-                binding.CreateHost(RealmContainer, compositeListener, mUriValidator);
+                binding.CreateHost(RealmContainer, compositeListener, mUriValidator, mSessionIdMap);
             
             return host;
         }
diff --git a/src/net45/WampSharp/WAMP2/V2/Authentication/Host/WampAuthenticationBinding.cs b/src/net45/WampSharp/WAMP2/V2/Authentication/Host/WampAuthenticationBinding.cs
@@ -3,6 +3,7 @@
 using WampSharp.Core.Serialization;
 using WampSharp.V2.Binding;
 using WampSharp.V2.Core;
+using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2.Authentication
@@ -24,14 +25,17 @@ public WampAuthenticationBinding(IWampBinding<TMessage> binding,
                 new RestrictedSessionAuthenticationFactory(sessionAuthenticationFactory);
         }
 
-        public IWampBindingHost CreateHost(IWampHostedRealmContainer realmContainer, IWampConnectionListener<TMessage> connectionListener)
+        public IWampBindingHost CreateHost(IWampHostedRealmContainer realmContainer,
+                                           IWampConnectionListener<TMessage> connectionListener,
+                                           IWampSessionMapper sessionIdMap)
         {
             IWampRouterBuilder wampRouterBuilder = new WampAuthenticationRouterBuilder(mSessionAuthenticationFactory, mUriValidator);
 
             return new WampBindingHost<TMessage>(realmContainer,
                                                  wampRouterBuilder,
                                                  connectionListener,
-                                                 mBinding);
+                                                 mBinding,
+                                                 sessionIdMap);
         }
 
         public string Name => mBinding.Name;
diff --git a/src/net45/WampSharp/WAMP2/V2/Binding/IWampRouterBinding.cs b/src/net45/WampSharp/WAMP2/V2/Binding/IWampRouterBinding.cs
@@ -1,4 +1,6 @@
 using WampSharp.Core.Listener;
+using WampSharp.V2.Core;
+using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2.Binding
@@ -14,8 +16,10 @@ public interface IWampRouterBinding<TMessage> : IWampBinding<TMessage>
         /// </summary>
         /// <param name="realmContainer"></param>
         /// <param name="connectionListener"></param>
+        /// <param name="sessionIdMap"></param>
         /// <returns></returns>
         IWampBindingHost CreateHost(IWampHostedRealmContainer realmContainer,
-            IWampConnectionListener<TMessage> connectionListener);
+                                    IWampConnectionListener<TMessage> connectionListener,
+                                    IWampSessionMapper sessionIdMap);
     }
 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Binding/WampRouterBindingExtensions.cs b/src/net45/WampSharp/WAMP2/V2/Binding/WampRouterBindingExtensions.cs
@@ -1,5 +1,6 @@
 using WampSharp.Core.Listener;
 using WampSharp.V2.Core;
+using WampSharp.V2.Core.Contracts;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2.Binding
@@ -10,12 +11,13 @@ public static IWampBindingHost CreateHost<TMessage>
             (this IWampBinding<TMessage> binding,
              IWampHostedRealmContainer realmContainer,
              IWampConnectionListener<TMessage> connectionListener,
-             IWampUriValidator uriValidator)
+             IWampUriValidator uriValidator,
+             IWampSessionMapper sessionIdMap)
         {
 
             if (binding is IWampRouterBinding<TMessage> routerBinding)
             {
-                return routerBinding.CreateHost(realmContainer, connectionListener);
+                return routerBinding.CreateHost(realmContainer, connectionListener, sessionIdMap);
             }
             else
             {
@@ -25,7 +27,8 @@ public static IWampBindingHost CreateHost<TMessage>
                     new WampBindingHost<TMessage>(realmContainer,
                                                   routerBuilder,
                                                   connectionListener,
-                                                  binding);
+                                                  binding,
+                                                  sessionIdMap);
 
                 return result;
             }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Listener/IWampSessionMapper.cs b/src/net45/WampSharp/WAMP2/V2/Core/Listener/IWampSessionMapper.cs
@@ -0,0 +1,11 @@
+﻿using WampSharp.V2.Core.Contracts;
+
+namespace WampSharp.V2.Core
+{
+    public interface IWampSessionMapper
+    {
+        long AllocateSession(IWampClientProxy proxy);
+
+        void ReleaseSession(long session);
+    }
+}
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Listener/WampClientContainer.cs b/src/net45/WampSharp/WAMP2/V2/Core/Listener/WampClientContainer.cs
@@ -5,29 +5,34 @@ namespace WampSharp.V2.Core.Listener
 {
     public class WampClientContainer<TMessage> : WampClientContainer<TMessage, IWampClientProxy<TMessage>>
     {
-        private readonly WampIdMapper<IWampClientProxy<TMessage>> mSessionIdToClientProxy = new WampIdMapper<IWampClientProxy<TMessage>>();
+        private IWampSessionMapper mSessionIdMap;
 
         public WampClientContainer(IWampClientBuilderFactory<TMessage, IWampClientProxy<TMessage>> clientBuilderFactory) :
+            this(clientBuilderFactory, new WampSessionMapper())
+        {
+        }
+
+        public WampClientContainer(IWampClientBuilderFactory<TMessage, IWampClientProxy<TMessage>> clientBuilderFactory, IWampSessionMapper sessionIdMap) :
             base(clientBuilderFactory)
         {
+            mSessionIdMap = sessionIdMap;
         }
 
         public override void RemoveClient(IWampConnection<TMessage> connection)
         {
-
             bool clientProxyFound = TryGetClient(connection, out IWampClientProxy<TMessage> clientProxy);
 
             base.RemoveClient(connection);
 
             if (clientProxyFound)
             {
-                mSessionIdToClientProxy.TryRemove(clientProxy.Session, out clientProxy);
+                mSessionIdMap.ReleaseSession(clientProxy.Session);
             }
         }
 
         public override object GenerateClientId(IWampClientProxy<TMessage> client)
         {
-            return mSessionIdToClientProxy.Add(client);
+            return mSessionIdMap.AllocateSession(client);
         }
     }
 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Listener/WampSessionMapper.cs b/src/net45/WampSharp/WAMP2/V2/Core/Listener/WampSessionMapper.cs
@@ -0,0 +1,19 @@
+﻿using WampSharp.V2.Core.Contracts;
+
+namespace WampSharp.V2.Core.Listener
+{
+    public class WampSessionMapper : IWampSessionMapper
+    {
+        private readonly WampIdMapper<IWampClientProxy> mSessionIdMap = new WampIdMapper<IWampClientProxy>();
+
+        public long AllocateSession(IWampClientProxy proxy)
+        {
+            return mSessionIdMap.Add(proxy);
+        }
+
+        public void ReleaseSession(long session)
+        {
+            mSessionIdMap.TryRemove(session, out var removed);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using WampSharp.Core.Listener;`
`2`	`2`	`using WampSharp.V2.Core;`
	`3`	`+using WampSharp.V2.Core.Contracts;`
`3`	`4`	`using WampSharp.V2.Realm;`
`4`	`5`
`5`	`6`	`namespace WampSharp.V2.Binding`
`@@ -10,12 +11,13 @@ public static IWampBindingHost CreateHost<TMessage>`
`10`	`11`	`(this IWampBinding<TMessage> binding,`
`11`	`12`	`IWampHostedRealmContainer realmContainer,`
`12`	`13`	`IWampConnectionListener<TMessage> connectionListener,`
`13`		`- IWampUriValidator uriValidator)`
	`14`	`+ IWampUriValidator uriValidator,`
	`15`	`+ IWampSessionMapper sessionIdMap)`
`14`	`16`	`{`
`15`	`17`
`16`	`18`	`if (binding is IWampRouterBinding<TMessage> routerBinding)`
`17`	`19`	`{`
`18`		`- return routerBinding.CreateHost(realmContainer, connectionListener);`
	`20`	`+ return routerBinding.CreateHost(realmContainer, connectionListener, sessionIdMap);`
`19`	`21`	`}`
`20`	`22`	`else`
`21`	`23`	`{`
`@@ -25,7 +27,8 @@ public static IWampBindingHost CreateHost<TMessage>`
`25`	`27`	`new WampBindingHost<TMessage>(realmContainer,`
`26`	`28`	`routerBuilder,`
`27`	`29`	`connectionListener,`
`28`		`- binding);`
	`30`	`+ binding,`
	`31`	`+ sessionIdMap);`
`29`	`32`
`30`	`33`	`return result;`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,29 +5,34 @@ namespace WampSharp.V2.Core.Listener`
`5`	`5`	`{`
`6`	`6`	`public class WampClientContainer<TMessage> : WampClientContainer<TMessage, IWampClientProxy<TMessage>>`
`7`	`7`	`{`
`8`		`- private readonly WampIdMapper<IWampClientProxy<TMessage>> mSessionIdToClientProxy = new WampIdMapper<IWampClientProxy<TMessage>>();`
	`8`	`+ private IWampSessionMapper mSessionIdMap;`
`9`	`9`
`10`	`10`	`public WampClientContainer(IWampClientBuilderFactory<TMessage, IWampClientProxy<TMessage>> clientBuilderFactory) :`
	`11`	`+ this(clientBuilderFactory, new WampSessionMapper())`
	`12`	`+ {`
	`13`	`+ }`
	`14`	`+`
	`15`	`+ public WampClientContainer(IWampClientBuilderFactory<TMessage, IWampClientProxy<TMessage>> clientBuilderFactory, IWampSessionMapper sessionIdMap) :`
`11`	`16`	`base(clientBuilderFactory)`
`12`	`17`	`{`
	`18`	`+ mSessionIdMap = sessionIdMap;`
`13`	`19`	`}`
`14`	`20`
`15`	`21`	`public override void RemoveClient(IWampConnection<TMessage> connection)`
`16`	`22`	`{`
`17`		`-`
`18`	`23`	`bool clientProxyFound = TryGetClient(connection, out IWampClientProxy<TMessage> clientProxy);`
`19`	`24`
`20`	`25`	`base.RemoveClient(connection);`
`21`	`26`
`22`	`27`	`if (clientProxyFound)`
`23`	`28`	`{`
`24`		`- mSessionIdToClientProxy.TryRemove(clientProxy.Session, out clientProxy);`
	`29`	`+ mSessionIdMap.ReleaseSession(clientProxy.Session);`
`25`	`30`	`}`
`26`	`31`	`}`
`27`	`32`
`28`	`33`	`public override object GenerateClientId(IWampClientProxy<TMessage> client)`
`29`	`34`	`{`
`30`		`- return mSessionIdToClientProxy.Add(client);`
	`35`	`+ return mSessionIdMap.AllocateSession(client);`
`31`	`36`	`}`
`32`	`37`	`}`
`33`	`38`	`}`