Polishing

Author: EmilianoSanchez

src/logger/messages/warn.ts

@@ -7,7 +7,7 @@ export const codesWarn: [number, string][] = codesError.concat([
   [c.ENGINE_VALUE_NO_ATTRIBUTES, c.LOG_PREFIX_ENGINE_VALUE + 'Defined attribute `%s`. No attributes received.'],
   // synchronizer
   [c.SYNC_MYSEGMENTS_FETCH_RETRY, c.LOG_PREFIX_SYNC_MYSEGMENTS + 'Retrying fetch of memberships (attempt #%s). Reason: %s'],
-  [c.SYNC_SPLITS_FETCH_FAILS, c.LOG_PREFIX_SYNC_SPLITS + 'Error while doing fetch of feature flags. %s'],
+  [c.SYNC_SPLITS_FETCH_FAILS, c.LOG_PREFIX_SYNC_SPLITS + 'Error while doing fetch of %s'],
   [c.STREAMING_PARSING_ERROR_FAILS, c.LOG_PREFIX_SYNC_STREAMING + 'Error parsing SSE error notification: %s'],
   [c.STREAMING_PARSING_MESSAGE_FAILS, c.LOG_PREFIX_SYNC_STREAMING + 'Error parsing SSE message notification: %s'],
   [c.STREAMING_FALLBACK, c.LOG_PREFIX_SYNC_STREAMING + 'Falling back to polling mode. Reason: %s'],

src/sync/polling/pollingManagerSS.ts

@@ -3,6 +3,11 @@ import { segmentsSyncTaskFactory } from './syncTasks/segmentsSyncTask';
 import { IPollingManager, ISegmentsSyncTask, ISplitsSyncTask } from './types';
 import { LOG_PREFIX_SYNC_POLLING, POLLING_START, POLLING_STOP } from '../../logger/constants';
 import { ISdkFactoryContextSync } from '../../sdkFactory/types';
+import { ISettings } from '../../types';
+
+export function isFetchingConfigs(settings: Pick<ISettings, 'definitionsType'>) {
+  return settings.definitionsType === 'configs';
+}
 
 /**
  * Expose start / stop mechanism for pulling data from services.
@@ -14,7 +19,7 @@ export function pollingManagerSSFactory(
   const { splitApi, storage, readiness, settings } = params;
   const log = settings.log;
 
-  const fetchingConfigs = settings.definitionsType === 'configs';
+  const fetchingConfigs = isFetchingConfigs(settings);
 
   const splitsSyncTask: ISplitsSyncTask = splitsSyncTaskFactory(fetchingConfigs ? splitApi.fetchConfigs : splitApi.fetchSplitChanges, storage, readiness, settings);
   const segmentsSyncTask: ISegmentsSyncTask = segmentsSyncTaskFactory(splitApi.fetchSegmentChanges, storage, readiness, settings);

src/sync/polling/syncTasks/splitsSyncTask.ts

@@ -3,9 +3,11 @@ import { IReadinessManager } from '../../../readiness/types';
 import { syncTaskFactory } from '../../syncTask';
 import { ISplitsSyncTask } from '../types';
 import { splitChangesFetcherFactory } from '../fetchers/splitChangesFetcher';
+import { configsFetcherFactory } from '../fetchers/configsFetcher';
 import { IFetchSplitChanges } from '../../../services/types';
 import { ISettings } from '../../../types';
 import { splitChangesUpdaterFactory } from '../updaters/splitChangesUpdater';
+import { isFetchingConfigs } from '../pollingManagerSS';
 
 /**
  * Creates a sync task that periodically executes a `splitChangesUpdater` task
@@ -17,19 +19,22 @@ export function splitsSyncTaskFactory(
   settings: ISettings,
   isClientSide?: boolean
 ): ISplitsSyncTask {
+  const fetcher = isFetchingConfigs(settings)
+    ? configsFetcherFactory(fetchSplitChanges)
+    : splitChangesFetcherFactory(fetchSplitChanges, settings, storage);
   return syncTaskFactory(
     settings.log,
     splitChangesUpdaterFactory(
       settings,
-      splitChangesFetcherFactory(fetchSplitChanges, settings, storage),
+      fetcher,
       storage,
       settings.sync.__splitFiltersValidation,
       readiness.splits,
       settings.startup.requestTimeoutBeforeReady,
       settings.startup.retriesOnFailureBeforeReady,
       isClientSide
     ),
-    settings.definitionsType === 'configs' ? settings.scheduler.configsRefreshRate : settings.scheduler.featuresRefreshRate,
-    settings.definitionsType === 'configs' ? 'configsUpdater' : 'splitChangesUpdater',
+    isFetchingConfigs(settings) ? settings.scheduler.configsRefreshRate : settings.scheduler.featuresRefreshRate,
+    isFetchingConfigs(settings) ? 'configsUpdater' : 'splitChangesUpdater',
   );
 }

src/sync/polling/updaters/splitChangesUpdater.ts

@@ -11,6 +11,7 @@ import { setToArray } from '../../../utils/lang/sets';
 import { SPLIT_UPDATE } from '../../streaming/constants';
 import { SdkUpdateMetadata } from '../../../../types/splitio';
 import { ISettings } from '../../../types';
+import { isFetchingConfigs } from '../pollingManagerSS';
 
 export type InstantUpdate = { payload: ISplit | IRBSegment, changeNumber: number, type: string };
 type SplitChangesUpdater = (noCache?: boolean, till?: number, instantUpdate?: InstantUpdate) => Promise<boolean>
@@ -129,7 +130,7 @@ export function splitChangesUpdaterFactory(
   retriesOnFailureBeforeReady = 0,
   isClientSide?: boolean
 ): SplitChangesUpdater {
-  const { log, definitionsType } = settings;
+  const { log } = settings;
   const { splits, rbSegments, segments } = storage;
 
   let startingUp = true;
@@ -204,7 +205,7 @@ export function splitChangesUpdaterFactory(
                   if (emitSplitsArrivedEvent) {
                     const metadata: SdkUpdateMetadata = {
                       type: updatedFlags.length > 0 ?
-                        definitionsType === 'configs' ? CONFIGS_UPDATE : FLAGS_UPDATE :
+                        isFetchingConfigs(settings) ? CONFIGS_UPDATE : FLAGS_UPDATE :
                         SEGMENTS_UPDATE,
                       names: updatedFlags.length > 0 ? updatedFlags : []
                     };
@@ -223,7 +224,7 @@ export function splitChangesUpdaterFactory(
             return _splitChangesUpdater(sinces, retry);
           } else {
             startingUp = false;
-            log.warn(SYNC_SPLITS_FETCH_FAILS, [error]);
+            log.warn(SYNC_SPLITS_FETCH_FAILS, [(isFetchingConfigs(settings) ? 'configs. ' : 'feature flags. ') + error]);
           }
           return false;
         });