Skip to content

feat: add retry logic to FDv2 polling initializer #1230

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
kinyoklion merged 4 commits into from
Mar 30, 2026
Merged

feat: add retry logic to FDv2 polling initializer #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83d5d76
feat: add retry logic to FDv2 polling initializer
kinyoklion Mar 27, 2026
13c04b6
fix: replace unicode arrow with ASCII in comments
kinyoklion Mar 27, 2026
3f47ff1
Merge branch 'main' into rlamb/polling-initializer-retries
kinyoklion Mar 27, 2026
1dd4150
fix: update BrowserClient mock to return valid FDv2 responses
kinyoklion Mar 27, 2026
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
30 changes: 29 additions & 1 deletion packages/sdk/browser/__tests__/BrowserClient.mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function mockResponse(value: string, statusCode: number) {
// @ts-ignore
headers: {
// @ts-ignore
get: jest.fn(),
get: jest.fn(() => null),
// @ts-ignore
keys: jest.fn(),
// @ts-ignore
Expand Down Expand Up @@ -61,6 +61,34 @@ export function makeRequests(): Requests {
200,
)();
}
if (url.includes('/sdk/poll/eval')) {
return mockFetch(
JSON.stringify({
events: [
{
event: 'server-intent',
data: {
payloads: [{ id: 'mock', target: 1, intentCode: 'xfer-full', reason: 'mock' }],
},
},
{
event: 'put-object',
data: {
kind: 'flag-eval',
key: 'flagA',
version: 1,
object: { value: true, trackEvents: false },
},
},
{
event: 'payload-transferred',
data: { state: 'mock-state', version: 1, id: 'mock' },
},
],
}),
200,
)();
}
return mockFetch('{ "flagA": true }', 200)();
}),
// @ts-ignore
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/sdk-client/__tests__/datasource/SourceFactoryProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ it('ping handler uses the factory selector getter, not a stale reference', () =>
pingHandler.handlePing();

// The ping poll should use the fresh selector, not 'selector-v1'
expect(mockFdv2Poll).toHaveBeenCalledWith(expect.anything(), 'selector-v2', false, ctx.logger);
expect(mockFdv2Poll).toHaveBeenCalledWith(expect.anything(), 'selector-v2', ctx.logger);
});

