Creepso/webstreamr-github
1
0
Fork 0
Code Issues 27 Pull requests 7 Projects Releases 240 Packages Wiki Activity Actions

chore(fetcher): retry timeouts once

Browse source
This commit is contained in:
WebStreamr 2025-08-31 20:12:04 +00:00
parent 3c4507b198
commit 0fc7675560
No known key found for this signature in database
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/Fetcher.test.ts
View file

@ -228,16 +228,16 @@ describe('fetch', () => {
await expect(fetcher.text(ctx, new URL('https://some-exception-url.test/'))).rejects.toBeInstanceOf(TypeError);
});
test('times out', async () => {
test('times out, retries and times out again', async () => {
const mockPool = mockAgent.get('https://some-timeout-url.test');
mockPool.intercept({ path: '/' }).reply(200).delay(20);
mockPool.intercept({ path: '/' }).reply(200).delay(20).persist();
await expect(fetcher.text(ctx, new URL('https://some-timeout-url.test/'), { timeout: 10 })).rejects.toBeInstanceOf(TimeoutError);
});
test('queues requests and throws if queue is full', async () => {
const mockPool = mockAgent.get('https://some-full-queue-url.test');
mockPool.intercept({ path: '/' }).reply(200).delay(20);
mockPool.intercept({ path: '/' }).reply(200).delay(20).persist();
const allPromises = Promise.all([
fetcher.text(ctx, new URL('https://some-full-queue-url.test/'), { queueLimit: 1, queueTimeout: 10 }),
@ -252,12 +252,10 @@ describe('fetch', () => {
test('throws if too many recent requests timed-out', async () => {
const mockPool = mockAgent.get('https://too-many-recent-timeouts-url.test');
mockPool.intercept({ path: '/' }).reply(200).delay(20).persist();
mockPool.intercept({ path: '/' }).reply(200).delay(20);
await expect(fetcher.text(ctx, new URL('https://too-many-recent-timeouts-url.test/'), { timeout: 10, timeoutsCountThrow: 2 })).rejects.toBeInstanceOf(TimeoutError);
mockPool.intercept({ path: '/' }).reply(200).delay(20);
await expect(fetcher.text(ctx, new URL('https://too-many-recent-timeouts-url.test/'), { timeout: 10, timeoutsCountThrow: 2 })).rejects.toBeInstanceOf(TimeoutError);
mockPool.intercept({ path: '/' }).reply(200).delay(20);
await expect(fetcher.text(ctx, new URL('https://too-many-recent-timeouts-url.test/'), { timeout: 10, timeoutsCountThrow: 2 })).rejects.toBeInstanceOf(TooManyTimeoutsError);
});
});

6
src/utils/Fetcher.ts
View file

@ -271,6 +271,12 @@ export class Fetcher {
response = await fetch(finalUrl, finalInit);
} catch (error) {
if (error instanceof DOMException && error.name === 'TimeoutError') {
if (tryCount < 1) {
await new Promise(sleep => setTimeout(sleep, 333));
return await this.fetchWithTimeout(ctx, url, init, ++tryCount);
}
await this.increaseTimeoutsCount(url);
throw new TimeoutError();
}