Skip to content

fix: reconnect, tests #280

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
merged 1 commit into from
Mar 23, 2023
Merged

fix: reconnect, tests #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libs/providers/flagd-web/src/lib/flagd-web-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe(FlagdWebProvider.name, () => {
const mockPromiseClient = new MockPromiseClient() as unknown as PromiseClient<typeof Service>;
OpenFeature.setProvider(
new FlagdWebProvider(
{ host: 'fake.com' },
{ host: 'fake.com', maxRetries: -1 },
console,
mockPromiseClient,
mockCallbackClient as unknown as CallbackClient<typeof Service>
Expand Down Expand Up @@ -221,7 +221,7 @@ describe(FlagdWebProvider.name, () => {
});
});

describe.skip('reconnect logic', () => {
describe('reconnect logic', () => {
describe('Infinite maxRetries', () => {
it('should attempt reconnect many times', (done) => {
const mockCallbackClient = new MockCallbackClient();
Expand All @@ -239,7 +239,7 @@ describe(FlagdWebProvider.name, () => {
});
setTimeout(() => {
try {
expect(mockCallbackClient.eventStream.mock.calls.length).toBeGreaterThanOrEqual(4);
expect(mockCallbackClient.eventStream.mock.calls.length).toBeGreaterThanOrEqual(3);
done();
} catch (err) {
done(err);
Expand Down Expand Up @@ -274,7 +274,7 @@ describe(FlagdWebProvider.name, () => {
}, RECONNECT_TIME_LIMIT);
});

it('should NOT attempt reconnect if maxRetries (0) times', (done) => {
it('should NOT attempt reconnect if maxRetries (-1) times', (done) => {
const mockCallbackClient = new MockCallbackClient();
OpenFeature.setProvider(
new FlagdWebProvider(
Expand Down
6 changes: 3 additions & 3 deletions libs/providers/flagd-web/src/lib/flagd-web-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const ERROR_DISABLED = 'DISABLED';

const EVENT_CONFIGURATION_CHANGE = 'configuration_change';
const EVENT_PROVIDER_READY = 'provider_ready';
const BACK_OFF_MULTIPLIER =- 3;
const BACK_OFF_MULTIPLIER = 2;

const INITIAL_DELAY_MS = 100;
type AnyFlagResolutionType = typeof AnyFlag.prototype.value.case;
Expand Down Expand Up @@ -108,7 +108,7 @@ export class FlagdWebProvider implements Provider {
private async retryConnect(context: EvaluationContext) {
this._delayMs = Math.min(this._delayMs * BACK_OFF_MULTIPLIER, this._maxDelay);

return new Promise<void>((resolve, reject) => {
return new Promise<void>((resolve) => {
this._callbackClient.eventStream(
{},
(message) => {
Expand All @@ -129,13 +129,13 @@ export class FlagdWebProvider implements Provider {
}
},
() => {
reject();
this._logger?.error(`${FlagdWebProvider.name}: could not establish connection to flagd`);
if (this._retry < this._maxRetries) {
this._retry++;
setTimeout(() => this.retryConnect(context), this._delayMs);
} else {
this._logger?.warn(`${FlagdWebProvider.name}: max retries reached`);
this.events.emit(ProviderEvents.Error);
}
}
);
Expand Down