extracted httpclient dependancy

MediaBrowser.Networking/HttpManager/HttpManager.cs

@@ -0,0 +1,482 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Cache;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Networking.HttpManager
+{
+    /// <summary>
+    /// Class HttpManager
+    /// </summary>
+    public class HttpManager : IHttpClient
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// The _app paths
+        /// </summary>
+        private readonly IApplicationPaths _appPaths;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpManager" /> class.
+        /// </summary>
+        /// <param name="appPaths">The kernel.</param>
+        /// <param name="logger">The logger.</param>
+        public HttpManager(IApplicationPaths appPaths, ILogger logger)
+        {
+            if (appPaths == null)
+            {
+                throw new ArgumentNullException("appPaths");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            
+            _logger = logger;
+            _appPaths = appPaths;
+        }
+
+        /// <summary>
+        /// Holds a dictionary of http clients by host.  Use GetHttpClient(host) to retrieve or create a client for web requests.
+        /// DON'T dispose it after use.
+        /// </summary>
+        /// <value>The HTTP clients.</value>
+        private readonly ConcurrentDictionary<string, HttpClient> _httpClients = new ConcurrentDictionary<string, HttpClient>();
+
+        /// <summary>
+        /// Gets
+        /// </summary>
+        /// <param name="host">The host.</param>
+        /// <returns>HttpClient.</returns>
+        /// <exception cref="System.ArgumentNullException">host</exception>
+        private HttpClient GetHttpClient(string host)
+        {
+            if (string.IsNullOrEmpty(host))
+            {
+                throw new ArgumentNullException("host");
+            }
+
+            HttpClient client;
+            if (!_httpClients.TryGetValue(host, out client))
+            {
+                var handler = new WebRequestHandler
+                {
+                    AutomaticDecompression = DecompressionMethods.Deflate,
+                    CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate)
+                };
+
+                client = new HttpClient(handler);
+                client.DefaultRequestHeaders.Add("Accept", "application/json,image/*");
+                client.Timeout = TimeSpan.FromSeconds(15);
+                _httpClients.TryAdd(host, client);
+            }
+
+            return client;
+        }
+
+        /// <summary>
+        /// Performs a GET request and returns the resulting stream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{Stream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.Get url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var msg = await GetHttpClient(GetHostFromUrl(url)).GetAsync(url, cancellationToken).ConfigureAwait(false);
+
+                EnsureSuccessStatusCode(msg);
+
+                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException ex)
+            {
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                throw new HttpException(ex.Message, ex);
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Performs a POST request
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="postData">Params to add to the POST data.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>stream on success, null on failure</returns>
+        /// <exception cref="System.ArgumentNullException">postData</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            if (postData == null)
+            {
+                throw new ArgumentNullException("postData");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var strings = postData.Keys.Select(key => string.Format("{0}={1}", key, postData[key]));
+            var postContent = string.Join("&", strings.ToArray());
+            var content = new StringContent(postContent, Encoding.UTF8, "application/x-www-form-urlencoded");
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.Post url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var msg = await GetHttpClient(GetHostFromUrl(url)).PostAsync(url, content, cancellationToken).ConfigureAwait(false);
+
+                EnsureSuccessStatusCode(msg);
+
+                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException ex)
+            {
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                throw new HttpException(ex.Message, ex);
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Downloads the contents of a given url into a temporary location
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="userAgent">The user agent.</param>
+        /// <returns>Task{System.String}.</returns>
+        /// <exception cref="System.ArgumentNullException">progress</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<string> GetTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress<double> progress, string userAgent = null)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            if (progress == null)
+            {
+                throw new ArgumentNullException("progress");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var tempFile = Path.Combine(_appPaths.TempDirectory, Guid.NewGuid() + ".tmp");
+
+            var message = new HttpRequestMessage(HttpMethod.Get, url);
+
+            if (!string.IsNullOrEmpty(userAgent))
+            {
+                message.Headers.Add("User-Agent", userAgent);
+            }
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.GetTempFile url: {0}, temp file: {1}", url, tempFile);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
+                {
+                    EnsureSuccessStatusCode(response);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    IEnumerable<string> lengthValues;
+
+                    if (!response.Headers.TryGetValues("content-length", out lengthValues) &&
+                        !response.Content.Headers.TryGetValues("content-length", out lengthValues))
+                    {
+                        // We're not able to track progress
+                        using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                        {
+                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
+                            {
+                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var length = long.Parse(string.Join(string.Empty, lengthValues.ToArray()));
+
+                        using (var stream = ProgressStream.CreateReadProgressStream(await response.Content.ReadAsStreamAsync().ConfigureAwait(false), progress.Report, length))
+                        {
+                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
+                            {
+                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                            }
+                        }
+                    }
+
+                    progress.Report(100);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+                }
+
+                return tempFile;
+            }
+            catch (OperationCanceledException ex)
+            {
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw new HttpException(ex.Message, ex);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw;
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Downloads the contents of a given url into a MemoryStream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{MemoryStream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<MemoryStream> GetMemoryStream(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var message = new HttpRequestMessage(HttpMethod.Get, url);
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            var ms = new MemoryStream();
+
+            _logger.Info("HttpManager.GetMemoryStream url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
+                {
+                    EnsureSuccessStatusCode(response);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    {
+                        await stream.CopyToAsync(ms, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                    }
+
+                    cancellationToken.ThrowIfCancellationRequested();
+                }
+
+                ms.Position = 0;
+
+                return ms;
+            }
+            catch (OperationCanceledException ex)
+            {
+                ms.Dispose();
+
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                ms.Dispose();
+
+                throw new HttpException(ex.Message, ex);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                ms.Dispose();
+
+                throw;
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Validates the params.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <exception cref="System.ArgumentNullException">url</exception>
+        private void ValidateParams(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException("url");
+            }
+
+            if (resourcePool == null)
+            {
+                throw new ArgumentNullException("resourcePool");
+            }
+
+            if (cancellationToken == null)
+            {
+                throw new ArgumentNullException("cancellationToken");
+            }
+        }
+
+        /// <summary>
+        /// Gets the host from URL.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <returns>System.String.</returns>
+        private string GetHostFromUrl(string url)
+        {
+            var start = url.IndexOf("://", StringComparison.OrdinalIgnoreCase) + 3;
+            var len = url.IndexOf('/', start) - start;
+            return url.Substring(start, len);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                foreach (var client in _httpClients.Values.ToList())
+                {
+                    client.Dispose();
+                }
+
+                _httpClients.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Throws the cancellation exception.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="exception">The exception.</param>
+        /// <returns>Exception.</returns>
+        private Exception GetCancellationException(string url, CancellationToken cancellationToken, OperationCanceledException exception)
+        {
+            // If the HttpClient's timeout is reached, it will cancel the Task internally
+            if (!cancellationToken.IsCancellationRequested)
+            {
+                var msg = string.Format("Connection to {0} timed out", url);
+
+                _logger.Error(msg);
+
+                // Throw an HttpException so that the caller doesn't think it was cancelled by user code
+                return new HttpException(msg, exception) { IsTimedOut = true };
+            }
+
+            return exception;
+        }
+
+        /// <summary>
+        /// Ensures the success status code.
+        /// </summary>
+        /// <param name="response">The response.</param>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        private void EnsureSuccessStatusCode(HttpResponseMessage response)
+        {
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new HttpException(response.ReasonPhrase) { StatusCode = response.StatusCode };
+            }
+        }
+    }
+}

MediaBrowser.Networking/HttpServer/HttpServer.cs

@@ -25,7 +25,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Networking.Web
+namespace MediaBrowser.Networking.HttpServer
 {
     /// <summary>
     /// Class HttpServer

MediaBrowser.Networking/HttpServer/NativeWebSocket.cs

@@ -1,10 +1,13 @@
-using MediaBrowser.Model.Logging;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
+using WebSocketMessageType = MediaBrowser.Common.Net.WebSocketMessageType;
+using WebSocketState = MediaBrowser.Common.Net.WebSocketState;
 
-namespace MediaBrowser.Common.Net
+namespace MediaBrowser.Networking.HttpServer
 {
     /// <summary>
     /// Class NativeWebSocket
@@ -20,7 +23,7 @@ namespace MediaBrowser.Common.Net
         /// Gets or sets the web socket.
         /// </summary>
         /// <value>The web socket.</value>
-        private WebSocket WebSocket { get; set; }
+        private System.Net.WebSockets.WebSocket WebSocket { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NativeWebSocket" /> class.
@@ -28,7 +31,7 @@ namespace MediaBrowser.Common.Net
         /// <param name="socket">The socket.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">socket</exception>
-        public NativeWebSocket(WebSocket socket, ILogger logger)
+        public NativeWebSocket(System.Net.WebSockets.WebSocket socket, ILogger logger)
         {
             if (socket == null)
             {
@@ -52,7 +55,17 @@ namespace MediaBrowser.Common.Net
         /// <value>The state.</value>
         public WebSocketState State
         {
-            get { return WebSocket.State; }
+            get
+            {
+                WebSocketState commonState;
+
+                if (!Enum.TryParse(WebSocket.State.ToString(), true, out commonState))
+                {
+                    _logger.Warn("Unrecognized WebSocketState: {0}", WebSocket.State.ToString());
+                }
+
+                return commonState;
+            }
         }
 
         /// <summary>
@@ -113,7 +126,14 @@ namespace MediaBrowser.Common.Net
         /// <returns>Task.</returns>
         public Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken)
         {
-            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), type, true, cancellationToken);
+            System.Net.WebSockets.WebSocketMessageType nativeType;
+
+            if (!Enum.TryParse(type.ToString(), true, out nativeType))
+            {
+                _logger.Warn("Unrecognized WebSocketMessageType: {0}", type.ToString());
+            }
+
+            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), nativeType, true, cancellationToken);
         }
 
         /// <summary>

MediaBrowser.Networking/HttpServer/ServerFactory.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 
-namespace MediaBrowser.Networking.Web
+namespace MediaBrowser.Networking.HttpServer
 {
     /// <summary>
     /// Class ServerFactory

MediaBrowser.Networking/MediaBrowser.Networking.csproj

@@ -81,6 +81,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Core.2.0.21114\lib\Net45\System.Reactive.Core.dll</HintPath>
@@ -104,16 +107,17 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="HttpManager\HttpManager.cs" />
     <Compile Include="Udp\UdpServer.cs" />
     <Compile Include="WebSocket\AlchemyServer.cs" />
     <Compile Include="WebSocket\AlchemyWebSocket.cs" />
-    <Compile Include="Web\HttpServer.cs" />
+    <Compile Include="HttpServer\HttpServer.cs" />
     <Compile Include="Management\NativeMethods.cs" />
     <Compile Include="Management\NetworkManager.cs" />
     <Compile Include="Management\NetworkShares.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Web\ServerFactory.cs" />
-    <Compile Include="Web\NativeWebSocket.cs" />
+    <Compile Include="HttpServer\ServerFactory.cs" />
+    <Compile Include="HttpServer\NativeWebSocket.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
@@ -145,6 +149,7 @@
     <Content Include="swagger-ui\swagger-ui.js" />
     <Content Include="swagger-ui\swagger-ui.min.js" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>

MediaBrowser.Networking/WebSocket/AlchemyWebSocket.cs

@@ -2,7 +2,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using System;
-using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;