chore: merge fixes

Author: Todd Anderson

packages/sdk/fastly/__tests__/utils/mockFeatureStore.ts

@@ -8,6 +8,7 @@ const mockFeatureStore: LDFeatureStore = {
   upsert: jest.fn(),
   get: jest.fn(),
   delete: jest.fn(),
+  applyChanges: jest.fn(),
 };
 
 export default mockFeatureStore;

packages/sdk/fastly/src/api/EdgeFeatureStore.ts

@@ -1,4 +1,3 @@
-import { InitMetadata } from '@launchdarkly/js-sdk-common/dist/esm/internal';
 import type {
   DataKind,
   internal,

packages/shared/sdk-server/__tests__/data_sources/DataSourceUpdates.test.ts

@@ -13,15 +13,22 @@ type InitMetadata = internal.InitMetadata;
 it('passes initialization metadata to underlying feature store', () => {
   const metadata: InitMetadata = { environmentId: '12345' };
   const store = new InMemoryFeatureStore();
-  store.init = jest.fn();
+  store.applyChanges = jest.fn();
   const updates = new DataSourceUpdates(
     store,
     () => false,
     () => {},
   );
   updates.init({}, () => {}, metadata);
-  expect(store.init).toHaveBeenCalledTimes(1);
-  expect(store.init).toHaveBeenNthCalledWith(1, expect.any(Object), expect.any(Function), metadata);
+  expect(store.applyChanges).toHaveBeenCalledTimes(1);
+  expect(store.applyChanges).toHaveBeenNthCalledWith(
+    1,
+    true,
+    expect.any(Object),
+    expect.any(Function),
+    metadata,
+    undefined,
+  );
 });
 
 describe.each([true, false])(

packages/shared/sdk-server/__tests__/data_sources/OneShotInitializerFDv2.test.ts

@@ -1,8 +1,7 @@
-import { DataSourceErrorKind, LDPollingError, subsystem } from '../../src';
+import { subsystem } from '../../src';
 import OneShotInitializerFDv2 from '../../src/data_sources/OneShotInitializerFDv2';
-import PollingProcessorFDv2 from '../../src/data_sources/PollingProcessorFDv2';
 import Requestor from '../../src/data_sources/Requestor';
-import TestLogger, { LogLevel } from '../Logger';
+import TestLogger from '../Logger';
 
 describe('given a one shot initializer', () => {
   const requestor = {

packages/shared/sdk-server/__tests__/data_sources/createStreamListeners.test.ts

@@ -102,6 +102,7 @@ describe('createStreamListeners', () => {
           segments,
         },
         onPutCompleteHandler,
+        undefined,
       );
     });
   });

packages/shared/sdk-server/__tests__/store/PersistentStoreWrapper.test.ts

@@ -510,6 +510,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector1',
       );
 
@@ -531,6 +532,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector1',
       );
 
@@ -549,6 +551,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector1',
       );
 
@@ -587,6 +590,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector',
       );
       expect(callbackCount).toEqual(3);
@@ -605,6 +609,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector',
       );
 
@@ -620,6 +625,7 @@ describe.each(['caching', 'non-caching'])(
             },
           },
         },
+        undefined,
         'selector',
       );
 

packages/shared/sdk-server/__tests__/store/TransactionalPersistentStore.test.ts

@@ -35,6 +35,7 @@ describe('given a non transactional store', () => {
           },
         },
       },
+      undefined,
       'selector1',
     );
     expect(await nonTransactionalFacade.all(VersionedDataKinds.Features)).toEqual({
@@ -85,6 +86,7 @@ describe('given a non transactional store', () => {
           },
         },
       },
+      undefined,
       'selector1',
     );
 

packages/shared/sdk-server/src/LDClientImpl.ts

@@ -232,9 +232,10 @@ export default class LDClientImpl implements LDClient {
             this._config.streamInitialReconnectDelay,
           )
         : new PollingProcessor(
-            config,
             new Requestor(config, this._platform.requests, baseHeaders),
+            config.pollInterval,
             dataSourceUpdates,
+            config.logger,
             () => this._initSuccess(),
             (e) => this._dataSourceErrorHandler(e),
           );

packages/shared/sdk-server/src/data_sources/PollingProcessor.ts

@@ -10,7 +10,6 @@ import {
 } from '@launchdarkly/js-sdk-common';
 
 import { LDDataSourceUpdates } from '../api/subsystems';
-import Configuration from '../options/Configuration';
 import { deserializePoll } from '../store';
 import VersionedDataKinds from '../store/VersionedDataKinds';
 import Requestor from './Requestor';
@@ -25,22 +24,16 @@ const { initMetadataFromHeaders } = internal;
 export default class PollingProcessor implements subsystem.LDStreamProcessor {
   private _stopped = false;
 
-  private _logger?: LDLogger;
-
-  private _pollInterval: number;
-
   private _timeoutHandle: any;
 
   constructor(
-    config: Configuration,
     private readonly _requestor: Requestor,
+    private readonly _pollInterval: number,
     private readonly _featureStore: LDDataSourceUpdates,
+    private readonly _logger?: LDLogger,
     private readonly _initSuccessHandler: VoidFunction = () => {},
     private readonly _errorHandler?: PollingErrorHandler,
-  ) {
-    this._logger = config.logger;
-    this._pollInterval = config.pollInterval;
-  }
+  ) {}
 
   private _poll() {
     if (this._stopped) {

packages/shared/sdk-server/src/store/PersistentDataStoreWrapper.ts

@@ -1,4 +1,5 @@
 import { internal } from '@launchdarkly/js-sdk-common';
+
 import {
   DataKind,
   PersistentDataStore,