Skip to content

fix: API error not passing message #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 13, 2022
Merged

fix: API error not passing message #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90ce583
fix: API error not passing message
DenverCoder1 Dec 13, 2022
6ccbd2d
Undo adding of type
DenverCoder1 Dec 13, 2022
56f5138
Also check if data is empty
DenverCoder1 Dec 13, 2022
b7a9132
style: Formatted code with Prettier
github-actions[bot] Dec 13, 2022
e31a113
Retry if the data is not returned
DenverCoder1 Dec 13, 2022
c70a4d7
Log error and continue instead of throwing
DenverCoder1 Dec 13, 2022
4ee3371
don't decode if not string
DenverCoder1 Dec 13, 2022
98336bc
Better error logging in case of server exception
DenverCoder1 Dec 13, 2022
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
4 changes: 4 additions & 0 deletions src/demo/preview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,9 @@
try {
renderOutput($demoStats);
} catch (InvalidArgumentException | AssertionError $error) {
error_log("Error {$error->getCode()}: {$error->getMessage()}");
if ($error->getCode() >= 500) {
error_log($error->getTraceAsString());
}
renderOutput($error->getMessage(), $error->getCode());
}
4 changes: 4 additions & 0 deletions src/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,9 @@
}
renderOutput($stats);
} catch (InvalidArgumentException | AssertionError $error) {
error_log("Error {$error->getCode()}: {$error->getMessage()}");
if ($error->getCode() >= 500) {
error_log($error->getTraceAsString());
}
renderOutput($error->getMessage(), $error->getCode());
}
17 changes: 8 additions & 9 deletions src/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,19 @@ function getContributionGraphs(string $user): array
$response = [];
foreach ($requests as $year => $request) {
$contents = curl_multi_getcontent($request);
$decoded = json_decode($contents);
$decoded = is_string($contents) ? json_decode($contents) : null;
// if response is empty or invalid, retry request one time
if (empty($decoded)) {
if (empty($decoded) || empty($decoded->data)) {
$query = buildContributionGraphQuery($user, $year);
$request = getGraphQLCurlHandle($query);
$contents = curl_exec($request);
if ($contents === false) {
error_log("Failed to decode response for $user's $year contributions after 2 attempts.");
$decoded = is_string($contents) ? json_decode($contents) : null;
// if the response is still empty or invalid, log an error and skip the year
if (empty($decoded) || empty($decoded->data)) {
$message = $decoded->errors[0]->message ?? ($decoded->message ?? "An API error occurred.");
error_log("Failed to decode response for $user's $year contributions after 2 attempts. $message");
continue;
}
$decoded = json_decode($contents);
}
array_unshift($response, $decoded);
}
Expand Down Expand Up @@ -198,7 +200,7 @@ function getContributionYears(string $user): array
}
$message = $response->errors[0]->message ?? "An API error occurred.";
// Other errors that contain a message field
throw new InvalidArgumentException($message, 500);
throw new InvalidArgumentException($message, 502);
}
// API did not return data
if (!isset($response->data) && isset($response->message)) {
Expand All @@ -223,9 +225,6 @@ function getContributionDates(array $contributionGraphs): array
// sort contribution calendars by year key
ksort($contributionGraphs);
foreach ($contributionGraphs as $graph) {
if (!empty($graph->errors)) {
throw new AssertionError($graph->data->errors[0]->message, 502);
}
$weeks = $graph->data->user->contributionsCollection->contributionCalendar->weeks;
foreach ($weeks as $week) {
foreach ($week->contributionDays as $day) {
Expand Down