mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Remove usage of depricated 'WebRequest'
Ref: https://docs.microsoft.com/en-us/dotnet/api/system.net.webrequest?view=netframework-4.7.2
This commit is contained in:
parent
d5fe82314e
commit
067200be83
@ -1,18 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Net.Http;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.HttpClientManager
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class HttpClientInfo
|
|
||||||
/// </summary>
|
|
||||||
public class HttpClientInfo
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the last timeout.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The last timeout.</value>
|
|
||||||
public DateTime LastTimeout { get; set; }
|
|
||||||
public HttpClient HttpClient { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Cache;
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@ -55,12 +54,13 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(appPaths));
|
throw new ArgumentNullException(nameof(appPaths));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loggerFactory == null)
|
if (loggerFactory == null)
|
||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(loggerFactory));
|
throw new ArgumentNullException(nameof(loggerFactory));
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger = loggerFactory.CreateLogger("HttpClient");
|
_logger = loggerFactory.CreateLogger(nameof(HttpClientManager));
|
||||||
_fileSystem = fileSystem;
|
_fileSystem = fileSystem;
|
||||||
_appPaths = appPaths;
|
_appPaths = appPaths;
|
||||||
_defaultUserAgentFn = defaultUserAgentFn;
|
_defaultUserAgentFn = defaultUserAgentFn;
|
||||||
@ -74,27 +74,26 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
/// DON'T dispose it after use.
|
/// DON'T dispose it after use.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The HTTP clients.</value>
|
/// <value>The HTTP clients.</value>
|
||||||
private readonly ConcurrentDictionary<string, HttpClientInfo> _httpClients = new ConcurrentDictionary<string, HttpClientInfo>();
|
private readonly ConcurrentDictionary<string, HttpClient> _httpClients = new ConcurrentDictionary<string, HttpClient>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets
|
/// Gets
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="host">The host.</param>
|
/// <param name="url">The host.</param>
|
||||||
/// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
|
/// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
|
||||||
/// <returns>HttpClient.</returns>
|
/// <returns>HttpClient.</returns>
|
||||||
/// <exception cref="ArgumentNullException">host</exception>
|
/// <exception cref="ArgumentNullException">host</exception>
|
||||||
private HttpClientInfo GetHttpClient(string host, bool enableHttpCompression)
|
private HttpClient GetHttpClient(string url, bool enableHttpCompression)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(host))
|
var key = GetHostFromUrl(url) + enableHttpCompression;
|
||||||
{
|
|
||||||
throw new ArgumentNullException(nameof(host));
|
|
||||||
}
|
|
||||||
|
|
||||||
var key = host + enableHttpCompression;
|
|
||||||
|
|
||||||
if (!_httpClients.TryGetValue(key, out var client))
|
if (!_httpClients.TryGetValue(key, out var client))
|
||||||
{
|
{
|
||||||
client = new HttpClientInfo();
|
|
||||||
|
client = new HttpClient()
|
||||||
|
{
|
||||||
|
BaseAddress = new Uri(url)
|
||||||
|
};
|
||||||
|
|
||||||
_httpClients.TryAdd(key, client);
|
_httpClients.TryAdd(key, client);
|
||||||
}
|
}
|
||||||
@ -102,110 +101,87 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
|
|
||||||
private WebRequest GetRequest(HttpRequestOptions options, string method)
|
private HttpRequestMessage GetRequestMessage(HttpRequestOptions options, HttpMethod method)
|
||||||
{
|
{
|
||||||
string url = options.Url;
|
string url = options.Url;
|
||||||
|
|
||||||
var uriAddress = new Uri(url);
|
var uriAddress = new Uri(url);
|
||||||
string userInfo = uriAddress.UserInfo;
|
string userInfo = uriAddress.UserInfo;
|
||||||
if (!string.IsNullOrWhiteSpace(userInfo))
|
if (!string.IsNullOrWhiteSpace(userInfo))
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Found userInfo in url: {0} ... url: {1}", userInfo, url);
|
_logger.LogWarning("Found userInfo in url: {0} ... url: {1}", userInfo, url);
|
||||||
url = url.Replace(userInfo + "@", string.Empty);
|
url = url.Replace(userInfo + "@", string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
var request = WebRequest.Create(url);
|
var request = new HttpRequestMessage(method, url);
|
||||||
|
|
||||||
if (request is HttpWebRequest httpWebRequest)
|
AddRequestHeaders(request, options);
|
||||||
|
|
||||||
|
if (options.EnableHttpCompression)
|
||||||
{
|
{
|
||||||
AddRequestHeaders(httpWebRequest, options);
|
if (options.DecompressionMethod.HasValue
|
||||||
|
&& options.DecompressionMethod.Value == CompressionMethod.Gzip)
|
||||||
if (options.EnableHttpCompression)
|
|
||||||
{
|
{
|
||||||
httpWebRequest.AutomaticDecompression = DecompressionMethods.Deflate;
|
request.Headers.Add(HeaderNames.AcceptEncoding, new[] { "gzip", "deflate" });
|
||||||
if (options.DecompressionMethod.HasValue
|
|
||||||
&& options.DecompressionMethod.Value == CompressionMethod.Gzip)
|
|
||||||
{
|
|
||||||
httpWebRequest.AutomaticDecompression = DecompressionMethods.GZip;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
httpWebRequest.AutomaticDecompression = DecompressionMethods.None;
|
request.Headers.Add(HeaderNames.AcceptEncoding, "deflate");
|
||||||
}
|
|
||||||
|
|
||||||
httpWebRequest.KeepAlive = options.EnableKeepAlive;
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(options.Host))
|
|
||||||
{
|
|
||||||
httpWebRequest.Host = options.Host;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(options.Referer))
|
|
||||||
{
|
|
||||||
httpWebRequest.Referer = options.Referer;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache);
|
if (options.EnableKeepAlive)
|
||||||
|
{
|
||||||
|
request.Headers.Add(HeaderNames.Connection, "Keep-Alive");
|
||||||
|
}
|
||||||
|
|
||||||
request.Method = method;
|
if (!string.IsNullOrEmpty(options.Host))
|
||||||
request.Timeout = options.TimeoutMs;
|
{
|
||||||
|
request.Headers.Add(HeaderNames.Host, options.Host);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(options.Referer))
|
||||||
|
{
|
||||||
|
request.Headers.Add(HeaderNames.Referer, options.Referer);
|
||||||
|
}
|
||||||
|
|
||||||
|
//request.Headers.Add(HeaderNames.CacheControl, "no-cache");
|
||||||
|
|
||||||
|
//request.Headers.Add(HeaderNames., options.TimeoutMs;
|
||||||
|
|
||||||
|
/*
|
||||||
if (!string.IsNullOrWhiteSpace(userInfo))
|
if (!string.IsNullOrWhiteSpace(userInfo))
|
||||||
{
|
{
|
||||||
var parts = userInfo.Split(':');
|
var parts = userInfo.Split(':');
|
||||||
if (parts.Length == 2)
|
if (parts.Length == 2)
|
||||||
{
|
{
|
||||||
request.Credentials = GetCredential(url, parts[0], parts[1]);
|
request.Headers.Add(HeaderNames., GetCredential(url, parts[0], parts[1]);
|
||||||
// TODO: .net core ??
|
|
||||||
request.PreAuthenticate = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static CredentialCache GetCredential(string url, string username, string password)
|
private void AddRequestHeaders(HttpRequestMessage request, HttpRequestOptions options)
|
||||||
{
|
|
||||||
//ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3;
|
|
||||||
var credentialCache = new CredentialCache();
|
|
||||||
credentialCache.Add(new Uri(url), "Basic", new NetworkCredential(username, password));
|
|
||||||
return credentialCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AddRequestHeaders(HttpWebRequest request, HttpRequestOptions options)
|
|
||||||
{
|
{
|
||||||
var hasUserAgent = false;
|
var hasUserAgent = false;
|
||||||
|
|
||||||
foreach (var header in options.RequestHeaders)
|
foreach (var header in options.RequestHeaders)
|
||||||
{
|
{
|
||||||
if (string.Equals(header.Key, HeaderNames.Accept, StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(header.Key, HeaderNames.UserAgent, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
request.Accept = header.Value;
|
|
||||||
}
|
|
||||||
else if (string.Equals(header.Key, HeaderNames.UserAgent, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
SetUserAgent(request, header.Value);
|
|
||||||
hasUserAgent = true;
|
hasUserAgent = true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
request.Headers.Add(header.Key, header.Value);
|
||||||
request.Headers.Set(header.Key, header.Value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hasUserAgent && options.EnableDefaultUserAgent)
|
if (!hasUserAgent && options.EnableDefaultUserAgent)
|
||||||
{
|
{
|
||||||
SetUserAgent(request, _defaultUserAgentFn());
|
request.Headers.Add(HeaderNames.UserAgent, _defaultUserAgentFn());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SetUserAgent(HttpWebRequest request, string userAgent)
|
|
||||||
{
|
|
||||||
request.UserAgent = userAgent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the response internal.
|
/// Gets the response internal.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -213,7 +189,7 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
/// <returns>Task{HttpResponseInfo}.</returns>
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
||||||
public Task<HttpResponseInfo> GetResponse(HttpRequestOptions options)
|
public Task<HttpResponseInfo> GetResponse(HttpRequestOptions options)
|
||||||
{
|
{
|
||||||
return SendAsync(options, "GET");
|
return SendAsync(options, HttpMethod.Get);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -235,7 +211,21 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
/// <returns>Task{HttpResponseInfo}.</returns>
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
||||||
/// <exception cref="HttpException">
|
/// <exception cref="HttpException">
|
||||||
/// </exception>
|
/// </exception>
|
||||||
public async Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod)
|
public Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod)
|
||||||
|
{
|
||||||
|
var httpMethod2 = GetHttpMethod(httpMethod);
|
||||||
|
return SendAsync(options, httpMethod2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// send as an asynchronous operation.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="options">The options.</param>
|
||||||
|
/// <param name="httpMethod">The HTTP method.</param>
|
||||||
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
||||||
|
/// <exception cref="HttpException">
|
||||||
|
/// </exception>
|
||||||
|
public async Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, HttpMethod httpMethod)
|
||||||
{
|
{
|
||||||
if (options.CacheMode == CacheMode.None)
|
if (options.CacheMode == CacheMode.None)
|
||||||
{
|
{
|
||||||
@ -263,6 +253,40 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private HttpMethod GetHttpMethod(string httpMethod)
|
||||||
|
{
|
||||||
|
if (httpMethod.Equals("DELETE", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Delete;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("GET", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Get;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("HEAD", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Head;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Options;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Post;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("PUT", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Put;
|
||||||
|
}
|
||||||
|
else if (httpMethod.Equals("TRACE", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return HttpMethod.Trace;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ArgumentException("Invalid HTTP method", nameof(httpMethod));
|
||||||
|
}
|
||||||
|
|
||||||
private HttpResponseInfo GetCachedResponse(string responseCachePath, TimeSpan cacheLength, string url)
|
private HttpResponseInfo GetCachedResponse(string responseCachePath, TimeSpan cacheLength, string url)
|
||||||
{
|
{
|
||||||
if (File.Exists(responseCachePath)
|
if (File.Exists(responseCachePath)
|
||||||
@ -294,31 +318,23 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<HttpResponseInfo> SendAsyncInternal(HttpRequestOptions options, string httpMethod)
|
private async Task<HttpResponseInfo> SendAsyncInternal(HttpRequestOptions options, HttpMethod httpMethod)
|
||||||
{
|
{
|
||||||
ValidateParams(options);
|
ValidateParams(options);
|
||||||
|
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
var client = GetHttpClient(GetHostFromUrl(options.Url), options.EnableHttpCompression);
|
var client = GetHttpClient(options.Url, options.EnableHttpCompression);
|
||||||
|
|
||||||
if ((DateTime.UtcNow - client.LastTimeout).TotalSeconds < TimeoutSeconds)
|
var httpWebRequest = GetRequestMessage(options, httpMethod);
|
||||||
{
|
|
||||||
throw new HttpException(string.Format("Cancelling connection to {0} due to a previous timeout.", options.Url))
|
|
||||||
{
|
|
||||||
IsTimedOut = true
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
var httpWebRequest = GetRequest(options, httpMethod);
|
|
||||||
|
|
||||||
if (options.RequestContentBytes != null ||
|
if (options.RequestContentBytes != null ||
|
||||||
!string.IsNullOrEmpty(options.RequestContent) ||
|
!string.IsNullOrEmpty(options.RequestContent) ||
|
||||||
string.Equals(httpMethod, "post", StringComparison.OrdinalIgnoreCase))
|
httpMethod == HttpMethod.Post)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var bytes = options.RequestContentBytes ?? Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
|
httpWebRequest.Content = new StringContent(Encoding.UTF8.GetString(options.RequestContentBytes) ?? options.RequestContent ?? string.Empty);
|
||||||
|
|
||||||
var contentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
|
var contentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
|
||||||
|
|
||||||
@ -327,8 +343,8 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
contentType = contentType.TrimEnd(';') + "; charset=\"utf-8\"";
|
contentType = contentType.TrimEnd(';') + "; charset=\"utf-8\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
httpWebRequest.ContentType = contentType;
|
httpWebRequest.Headers.Add(HeaderNames.ContentType, contentType);
|
||||||
(await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
|
await client.SendAsync(httpWebRequest).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -341,68 +357,45 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
await options.ResourcePool.WaitAsync(options.CancellationToken).ConfigureAwait(false);
|
await options.ResourcePool.WaitAsync(options.CancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((DateTime.UtcNow - client.LastTimeout).TotalSeconds < TimeoutSeconds)
|
|
||||||
{
|
|
||||||
options.ResourcePool?.Release();
|
|
||||||
|
|
||||||
throw new HttpException($"Connection to {options.Url} timed out") { IsTimedOut = true };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.LogRequest)
|
if (options.LogRequest)
|
||||||
{
|
{
|
||||||
if (options.LogRequestAsDebug)
|
_logger.LogDebug("HttpClientManager {0}: {1}", httpMethod.ToString(), options.Url);
|
||||||
{
|
|
||||||
_logger.LogDebug("HttpClientManager {0}: {1}", httpMethod.ToUpper(CultureInfo.CurrentCulture), options.Url);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_logger.LogInformation("HttpClientManager {0}: {1}", httpMethod.ToUpper(CultureInfo.CurrentCulture), options.Url);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
if (!options.BufferContent)
|
/*if (!options.BufferContent)
|
||||||
{
|
{
|
||||||
var response = await GetResponseAsync(httpWebRequest, TimeSpan.FromMilliseconds(options.TimeoutMs)).ConfigureAwait(false);
|
var response = await client.HttpClient.SendAsync(httpWebRequest).ConfigureAwait(false);
|
||||||
|
|
||||||
var httpResponse = (HttpWebResponse)response;
|
await EnsureSuccessStatusCode(client, response, options).ConfigureAwait(false);
|
||||||
|
|
||||||
EnsureSuccessStatusCode(client, httpResponse, options);
|
|
||||||
|
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
return GetResponseInfo(httpResponse, httpResponse.GetResponseStream(), GetContentLength(httpResponse), httpResponse);
|
return GetResponseInfo(response, await response.Content.ReadAsStreamAsync().ConfigureAwait(false), response.Content.Headers.ContentLength, response);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
using (var response = await GetResponseAsync(httpWebRequest, TimeSpan.FromMilliseconds(options.TimeoutMs)).ConfigureAwait(false))
|
using (var response = await client.SendAsync(httpWebRequest).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var httpResponse = (HttpWebResponse)response;
|
await EnsureSuccessStatusCode(response, options).ConfigureAwait(false);
|
||||||
|
|
||||||
EnsureSuccessStatusCode(client, httpResponse, options);
|
|
||||||
|
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
using (var stream = httpResponse.GetResponseStream())
|
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
var memoryStream = new MemoryStream();
|
var memoryStream = new MemoryStream();
|
||||||
await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
|
await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
|
||||||
|
|
||||||
memoryStream.Position = 0;
|
memoryStream.Position = 0;
|
||||||
|
|
||||||
return GetResponseInfo(httpResponse, memoryStream, memoryStream.Length, null);
|
return GetResponseInfo(response, memoryStream, memoryStream.Length, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException ex)
|
catch (OperationCanceledException ex)
|
||||||
{
|
{
|
||||||
throw GetCancellationException(options, client, options.CancellationToken, ex);
|
throw GetCancellationException(options, options.CancellationToken, ex);
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
throw GetException(ex, options, client);
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@ -410,69 +403,54 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private HttpResponseInfo GetResponseInfo(HttpWebResponse httpResponse, Stream content, long? contentLength, IDisposable disposable)
|
private HttpResponseInfo GetResponseInfo(HttpResponseMessage httpResponse, Stream content, long? contentLength, IDisposable disposable)
|
||||||
{
|
{
|
||||||
var responseInfo = new HttpResponseInfo(disposable)
|
var responseInfo = new HttpResponseInfo(disposable)
|
||||||
{
|
{
|
||||||
Content = content,
|
Content = content,
|
||||||
StatusCode = httpResponse.StatusCode,
|
StatusCode = httpResponse.StatusCode,
|
||||||
ContentType = httpResponse.ContentType,
|
ContentType = httpResponse.Content.Headers.ContentType?.MediaType,
|
||||||
ContentLength = contentLength,
|
ContentLength = contentLength,
|
||||||
ResponseUrl = httpResponse.ResponseUri.ToString()
|
ResponseUrl = httpResponse.Content.Headers.ContentLocation?.ToString()
|
||||||
};
|
};
|
||||||
|
|
||||||
if (httpResponse.Headers != null)
|
if (httpResponse.Headers != null)
|
||||||
{
|
{
|
||||||
SetHeaders(httpResponse.Headers, responseInfo);
|
SetHeaders(httpResponse.Content.Headers, responseInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
return responseInfo;
|
return responseInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
private HttpResponseInfo GetResponseInfo(HttpWebResponse httpResponse, string tempFile, long? contentLength)
|
private HttpResponseInfo GetResponseInfo(HttpResponseMessage httpResponse, string tempFile, long? contentLength)
|
||||||
{
|
{
|
||||||
var responseInfo = new HttpResponseInfo
|
var responseInfo = new HttpResponseInfo
|
||||||
{
|
{
|
||||||
TempFilePath = tempFile,
|
TempFilePath = tempFile,
|
||||||
StatusCode = httpResponse.StatusCode,
|
StatusCode = httpResponse.StatusCode,
|
||||||
ContentType = httpResponse.ContentType,
|
ContentType = httpResponse.Content.Headers.ContentType?.MediaType,
|
||||||
ContentLength = contentLength
|
ContentLength = contentLength
|
||||||
};
|
};
|
||||||
|
|
||||||
if (httpResponse.Headers != null)
|
if (httpResponse.Headers != null)
|
||||||
{
|
{
|
||||||
SetHeaders(httpResponse.Headers, responseInfo);
|
SetHeaders(httpResponse.Content.Headers, responseInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
return responseInfo;
|
return responseInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SetHeaders(WebHeaderCollection headers, HttpResponseInfo responseInfo)
|
private static void SetHeaders(HttpContentHeaders headers, HttpResponseInfo responseInfo)
|
||||||
{
|
{
|
||||||
foreach (var key in headers.AllKeys)
|
foreach (var key in headers)
|
||||||
{
|
{
|
||||||
responseInfo.Headers[key] = headers[key];
|
responseInfo.Headers[key.Key] = string.Join(", ", key.Value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<HttpResponseInfo> Post(HttpRequestOptions options)
|
public Task<HttpResponseInfo> Post(HttpRequestOptions options)
|
||||||
{
|
{
|
||||||
return SendAsync(options, "POST");
|
return SendAsync(options, HttpMethod.Post);
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Performs a POST request
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="options">The options.</param>
|
|
||||||
/// <param name="postData">Params to add to the POST data.</param>
|
|
||||||
/// <returns>stream on success, null on failure</returns>
|
|
||||||
public async Task<Stream> Post(HttpRequestOptions options, Dictionary<string, string> postData)
|
|
||||||
{
|
|
||||||
options.SetPostData(postData);
|
|
||||||
|
|
||||||
var response = await Post(options).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return response.Content;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -482,9 +460,10 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
/// <returns>Task{System.String}.</returns>
|
/// <returns>Task{System.String}.</returns>
|
||||||
public async Task<string> GetTempFile(HttpRequestOptions options)
|
public async Task<string> GetTempFile(HttpRequestOptions options)
|
||||||
{
|
{
|
||||||
var response = await GetTempFileResponse(options).ConfigureAwait(false);
|
using (var response = await GetTempFileResponse(options).ConfigureAwait(false))
|
||||||
|
{
|
||||||
return response.TempFilePath;
|
return response.TempFilePath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<HttpResponseInfo> GetTempFileResponse(HttpRequestOptions options)
|
public async Task<HttpResponseInfo> GetTempFileResponse(HttpRequestOptions options)
|
||||||
@ -502,7 +481,7 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
|
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
var httpWebRequest = GetRequest(options, "GET");
|
var httpWebRequest = GetRequestMessage(options, HttpMethod.Get);
|
||||||
|
|
||||||
if (options.ResourcePool != null)
|
if (options.ResourcePool != null)
|
||||||
{
|
{
|
||||||
@ -513,33 +492,22 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
|
|
||||||
if (options.LogRequest)
|
if (options.LogRequest)
|
||||||
{
|
{
|
||||||
if (options.LogRequestAsDebug)
|
_logger.LogDebug("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
|
||||||
{
|
|
||||||
_logger.LogDebug("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_logger.LogInformation("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var client = GetHttpClient(GetHostFromUrl(options.Url), options.EnableHttpCompression);
|
var client = GetHttpClient(options.Url, options.EnableHttpCompression);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
using (var response = await httpWebRequest.GetResponseAsync().ConfigureAwait(false))
|
using (var response = (await client.SendAsync(httpWebRequest).ConfigureAwait(false)))
|
||||||
{
|
{
|
||||||
var httpResponse = (HttpWebResponse)response;
|
await EnsureSuccessStatusCode(response, options).ConfigureAwait(false);
|
||||||
|
|
||||||
EnsureSuccessStatusCode(client, httpResponse, options);
|
|
||||||
|
|
||||||
options.CancellationToken.ThrowIfCancellationRequested();
|
options.CancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
var contentLength = GetContentLength(httpResponse);
|
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
||||||
|
|
||||||
using (var stream = httpResponse.GetResponseStream())
|
|
||||||
using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
|
using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
|
||||||
{
|
{
|
||||||
await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
|
await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
|
||||||
@ -547,13 +515,18 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
|
|
||||||
options.Progress.Report(100);
|
options.Progress.Report(100);
|
||||||
|
|
||||||
return GetResponseInfo(httpResponse, tempFile, contentLength);
|
var contentLength = response.Content.Headers.ContentLength;
|
||||||
|
return GetResponseInfo(response, tempFile, contentLength);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
DeleteTempFile(tempFile);
|
if (File.Exists(tempFile))
|
||||||
throw GetException(ex, options, client);
|
{
|
||||||
|
File.Delete(tempFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw GetException(ex, options);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@ -561,21 +534,7 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static long? GetContentLength(HttpWebResponse response)
|
private Exception GetException(Exception ex, HttpRequestOptions options)
|
||||||
{
|
|
||||||
var length = response.ContentLength;
|
|
||||||
|
|
||||||
if (length == 0)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return length;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
|
||||||
|
|
||||||
private Exception GetException(Exception ex, HttpRequestOptions options, HttpClientInfo client)
|
|
||||||
{
|
{
|
||||||
if (ex is HttpException)
|
if (ex is HttpException)
|
||||||
{
|
{
|
||||||
@ -599,11 +558,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
if (response != null)
|
if (response != null)
|
||||||
{
|
{
|
||||||
exception.StatusCode = response.StatusCode;
|
exception.StatusCode = response.StatusCode;
|
||||||
|
|
||||||
if ((int)response.StatusCode == 429)
|
|
||||||
{
|
|
||||||
client.LastTimeout = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -624,7 +578,7 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
|
|
||||||
if (operationCanceledException != null)
|
if (operationCanceledException != null)
|
||||||
{
|
{
|
||||||
return GetCancellationException(options, client, options.CancellationToken, operationCanceledException);
|
return GetCancellationException(options, options.CancellationToken, operationCanceledException);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.LogErrors)
|
if (options.LogErrors)
|
||||||
@ -635,18 +589,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
return ex;
|
return ex;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DeleteTempFile(string file)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_fileSystem.DeleteFile(file);
|
|
||||||
}
|
|
||||||
catch (IOException)
|
|
||||||
{
|
|
||||||
// Might not have been created at all. No need to worry.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ValidateParams(HttpRequestOptions options)
|
private void ValidateParams(HttpRequestOptions options)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(options.Url))
|
if (string.IsNullOrEmpty(options.Url))
|
||||||
@ -682,11 +624,10 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
/// Throws the cancellation exception.
|
/// Throws the cancellation exception.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="options">The options.</param>
|
/// <param name="options">The options.</param>
|
||||||
/// <param name="client">The client.</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <param name="exception">The exception.</param>
|
/// <param name="exception">The exception.</param>
|
||||||
/// <returns>Exception.</returns>
|
/// <returns>Exception.</returns>
|
||||||
private Exception GetCancellationException(HttpRequestOptions options, HttpClientInfo client, CancellationToken cancellationToken, OperationCanceledException exception)
|
private Exception GetCancellationException(HttpRequestOptions options, CancellationToken cancellationToken, OperationCanceledException exception)
|
||||||
{
|
{
|
||||||
// If the HttpClient's timeout is reached, it will cancel the Task internally
|
// If the HttpClient's timeout is reached, it will cancel the Task internally
|
||||||
if (!cancellationToken.IsCancellationRequested)
|
if (!cancellationToken.IsCancellationRequested)
|
||||||
@ -698,8 +639,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
_logger.LogError(msg);
|
_logger.LogError(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.LastTimeout = DateTime.UtcNow;
|
|
||||||
|
|
||||||
// Throw an HttpException so that the caller doesn't think it was cancelled by user code
|
// Throw an HttpException so that the caller doesn't think it was cancelled by user code
|
||||||
return new HttpException(msg, exception)
|
return new HttpException(msg, exception)
|
||||||
{
|
{
|
||||||
@ -710,91 +649,20 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
return exception;
|
return exception;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EnsureSuccessStatusCode(HttpClientInfo client, HttpWebResponse response, HttpRequestOptions options)
|
private async Task EnsureSuccessStatusCode(HttpResponseMessage response, HttpRequestOptions options)
|
||||||
{
|
{
|
||||||
var statusCode = response.StatusCode;
|
if (response.IsSuccessStatusCode)
|
||||||
|
|
||||||
var isSuccessful = statusCode >= HttpStatusCode.OK && statusCode <= (HttpStatusCode)299;
|
|
||||||
|
|
||||||
if (isSuccessful)
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.LogErrorResponseBody)
|
var msg = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
|
||||||
{
|
_logger.LogError(msg);
|
||||||
try
|
|
||||||
{
|
|
||||||
using (var stream = response.GetResponseStream())
|
|
||||||
{
|
|
||||||
if (stream != null)
|
|
||||||
{
|
|
||||||
using (var reader = new StreamReader(stream))
|
|
||||||
{
|
|
||||||
var msg = reader.ReadToEnd();
|
|
||||||
|
|
||||||
_logger.LogError(msg);
|
throw new HttpException(response.ReasonPhrase)
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new HttpException(response.StatusDescription)
|
|
||||||
{
|
{
|
||||||
StatusCode = response.StatusCode
|
StatusCode = response.StatusCode
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Task<WebResponse> GetResponseAsync(WebRequest request, TimeSpan timeout)
|
|
||||||
{
|
|
||||||
var taskCompletion = new TaskCompletionSource<WebResponse>();
|
|
||||||
|
|
||||||
var asyncTask = Task.Factory.FromAsync(request.BeginGetResponse, request.EndGetResponse, null);
|
|
||||||
|
|
||||||
ThreadPool.RegisterWaitForSingleObject((asyncTask as IAsyncResult).AsyncWaitHandle, TimeoutCallback, request, timeout, true);
|
|
||||||
var callback = new TaskCallback { taskCompletion = taskCompletion };
|
|
||||||
asyncTask.ContinueWith(callback.OnSuccess, TaskContinuationOptions.NotOnFaulted);
|
|
||||||
|
|
||||||
// Handle errors
|
|
||||||
asyncTask.ContinueWith(callback.OnError, TaskContinuationOptions.OnlyOnFaulted);
|
|
||||||
|
|
||||||
return taskCompletion.Task;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void TimeoutCallback(object state, bool timedOut)
|
|
||||||
{
|
|
||||||
if (timedOut && state != null)
|
|
||||||
{
|
|
||||||
var request = (WebRequest)state;
|
|
||||||
request.Abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class TaskCallback
|
|
||||||
{
|
|
||||||
public TaskCompletionSource<WebResponse> taskCompletion;
|
|
||||||
|
|
||||||
public void OnSuccess(Task<WebResponse> task)
|
|
||||||
{
|
|
||||||
taskCompletion.TrySetResult(task.Result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnError(Task<WebResponse> task)
|
|
||||||
{
|
|
||||||
if (task.Exception == null)
|
|
||||||
{
|
|
||||||
taskCompletion.TrySetException(Enumerable.Empty<Exception>());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
taskCompletion.TrySetException(task.Exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,6 @@ namespace MediaBrowser.Common.Net
|
|||||||
public bool EnableDefaultUserAgent { get; set; }
|
public bool EnableDefaultUserAgent { get; set; }
|
||||||
|
|
||||||
public bool AppendCharsetToMimeType { get; set; }
|
public bool AppendCharsetToMimeType { get; set; }
|
||||||
public string DownloadFilePath { get; set; }
|
|
||||||
|
|
||||||
private string GetHeaderValue(string name)
|
private string GetHeaderValue(string name)
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Net.Http;
|
||||||
|
|
||||||
namespace MediaBrowser.Common.Net
|
namespace MediaBrowser.Common.Net
|
||||||
{
|
{
|
||||||
@ -23,6 +24,8 @@ namespace MediaBrowser.Common.Net
|
|||||||
Task<Stream> Get(HttpRequestOptions options);
|
Task<Stream> Get(HttpRequestOptions options);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// Warning: Depricated function,
|
||||||
|
/// use 'Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, HttpMethod httpMethod);' instead
|
||||||
/// Sends the asynchronous.
|
/// Sends the asynchronous.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="options">The options.</param>
|
/// <param name="options">The options.</param>
|
||||||
@ -30,6 +33,14 @@ namespace MediaBrowser.Common.Net
|
|||||||
/// <returns>Task{HttpResponseInfo}.</returns>
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
||||||
Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod);
|
Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the asynchronous.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="options">The options.</param>
|
||||||
|
/// <param name="httpMethod">The HTTP method.</param>
|
||||||
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
||||||
|
Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, HttpMethod httpMethod);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Posts the specified options.
|
/// Posts the specified options.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
Loading…
Reference in New Issue
Block a user