Adjusting doc, adding Content Type support on top of detection, adjusting comments

Author: Ellerbach

README.md

@@ -12,10 +12,10 @@ This is a simple nanoFrmaework WebServer. Features:
 - Reflection for easy usage of controllers and notion of routes
 - Helpers to return error code directly facilitating REST API
 - HTTPS support
+- [URL decode/encode](https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/develop/nanoFramework.System.Net.Http/Http/System.Net.HttpUtility.cs)
 
 Limitations:
-- Does not support any zip way
-- No URL decode/encode implemented yet
+- Does not support any zip in the request or response stream
 
 ## Usage
 

WebServer.Sample/ControllerTest.cs

@@ -24,5 +24,23 @@ public void RouteAnyTest(WebServerEventArgs e)
         {
             WebServer.OutputHttpCode(e.Context.Response, HttpStatusCode.OK);
         }
+
+        [Route("urlencode")]
+        public void UrlEncode(WebServerEventArgs e)
+        {
+            var rawUrl = e.Context.Request.RawUrl;
+            var paramsUrl = WebServer.DecodeParam(rawUrl);
+            string ret = "Parameters | Encoded | Decoded";
+            foreach (var param in paramsUrl)
+            {
+                ret += $"{param.Name} | ";
+                ret += $"{param.Value} | ";
+                // Need to wait for latest version of System.Net
+                // See https://github.com/nanoframework/lib-nanoFramework.System.Net.Http/blob/develop/nanoFramework.System.Net.Http/Http/System.Net.HttpUtility.cs
+                // ret += $"{System.Web.HttpUtility.UrlDecode(param.Value)}";
+                ret += "\r\n";
+            }
+            WebServer.OutPutStream(e.Context.Response, ret);
+        }
     }
 }

WebServer.Sample/WebServer.Sample.nfproj

@@ -74,7 +74,7 @@
       <SpecificVersion>True</SpecificVersion>
     </Reference>
     <Reference Include="System.Net.Http, Version=1.3.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.1.3.3-preview.23\lib\System.Net.Http.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.Http.1.3.3-preview.25\lib\System.Net.Http.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>

WebServer.Sample/packages.config

@@ -6,7 +6,7 @@
   <package id="nanoFramework.System.Collections" version="1.2.0-preview.14" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.14" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Net" version="1.6.3-preview.15" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Net.Http" version="1.3.3-preview.23" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.Net.Http" version="1.3.3-preview.25" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Text" version="1.1.1-preview.14" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Windows.Devices.Wifi" version="1.3.2-preview.11" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Windows.Storage" version="1.4.4-preview.25" targetFramework="netnanoframework10" />

WebServer/WebServer.cs

@@ -416,16 +416,19 @@ public static void OutputHttpCode(HttpListenerResponse response, HttpStatusCode
         /// <summary>
         /// Return a file from Storage over HTTP response.
         /// </summary>
-        public static void SendFileOverHTTP(HttpListenerResponse response, StorageFile strFilePath)
+        /// <param name="response"><see cref="HttpListenerResponse"/> to send the content over.</param>
+        /// <param name="strFilePath">The file to send</param>
+        /// <param name="contentType">The type of file, if empty string, then will use auto detection</param>
+        public static void SendFileOverHTTP(HttpListenerResponse response, StorageFile strFilePath, string contentType = "")
         {
-            string ContentType = GetContentTypeFromFileName(strFilePath.FileType);
-           
+            contentType = contentType == "" ? GetContentTypeFromFileName(strFilePath.FileType) : contentType;
+
             try
             {
                 IBuffer readBuffer = FileIO.ReadBuffer(strFilePath);
                 long fileLength = readBuffer.Length;
 
-                response.ContentType = ContentType;
+                response.ContentType = contentType;
                 response.ContentLength64 = fileLength;
                 // Now loops sending all the data.
 
@@ -459,13 +462,14 @@ public static void SendFileOverHTTP(HttpListenerResponse response, StorageFile s
         /// <param name="response"><see cref="HttpListenerResponse"/> to send the content over.</param>
         /// <param name="fileName">Name of the file to send over <see cref="HttpListenerResponse"/>.</param>
         /// <param name="content">Content of the file to send.</param>
-        public static void SendFileOverHTTP(HttpListenerResponse response, string fileName, byte[] content)
+        /// /// <param name="contentType">The type of file, if empty string, then will use auto detection</param>
+        public static void SendFileOverHTTP(HttpListenerResponse response, string fileName, byte[] content, string contentType = "")
         {
-            string ContentType = GetContentTypeFromFileName(fileName.Substring(fileName.LastIndexOf('.')));
+            contentType = contentType == "" ? GetContentTypeFromFileName(fileName.Substring(fileName.LastIndexOf('.'))) : contentType;
 
             try
             {
-                response.ContentType = ContentType;
+                response.ContentType = contentType;
                 response.ContentLength64 = content.Length;
 
                 // Now loop to send all the data.
@@ -480,7 +484,7 @@ public static void SendFileOverHTTP(HttpListenerResponse response, string fileNa
                     response.OutputStream.Write(content, (int)bytesSent, (int)bytesToSend);
 
                     // allow some time to physically send the bits. Can be reduce to 10 or even less if not too much other code running in parallel
-                    
+
                     // update bytes sent
                     bytesSent += bytesToSend;
                 }
@@ -658,7 +662,6 @@ private void ListInterfaces()
             }
         }
 
-        /// Get the MIME-type for a file name.
         /// <summary>
         /// Get the MIME-type for a file name.
         /// </summary>