Merge pull request #201 from LykkeCity/wampv2

NetCore RPC memory leak fixed

Author: darkl

src/net45/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs

@@ -95,23 +95,22 @@ private async Task WebSocketHandler(HttpContext context, Func<Task> next)
 
                 if (subprotocol != null)
                 {
-                    WebSocket websocket =
-                        await context.WebSockets.
-                                      AcceptWebSocketAsync(subprotocol)
-                                     .ConfigureAwait(false);
+                    using (var websocket = await context.WebSockets.AcceptWebSocketAsync(subprotocol).ConfigureAwait(false))
+                    {
 
-                    // In an ideal world, OnNewConnection would return the
-                    // connection itself and then we could somehow access its
-                    // task, but for now we wrap the WebSocket with a WebSocketData
-                    // struct, and let OnNewConnection to fill us magically
-                    // the ReadTask
-                    WebSocketData webSocketData = new WebSocketData(websocket, context);
+                        // In an ideal world, OnNewConnection would return the
+                        // connection itself and then we could somehow access its
+                        // task, but for now we wrap the WebSocket with a WebSocketData
+                        // struct, and let OnNewConnection to fill us magically
+                        // the ReadTask
+                        WebSocketData webSocketData = new WebSocketData(websocket, context);
 
-                    OnNewConnection(webSocketData);
+                        OnNewConnection(webSocketData);
 
-                    await webSocketData.ReadTask.ConfigureAwait(false);
+                        await webSocketData.ReadTask.ConfigureAwait(false);
 
-                    return;
+                        return;
+                    }
                 }
             }
 

src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampClientRouterCallbackAdapter.cs

@@ -22,6 +22,7 @@ public WampClientRouterCallbackAdapter(IWampRawRpcOperationClientCallback caller
 
         private void OnDisconnected(object sender, EventArgs e)
         {
+            mNotifier.Disconnected -= OnDisconnected;
             RaiseDisconnected();
         }
 

src/net45/WampSharp/WAMP2/V2/Rpc/Dealer/WampRpcOperationCallback.cs

@@ -61,6 +61,7 @@ public void Error<TResult>(IWampFormatter<TResult> formatter, TResult details, s
 
         private void OnConnectionClosed(object sender, EventArgs e)
         {
+            mMonitor.ConnectionClosed -= OnConnectionClosed;
             RaiseDisconnected();
         }