From 88fbbaa9236c2a781ef08afc3cd52533c82256af Mon Sep 17 00:00:00 2001
From: dk307 <9539519+dk307@users.noreply.github.com>
Date: Mon, 31 Dec 2018 18:40:38 -0800
Subject: [PATCH] Update EmbedIO Server

---
 HSPI_ChromecastSpeak.csproj     |  8 +++-----
 README.md                       |  2 +-
 Web/InMemoryFileSystemModule.cs | 26 +++++++++-----------------
 scripts/Win10Firewall.ps1       | 21 +++------------------
 4 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/HSPI_ChromecastSpeak.csproj b/HSPI_ChromecastSpeak.csproj
index b847dc7..b33f758 100644
--- a/HSPI_ChromecastSpeak.csproj
+++ b/HSPI_ChromecastSpeak.csproj
@@ -222,7 +222,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EmbedIO">
-      <Version>1.16.1</Version>
+      <Version>2.1.1</Version>
     </PackageReference>
     <PackageReference Include="Fody">
       <Version>3.3.5</Version>
@@ -274,7 +274,6 @@
       <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
     </Task>
   </UsingTask>
-
   <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Release' ">
     <ItemGroup>
       <InputAssemblies Include="$(OutputPath)\HSPI_ChromecastSpeak.exe" />
@@ -290,11 +289,10 @@
       <InputAssemblies Include="$(OutputPath)\System.Collections.Immutable.dll" />
     </ItemGroup>
     <!-- <CreateItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)'=='.dll'"> -->
-      <!-- <Output ItemName="AssembliesToMerge" TaskParameter="Include" /> -->
+    <!-- <Output ItemName="AssembliesToMerge" TaskParameter="Include" /> -->
     <!-- </CreateItem> -->
     <Message Importance="high" Text="Executing ILMerge in $(ProjectDir)..." />
-    <Exec WorkingDirectory="$(ProjectDir)"
-		  Command="&quot;$(ILMergeConsolePath)&quot; /ndebug /target:winexe /out:@(MainAssembly) /internalize /targetplatform:v4 @(InputAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
+    <Exec WorkingDirectory="$(ProjectDir)" Command="&quot;$(ILMergeConsolePath)&quot; /ndebug /target:winexe /out:@(MainAssembly) /internalize /targetplatform:v4 @(InputAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
     <!-- <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" /> -->
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/README.md b/README.md
index 1bf5f6c..057bfe1 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Chromecast Device Settings
 
 Firewall
 ------------
-Open the firewall based on Settings. Windows 10 powershell script is included.
+Open the firewall based on port settings. Windows 10 powershell script is included.
 ![Firewall](/asserts/firewall.PNG "Firewall")
 
 Build State
diff --git a/Web/InMemoryFileSystemModule.cs b/Web/InMemoryFileSystemModule.cs
index afe28e4..d158058 100644
--- a/Web/InMemoryFileSystemModule.cs
+++ b/Web/InMemoryFileSystemModule.cs
@@ -42,15 +42,6 @@ public InMemoryFileSystemModule(Dictionary<string, string> headers = null)
             AddHandler(ModuleMap.AnyPath, HttpVerbs.Get, (context, ct) => HandleGet(context, ct));
         }
 
-        /// <summary>
-        /// Gets the collection holding the MIME types.
-        /// </summary>
-        /// <value>
-        /// The MIME types.
-        /// </value>
-        public static IReadOnlyDictionary<string, string> MimeTypes
-            => new ReadOnlyDictionary<string, string>(Unosquare.Labs.EmbedIO.Constants.MimeTypes.DefaultMimeTypes);
-
         /// <summary>
         /// Gets the name of this module.
         /// </summary>
@@ -109,14 +100,14 @@ private static bool CalculateRange(string partialHeader, long fileSize, out int
             return false;
         }
 
-        private static string GetUrlPath(HttpListenerContext context)
+        private static string GetUrlPath(IHttpContext context)
         {
             var urlPath = context.RequestPathCaseSensitive().Replace('/', Path.DirectorySeparatorChar);
             urlPath = urlPath.TrimStart(Path.DirectorySeparatorChar);
             return urlPath;
         }
 
