From 0fff72236f0dacbed4d12117c9c5ffcef6a724b6 Mon Sep 17 00:00:00 2001 From: Gervasio Marchand Date: Fri, 7 Jul 2023 18:24:49 -0300 Subject: [PATCH] Avoid recreating the HttpClient every time --- src/FakeRelay.Core/Helpers/MastodonHelper.cs | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/FakeRelay.Core/Helpers/MastodonHelper.cs b/src/FakeRelay.Core/Helpers/MastodonHelper.cs index c3b02fa..1baf8fe 100644 --- a/src/FakeRelay.Core/Helpers/MastodonHelper.cs +++ b/src/FakeRelay.Core/Helpers/MastodonHelper.cs @@ -1,4 +1,5 @@ using System.Net.Http.Headers; +using System.Text; namespace FakeRelay.Core.Helpers; @@ -23,28 +24,34 @@ public static class MastodonHelper }}"); } - public static async Task SendMessageToInboxAsync(string targetHost, string content) + private static HttpClient? _client; + private static HttpClient Client => _client ??= GetClient(); + + private static HttpClient GetClient() { var client = new HttpClient { Timeout = TimeSpan.FromSeconds(5) }; client.DefaultRequestHeaders.Add("User-Agent", $"FakeRelay (hosted at {Config.Instance.Host})"); + return client; + } + public static async Task SendMessageToInboxAsync(string targetHost, string content) + { var date = DateTime.UtcNow; var digest = CryptographyHelper.GetSHA256Digest(content); - var requestContent = new StringContent(content); - - requestContent.Headers.Add("Digest", "SHA-256=" + digest); - + + var request = new HttpRequestMessage(HttpMethod.Post, $"https://{targetHost}/inbox"); + request.Headers.Date = date; + request.Headers.Add("Digest", "SHA-256=" + digest); + + request.Content = new StringContent(content, Encoding.UTF8, "application/activity+json"); var stringToSign = $"(request-target): post /inbox\ndate: {date.ToString("R")}\nhost: {targetHost}\ndigest: SHA-256={digest}\ncontent-length: {content.Length}"; var signature = CryptographyHelper.Sign(stringToSign); - requestContent.Headers.Add("Signature", $@"keyId=""https://{Config.Instance.Host}/actor#main-key"",algorithm=""rsa-sha256"",headers=""(request-target) date host digest content-length"",signature=""{signature}"""); - - requestContent.Headers.ContentType = new MediaTypeHeaderValue("application/activity+json"); - client.DefaultRequestHeaders.Date = date; + request.Headers.Add("Signature", $@"keyId=""https://{Config.Instance.Host}/actor#main-key"",algorithm=""rsa-sha256"",headers=""(request-target) date host digest content-length"",signature=""{signature}"""); try { - var response = await client.PostAsync($"https://{targetHost}/inbox", requestContent); + var response = await Client.SendAsync(request); return await response.Content.ReadAsStringAsync(); } catch (Exception e)