From 764d2b15ff61a77c189a699822fcf512200a0706 Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Mon, 10 Jan 2022 20:57:11 -0700
Subject: [PATCH] Add retry logic to GetAppManifest

---
 .github/workflows/tests.yaml         |  2 +-
 Wabbajack.Networking.Steam/Client.cs | 35 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5583b16b..91f923fd 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  VERSION: 3.0.0.0-beta5
+  VERSION: 3.0.0.0-beta6
 
 jobs:
   build:
diff --git a/Wabbajack.Networking.Steam/Client.cs b/Wabbajack.Networking.Steam/Client.cs
index 1612acbc..68451ead 100644
--- a/Wabbajack.Networking.Steam/Client.cs
+++ b/Wabbajack.Networking.Steam/Client.cs
@@ -376,24 +376,29 @@ public class Client : IDisposable
     public async Task<DepotManifest> GetAppManifest(uint appId, uint depotId, ulong manifestId)
     {
         await LoadCDNServers();
-        var client = _cdnServers.First();
-
-        var uri = new UriBuilder()
+        
+        var manifest = await CircuitBreaker.WithAutoRetryAsync<DepotManifest, HttpRequestException>(_logger, async () =>
         {
-            Host = client.Host,
-            Port = client.Port,
-            Scheme = client.Protocol.ToString(),
-            Path = $"depot/{depotId}/manifest/{manifestId}/5"
-        }.Uri;
+            
+            var client = _cdnServers.First();
+            var uri = new UriBuilder
+            {
+                Host = client.Host,
+                Port = client.Port,
+                Scheme = client.Protocol.ToString(),
+                Path = $"depot/{depotId}/manifest/{manifestId}/5"
+            }.Uri;
+            
+            var rawData = await _httpClient.GetByteArrayAsync(uri);
 
-        var rawData = await _httpClient.GetByteArrayAsync(uri);
+            using var zip = new ZipArchive(new MemoryStream(rawData));
+            var firstEntry = zip.Entries.First();
+            var data = new MemoryStream();
+            await using var entryStream = firstEntry.Open();
+            await entryStream.CopyToAsync(data);
+            return DepotManifest.Deserialize(data.ToArray());
+        });
 
-        using var zip = new ZipArchive(new MemoryStream(rawData));
-        var firstEntry = zip.Entries.First();
-        var data = new MemoryStream();
-        await using var entryStream = firstEntry.Open();
-        await entryStream.CopyToAsync(data);
-        var manifest = DepotManifest.Deserialize(data.ToArray());
 
         if (manifest.FilenamesEncrypted)
             manifest.DecryptFilenames(await GetDepotKey(depotId, appId));