Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 98 additions & 108 deletions app/src/gfn/catalog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <algorithm>
#include <cctype>
#include <optional>
#include <stdexcept>
#include <string>
#include <unordered_map>
Expand All @@ -26,12 +27,11 @@ constexpr const char* kGraphQlEndpoint = "https://games.geforce.com/graphql"
constexpr const char* kClientVersion = "2.0.80.173";
constexpr const char* kLcarsClientId = "ec7e38d4-03af-4b58-b131-cfb0495903ab";
constexpr const char* kDefaultLocale = "en_US";
constexpr const char* kPanelsQueryHash = "f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0";
constexpr const char* kLibraryWithTimeQueryHash = "039e8c0d553972975485fee56e59f2549d2fdb518e247a42ab5022056a74406f";
constexpr const char* kPlayOrigin = "https://play.geforcenow.com";
constexpr const char* kPlayReferer = "https://play.geforcenow.com/";
constexpr std::size_t kCatalogPageSize = 60;
constexpr std::size_t kCatalogPageBytes = 4 * 1024 * 1024;
constexpr std::size_t kMaxLibraryPages = 50;

std::vector<std::string> BuildGfnLcarsHeaders(
const std::string& token,
Expand Down Expand Up @@ -251,24 +251,6 @@ void ThrowIfGraphQlFailed(json_t* root)
throw std::runtime_error(message);
}

std::string BuildLibraryUrl(const std::string& vpc_id, bool with_library_time)
{
const std::string variables =
std::string("{\"vpcId\":\"") + vpc_id + "\",\"locale\":\"" + kDefaultLocale +
"\",\"panelNames\":[\"LIBRARY\"]}";

const std::string extensions =
std::string("{\"persistedQuery\":{\"sha256Hash\":\"") +
(with_library_time ? kLibraryWithTimeQueryHash : kPanelsQueryHash) + "\"}}";

std::string url = std::string(kGraphQlEndpoint) + "?";
url += "requestType=" + UrlEncode("panels/Library");
url += "&extensions=" + UrlEncode(extensions);
url += "&huId=" + UrlEncode(HexEncode(GenerateRandomBytes(8).data(), 8));
url += "&variables=" + UrlEncode(variables);
return url;
}

std::string ResolveVpcId(
const HttpClient& http_client,
const AuthSession& session)
Expand All @@ -293,66 +275,6 @@ std::string ResolveVpcId(
return server_id.empty() ? std::string("GFN-PC") : server_id;
}

std::vector<GameInfo> ParseLibraryGames(JsonPtr& root)
{
ThrowIfGraphQlFailed(root.get());

std::unordered_map<std::string, size_t> index_by_id;
std::vector<GameInfo> games;

json_t* data = json_object_get(root.get(), "data");
json_t* panels = data ? json_object_get(data, "panels") : nullptr;
if (!json_is_array(panels))
return {};

size_t panel_index = 0;
json_t* panel = nullptr;
json_array_foreach(panels, panel_index, panel)
{
json_t* sections = json_object_get(panel, "sections");
if (!json_is_array(sections))
continue;

size_t section_index = 0;
json_t* section = nullptr;
json_array_foreach(sections, section_index, section)
{
json_t* items = json_object_get(section, "items");
if (!json_is_array(items))
continue;

size_t item_index = 0;
json_t* item = nullptr;
json_array_foreach(items, item_index, item)
{
if (GetString(item, "__typename") != "GameItem")
continue;

json_t* app = json_object_get(item, "app");
if (!json_is_object(app))
continue;

GameInfo game = ParseApp(app);
if (game.id.empty() || game.title.empty())
continue;

const auto existing = index_by_id.find(game.id);
if (existing == index_by_id.end())
{
index_by_id.emplace(game.id, games.size());
games.push_back(std::move(game));
}
else
{
MergeGame(games[existing->second], game);
}
}
}
}

return games;
}

PublicGame ToPublicGame(const GameInfo& source)
{
PublicGame game;
Expand All @@ -375,10 +297,17 @@ PublicGame ToPublicGame(const GameInfo& source)
return game;
}

CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor)
struct AppsPage
{
std::vector<GameInfo> games;
std::optional<std::string> next_cursor;
std::optional<std::size_t> total_count;
};

