ClientFactory moved to Wabbajack.Lib

Wabbajack.Lib/AuthorApi/Client.cs

@@ -18,20 +18,20 @@ namespace Wabbajack.Lib.AuthorApi
             return new Client(client); 
         }
 
-        private Client(Common.Http.Client client)
+        private Client(Wabbajack.Lib.Http.Client client)
         {
             _client = client;
         }
         
-        public static async Task<Common.Http.Client> GetAuthorizedClient(string? apiKey = null)
+        public static async Task<Wabbajack.Lib.Http.Client> GetAuthorizedClient(string? apiKey = null)
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             client.Headers.Add(("X-API-KEY", await GetAPIKey(apiKey)));
             return client;
         }
 
         public static string? ApiKeyOverride = null;
-        private Common.Http.Client _client;
+        private Wabbajack.Lib.Http.Client _client;
 
         public static async ValueTask<string> GetAPIKey(string? apiKey = null)
         {

Wabbajack.Lib/ClientAPI.cs

@@ -45,9 +45,9 @@ using Wabbajack.Lib.Downloaders;
     
     public class ClientAPI
     {
-        public static async Task<Common.Http.Client> GetClient()
+        public static async Task<Wabbajack.Lib.Http.Client> GetClient()
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             client.Headers.Add((Consts.MetricsKeyHeader, await Metrics.GetMetricsKey()));
             return client;
         }

Wabbajack.Lib/Downloaders/AbstractNeedsLoginDownloader.cs

@@ -26,7 +26,7 @@ namespace Wabbajack.Lib.Downloaders
 
         // ToDo
         // Remove null assignment.  Either add nullability to type, or figure way to prepare it safely
-        public Common.Http.Client AuthedClient { get; private set; } = null!;
+        public Wabbajack.Lib.Http.Client AuthedClient { get; private set; } = null!;
 
         public ReactiveCommand<Unit, Unit> TriggerLogin { get; }
         public ReactiveCommand<Unit, Unit> ClearLogin { get; }
@@ -86,7 +86,7 @@ namespace Wabbajack.Lib.Downloaders
             return cookies;
         }
         
-        public async Task<Common.Http.Client> GetAuthedClient()
+        public async Task<Wabbajack.Lib.Http.Client> GetAuthedClient()
         {
             Helpers.Cookie[] cookies;
             try

Wabbajack.Lib/Downloaders/BethesdaNetDownloader.cs

@@ -216,13 +216,13 @@ namespace Wabbajack.Lib.Downloaders
                 return true;
             }
 