-        private static async Task WriteToOutputMemoryStream(HttpListenerContext context, long byteLength, byte[] buffer,
+        private static async Task WriteToOutputMemoryStream(IHttpContext context, long byteLength, byte[] buffer,
             int lowerByteIndex, CancellationToken ct)
         {
             checked
@@ -133,7 +124,7 @@ private static async Task WriteToOutputMemoryStream(HttpListenerContext context,
             }
         }
 
-        private async Task<bool> HandleGet(HttpListenerContext context, CancellationToken ct, bool sendBuffer = true)
+        private async Task<bool> HandleGet(IHttpContext context, CancellationToken ct, bool sendBuffer = true)
         {
             Trace.WriteLine($"Request Type {context.RequestVerb()} from {context.Request.RemoteEndPoint} for {context.Request.Url}");
 
@@ -237,7 +228,7 @@ private async Task<bool> HandleGet(HttpListenerContext context, CancellationToke
             return true;
         }
 
-        private async Task<bool> SendFileList(HttpListenerContext context, CancellationToken ct)
+        private async Task<bool> SendFileList(IHttpContext context, CancellationToken ct)
         {
             StringBuilder stb = new StringBuilder();
 
@@ -264,12 +255,13 @@ private async Task<bool> SendFileList(HttpListenerContext context, CancellationT
             return await context.HtmlResponseAsync(stb.ToString(), cancellationToken: ct).ConfigureAwait(false);
         }
 
-        private void SetHeaders(HttpListenerContext context, string localPath, string utcFileDateString)
+        private void SetHeaders(IHttpContext context, string localPath, string utcFileDateString)
         {
             var fileExtension = Path.GetExtension(localPath);
 
-            if (MimeTypes.ContainsKey(fileExtension))
-                context.Response.ContentType = MimeTypes[fileExtension];
+            var mimeTypes = MimeTypes.DefaultMimeTypes.Value;
+            if (mimeTypes.ContainsKey(fileExtension))
+                context.Response.ContentType = mimeTypes[fileExtension];
 
             context.Response.AddHeader(Headers.CacheControl,
                 DefaultHeaders.ContainsKey(Headers.CacheControl)
@@ -290,7 +282,7 @@ private void SetHeaders(HttpListenerContext context, string localPath, string ut
             context.Response.AddHeader(Headers.AcceptRanges, "bytes");
         }
 
-        private void SetStatusCode304(HttpListenerContext context)
+        private void SetStatusCode304(IHttpContext context)
         {
             context.Response.AddHeader(Headers.CacheControl,
                 DefaultHeaders.ContainsKey(Headers.CacheControl)
diff --git a/scripts/Win10Firewall.ps1 b/scripts/Win10Firewall.ps1
index 097b9ac..32f56d2 100644
--- a/scripts/Win10Firewall.ps1
+++ b/scripts/Win10Firewall.ps1
@@ -16,7 +16,7 @@ $currentPrincipal = New-Object Security.Principal.WindowsPrincipal( [Security.Pr
 if ( -not $currentPrincipal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator ))
 {
      write-host "Error Script only works as administrator".
-    // return
+     return
 }
 
 $builder = New-Object System.UriBuilder
@@ -25,22 +25,7 @@ $builder.Port = $port
 $builder.Scheme = 'http'
 $serviceUrl = $builder.ToString()
 
-$serviceUser = [String]::Join("\", $env:userdomain, $env:username)
-
-if( -not (netsh http show urlacl url=$serviceUrl | Where-Object { $_ -match [regex]::Escape($serviceUrl) }) )
-{
-    if ($operation -eq 'add') {
-        Write-Verbose -Message ('Granting {0} permission to listen on {1}' -f $serviceUser, $serviceUrl) -Verbose
-        netsh http add urlacl url=$serviceUrl  user=$serviceUser| Write-Verbose -Verbose
-    }
-} else {
-    if ($operation -eq 'remove') {
-        Write-Verbose -Message ('Removing listen on {0}' -f $serviceUrl) -Verbose
-        netsh http delete urlacl url=$serviceUrl | Write-Verbose -Verbose
-    }
-}
-
-$ruleName = 'Homeseer Chromecast Speak'
+$ruleName = 'HSPI Chromecast Speak Plugin'
 $exitingRules = @()
 
 $potentialRules = @(Get-NetFirewallRule -DisplayName $ruleName -ErrorAction SilentlyContinue)
@@ -56,7 +41,7 @@ foreach($rule in $potentialRules) {
 if ($operation -eq 'add') {
     if ($exitingRules.Length -eq 0) {
         Write-Verbose -Message ('Adding Firewall rule for {0}' -f $serviceUrl) -Verbose
-        New-NetFirewallRule -DisplayName 'Homeseer Chromecast Speak' -LocalAddress $ipAddress -LocalPort $port -Protocol TCP -Program "System" | Write-Verbose -Verbose
+        New-NetFirewallRule -DisplayName $ruleName -LocalAddress $ipAddress -LocalPort $port -Protocol TCP | Write-Verbose -Verbose
     }
 }