Fixed the number of Github API requests that were being executed twice.

This commit is contained in:
ryo-ma 2023-09-28 00:56:48 +09:00
parent 85f8064807
commit a4d50a11db
3 changed files with 39 additions and 15 deletions

View file

@ -101,4 +101,4 @@ async function app (req: Request): Promise<Response>{
headers: defaultHeaders, headers: defaultHeaders,
}, },
); );
}; }

View file

@ -24,6 +24,7 @@ export class GithubAPIClient {
this.requestUserRepository(username), this.requestUserRepository(username),
]); ]);
if (results.some((r) => r == null)) { if (results.some((r) => r == null)) {
console.error(`Can not find a user with username:'${username}'`);
return null; return null;
} }
return new UserInfo(results[0]!, results[1]!, results[2]!, results[3]!); return new UserInfo(results[0]!, results[1]!, results[2]!, results[3]!);
@ -109,28 +110,50 @@ export class GithubAPIClient {
private async request( private async request(
query: string, query: string,
username: string, username: string,
retryDelay = CONSTANTS.DEFAULT_GITHUB_RETRY_DELAY,
) { ) {
const tokens = [ const tokens = [
Deno.env.get("GITHUB_TOKEN1"), Deno.env.get("GITHUB_TOKEN1"),
Deno.env.get("GITHUB_TOKEN2"), Deno.env.get("GITHUB_TOKEN2"),
]; ];
const maxRetries = tokens.length;
const variables = { username: username }; const variables = { username: username };
let response; let response;
for (const token of tokens) {
for (let attempt = 0; attempt < maxRetries; attempt++) {
try {
response = await soxa.post( response = await soxa.post(
this.apiEndpoint, this.apiEndpoint,
{}, {},
{ {
data: { query: query, variables }, data: { query: query, variables },
headers: { Authorization: `bearer ${token}` }, headers: { Authorization: `bearer ${tokens[attempt]}` },
}, },
).catch((error) => { );
console.error(error.response.data); if (response.data.errors !== undefined) {
}); throw new Error(
response.data.errors.map((e: { message: string; type: string }) =>
e.message
).join("\n"),
);
}
if (response.data.data !== undefined) { if (response.data.data !== undefined) {
break;
}
}
return response.data.data.user; return response.data.data.user;
} else {
return null;
}
} catch (error) {
console.error(
`Attempt ${attempt} failed with GITHUB_TOKEN${attempt + 1}:`,
error,
);
}
console.log(`Retrying in ${retryDelay / 1000} seconds...`);
await new Promise((resolve) => setTimeout(resolve, retryDelay));
}
throw new Error(`Max retries (${maxRetries}) exceeded.`);
} }
} }

View file

@ -65,6 +65,7 @@ export const CONSTANTS = {
DEFAULT_NO_BACKGROUND: false, DEFAULT_NO_BACKGROUND: false,
DEFAULT_NO_FRAME: false, DEFAULT_NO_FRAME: false,
DEFAULT_GITHUB_API: "https://api.github.com/graphql", DEFAULT_GITHUB_API: "https://api.github.com/graphql",
DEFAULT_GITHUB_RETRY_DELAY: 1000,
REVALIDATE_TIME: HOUR_IN_MILLISECONDS, REVALIDATE_TIME: HOUR_IN_MILLISECONDS,
}; };