Merge pull request #220 from Code-Sharp/develop

Adding .NETStandard2.0 support
Code-Sharp · Nov 25, 2017 · f7f71bb · f7f71bb
2 parents 233e979 + 710b362
commit f7f71bb
Show file tree

Hide file tree

Showing 35 changed files with 643 additions and 57 deletions.
diff --git a/NuGet/WampSharp.AspNetCore.WebSockets.Server.nuspec b/NuGet/WampSharp.AspNetCore.WebSockets.Server.nuspec
@@ -20,5 +20,7 @@
   <files>
     <file src="$bin$\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.dll" target="lib\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.xml" target="lib\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.Default.Client.nuspec b/NuGet/WampSharp.Default.Client.nuspec
@@ -28,6 +28,11 @@
         <dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
         <dependency id="WampSharp.WebSockets" version="[$version$]" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
+        <dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
+        <dependency id="WampSharp.WebSockets" version="[$version$]" />
+      </group>
     </dependencies>
     <id>WampSharp.Default.Client</id>
     <title>WampSharp default client binding</title>
@@ -47,5 +52,7 @@
     <file src="$bin$\uap10.0\WampSharp.Default.Client.xml" target="lib\uap10.0\WampSharp.Default.Client.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.Default.Client.dll" target="lib\netstandard1.3\WampSharp.Default.Client.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.Default.Client.xml" target="lib\netstandard1.3\WampSharp.Default.Client.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.Default.Client.dll" target="lib\netstandard2.0\WampSharp.Default.Client.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.Default.Client.xml" target="lib\netstandard2.0\WampSharp.Default.Client.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.Default.nuspec b/NuGet/WampSharp.Default.nuspec
@@ -19,6 +19,9 @@
       <group targetFramework=".NETStandard1.3">
         <dependency id="WampSharp.Default.Client" version="[$version$]" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp.Default.Client" version="[$version$]" />
+      </group>
     </dependencies>
     <id>WampSharp.Default</id>
     <title>WampSharp default binding</title>

diff --git a/NuGet/WampSharp.NewtonsoftJson.nuspec b/NuGet/WampSharp.NewtonsoftJson.nuspec
@@ -21,6 +21,10 @@
         <dependency id="WampSharp" version="[$version$]" />
         <dependency id="Newtonsoft.Json" version="[9.0.1, )" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="Newtonsoft.Json" version="[9.0.1, )" />
+      </group>
       <group targetFramework="uap10.0">
         <dependency id="WampSharp" version="[$version$]" />
         <dependency id="Newtonsoft.Json" version="[9.0.1, )" />
@@ -42,5 +46,7 @@
     <file src="$bin$\pcl\WampSharp.NewtonsoftJson.xml" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.NewtonsoftJson.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.NewtonsoftJson.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.NewtonsoftMsgpack.nuspec b/NuGet/WampSharp.NewtonsoftMsgpack.nuspec
@@ -20,6 +20,11 @@
         <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
         <dependency id="Newtonsoft.Msgpack" version="[0.1.10,)" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
+        <dependency id="Newtonsoft.Msgpack" version="[0.1.10,)" />
+      </group>
     </dependencies>
     <id>WampSharp.NewtonsoftMsgpack</id>
     <title>WampSharp Newtonsoft.Msgpack binding</title>
@@ -35,5 +40,7 @@
     <file src="$bin$\net40\WampSharp.NewtonsoftMsgpack.xml" target="lib\net40\WampSharp.NewtonsoftMsgpack.xml" />
     <file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.dll" />
     <file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.xml" />
+    <file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.dll" />
+    <file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.RawSocket.nuspec b/NuGet/WampSharp.RawSocket.nuspec
@@ -14,6 +14,10 @@
         <dependency id="System.Buffers" version="4.3.0" />
         <dependency id="System.Net.Sockets" version="4.3.0" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="System.Buffers" version="4.3.0" />
+      </group>
     </dependencies>
     <id>WampSharp.RawSocket</id>
     <title>WampSharp RawSocket support</title>
