|
@@ -1,7 +1,6 @@ |
|
|
using Newtonsoft.Json; |
|
|
using Newtonsoft.Json; |
|
|
using System; |
|
|
using System; |
|
|
using System.Diagnostics; |
|
|
using System.Diagnostics; |
|
|
using System.Net; |
|
|
|
|
|
using System.Net.Http; |
|
|
using System.Net.Http; |
|
|
using System.Reflection; |
|
|
using System.Reflection; |
|
|
using System.Threading; |
|
|
using System.Threading; |
|
@@ -21,7 +20,6 @@ namespace Discord.Net.API |
|
|
private readonly IRestEngine _engine; |
|
|
private readonly IRestEngine _engine; |
|
|
private readonly LogMessageSeverity _logLevel; |
|
|
private readonly LogMessageSeverity _logLevel; |
|
|
private CancellationToken _cancelToken; |
|
|
private CancellationToken _cancelToken; |
|
|
private ServicePoint _servicePoint; |
|
|
|
|
|
|
|
|
|
|
|
public RestClient(LogMessageSeverity logLevel) |
|
|
public RestClient(LogMessageSeverity logLevel) |
|
|
{ |
|
|
{ |
|
@@ -111,8 +109,6 @@ namespace Discord.Net.API |
|
|
stopwatch = Stopwatch.StartNew(); |
|
|
stopwatch = Stopwatch.StartNew(); |
|
|
|
|
|
|
|
|
string responseJson = await _engine.Send(method, path, requestJson, _cancelToken).ConfigureAwait(false); |
|
|
string responseJson = await _engine.Send(method, path, requestJson, _cancelToken).ConfigureAwait(false); |
|
|
if (_servicePoint == null) |
|
|
|
|
|
ConfigureServicePoint(); |
|
|
|
|
|
|
|
|
|
|
|
#if TEST_RESPONSES |
|
|
#if TEST_RESPONSES |
|
|
if (!hasResponse && !string.IsNullOrEmpty(responseJson)) |
|
|
if (!hasResponse && !string.IsNullOrEmpty(responseJson)) |
|
@@ -152,8 +148,6 @@ namespace Discord.Net.API |
|
|
stopwatch = Stopwatch.StartNew(); |
|
|
stopwatch = Stopwatch.StartNew(); |
|
|
|
|
|
|
|
|
string responseJson = await _engine.SendFile(method, path, filePath, _cancelToken).ConfigureAwait(false); |
|
|
string responseJson = await _engine.SendFile(method, path, filePath, _cancelToken).ConfigureAwait(false); |
|
|
if (_servicePoint == null) |
|
|
|
|
|
ConfigureServicePoint(); |
|
|
|
|
|
|
|
|
|
|
|
#if TEST_RESPONSES |
|
|
#if TEST_RESPONSES |
|
|
if (!hasResponse && !string.IsNullOrEmpty(responseJson)) |
|
|
if (!hasResponse && !string.IsNullOrEmpty(responseJson)) |
|
@@ -192,14 +186,5 @@ namespace Discord.Net.API |
|
|
|
|
|
|
|
|
internal void SetToken(string token) => _engine.SetToken(token); |
|
|
internal void SetToken(string token) => _engine.SetToken(token); |
|
|
internal void SetCancelToken(CancellationToken token) => _cancelToken = token; |
|
|
internal void SetCancelToken(CancellationToken token) => _cancelToken = token; |
|
|
|
|
|
|
|
|
private void ConfigureServicePoint() |
|
|
|
|
|
{ |
|
|
|
|
|
_servicePoint = ServicePointManager.FindServicePoint(new Uri(Endpoints.BaseApi)); |
|
|
|
|
|
_servicePoint.Expect100Continue = true; |
|
|
|
|
|
_servicePoint.UseNagleAlgorithm = false; |
|
|
|
|
|
_servicePoint.MaxIdleTime = int.MaxValue; |
|
|
|
|
|
_servicePoint.ConnectionLeaseTimeout = int.MaxValue; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |