KnightsOfTheArk
/
DepotDownloader
mirror of https://github.com/SteamRE/DepotDownloader.git
23
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented manifest request codes

Browse Source
pull/319/head
Ryan Kistner 4 years ago
parent 703929dad0
commit 969a394fdd
3 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File

16
DepotDownloader/CDNClientPool.cs
Unescape Escape View File

@ -140,22 +140,6 @@ namespace DepotDownloader
return connection;
}
public async Task<string> AuthenticateConnection(uint appId, uint depotId, Server server)
{
var host = steamSession.ResolveCDNTopLevelHost(server.Host);
var cdnKey = $"{depotId:D}:{host}";
steamSession.RequestCDNAuthToken(appId, depotId, host, cdnKey);
if (steamSession.CDNAuthTokens.TryGetValue(cdnKey, out var authTokenCallbackPromise))
{
var result = await authTokenCallbackPromise.Task;
return result.Token;
}
throw new Exception($"Failed to retrieve CDN token for server {server.Host} depot {depotId}");
}
public void ReturnConnection(Server server)
{
if (server == null) return;

91
DepotDownloader/ContentDownloader.cs
Unescape Escape View File

@ -36,18 +36,27 @@ namespace DepotDownloader
private sealed class DepotDownloadInfo
{
public uint id { get; private set; }
public uint appId { get; private set; }
public ulong manifestId { get; private set; }
public string branch { get; private set; }
public string installDir { get; private set; }
public string contentName { get; private set; }
public ulong manifestId { get; private set; }
public byte[] depotKey;
public byte[] depotKey { get; private set; }
public DepotDownloadInfo(uint depotid, ulong manifestId, string installDir, string contentName)
public DepotDownloadInfo(
uint depotid, uint appId, ulong manifestId, string branch,
string installDir, string contentName,
byte[] depotKey)
{
this.id = depotid;
this.appId = appId;
this.manifestId = manifestId;
this.branch = branch;
this.installDir = installDir;
this.contentName = contentName;
this.depotKey = depotKey;
}
}
@ -202,6 +211,20 @@ namespace DepotDownloader
return uint.Parse(buildid.Value);
}
static uint GetSteam3DepotProxyAppId(uint depotId, uint appId)
{
var depots = GetSteam3AppSection(appId, EAppInfoSection.Depots);
var depotChild = depots[depotId.ToString()];
if (depotChild == KeyValue.Invalid)
return INVALID_APP_ID;
if (depotChild["depotfromapp"] == KeyValue.Invalid)
return INVALID_APP_ID;
return depotChild["depotfromapp"].AsUnsignedInteger();
}
static ulong GetSteam3DepotManifest(uint depotId, uint appId, string branch)
{
var depots = GetSteam3AppSection(appId, EAppInfoSection.Depots);
@ -626,27 +649,30 @@ namespace DepotDownloader
}
}
var uVersion = GetSteam3AppBuildNumber(appId, branch);
// For depots that are proxied through depotfromapp, we still need to resolve the proxy app id
var containingAppId = appId;
var proxyAppId = GetSteam3DepotProxyAppId(depotId, appId);
if (proxyAppId != INVALID_APP_ID) containingAppId = proxyAppId;
string installDir;
if (!CreateDirectories(depotId, uVersion, out installDir))
steam3.RequestDepotKey(depotId, containingAppId);
if (!steam3.DepotKeys.ContainsKey(depotId))
{
Console.WriteLine("Error: Unable to create install directories!");
Console.WriteLine("No valid depot key for {0}, unable to download.", depotId);
return null;
}
steam3.RequestDepotKey(depotId, appId);
if (!steam3.DepotKeys.ContainsKey(depotId))
var uVersion = GetSteam3AppBuildNumber(appId, branch);
string installDir;
if (!CreateDirectories(depotId, uVersion, out installDir))
{
Console.WriteLine("No valid depot key for {0}, unable to download.", depotId);
Console.WriteLine("Error: Unable to create install directories!");
return null;
}
var depotKey = steam3.DepotKeys[depotId];
var info = new DepotDownloadInfo(depotId, manifestId, installDir, contentName);
info.depotKey = depotKey;
return info;
return new DepotDownloadInfo(depotId, containingAppId, manifestId, branch, installDir, contentName, depotKey);
}
private class ChunkMatch
@ -837,9 +863,34 @@ namespace DepotDownloader
{
connection = cdnPool.GetConnection(cts.Token);
DebugLog.WriteLine("ContentDownloader", "Downloading manifest {0} from {1} with {2}", depot.manifestId, connection, cdnPool.ProxyServer != null ? cdnPool.ProxyServer : "no proxy");
depotManifest = await cdnPool.CDNClient.DownloadManifestAsync(depot.id, depot.manifestId, manifestRequestCode: 0,
connection, depot.depotKey, cdnPool.ProxyServer).ConfigureAwait(false);
// In order to download this manifest, we need the current manifest request code
// The manifest request code is time limited, so it must be retrieved on demand
// TODO: for retried requests, is there enough leeway to use a cached code?
var manifestRequestCode = await steam3.GetDepotManifestRequestCodeAsync(
depot.id,
depot.appId,
depot.manifestId,
depot.branch);
if (manifestRequestCode == 0)
{
DebugLog.WriteLine("ContentDownloader",
"No manifest request code was returned for {0} {1}",
depot.id, depot.manifestId);
}
DebugLog.WriteLine("ContentDownloader",
"Downloading manifest {0} from {1} with {2}",
depot.manifestId,
connection,
cdnPool.ProxyServer != null ? cdnPool.ProxyServer : "no proxy");
depotManifest = await cdnPool.CDNClient.DownloadManifestAsync(
depot.id,
depot.manifestId,
manifestRequestCode,
connection,
depot.depotKey,
cdnPool.ProxyServer).ConfigureAwait(false);
cdnPool.ReturnConnection(connection);
}
@ -1236,8 +1287,12 @@ namespace DepotDownloader
connection = cdnPool.GetConnection(cts.Token);
DebugLog.WriteLine("ContentDownloader", "Downloading chunk {0} from {1} with {2}", chunkID, connection, cdnPool.ProxyServer != null ? cdnPool.ProxyServer : "no proxy");
chunkData = await cdnPool.CDNClient.DownloadDepotChunkAsync(depot.id, data,
connection, depot.depotKey, cdnPool.ProxyServer).ConfigureAwait(false);
chunkData = await cdnPool.CDNClient.DownloadDepotChunkAsync(
depot.id,
data,
connection,
depot.depotKey,
cdnPool.ProxyServer).ConfigureAwait(false);
cdnPool.ReturnConnection(connection);
}