@@ -27,5 +31,7 @@
     <file src="$bin$\net45\WampSharp.RawSocket.xml" target="lib\net45\WampSharp.RawSocket.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.RawSocket.dll" target="lib\netstandard1.3\WampSharp.RawSocket.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.RawSocket.xml" target="lib\netstandard1.3\WampSharp.RawSocket.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.RawSocket.dll" target="lib\netstandard2.0\WampSharp.RawSocket.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.RawSocket.xml" target="lib\netstandard2.0\WampSharp.RawSocket.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.Vtortola.nuspec b/NuGet/WampSharp.Vtortola.nuspec
@@ -5,8 +5,14 @@
     <authors>CodeSharp</authors>
     <owners />
     <dependencies>
-      <dependency id="WampSharp" version="[$version$]" />
-      <dependency id="vtortola.WebSocketListener" version="[2.2.2]" />
+      <group targetFramework="net45">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="vtortola.WebSocketListener" version="[2.2.2]" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="vtortola.WebSocketListener" version="[3.0.0-beta]" />
+      </group>
     </dependencies>
     <id>WampSharp.Vtortola</id>
     <title>WampSharp Vtortola support</title>
@@ -18,5 +24,7 @@
   <files>
     <file src="$bin$\net45\WampSharp.Vtortola.dll" target="lib\net45\WampSharp.Vtortola.dll" />
     <file src="$bin$\net45\WampSharp.Vtortola.xml" target="lib\net45\WampSharp.Vtortola.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.Vtortola.dll" target="lib\netstandard2.0\WampSharp.Vtortola.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.Vtortola.xml" target="lib\netstandard2.0\WampSharp.Vtortola.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.WebSocket4Net.nuspec b/NuGet/WampSharp.WebSocket4Net.nuspec
@@ -17,6 +17,10 @@
         <dependency id="WampSharp" version="[$version$]" />
         <dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
       </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
+      </group>
     </dependencies>
     <id>WampSharp.WebSocket4Net</id>
     <title>WampSharp WebSocket4Net connection</title>
@@ -32,5 +36,7 @@
     <file src="$bin$\net40\WampSharp.WebSocket4Net.xml" target="lib\net40\WampSharp.WebSocket4Net.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.WebSocket4Net.dll" target="lib\netstandard1.3\WampSharp.WebSocket4Net.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.WebSocket4Net.xml" target="lib\netstandard1.3\WampSharp.WebSocket4Net.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.dll" target="lib\netstandard2.0\WampSharp.WebSocket4Net.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.xml" target="lib\netstandard2.0\WampSharp.WebSocket4Net.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.WebSockets.nuspec b/NuGet/WampSharp.WebSockets.nuspec
@@ -10,11 +10,14 @@
     <description>WampSharp System.Net.WebSockets.WebSocket support</description>
     <tags>websockets,wampws,rpc,pubsub,wampv1,wampv2</tags>
     <dependencies>
+      <group targetFramework="net45">
+        <dependency id="WampSharp" version="[$version$]" />
+      </group>
       <group targetFramework=".NETStandard1.3">
         <dependency id="System.Net.WebSockets.Client" version="[4.3.1, )" />
         <dependency id="WampSharp" version="[$version$]" />
       </group>
-      <group targetFramework="net45">
+      <group targetFramework=".NETStandard2.0">
         <dependency id="WampSharp" version="[$version$]" />
       </group>
     </dependencies>
@@ -24,5 +27,7 @@
     <file src="$bin$\net45\WampSharp.WebSockets.xml" target="lib\net45\WampSharp.WebSockets.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.WebSockets.dll" target="lib\netstandard1.3\WampSharp.WebSockets.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.WebSockets.xml" target="lib\netstandard1.3\WampSharp.WebSockets.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.WebSockets.dll" target="lib\netstandard2.0\WampSharp.WebSockets.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.WebSockets.xml" target="lib\netstandard2.0\WampSharp.WebSockets.xml" />
   </files>
 </package>
diff --git a/NuGet/WampSharp.nuspec b/NuGet/WampSharp.nuspec
@@ -6,7 +6,7 @@
     <owners />
     <dependencies>
       <group targetFramework="net45">
-        <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.Collections.Immutable" version="[1.3.1, )" />
         <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
         <dependency id="Castle.Core" version="[4.1.1, )" />
