Add WebSocketContext class (#263)

Author: Feiko

nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj

@@ -115,6 +115,9 @@
     <Compile Include="..\nanoFramework.System.Net.Http\Http\System.Net.HttpUtility.cs">
       <Link>Http\System.Net.HttpUtility.cs</Link>
     </Compile>
+    <Compile Include="..\nanoFramework.System.Net.Http\Http\System.Net.WebSocketContext.cs">
+      <Link>Http\System.Net.WebSocketContext.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\nanoFramework.System.Net.Http\key.snk" />

nanoFramework.System.Net.Http/Http/System.Net.HttpListenerContext.cs

@@ -30,14 +30,14 @@ public class HttpListenerContext
         /// This stream is used for writing data.
         /// This stream owns the socket.
         /// </summary>
-        private OutputNetworkStreamWrapper m_clientOutputStream;
+        internal OutputNetworkStreamWrapper m_clientOutputStream;
 
         /// <summary>
         /// Member with network stream connected to client.
         /// This stream is used for Reading data.
         /// This stream does not own the socket.
         /// </summary>
-        private InputNetworkStreamWrapper m_clientInputStream;
+        internal InputNetworkStreamWrapper m_clientInputStream;
 
         /// <summary>
         /// Instance of the request from client.
@@ -50,7 +50,7 @@ public class HttpListenerContext
         /// Instance of the response to client.
         ///
         /// </summary>
-        private HttpListenerResponse m_ResponseToClient;
+        internal HttpListenerResponse m_ResponseToClient;
 
         /// <summary>
         /// Internal constructor, used each time client connects.
@@ -143,6 +143,25 @@ public void Close()
             Close(-2);
         }
 
+        /// <summary>
+        /// Get WebsocketContext for WebsocketServer.
+        /// This will release all bindings and resources from the HttpListner rendering HttpListnerContext unusable. 
+        /// </summary>
+        internal WebSocketContext GetWebsocketContext()
+        {
+            var webSocketContext = new WebSocketContext(m_clientOutputStream.m_Socket, m_clientOutputStream.m_Stream, Request.Headers);
+
+            m_ResponseToClient.m_Listener.RemoveClientStream(m_ResponseToClient.m_clientStream);
+
+            m_ResponseToClient = null;
+            m_clientOutputStream = null;
+            m_clientInputStream = null;
+
+
+
+            return webSocketContext;
+        }
+
         /// <summary>
         /// Closes the stream attached to this listener context. 
         /// </summary>

nanoFramework.System.Net.Http/Http/System.Net.HttpListenerResponse.cs

@@ -67,13 +67,13 @@ public sealed class HttpListenerResponse : IDisposable
         /// <summary>
         /// Array of connected client streams
         /// </summary>
-        private HttpListener m_Listener;
+        internal HttpListener m_Listener;
 
         /// <summary>
         /// Member with network stream connected to client.
         /// After call to Close() the stream is closed, no further writing allowed.
         /// </summary>
-        private OutputNetworkStreamWrapper m_clientStream;
+        internal OutputNetworkStreamWrapper m_clientStream;
 
         /// <summary>
         /// The value of the HTTP Location header in this response.

nanoFramework.System.Net.Http/Http/System.Net.WebSocketContext.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+using System.Net.Sockets;
+
+namespace System.Net
+{
+    /// <summary>
+    /// Provides access to the networkStream and socket for creating a websocket
+    /// <itemref>HttpListener</itemref> class.  This class cannot be inherited.
+    /// </summary>
+    internal class WebSocketContext
+    {
+        /// <summary>
+        /// Actual network or SSL stream connected to the client.
+        /// It could be SSL stream, so NetworkStream is not exact type, m_Stream would be derived from NetworkStream
+        /// </summary>
+        internal NetworkStream NetworkStream;
+
+        /// <summary>
+        /// This is a socket connected to client.
+        /// OutputNetworkStreamWrapper owns the socket, not NetworkStream.
+        /// If connection is persistent, then the m_Socket is transferred to the list of
+        /// </summary>
+        internal Socket Socket;
+
+        /// <summary>
+        /// Gets the collection of header name/value pairs sent in the request.
+        /// </summary>
+        /// <value>A <itemref>WebHeaderCollection</itemref> that contains the
+        /// HTTP headers included in the request.</value>
+        internal WebHeaderCollection Headers;
+
+        internal WebSocketContext(Socket socket, NetworkStream networkStream, WebHeaderCollection headers)
+        {
+            Socket = socket;
+            NetworkStream = networkStream;
+            Headers = headers;
+
+        }
+    }
+}

nanoFramework.System.Net.Http/System.Net.Http.nfproj

@@ -70,6 +70,7 @@
     <Compile Include="Http\System.Net._ValidationHelper.cs" />
     <Compile Include="Http\System.Uri.cs" />
     <Compile Include="Http\System.Net.HttpUtility.cs" />
+    <Compile Include="Http\System.Net.WebSocketContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.3.7-preview.{height}",
+  "version": "1.4.0-preview.{height}",
   "assemblyVersion": {
     "precision": "revision"
   },
@@ -21,4 +21,4 @@
     "versionIncrement": "build",
     "firstUnstableTag": "preview"
   }
-}
+}