Skip to content

fix(typescript): clear timeout handle after fetch #32

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

Open
maxceem wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(typescript): clear timeout handle after fetch #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions xdk-gen/templates/typescript/http_client.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,28 @@ export class HttpClient {

// Handle timeout
let signal = options.signal;
let timeoutId: ReturnType<typeof setTimeout> | undefined;

if (options.timeout && options.timeout > 0 && !signal) {
const controller = new AbortController();
setTimeout(() => controller.abort(), options.timeout);
timeoutId = setTimeout(() => controller.abort(), options.timeout);
signal = controller.signal;
}

const response = await this.fetch(url, {
method: options.method || 'GET',
headers: options.headers as any,
body: body as any,
signal: signal,
});

return response as HttpResponse;
try {
const response = await this.fetch(url, {
method: options.method || 'GET',
headers: options.headers as any,
body: body as any,
signal: signal,
});

return response as HttpResponse;
} finally {
if (timeoutId !== undefined) {
clearTimeout(timeoutId);
}
}
}

/**
Expand Down