Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1808 from wabbajack-tools/retry-steam-calls

Browse Source 
Add retry logic to GetAppManifest
This commit is contained in:
Timothy Baldridge
2022-01-10 20:57:57 -07:00
committed by GitHub
parent 55aa6233a3 764d2b15ff
commit c16c9c83d9
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yaml vendored
View File

@ -7,7 +7,7 @@ on:
branches: [ main ] branches: [ main ]
env: env:
VERSION: 3.0.0.0-beta5 VERSION: 3.0.0.0-beta6
jobs: jobs:
build: build:

35
Wabbajack.Networking.Steam/Client.cs
View File

@ -376,24 +376,29 @@ public class Client : IDisposable
public async Task<DepotManifest> GetAppManifest(uint appId, uint depotId, ulong manifestId) public async Task<DepotManifest> GetAppManifest(uint appId, uint depotId, ulong manifestId)
{ {
await LoadCDNServers(); await LoadCDNServers();
var client = _cdnServers.First();
var manifest = await CircuitBreaker.WithAutoRetryAsync<DepotManifest, HttpRequestException>(_logger, async () =>
var uri = new UriBuilder()
{ {
Host = client.Host,
Port = client.Port, var client = _cdnServers.First();
Scheme = client.Protocol.ToString(), var uri = new UriBuilder
Path = $"depot/{depotId}/manifest/{manifestId}/5" {
}.Uri; 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) if (manifest.FilenamesEncrypted)
manifest.DecryptFilenames(await GetDepotKey(depotId, appId)); manifest.DecryptFilenames(await GetDepotKey(depotId, appId));