Fix client configuration and tests.

launchdarkly · Oct 10, 2024 · 30fe70c · 30fe70c
1 parent 511c58a
commit 30fe70c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/packages/sdk/react-native/__tests__/fromExternal/react-native-sse/EventSource.test.ts b/packages/sdk/react-native/__tests__/fromExternal/react-native-sse/EventSource.test.ts
@@ -102,7 +102,7 @@ describe('EventSource', () => {
  jest.runAllTimers();
  // This forces it to reconnect.
  // @ts-ignore
- eventSource.tryConnect();
+ eventSource._tryConnect();
  jest.runAllTimers();
 
  expect(logger.debug).toHaveBeenNthCalledWith(

diff --git a/packages/shared/sdk-client/__tests__/LDClientImpl.events.test.ts b/packages/shared/sdk-client/__tests__/LDClientImpl.events.test.ts
@@ -109,7 +109,7 @@ describe('sdk-client object', () => {
  expect.objectContaining<InputIdentifyEvent>({
  kind: 'identify',
  context: expect.objectContaining({
- contexts: expect.objectContaining({
+ _contexts: expect.objectContaining({
  car: { key: 'test-car' },
  }),
  }),
@@ -130,7 +130,7 @@ describe('sdk-client object', () => {
  kind: 'custom',
  key: 'the-event',
  context: expect.objectContaining({
- contexts: expect.objectContaining({
+ _contexts: expect.objectContaining({
  car: { key: 'test-car' },
  }),
  }),
@@ -153,7 +153,7 @@ describe('sdk-client object', () => {
  kind: 'custom',
  key: 'the-event',
  context: expect.objectContaining({
- contexts: expect.objectContaining({
+ _contexts: expect.objectContaining({
  car: { key: 'test-car' },
  }),
  }),
@@ -176,7 +176,7 @@ describe('sdk-client object', () => {
  kind: 'custom',
  key: 'the-event',
  context: expect.objectContaining({
- contexts: expect.objectContaining({
+ _contexts: expect.objectContaining({
  car: { key: 'test-car' },
  }),
  }),

diff --git a/packages/shared/sdk-client/src/configuration/Configuration.ts b/packages/shared/sdk-client/src/configuration/Configuration.ts
@@ -71,9 +71,14 @@ function ensureSafeLogger(logger?: LDLogger): LDLogger {
 export default class ConfigurationImpl implements Configuration {
  public readonly logger: LDLogger = createSafeLogger();
 
- private readonly _baseUri = DEFAULT_POLLING;
- private readonly _eventsUri = ServiceEndpoints.DEFAULT_EVENTS;
- private readonly _streamUri = DEFAULT_STREAM;
+ // Naming conventions is not followed for these lines because the config validation
+ // accesses members based on the keys of the options. 
+ // eslint-disable-next-line @typescript-eslint/naming-convention
+ private readonly baseUri = DEFAULT_POLLING;
+ // eslint-disable-next-line @typescript-eslint/naming-convention
+ private readonly eventsUri = ServiceEndpoints.DEFAULT_EVENTS;
+ // eslint-disable-next-line @typescript-eslint/naming-convention
+ private readonly streamUri = DEFAULT_STREAM;
 
  public readonly maxCachedContexts = 5;
 
@@ -130,9 +135,9 @@ export default class ConfigurationImpl implements Configuration {
  errors.forEach((e: string) => this.logger.warn(e));
 
  this.serviceEndpoints = new ServiceEndpoints(
- this._streamUri,
- this._baseUri,
- this._eventsUri,
+ this.streamUri,
+ this.baseUri,
+ this.eventsUri,
  internalOptions.analyticsEventPath,
  internalOptions.diagnosticEventPath,
  internalOptions.includeAuthorizationHeader,