AppsPage ParseAppsPage(JsonPtr& root, const std::string& cursor)
{
ThrowIfGraphQlFailed(root.get());
CatalogPage page;
AppsPage page;

json_t* data = json_object_get(root.get(), "data");
json_t* apps = data ? json_object_get(data, "apps") : nullptr;
Expand Down Expand Up @@ -409,11 +338,22 @@ CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor)
{
GameInfo parsed = ParseApp(app);
if (!parsed.id.empty() && !parsed.title.empty())
page.games.push_back(ToPublicGame(parsed));
page.games.push_back(std::move(parsed));
}
return page;
}

CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor)
{
AppsPage apps = ParseAppsPage(root, cursor);
CatalogPage page;
page.next_cursor = std::move(apps.next_cursor);
page.total_count = apps.total_count;
for (const GameInfo& game : apps.games)
page.games.push_back(ToPublicGame(game));
return page;
}

std::string BuildCatalogRequestBody(
const std::string& vpc_id, const std::string& search_query,
const std::string& cursor)
Expand Down Expand Up @@ -462,6 +402,39 @@ query GetSearchFilterResults($vpcId: String!, $locale: String!, $sortString: Str
return DumpJson(body.get());
}

std::string BuildLibraryRequestBody(const std::string& vpc_id, const std::string& cursor)
{
static const char* kLibraryQuery = R"GRAPHQL(
query GetLibraryApps($vpcId: String!, $locale: String!, $sortString: String!, $fetchCount: Int!, $cursor: String!, $filters: AppFilterFields!) {
apps(vpcId: $vpcId, language: $locale, orderBy: $sortString, first: $fetchCount, after: $cursor, filters: $filters) {
numberReturned numberSupported
pageInfo { hasNextPage endCursor totalCount }
items {
id title longDescription shortDescription publisherName
images { KEY_ART GAME_BOX_ART TV_BANNER HERO_IMAGE }
variants { id appStore gfn { status library { status selected lastPlayedDate } } }
gfn { playabilityState minimumMembershipTierLabel }
}
}
})GRAPHQL";

JsonPtr body(json_object(), &json_decref);
JsonPtr variables(json_object(), &json_decref);
json_object_set_new(body.get(), "query", json_string(kLibraryQuery));
json_object_set_new(variables.get(), "vpcId", json_string(vpc_id.c_str()));
json_object_set_new(variables.get(), "locale", json_string(kDefaultLocale));
json_object_set_new(
variables.get(), "sortString",
json_string("variants.gfn.library.lastPlayedDate:DESC,computedValues.libraryAddedDate:DESC,sortName:ASC"));
json_object_set_new(variables.get(), "fetchCount", json_integer(kCatalogPageSize));
json_object_set_new(variables.get(), "cursor", json_string(cursor.c_str()));
json_t* filters = json_pack(
"{s:{s:{s:{s:{s:s}}}}}", "variants", "gfn", "library", "status", "notEquals", "NOT_OWNED");
json_object_set_new(variables.get(), "filters", filters);
json_object_set_new(body.get(), "variables", json_incref(variables.get()));
return DumpJson(body.get());
}

