fix: issue where context updates somtimes missed

Signed-off-by: Todd Baert <toddbaert@gmail.com>

Author: toddbaert

libs/providers/flagd-web/src/lib/flagd-web-provider.spec.ts

@@ -1,6 +1,6 @@
 import { CallbackClient, Code, ConnectError, PromiseClient } from '@bufbuild/connect-web';
 import { Struct } from '@bufbuild/protobuf';
-import { Client, ErrorCode, OpenFeature, ProviderEvents, StandardResolutionReasons } from '@openfeature/web-sdk';
+import { Client, ErrorCode, JsonValue, OpenFeature, ProviderEvents, StandardResolutionReasons } from '@openfeature/web-sdk';
 import fetchMock from 'jest-fetch-mock';
 import { Service } from '../proto/ts/schema/v1/schema_connectweb';
 import { AnyFlag, EventStreamResponse, ResolveAllResponse } from '../proto/ts/schema/v1/schema_pb';
@@ -105,6 +105,10 @@ class MockPromiseClient implements Partial<PromiseClient<typeof Service>> {
 }
 
 describe(FlagdWebProvider.name, () => {
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
  describe('resolution functionality', () => {
  let client: Client;
  beforeAll((done) => {
@@ -126,10 +130,6 @@ describe(FlagdWebProvider.name, () => {
  });
  });
 
- afterEach(() => {
- fetchMock.resetMocks();
- });
-
  it(FlagdWebProvider.prototype.resolveBooleanEvaluation.name, async () => {
  const details = client.getBooleanDetails(BOOL_FLAG_KEY, false);
  expect(details.value).toEqual(BOOL_FLAG_VALUE);
@@ -159,13 +159,14 @@ describe(FlagdWebProvider.name, () => {
  });
  });
 
- describe('events-enabled', () => {
+ describe('events', () => {
  let client: Client;
  let mockCallbackClient: MockCallbackClient;
+ const mockPromiseClient = new MockPromiseClient() as unknown as PromiseClient<typeof Service>;
+ const context = { some: 'value' };
 
  beforeEach(() => {
  mockCallbackClient = new MockCallbackClient();
- const mockPromiseClient = new MockPromiseClient() as unknown as PromiseClient<typeof Service>;
  OpenFeature.setProvider(
  new FlagdWebProvider(
  { host: 'fake.com', maxRetries: -1 },
@@ -207,6 +208,23 @@ describe(FlagdWebProvider.name, () => {
  type: EVENT_CONFIGURATION_CHANGE,
  });
  });
+
+ it('should trigger call to resolveAll with current context', (done) => {
+
+ client.addHandler(ProviderEvents.ConfigurationChanged, () => {
+ try {
+ expect(mockPromiseClient.resolveAll).toHaveBeenLastCalledWith({context: Struct.fromJson(context as JsonValue)});
+ done();
+ } catch(err) {
+ done(err);
+ }
+ });
+ OpenFeature.setContext(context).then(() => {
+ mockCallbackClient.mockMessage({
+ type: EVENT_CONFIGURATION_CHANGE,
+ });
+ });
+ });
  });
 
  describe(ProviderEvents.Error, () => {

libs/providers/flagd-web/src/lib/flagd-web-provider.ts

@@ -12,6 +12,7 @@ import {
  FlagValue,
  JsonValue,
  Logger,
+ OpenFeature,
  Provider,
  ProviderEvents,
  ResolutionDetails,
@@ -71,7 +72,7 @@ export class FlagdWebProvider implements Provider {
  }
 
  async initialize(context: EvaluationContext): Promise<void> {
- await this.retryConnect(context);
+ await this.retryConnect();
  }
 
  resolveBooleanEvaluation(flagKey: string, _: boolean): ResolutionDetails<boolean> {
@@ -105,23 +106,25 @@ export class FlagdWebProvider implements Provider {
  };
  }
 
- private async retryConnect(context: EvaluationContext) {
+ private async retryConnect() {
  this._delayMs = Math.min(this._delayMs * BACK_OFF_MULTIPLIER, this._maxDelay);
 
  return new Promise<void>((resolve) => {
  this._callbackClient.eventStream(
  {},
  (message) => {
+ // get the context at the time of the message
+ const currentContext = OpenFeature.getContext();
  this._logger?.debug(`${FlagdWebProvider.name}: event received: ${message.type}`);
  switch (message.type) {
  case EVENT_PROVIDER_READY:
- this.fetchAll(context).then(() => {
+ this.fetchAll(currentContext).then(() => {
  this.resetConnectionState();
  resolve();
  });
  return;
  case EVENT_CONFIGURATION_CHANGE: {
- this.fetchAll(context).then(() => {
+ this.fetchAll(currentContext).then(() => {
  this.events.emit(ProviderEvents.ConfigurationChanged);
  });
  return;
@@ -132,7 +135,7 @@ export class FlagdWebProvider implements Provider {
  this._logger?.error(`${FlagdWebProvider.name}: could not establish connection to flagd`);
  if (this._retry < this._maxRetries) {
  this._retry++;
- setTimeout(() => this.retryConnect(context), this._delayMs);
+ setTimeout(() => this.retryConnect(), this._delayMs);
  } else {
  this._logger?.warn(`${FlagdWebProvider.name}: max retries reached`);
  this.events.emit(ProviderEvents.Error);