Elgato_dark/console
1
0
Fork 0
mirror of https://github.com/graphql-hive/console synced 2026-05-23 09:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add time out to AWSClient (#5326)

Browse source
This commit is contained in:
Kamil Kisiela 2024-08-09 13:28:18 +02:00 committed by GitHub
parent 5d3fddf4ce
commit 3100043bb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/services/api/src/modules/schema/providers/artifact-storage-writer.ts
View file

@ -62,6 +62,9 @@ export class ArtifactStorageWriter {
// This boolean makes Google Cloud Storage & AWS happy.
signQuery: true,
},
// Add a timeout to prevent hanging the request.
// Should be more than enough to write an artifact.
timeout: 10_000,
});
if (result.status !== 200) {
@ -95,6 +98,9 @@ export class ArtifactStorageWriter {
// This boolean makes Google Cloud Storage & AWS happy.
signQuery: true,
},
// Add a timeout to prevent hanging the request.
// Should be more than enough to delete an artifact.
timeout: 5_000,
});
if (result.status !== 204) {

25
packages/services/cdn-worker/src/aws.ts
View file

@ -45,6 +45,10 @@ type AwsRequestInit = RequestInit & {
allHeaders?: boolean;
singleEncode?: boolean;
};
/**
* Timeout in milliseconds for each fetch call.
*/
timeout?: number;
};
export class AwsClient {
@ -91,7 +95,15 @@ export class AwsClient {
async sign(input: RequestInfo, init?: AwsRequestInit) {
if (input instanceof Request) {
const { method, url, headers, body } = input;
init = Object.assign({ method, url, headers }, init);
init = Object.assign(
{
method,
url,
headers,
signal: init?.timeout ? AbortSignal.timeout(init.timeout) : undefined,
},
init,
);
if (init.body == null && headers.has('Content-Type')) {
init.body =
body != null && headers.has('X-Amz-Content-Sha256')
@ -120,9 +132,14 @@ export class AwsClient {
if (i === this.retries) {
return fetched; // No need to await if we're returning anyway
}
const res = await fetched;
if (res.status < 500 && res.status !== 429 && res.status !== 499) {
return res;
try {
const res = await fetched;
if (res.status < 500 && res.status !== 429 && res.status !== 499) {
return res;
}
} catch (error) {
// Retry also when there's an exception
console.error(error);
}
await new Promise(resolve =>
setTimeout(resolve, Math.random() * this.initRetryMs * Math.pow(2, i)),