From 28ccfb1bd17eceb683d428d1c0e2d2ea52a2f7ff Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Sun, 24 Feb 2013 19:13:45 -0500 Subject: extracted httpclient dependancy --- MediaBrowser.Common/Net/HttpManager.cs | 481 --------------------- MediaBrowser.Common/Net/IHttpClient.cs | 61 +++ MediaBrowser.Common/Net/INetworkManager.cs | 2 +- MediaBrowser.Common/Net/IWebSocket.cs | 1 - MediaBrowser.Common/Net/MimeTypes.cs | 2 +- .../Net/WebSocketConnectEventArgs.cs | 1 - MediaBrowser.Common/Net/WebSocketConnection.cs | 5 +- MediaBrowser.Common/Net/WebSocketMessageType.cs | 22 + MediaBrowser.Common/Net/WebSocketState.cs | 38 ++ 9 files changed, 125 insertions(+), 488 deletions(-) delete mode 100644 MediaBrowser.Common/Net/HttpManager.cs create mode 100644 MediaBrowser.Common/Net/IHttpClient.cs create mode 100644 MediaBrowser.Common/Net/WebSocketMessageType.cs create mode 100644 MediaBrowser.Common/Net/WebSocketState.cs (limited to 'MediaBrowser.Common/Net') diff --git a/MediaBrowser.Common/Net/HttpManager.cs b/MediaBrowser.Common/Net/HttpManager.cs deleted file mode 100644 index 180843e0f..000000000 --- a/MediaBrowser.Common/Net/HttpManager.cs +++ /dev/null @@ -1,481 +0,0 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Kernel; -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.Common.Net -{ - /// - /// Class HttpManager - /// - public class HttpManager : IDisposable - { - /// - /// The _logger - /// - private readonly ILogger _logger; - - /// - /// The _kernel - /// - private readonly IKernel _kernel; - - /// - /// Initializes a new instance of the class. - /// - /// The kernel. - /// The logger. - public HttpManager(IKernel kernel, ILogger logger) - { - if (kernel == null) - { - throw new ArgumentNullException("kernel"); - } - if (logger == null) - { - throw new ArgumentNullException("logger"); - } - - _logger = logger; - _kernel = kernel; - } - - /// - /// 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. - /// - /// The HTTP clients. - private readonly ConcurrentDictionary _httpClients = new ConcurrentDictionary(); - - /// - /// Gets - /// - /// The host. - /// HttpClient. - /// host - 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; - } - - /// - /// Performs a GET request and returns the resulting stream - /// - /// The URL. - /// The resource pool. - /// The cancellation token. - /// Task{Stream}. - /// - public async Task 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(); - } - } - - /// - /// Performs a POST request - /// - /// The URL. - /// Params to add to the POST data. - /// The resource pool. - /// The cancellation token. - /// stream on success, null on failure - /// postData - /// - public async Task Post(string url, Dictionary 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(); - } - } - - /// - /// Downloads the contents of a given url into a temporary location - /// - /// The URL. - /// The resource pool. - /// The cancellation token. - /// The progress. - /// The user agent. - /// Task{System.String}. - /// progress - /// - public async Task FetchToTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress progress, string userAgent = null) - { - ValidateParams(url, resourcePool, cancellationToken); - - if (progress == null) - { - throw new ArgumentNullException("progress"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - var tempFile = Path.Combine(_kernel.ApplicationPaths.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.FetchToTempFile 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 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(); - } - } - - /// - /// Downloads the contents of a given url into a MemoryStream - /// - /// The URL. - /// The resource pool. - /// The cancellation token. - /// Task{MemoryStream}. - /// - public async Task FetchToMemoryStream(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.FetchToMemoryStream 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(); - } - } - - /// - /// Validates the params. - /// - /// The URL. - /// The resource pool. - /// The cancellation token. - /// url - 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"); - } - } - - /// - /// Gets the host from URL. - /// - /// The URL. - /// System.String. - private string GetHostFromUrl(string url) - { - var start = url.IndexOf("://", StringComparison.OrdinalIgnoreCase) + 3; - var len = url.IndexOf('/', start) - start; - return url.Substring(start, len); - } - - /// - /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. - /// - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - /// - /// Releases unmanaged and - optionally - managed resources. - /// - /// true to release both managed and unmanaged resources; false to release only unmanaged resources. - protected virtual void Dispose(bool dispose) - { - if (dispose) - { - foreach (var client in _httpClients.Values.ToList()) - { - client.Dispose(); - } - - _httpClients.Clear(); - } - } - - /// - /// Throws the cancellation exception. - /// - /// The URL. - /// The cancellation token. - /// The exception. - /// Exception. - 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; - } - - /// - /// Ensures the success status code. - /// - /// The response. - /// - private void EnsureSuccessStatusCode(HttpResponseMessage response) - { - if (!response.IsSuccessStatusCode) - { - throw new HttpException(response.ReasonPhrase) { StatusCode = response.StatusCode }; - } - } - } -} diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs new file mode 100644 index 000000000..ef0dd69b7 --- /dev/null +++ b/MediaBrowser.Common/Net/IHttpClient.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Common.Net +{ + public interface IHttpClient : IDisposable + { + /// + /// Performs a GET request and returns the resulting stream + /// + /// The URL. + /// The resource pool. + /// The cancellation token. + /// Task{Stream}. + /// + Task Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken); + + /// + /// Performs a POST request + /// + /// The URL. + /// Params to add to the POST data. + /// The resource pool. + /// The cancellation token. + /// stream on success, null on failure + /// postData + /// + Task Post(string url, Dictionary postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken); + + /// + /// Downloads the contents of a given url into a temporary location + /// + /// The URL. + /// The resource pool. + /// The cancellation token. + /// The progress. + /// The user agent. + /// Task{System.String}. + /// progress + /// + Task GetTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress progress, string userAgent = null); + + /// + /// Downloads the contents of a given url into a MemoryStream + /// + /// The URL. + /// The resource pool. + /// The cancellation token. + /// Task{MemoryStream}. + /// + Task GetMemoryStream(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken); + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + void Dispose(); + } +} \ No newline at end of file diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs index 7f6bfe152..782855cd1 100644 --- a/MediaBrowser.Common/Net/INetworkManager.cs +++ b/MediaBrowser.Common/Net/INetworkManager.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; using MediaBrowser.Model.Net; +using System.Collections.Generic; namespace MediaBrowser.Common.Net { diff --git a/MediaBrowser.Common/Net/IWebSocket.cs b/MediaBrowser.Common/Net/IWebSocket.cs index 3fd4b1241..9c9bcb41d 100644 --- a/MediaBrowser.Common/Net/IWebSocket.cs +++ b/MediaBrowser.Common/Net/IWebSocket.cs @@ -1,5 +1,4 @@ using System; -using System.Net.WebSockets; using System.Threading; using System.Threading.Tasks; diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs index 8f980200e..b9d0347d7 100644 --- a/MediaBrowser.Common/Net/MimeTypes.cs +++ b/MediaBrowser.Common/Net/MimeTypes.cs @@ -200,7 +200,7 @@ namespace MediaBrowser.Common.Net return "image/svg+xml"; } - throw new InvalidOperationException("Argument not supported: " + path); + throw new ArgumentException("Argument not supported: " + path); } } } diff --git a/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs b/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs index 711da7a50..ce22c9520 100644 --- a/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs +++ b/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs @@ -1,5 +1,4 @@ using System; -using System.Net; namespace MediaBrowser.Common.Net { diff --git a/MediaBrowser.Common/Net/WebSocketConnection.cs b/MediaBrowser.Common/Net/WebSocketConnection.cs index 6b22ef78e..36d649e3b 100644 --- a/MediaBrowser.Common/Net/WebSocketConnection.cs +++ b/MediaBrowser.Common/Net/WebSocketConnection.cs @@ -1,8 +1,7 @@ -using System.IO; -using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Logging; using MediaBrowser.Model.Serialization; using System; -using System.Net.WebSockets; +using System.IO; using System.Threading; using System.Threading.Tasks; diff --git a/MediaBrowser.Common/Net/WebSocketMessageType.cs b/MediaBrowser.Common/Net/WebSocketMessageType.cs new file mode 100644 index 000000000..3b12bc2b2 --- /dev/null +++ b/MediaBrowser.Common/Net/WebSocketMessageType.cs @@ -0,0 +1,22 @@ + +namespace MediaBrowser.Common.Net +{ + /// + /// Enum WebSocketMessageType + /// + public enum WebSocketMessageType + { + /// + /// The text + /// + Text, + /// + /// The binary + /// + Binary, + /// + /// The close + /// + Close, + } +} diff --git a/MediaBrowser.Common/Net/WebSocketState.cs b/MediaBrowser.Common/Net/WebSocketState.cs new file mode 100644 index 000000000..7f8ac3cbe --- /dev/null +++ b/MediaBrowser.Common/Net/WebSocketState.cs @@ -0,0 +1,38 @@ + +namespace MediaBrowser.Common.Net +{ + /// + /// Enum WebSocketState + /// + public enum WebSocketState + { + /// + /// The none + /// + None, + /// + /// The connecting + /// + Connecting, + /// + /// The open + /// + Open, + /// + /// The close sent + /// + CloseSent, + /// + /// The close received + /// + CloseReceived, + /// + /// The closed + /// + Closed, + /// + /// The aborted + /// + Aborted + } +} -- cgit v1.2.3