@@ -19,35 +19,35 @@
         <dependency id="Rackspace.Collections.Immutable" version="[1.1.36]" />
       </group>
       <group targetFramework="portable-win81+wpa81">
-        <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.Collections.Immutable" version="[1.3.1, )" />
         <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
         <dependency id="System.ValueTuple" version="[4.4.0, )" />
       </group>
       <group targetFramework=".NETStandard1.3">
-        <dependency id="Microsoft.CSharp" version="[4.3.0, )" />
         <dependency id="Castle.Core" version="[4.1.1, )" />
-        <dependency id="System.Collections.Concurrent" version="[4.3.0, )" />
         <dependency id="System.Collections.Immutable" version="[1.3.1, )" />
-        <dependency id="System.ComponentModel" version="[4.3.0, )" />
-        <dependency id="System.Net.Primitives" version="[4.3.0, )" />
-        <dependency id="System.Reactive" version="[3.1.1, )" />
-        <dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
-        <dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
-        <dependency id="System.Runtime" version="[4.3.0, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
-        <dependency id="System.Security.Cryptography.Algorithms" version="[4.3.0, )" />
-        <dependency id="System.Text.RegularExpressions" version="[4.3.0, )" />
+        <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
+        <dependency id="System.ValueTuple" version="[4.4.0, )" />
+        <dependency id="NETStandard.Library" version="[1.6.1, )" />
+      </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="Microsoft.CSharp" version="[4.3.0, )" />
+        <dependency id="Castle.Core" version="[4.1.1, )" />
+        <dependency id="System.Collections.Immutable" version="[1.3.1, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
         <dependency id="System.ValueTuple" version="[4.4.0, )" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="[5.2.2 , )" />
-        <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.ValueTuple" version="[4.4.0, )" />
       </group>
       <group targetFramework="Xamarin.iOS10">
-        <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reactive" version="[3.0.0, 4)" />
         <dependency id="System.Collections.Immutable" version="[1.3.1, )" />
         <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
         <dependency id="System.ValueTuple" version="[4.4.0, )" />
@@ -71,6 +71,8 @@
     <file src="$bin$\pcl\WampSharp.xml" target="lib\Xamarin.iOS10\WampSharp.xml" />
     <file src="$bin$\netstandard1.3\WampSharp.dll" target="lib\netstandard1.3\WampSharp.dll" />
     <file src="$bin$\netstandard1.3\WampSharp.xml" target="lib\netstandard1.3\WampSharp.xml" />
+    <file src="$bin$\netstandard2.0\WampSharp.dll" target="lib\netstandard2.0\WampSharp.dll" />
+    <file src="$bin$\netstandard2.0\WampSharp.xml" target="lib\netstandard2.0\WampSharp.xml" />
     <file src="$bin$\uap10.0\WampSharp.dll" target="lib\uap10.0\WampSharp.dll" />
     <file src="$bin$\uap10.0\WampSharp.xml" target="lib\uap10.0\WampSharp.xml" />
   </files>

diff --git a/src/net45/Default/WampSharp.WebSocket4Net/WebSocket4Net/WebSocket4NetConnection.cs b/src/net45/Default/WampSharp.WebSocket4Net/WebSocket4Net/WebSocket4NetConnection.cs
@@ -2,6 +2,7 @@
 using SuperSocket.ClientEngine;
 using WampSharp.Core.Listener;
 using WampSharp.Core.Message;
+using WampSharp.Logging;
 using WampSharp.V2.Binding;
 using WebSocket4Net;
 
@@ -14,14 +15,17 @@ public abstract class WebSocket4NetConnection<TMessage> : IControlledWampConnect
         private readonly IWampBinding<TMessage> mBinding;
 
         private readonly WebSocket mWebSocket;