it('ping handler uses per-entry endpoint-overridden requestor', () => {
Expand All @@ -361,5 +361,5 @@ it('ping handler uses per-entry endpoint-overridden requestor', () => {

// The ping poll should use the overridden requestor, not ctx.requestor
const overriddenRequestor = mockMakeFDv2Requestor.mock.results[0].value;
expect(mockFdv2Poll).toHaveBeenCalledWith(overriddenRequestor, undefined, false, ctx.logger);
expect(mockFdv2Poll).toHaveBeenCalledWith(overriddenRequestor, undefined, ctx.logger);
});
101 changes: 22 additions & 79 deletions packages/shared/sdk-client/__tests__/datasource/fdv2/PollingBase.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('given a successful FDv2 response', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('changeSet');
if (result.type === 'changeSet') {
Expand All @@ -48,7 +48,7 @@ describe('given a successful FDv2 response', () => {
body,
});

await poll(requestor, 'my-basis', false, logger);
await poll(requestor, 'my-basis', logger);

expect(requestor.poll).toHaveBeenCalledWith('my-basis');
});
Expand All @@ -62,7 +62,7 @@ describe('given a 304 Not Modified response', () => {
body: null,
});

const result = await poll(requestor, 'some-basis', false, logger);
const result = await poll(requestor, 'some-basis', logger);

expect(result.type).toBe('changeSet');
if (result.type === 'changeSet') {
Expand All @@ -76,7 +76,7 @@ describe('given a network error', () => {
it('returns interrupted for synchronizer mode', async () => {
const requestor = makeErrorRequestor(new Error('connection reset'));

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -85,18 +85,6 @@ describe('given a network error', () => {
expect(result.errorInfo?.message).toBe('connection reset');
}
});

it('returns terminal error for initializer mode', async () => {
const requestor = makeErrorRequestor(new Error('connection reset'));

const result = await poll(requestor, undefined, true, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
expect(result.state).toBe('terminal_error');
expect(result.errorInfo?.kind).toBe(DataSourceErrorKind.NetworkError);
}
});
});

describe('given an unrecoverable HTTP error', () => {
Expand All @@ -107,7 +95,7 @@ describe('given an unrecoverable HTTP error', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -123,7 +111,7 @@ describe('given an unrecoverable HTTP error', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

if (result.type === 'status') {
expect(result.state).toBe('terminal_error');
Expand All @@ -139,7 +127,7 @@ describe('given a recoverable HTTP error', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -155,26 +143,12 @@ describe('given a recoverable HTTP error', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

if (result.type === 'status') {
expect(result.state).toBe('interrupted');
}
});

it('returns terminal error for initializer mode on 500', async () => {
const requestor = makeRequestor({
status: 500,
headers: makeHeaders(),
body: null,
});

const result = await poll(requestor, undefined, true, logger);

if (result.type === 'status') {
expect(result.state).toBe('terminal_error');
}
});
});

describe('given x-ld-fd-fallback header', () => {
Expand All @@ -186,7 +160,7 @@ describe('given x-ld-fd-fallback header', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.fdv1Fallback).toBe(true);
});
Expand All @@ -199,7 +173,7 @@ describe('given x-ld-fd-fallback header', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.fdv1Fallback).toBe(false);
});
Expand All @@ -211,7 +185,7 @@ describe('given x-ld-fd-fallback header', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.fdv1Fallback).toBe(true);
});
Expand All @@ -226,7 +200,7 @@ describe('given x-ld-envid header', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

if (result.type === 'changeSet') {
expect(result.environmentId).toBe('env-abc-123');
Expand All @@ -240,7 +214,7 @@ describe('given x-ld-envid header', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

if (result.type === 'changeSet') {
expect(result.environmentId).toBe('env-abc-123');
Expand All @@ -256,28 +230,13 @@ describe('given malformed JSON response', () => {
body: '{invalid json',
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

if (result.type === 'status') {
expect(result.state).toBe('interrupted');
expect(result.errorInfo?.kind).toBe(DataSourceErrorKind.InvalidData);
}
});

it('returns terminal error for initializer mode', async () => {
const requestor = makeRequestor({
status: 200,
headers: makeHeaders(),
body: '{invalid json',
});

const result = await poll(requestor, undefined, true, logger);

if (result.type === 'status') {
expect(result.state).toBe('terminal_error');
expect(result.errorInfo?.kind).toBe(DataSourceErrorKind.InvalidData);
}
});
});

describe('given valid JSON without an events array', () => {
Expand All @@ -288,7 +247,7 @@ describe('given valid JSON without an events array', () => {
body: '{"notEvents": true}',
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -297,22 +256,6 @@ describe('given valid JSON without an events array', () => {
expect(result.errorInfo?.message).toContain('missing or invalid events array');
}
});

it('returns terminal error for initializer mode', async () => {
const requestor = makeRequestor({
status: 200,
headers: makeHeaders(),
body: '{"events": "not-an-array"}',
});

const result = await poll(requestor, undefined, true, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
expect(result.state).toBe('terminal_error');
expect(result.errorInfo?.kind).toBe(DataSourceErrorKind.InvalidData);
}
});
});

describe('given an empty response body', () => {
Expand All @@ -323,7 +266,7 @@ describe('given an empty response body', () => {
body: null,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand Down Expand Up @@ -352,7 +295,7 @@ describe('given a goodbye event in the response', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand Down Expand Up @@ -382,7 +325,7 @@ describe('given a server error event in the response', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -408,7 +351,7 @@ describe('given a response with no payload-transferred event', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('status');
if (result.type === 'status') {
Expand All @@ -433,7 +376,7 @@ describe('given an intent with code none', () => {
body,
});

const result = await poll(requestor, undefined, false, logger);
const result = await poll(requestor, undefined, logger);

expect(result.type).toBe('changeSet');
if (result.type === 'changeSet') {
Expand Down Expand Up @@ -473,7 +416,7 @@ describe('given a partial (changes) transfer', () => {
body,
});

const result = await poll(requestor, 'old-state', false, logger);
const result = await poll(requestor, 'old-state', logger);

expect(result.type).toBe('changeSet');
if (result.type === 'changeSet') {
Expand Down Expand Up @@ -515,7 +458,7 @@ describe('given a delete-object event', () => {
body,
});

const result = await poll(requestor, 'old-state', false, logger);
const result = await poll(requestor, 'old-state', logger);

expect(result.type).toBe('changeSet');
if (result.type === 'changeSet') {
Expand Down
Loading
Loading