std::vector<std::string> BuildGraphQlPostHeaders(const std::string& token)
{
std::vector<std::string> headers = BuildGraphQlHeaders(token);
Expand Down Expand Up @@ -654,37 +627,54 @@ std::vector<GameInfo> GfnClient::FetchLibraryGames(AuthSession& session) const
std::string jwt_token = ResolveSessionJwt(session);
const std::string vpc_id = ResolveVpcId(http_client_, session);

HttpResponse response = http_client_.Get(
BuildLibraryUrl(vpc_id, true),
kUserAgent,
BuildGraphQlHeaders(jwt_token));

if (response.status_code == 401)
std::vector<GameInfo> games;
std::unordered_map<std::string, size_t> index_by_id;
std::string cursor;
for (std::size_t page_index = 0; page_index < kMaxLibraryPages; ++page_index)
{
session = RecoverSavedSession(session, true);
jwt_token = ResolveSessionJwt(session);
response = http_client_.Get(
BuildLibraryUrl(vpc_id, true),
HttpResponse response = http_client_.Post(
kGraphQlEndpoint,
kUserAgent,
BuildGraphQlHeaders(jwt_token));
}
BuildGraphQlPostHeaders(jwt_token),
BuildLibraryRequestBody(vpc_id, cursor),
{}, {.max_body_bytes = kCatalogPageBytes});

if (response.status_code != 200)
{
response = http_client_.Get(
BuildLibraryUrl(vpc_id, false),
kUserAgent,
BuildGraphQlHeaders(jwt_token));
}
if (response.status_code == 401)
{
session = RecoverSavedSession(session, true);
jwt_token = ResolveSessionJwt(session);
response = http_client_.Post(
kGraphQlEndpoint,
kUserAgent,
BuildGraphQlPostHeaders(jwt_token),
BuildLibraryRequestBody(vpc_id, cursor),
{}, {.max_body_bytes = kCatalogPageBytes});
}

if (response.status_code != 200)
{
throw std::runtime_error(
"Library fetch failed with HTTP " + std::to_string(response.status_code));
if (response.status_code != 200)
{
throw std::runtime_error(
"Library fetch failed with HTTP " + std::to_string(response.status_code));
}

JsonPtr root = LoadJson(response.body);
AppsPage page = ParseAppsPage(root, cursor);
for (GameInfo& game : page.games)
{
const auto existing = index_by_id.find(game.id);
if (existing != index_by_id.end())
{
MergeGame(games[existing->second], game);
continue;
}
index_by_id.emplace(game.id, games.size());
games.push_back(std::move(game));
}
if (!page.next_cursor)
break;
cursor = std::move(*page.next_cursor);
}

JsonPtr root = LoadJson(response.body);
std::vector<GameInfo> games = ParseLibraryGames(root);
ApplyPlayHistory(games, LoadPlayHistory());
return games;
}
Expand Down
20 changes: 8 additions & 12 deletions app/src/stream/audio/AudioPipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ struct AudioPipeline::Impl {
std::atomic<bool> output_ready {false};
std::atomic<bool> output_started {false};
size_t queued_output_buffers = 0;
uint64_t played_sample_base = 0;
uint64_t released_samples = 0;
std::atomic<uint64_t> submitted_samples {0};
std::atomic<uint64_t> played_samples {0};
std::atomic<uint64_t> played_samples_observed_at_us {0};
Expand Down Expand Up @@ -175,9 +175,7 @@ struct AudioPipeline::Impl {
slot.buffer.data_offset = 0;
slot.free = true;
}
u64 raw_played = 0;
if (R_SUCCEEDED(audoutGetAudioOutPlayedSampleCount(&raw_played)))
played_sample_base = raw_played;
released_samples = 0;
output_ready.store(true);
log("INIT ok backend=audout rate=48000 channels=2 frameSamples=480 prebuffer=" +
std::to_string(prime_packets) + " buffers=24 outputLimit=" +
Expand Down Expand Up @@ -216,12 +214,8 @@ struct AudioPipeline::Impl {
}

void refresh_played_samples() {
u64 raw_played = 0;
if (R_FAILED(audoutGetAudioOutPlayedSampleCount(&raw_played)))
return;
const uint64_t relative = raw_played >= played_sample_base ? raw_played - played_sample_base : raw_played;
std::lock_guard<std::mutex> lock(sender_report_mutex);
played_samples.store(std::min(relative, submitted_samples.load()),
played_samples.store(std::min(released_samples, submitted_samples.load()),
std::memory_order_relaxed);
played_samples_observed_at_us.store(monotonic_us(), std::memory_order_release);
playback_timeline.discardBefore(played_samples.load(std::memory_order_relaxed));
Expand All @@ -234,8 +228,11 @@ struct AudioPipeline::Impl {
released && released_count > 0) {
for (auto& slot : output_slots) {
if (&slot.buffer == released) {
if (!slot.free && queued_output_buffers > 0)
--queued_output_buffers;
if (!slot.free) {
released_samples += slot.buffer.data_size / (kChannels * sizeof(int16_t));
if (queued_output_buffers > 0)
--queued_output_buffers;
}
slot.free = true;
break;
}
Expand Down Expand Up @@ -679,7 +676,6 @@ bool AudioPipeline::start() {
impl_->submitted_samples.store(0);
impl_->played_samples.store(0);
impl_->played_samples_observed_at_us.store(0);
impl_->played_sample_base = 0;
{
std::lock_guard<std::mutex> lock(impl_->sender_report_mutex);
impl_->playback_timeline.clear();
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-streaming-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ printf 'PASS deko_renderer_quality_snapshot\n'
run_cpp audio_pipeline -Itests/stream_stubs -Iextern/libpeer/src app/src/stream/audio/AudioPipeline.cpp
bash tests/run_audio_video_underrun_test.sh
printf 'PASS audio_video_underrun\n'
for scenario in timeline ssrc red; do
for scenario in timeline ssrc red stuck_counter; do
"$out/audio_pipeline" "$scenario"
printf 'PASS audio_pipeline/%s\n' "$scenario"
done
Expand Down
Loading
Loading