47
DepotDownloader/Steam3Session.cs
Unescape Escape View File

@ -317,50 +317,19 @@ namespace DepotDownloader
}, () => { return completed; });
}
public string ResolveCDNTopLevelHost(string host)
{
// SteamPipe CDN shares tokens with all hosts
if (host.EndsWith(".steampipe.steamcontent.com"))
{
return "steampipe.steamcontent.com";
}
if (host.EndsWith(".steamcontent.com"))
{
return "steamcontent.com";
}
return host;
}
public void RequestCDNAuthToken(uint appid, uint depotid, string host, string cdnKey)
public async Task<ulong> GetDepotManifestRequestCodeAsync(uint depotId, uint appId, ulong manifestId, string branch)
{
if (CDNAuthTokens.ContainsKey(cdnKey) || bAborted)
return;
if (!CDNAuthTokens.TryAdd(cdnKey, new TaskCompletionSource<SteamApps.CDNAuthTokenCallback>()))
return;
if (bAborted)
return 0;
var completed = false;
var timeoutDate = DateTime.Now.AddSeconds(10);
Action<SteamApps.CDNAuthTokenCallback> cbMethod = cdnAuth =>
{
completed = true;
Console.WriteLine("Got CDN auth token for {0} result: {1} (expires {2})", host, cdnAuth.Result, cdnAuth.Expiration);
var requestCode = await steamContent.GetManifestRequestCode(depotId, appId, manifestId, branch);
if (cdnAuth.Result != EResult.OK)
{
Abort();
return;
}
CDNAuthTokens[cdnKey].TrySetResult(cdnAuth);
};
Console.WriteLine("Got manifest request code for {0} {1} result: {2}",
depotId, manifestId,
requestCode);
WaitUntilCallback(() =>
{
callbacks.Subscribe(steamApps.GetCDNAuthToken(appid, depotid, host), cbMethod);
}, () => { return completed || DateTime.Now >= timeoutDate; });
return requestCode;
}
public void CheckAppBetaPassword(uint appid, string password)

Write Preview
Loading…
Cancel
Save