optimize GitHub Client

nager · Feb 22, 2024 · f950827 · f950827
1 parent 815d3a9
commit f950827
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 12 deletions.
diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs b/src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs
@@ -0,0 +1,41 @@
+using Nager.PublicSuffix.WebApi.GitHub.Models;
+
+namespace Nager.PublicSuffix.WebApi.GitHub
+{
+    /// <summary>
+    /// GitHub Client
+    /// </summary>
+    public class GitHubClient
+    {
+        private readonly HttpClient _httpClient;
+
+        /// <summary>
+        /// GitHub Client
+        /// </summary>
+        /// <param name="httpClient"></param>
+        public GitHubClient(HttpClient httpClient)
+        {
+            this._httpClient = httpClient;
+            this._httpClient.DefaultRequestHeaders.Add("User-Agent", "Nager.PublicSuffix");
+        }
+
+        /// <summary>
+        /// GetCommitAsync
+        /// </summary>
+        /// <param name="owner"></param>
+        /// <param name="repository"></param>
+        /// <param name="branch"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<GitHubCommit?> GetCommitAsync(
+            string owner,
+            string repository,
+            string branch,
+            CancellationToken cancellationToken = default)
+        {
+            var requestUri = $"https://api.github.com/repos/{owner}/{repository}/commits/{branch}";
+
+            return await this._httpClient.GetFromJsonAsync<GitHubCommit>(requestUri, cancellationToken);
+        }
+    }
+}
diff --git a/...ager.PublicSuffix.WebApi/Models/Author.cs → ...blicSuffix.WebApi/GitHub/Models/Author.cs b/...ager.PublicSuffix.WebApi/Models/Author.cs → ...blicSuffix.WebApi/GitHub/Models/Author.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class Author
     {

diff --git a/....PublicSuffix.WebApi/Models/CommitInfo.cs → ...Suffix.WebApi/GitHub/Models/CommitInfo.cs b/....PublicSuffix.WebApi/Models/CommitInfo.cs → ...Suffix.WebApi/GitHub/Models/CommitInfo.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class CommitInfo
     {

diff --git a/...r.PublicSuffix.WebApi/Models/Committer.cs → ...cSuffix.WebApi/GitHub/Models/Committer.cs b/...r.PublicSuffix.WebApi/Models/Committer.cs → ...cSuffix.WebApi/GitHub/Models/Committer.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class Committer
     {

diff --git a/src/Nager.PublicSuffix.WebApi/Models/File.cs → ...PublicSuffix.WebApi/GitHub/Models/File.cs b/src/Nager.PublicSuffix.WebApi/Models/File.cs → ...PublicSuffix.WebApi/GitHub/Models/File.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class File
     {

diff --git a/...ublicSuffix.WebApi/Models/GitHubCommit.cs → ...ffix.WebApi/GitHub/Models/GitHubCommit.cs b/...ublicSuffix.WebApi/Models/GitHubCommit.cs → ...ffix.WebApi/GitHub/Models/GitHubCommit.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
 
     public class GitHubCommit

diff --git a/src/Nager.PublicSuffix.WebApi/Models/Tree.cs → ...PublicSuffix.WebApi/GitHub/Models/Tree.cs b/src/Nager.PublicSuffix.WebApi/Models/Tree.cs → ...PublicSuffix.WebApi/GitHub/Models/Tree.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class Tree
     {

diff --git a/...ublicSuffix.WebApi/Models/Verification.cs → ...ffix.WebApi/GitHub/Models/Verification.cs b/...ublicSuffix.WebApi/Models/Verification.cs → ...ffix.WebApi/GitHub/Models/Verification.cs
@@ -1,4 +1,4 @@
-namespace Nager.PublicSuffix.WebApi.Models
+namespace Nager.PublicSuffix.WebApi.GitHub.Models
 {
     public class Verification
     {

diff --git a/src/Nager.PublicSuffix.WebApi/Program.cs b/src/Nager.PublicSuffix.WebApi/Program.cs
@@ -1,8 +1,7 @@
 using Nager.PublicSuffix;
 using Nager.PublicSuffix.RuleProviders;
 using Nager.PublicSuffix.RuleProviders.CacheProviders;
-using Nager.PublicSuffix.WebApi.Models;
-using System.Text.Encodings.Web;
+using Nager.PublicSuffix.WebApi.GitHub;
 using System.Text.Json.Serialization;
 using System.Web;
 
@@ -14,6 +13,7 @@
 builder.Services.AddSingleton<ICacheProvider, LocalFileSystemCacheProvider>();
 builder.Services.AddSingleton<IRuleProvider, CachedHttpRuleProvider>();
 builder.Services.AddSingleton<IDomainParser, DomainParser>();
+builder.Services.AddScoped<GitHubClient>();
 
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
@@ -49,10 +49,9 @@
 .WithName("DomainInfo")
 .WithOpenApi();
 
-app.MapPost("/CheckLastCommit", async (HttpClient httpClient) =>
+app.MapPost("/CheckLastCommit", async (GitHubClient gitHubClient, CancellationToken cancellationToken) =>
 {
-    httpClient.DefaultRequestHeaders.Add("User-Agent", "Nager.PublicSuffix");
-    var lastGitHubCommit = await httpClient.GetFromJsonAsync<GitHubCommit>("https://api.github.com/repos/publicsuffix/list/commits/master");
+    var lastGitHubCommit = await gitHubClient.GetCommitAsync("publicsuffix", "list", "master", cancellationToken);
 
     return lastGitHubCommit?.Commit?.Committer?.Date;
 })