-            private async Task<(Common.Http.Client, CDPTree, CollectedBNetInfo)> ResolveDownloadInfo()
+            private async Task<(Wabbajack.Lib.Http.Client, CDPTree, CollectedBNetInfo)> ResolveDownloadInfo()
             {
                 var info = new CollectedBNetInfo();
 
                 var login_info = await Utils.FromEncryptedJson<BethesdaNetData>(DataName);
 
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
 
                 client.Headers.Add(("User-Agent", "bnet"));
                 foreach (var header in login_info.headers.Where(h => h.Key.ToLower().StartsWith("x-")))

Wabbajack.Lib/Downloaders/GoogleDriveDownloader.cs

@@ -59,7 +59,7 @@ namespace Wabbajack.Lib.Downloaders
             private async Task<HTTPDownloader.State> ToHttpState()
             {
                 var initialURL = $"https://drive.google.com/uc?id={Id}&export=download";
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 using var response = await client.GetAsync(initialURL);
                 if (!response.IsSuccessStatusCode)
                     throw new HttpException((int)response.StatusCode, response.ReasonPhrase);

Wabbajack.Lib/Downloaders/HTTPDownloader.cs

@@ -54,7 +54,7 @@ namespace Wabbajack.Lib.Downloaders
             public List<string> Headers { get; } = new List<string>();
 
             [JsonIgnore]
-            public Common.Http.Client? Client { get; set; }
+            public Wabbajack.Lib.Http.Client? Client { get; set; }
 
             [JsonIgnore]
             public override object[] PrimaryKey => new object[] { Url };

Wabbajack.Lib/Downloaders/MEGADownloader.cs

@@ -115,7 +115,7 @@ namespace Wabbajack.Lib.Downloaders
             TriggerLogin = ReactiveCommand.Create(() => { },
                 IsLoggedIn.Select(b => !b).ObserveOnGuiThread());
 
-            ClearLogin = ReactiveCommand.Create(() => Utils.CatchAndLog(() => Utils.DeleteEncryptedJson(DataName)),
+            ClearLogin = ReactiveCommand.CreateFromTask(() => Utils.CatchAndLog(async () => await Utils.DeleteEncryptedJson(DataName)),
                 IsLoggedIn.ObserveOnGuiThread());
         }
 

Wabbajack.Lib/Downloaders/MediaFireDownloader.cs

@@ -50,7 +50,7 @@ namespace Wabbajack.Lib.Downloaders
 
             private async Task<HTTPDownloader.State?> Resolve()
             {
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 var body = await client.GetHtmlAsync(Url);
                 var node = body.DocumentNode.DescendantsAndSelf().First(d => d.HasClass("input") && d.HasClass("popsok") &&
                                                                              d.GetAttributeValue("aria-label", "") == "Download file");

Wabbajack.Lib/Downloaders/NexusDownloader.cs

@@ -46,8 +46,8 @@ namespace Wabbajack.Lib.Downloaders
             TriggerLogin = ReactiveCommand.CreateFromTask(
                 execute: () => Utils.CatchAndLog(NexusApiClient.RequestAndCacheAPIKey), 
                 canExecute: IsLoggedIn.Select(b => !b).ObserveOnGuiThread());
-            ClearLogin = ReactiveCommand.Create(
+            ClearLogin = ReactiveCommand.CreateFromTask(
-                execute: () => Utils.CatchAndLog(() => Utils.DeleteEncryptedJson("nexusapikey")),
+                execute: () => Utils.CatchAndLog(async () => await Utils.DeleteEncryptedJson("nexusapikey")),
                 canExecute: IsLoggedIn.ObserveOnGuiThread());
         }
 

Wabbajack.Lib/Downloaders/UrlDownloaders/YoutubeInferencer.cs

@@ -16,7 +16,7 @@ namespace Wabbajack.Lib.Downloaders.UrlDownloaders
             var state = YouTubeDownloader.UriToState(uri) as YouTubeDownloader.State;
             if (state == null) return null;
             
-            var client = new YoutubeClient(Common.Http.ClientFactory.Client);
+            var client = new YoutubeClient(Wabbajack.Lib.Http.ClientFactory.Client);
             var video = await client.Videos.GetAsync(state.Key);
 
             var desc = video.Description;

Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs

@@ -59,7 +59,7 @@ namespace Wabbajack.Lib.Downloaders
                 var definition = await GetDefinition();
                 await using var fs = await destination.Create();
                 using var mmfile = MemoryMappedFile.CreateFromFile(fs, null, definition.Size, MemoryMappedFileAccess.ReadWrite, HandleInheritability.None, false);
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 using var queue = new WorkQueue();
                 await definition.Parts.PMap(queue, async part =>
                 {
@@ -81,7 +81,7 @@ namespace Wabbajack.Lib.Downloaders
 
             private async Task<CDNFileDefinition> GetDefinition()
             {
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 using var data = await client.GetAsync(Url + "/definition.json.gz");
                 await using var gz = new GZipStream(await data.Content.ReadAsStreamAsync(), CompressionMode.Decompress);
                 return gz.FromJson<CDNFileDefinition>();

Wabbajack.Lib/Downloaders/YandexDownloader.cs

@@ -61,7 +61,7 @@ namespace Wabbajack.Lib.Downloaders
 
             public override async Task<bool> Verify(Archive archive)
             {
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 var result = await client.GetAsync(Url, errorsAsExceptions: false);
                 return result.IsSuccessStatusCode;
             }

Wabbajack.Lib/Downloaders/YouTubeDownloader.cs

@@ -104,7 +104,7 @@ namespace Wabbajack.Lib.Downloaders
                     using var queue = new WorkQueue();
                     await using var folder = await TempFolder.Create();
                     folder.Dir.Combine("tracks").CreateDirectory();
-                    var client = new YoutubeClient(Common.Http.ClientFactory.Client);
+                    var client = new YoutubeClient(Wabbajack.Lib.Http.ClientFactory.Client);
                     var meta = await client.Videos.GetAsync(Key);
                     var video = await client.Videos.Streams.GetManifestAsync(Key);
                     var stream = video.Streams.OfType<AudioOnlyStreamInfo>().Where(f => f.AudioCodec.StartsWith("mp4a")).OrderByDescending(a => a.Bitrate)
@@ -210,7 +210,7 @@ namespace Wabbajack.Lib.Downloaders
             {
                 try
                 {
-                    var client = new YoutubeClient(Common.Http.ClientFactory.Client);
+                    var client = new YoutubeClient(Wabbajack.Lib.Http.ClientFactory.Client);
                     var video = await client.Videos.GetAsync(Key);
                     return true;
                 }

Wabbajack.Lib/FileUploader/AuthorAPI.cs

@@ -29,9 +29,9 @@ namespace Wabbajack.Lib.FileUploader
             return apiKey ?? (await Consts.LocalAppDataPath.Combine(Consts.AuthorAPIKeyFile).ReadAllTextAsync()).Trim();
         }
  
-        public static async Task<Common.Http.Client> GetAuthorizedClient(string? apiKey = null)
+        public static async Task<Wabbajack.Lib.Http.Client> GetAuthorizedClient(string? apiKey = null)
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             client.Headers.Add(("X-API-KEY", await GetAPIKey(apiKey)));
             return client;
         }

Wabbajack.Lib/Http/Client.cs

@@ -6,9 +6,10 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using HtmlAgilityPack;
+using Wabbajack.Common;
 using Wabbajack.Common.Exceptions;
 
-namespace Wabbajack.Common.Http
+namespace Wabbajack.Lib.Http
 {
     public class Client
     {

Wabbajack.Lib/Http/ClientFactory.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Net;
 using SysHttp = System.Net.Http;
-namespace Wabbajack.Common.Http
+
+namespace Wabbajack.Lib.Http
 {
     public static class ClientFactory
     {

Wabbajack.Lib/LibCefHelpers/Init.cs

@@ -18,9 +18,9 @@ namespace Wabbajack.Lib.LibCefHelpers
 {
     public static class Helpers
     {
-        public static Common.Http.Client GetClient(IEnumerable<Cookie> cookies, string referer)
+        public static Wabbajack.Lib.Http.Client GetClient(IEnumerable<Cookie> cookies, string referer)
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             client.Headers.Add(("Referrer", referer));
             client.Cookies.AddRange(cookies.Select(cookie => new System.Net.Cookie(cookie.Name, cookie.Value, cookie.Path, cookie.Domain)));
             return client;

Wabbajack.Lib/Metrics.cs

@@ -7,9 +7,10 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Win32;
+using Wabbajack.Common;
 using Wabbajack.Common.Exceptions;
 
-namespace Wabbajack.Common
+namespace Wabbajack.Lib
 {
     public class Metrics
     {

Wabbajack.Lib/ModListRegistry/ModListMetadata.cs

@@ -62,7 +62,7 @@ namespace Wabbajack.Lib.ModListRegistry
 
         public static async Task<List<ModlistMetadata>> LoadFromGithub()
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             Utils.Log("Loading ModLists from GitHub");
             var metadataResult = client.GetStringAsync(Consts.ModlistMetadataURL);
             var summaryResult = client.GetStringAsync(Consts.ModlistSummaryURL);

Wabbajack.Lib/NexusApi/NexusApi.cs

@@ -11,7 +11,6 @@ using Wabbajack.Common;
 using Wabbajack.Lib.Downloaders;
 using System.Threading;
 using Wabbajack.Common.Exceptions;
-using Wabbajack.Common.Http;
 using Wabbajack.Lib.WebAutomation;
 
 namespace Wabbajack.Lib.NexusApi
@@ -20,7 +19,7 @@ namespace Wabbajack.Lib.NexusApi
     {
         private static readonly string API_KEY_CACHE_FILE = "nexus.key_cache";
        
-        public Common.Http.Client HttpClient { get; } = new Common.Http.Client();
+        public Wabbajack.Lib.Http.Client HttpClient { get; } = new Wabbajack.Lib.Http.Client();
 
         #region Authentication
 
@@ -255,7 +254,7 @@ namespace Wabbajack.Lib.NexusApi
             return new NexusApiClient(apiKey);
         }
 
-        public async Task<T> Get<T>(string url, Client? client = null)
+        public async Task<T> Get<T>(string url, Wabbajack.Lib.Http.Client? client = null)
         {
             client ??= HttpClient;
             int retries = 0;

Wabbajack.Lib/NexusApi/NexusUpdatesFeeds.cs

@@ -46,7 +46,7 @@ namespace Wabbajack.Lib.NexusApi
 
         private static async Task<IEnumerable<UpdateRecord>> GetFeed(Uri uri)
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
             var data = await client.GetStringAsync(uri);
             var reader = XmlReader.Create(new StringReader(data));
             var results = SyndicationFeed.Load(reader);

Wabbajack.Lib/StatusMessages/ManuallyDownloadFile.cs

@@ -12,8 +12,8 @@ namespace Wabbajack.Lib
         public override string ShortDescription { get; } = string.Empty;
         public override string ExtendedDescription { get; } = string.Empty;
 
-        private TaskCompletionSource<(Uri, Common.Http.Client)> _tcs = new TaskCompletionSource<(Uri, Common.Http.Client)>();
+        private TaskCompletionSource<(Uri, Wabbajack.Lib.Http.Client)> _tcs = new TaskCompletionSource<(Uri, Wabbajack.Lib.Http.Client)>();
-        public Task<(Uri, Common.Http.Client)> Task => _tcs.Task;
+        public Task<(Uri, Wabbajack.Lib.Http.Client)> Task => _tcs.Task;
 
         private ManuallyDownloadFile(ManualDownloader.State state)
         {
@@ -30,7 +30,7 @@ namespace Wabbajack.Lib
             _tcs.SetCanceled();
         }
 
-        public void Resume(Uri s, Common.Http.Client client)
+        public void Resume(Uri s, Wabbajack.Lib.Http.Client client)
         {
             _tcs.SetResult((s, client));
         }

Wabbajack.Lib/Validation/ValidateModlist.cs

@@ -24,7 +24,7 @@ namespace Wabbajack.Lib.Validation
 
         public async Task LoadListsFromGithub()
         {
-            var client = new Common.Http.Client();
+            var client = new Wabbajack.Lib.Http.Client();
 
             Utils.Log("Loading server whitelist");
             using (var response = await client.GetAsync(Consts.ServerWhitelistURL))

Wabbajack.Server.Test/ABuildServerSystemTest.cs

@@ -7,7 +7,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using Wabbajack.Common;
-using Wabbajack.Common.Http;
 using Wabbajack.Common.StatusFeed;
 using Wabbajack.Lib;
 using Wabbajack.Lib.Downloaders;
@@ -145,10 +144,10 @@ namespace Wabbajack.BuildServer.Test
     [Collection("ServerTests")]
     public class ABuildServerSystemTest : XunitContextBase, IClassFixture<SingletonAdaptor<BuildServerFixture>>
     {
-        protected readonly Client _client;
+        protected readonly Wabbajack.Lib.Http.Client _client;
         private readonly IDisposable _unsubMsgs;
         private readonly IDisposable _unsubErr;
-        protected Client _authedClient;
+        protected Wabbajack.Lib.Http.Client _authedClient;
         protected WorkQueue _queue;
         private Random _random;
 
@@ -159,8 +158,8 @@ namespace Wabbajack.BuildServer.Test
             _unsubMsgs = Utils.LogMessages.OfType<IInfo>().Subscribe(onNext: msg => XunitContext.WriteLine(msg.ShortDescription));
             _unsubErr = Utils.LogMessages.OfType<IUserIntervention>().Subscribe(msg =>
                 XunitContext.WriteLine("ERROR: User intervention required: " + msg.ShortDescription));
-            _client = new Client();
+            _client = new Wabbajack.Lib.Http.Client();
-            _authedClient = new Client();
+            _authedClient = new Wabbajack.Lib.Http.Client();
             Fixture = fixture.Deref();
             _authedClient.Headers.Add(("x-api-key", Fixture.APIKey));
             AuthorAPI.ApiKeyOverride = Fixture.APIKey;

Wabbajack.Server.Test/MetricsTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Dapper;
-using Wabbajack.Common;
+using Wabbajack.Lib;
 using Wabbajack.Server.DataLayer;
 using Wabbajack.Server.DTOs;
 using Xunit;

Wabbajack.Server/Services/DiscordWebHook.cs

@@ -49,7 +49,7 @@ namespace Wabbajack.Server.Services
                 };
                 if (url == null) return;
 
-                var client = new Common.Http.Client();
+                var client = new Wabbajack.Lib.Http.Client();
                 await client.PostAsync(url, new StringContent(message.ToJson(true), Encoding.UTF8, "application/json"));
             }
             catch (Exception ex)

Wabbajack/View Models/Settings/LoginManagerVM.cs

@@ -84,7 +84,7 @@ namespace Wabbajack
             {
                 if (Login.IconUri == null) return;
 
-                using var img = await new Common.Http.Client().GetAsync(Login.IconUri, errorsAsExceptions:false);
+                using var img = await new Wabbajack.Lib.Http.Client().GetAsync(Login.IconUri, errorsAsExceptions:false);
                 if (!img.IsSuccessStatusCode) return;
 
                 var icoData = new MemoryStream(await img.Content.ReadAsByteArrayAsync());