-
+
+        private readonly ILog mLogger;
+
         #endregion
 
         public WebSocket4NetConnection(WebSocket webSocket,
                                        IWampBinding<TMessage> binding)
         {
             mBinding = binding;
             mWebSocket = webSocket;
+            mLogger = LogProvider.GetLogger(this.GetType());
             mWebSocket.Opened += WebSocketOnOpened;
             mWebSocket.Closed += WebSocketOnClosed;
             mWebSocket.Error += WebSocketOnError;
@@ -73,6 +77,7 @@ private void WebSocketOnClosed(object sender, EventArgs eventArgs)
 
         private void WebSocketOnError(object sender, ErrorEventArgs e)
         {
+            mLogger.Error("A connection error occured", e.Exception);
             RaiseConnectionError(e.Exception);
         }
 

diff --git a/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampBinaryConnection.cs b/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampBinaryConnection.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using vtortola.WebSockets;
 using WampSharp.Core.Message;
@@ -12,9 +13,10 @@ internal class VtortolaWampBinaryConnection<TMessage> : VtortolaWampConnection<T
         private readonly IWampBinaryBinding<TMessage> mBinding;
 
         public VtortolaWampBinaryConnection(WebSocket connection,
-                                            IWampBinaryBinding<TMessage> binding,
-                                            ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
-                                                base(connection, cookieAuthenticatorFactory)
+            CancellationToken cancellationToken,
+            IWampBinaryBinding<TMessage> binding,
+            ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
+            base(connection, cancellationToken, cookieAuthenticatorFactory)
         {
             mBinding = binding;
         }

diff --git a/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampConnection.cs b/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampConnection.cs
@@ -16,14 +16,17 @@ internal abstract class VtortolaWampConnection<TMessage> : AsyncWebSocketWampCon
         IDetailedWampConnection<TMessage>
     {
         protected readonly WebSocket mWebsocket;
+        private readonly CancellationToken mCancellationToken;
         private readonly VtortolaTransportDetails mTransportDetails;
 
         protected VtortolaWampConnection(WebSocket websocket,
-                                         ICookieAuthenticatorFactory cookieAuthenticatorFactory)
+            CancellationToken cancellationToken,
+            ICookieAuthenticatorFactory cookieAuthenticatorFactory)
             : base(new CookieCollectionCookieProvider(websocket.HttpRequest.Cookies),
-                   cookieAuthenticatorFactory)
+                cookieAuthenticatorFactory)
         {
             mWebsocket = websocket;
+            mCancellationToken = cancellationToken;
             mTransportDetails = new VtortolaTransportDetails(mWebsocket);
         }
 
@@ -33,7 +36,7 @@ public async Task HandleWebSocketAsync()
             {
                 RaiseConnectionOpen();
 
-                while (mWebsocket.IsConnected)
+                while (IsConnected)
                 {
                     WebSocketMessageReadStream message =
                         await mWebsocket.ReadMessageAsync(CancellationToken.None)
@@ -63,7 +66,8 @@ protected override bool IsConnected
         {
             get
             {
-                return mWebsocket.IsConnected;
+                return !mCancellationToken.IsCancellationRequested &&
+                    mWebsocket.IsConnected;
             }
         }
 

diff --git a/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampTextConnection.cs b/src/net45/Extensions/WampSharp.Vtortola/VtortolaWampTextConnection.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using vtortola.WebSockets;
 using WampSharp.Core.Message;
@@ -12,9 +13,10 @@ internal class VtortolaWampTextConnection<TMessage> : VtortolaWampConnection<TMe
         private readonly IWampTextBinding<TMessage> mBinding;
 
         public VtortolaWampTextConnection(WebSocket connection,
-                                          IWampTextBinding<TMessage> binding,
-                                          ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
-                                              base(connection, cookieAuthenticatorFactory)
+            CancellationToken cancellationToken,
+            IWampTextBinding<TMessage> binding,
+            ICookieAuthenticatorFactory cookieAuthenticatorFactory) :
+            base(connection, cancellationToken, cookieAuthenticatorFactory)
         {
             mBinding = binding;
         }

diff --git a/src/net45/Extensions/WampSharp.Vtortola/VtortolaWebSocketHttpResponse.cs b/src/net45/Extensions/WampSharp.Vtortola/VtortolaWebSocketHttpResponse.cs
@@ -1,6 +1,9 @@
 using System.Linq;
 using System.Net;
 using vtortola.WebSockets;
+#if NETCORE
+using HttpStatusCode = vtortola.WebSockets.HttpStatusCode;
+#endif
 
 namespace WampSharp.Vtortola
 {