ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-24 01:19:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove second HttpClient from PluginRepository (#1551)

Browse source 
Co-authored-by: goat <16760685+goaaats@users.noreply.github.com>
This commit is contained in:
KazWolfe 2023-11-28 13:52:38 -08:00 • committed by GitHub
parent a71cb81384
commit 13346b04db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Dalamud/Plugin/Internal/Types/PluginRepository.cs
View file

@ -6,12 +6,14 @@ using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dalamud.Logging.Internal; using Dalamud.Logging.Internal;
using Dalamud.Networking.Http; using Dalamud.Networking.Http;
using Dalamud.Plugin.Internal.Types.Manifest; using Dalamud.Plugin.Internal.Types.Manifest;
using Dalamud.Utility; using Dalamud.Utility;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Dalamud.Plugin.Internal.Types; namespace Dalamud.Plugin.Internal.Types;
@ -26,8 +28,9 @@ internal class PluginRepository
/// </summary> /// </summary>
public const string MainRepoUrl = "https://kamori.goats.dev/Plugin/PluginMaster"; public const string MainRepoUrl = "https://kamori.goats.dev/Plugin/PluginMaster";
private static readonly ModuleLog Log = new("PLUGINR"); private const int HttpRequestTimeoutSeconds = 20;
private static readonly ModuleLog Log = new("PLUGINR");
private readonly HttpClient httpClient; private readonly HttpClient httpClient;
/// <summary> /// <summary>
@ -112,7 +115,8 @@ internal class PluginRepository
{ {
Log.Information($"Fetching repo: {this.PluginMasterUrl}"); Log.Information($"Fetching repo: {this.PluginMasterUrl}");
using var response = await this.httpClient.GetAsync(this.PluginMasterUrl); using var response = await this.GetPluginMaster(this.PluginMasterUrl);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var data = await response.Content.ReadAsStringAsync(); var data = await response.Content.ReadAsStringAsync();
@ -204,4 +208,17 @@ internal class PluginRepository
return true; return true;
} }
private async Task<HttpResponseMessage> GetPluginMaster(string url, int timeout = HttpRequestTimeoutSeconds)
{
var httpClient = Service<HappyHttpClient>.Get().SharedHttpClient;
var request = new HttpRequestMessage(HttpMethod.Get, url);
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
request.Headers.CacheControl = new CacheControlHeaderValue { NoCache = true };
using var requestCts = new CancellationTokenSource(TimeSpan.FromSeconds(timeout));
return await httpClient.SendAsync(request, requestCts.Token);
}
} }