Merge pull request #288 from splitio/nodejs_http_support

Remove the `getOptions` method from the `IPlatform` interface.

Author: EmilianoSanchez

CHANGES.txt

@@ -1,3 +1,6 @@
+1.13.0 (January 4, 2024)
+ - Removed the `getOptions` method from the `IPlatform` interface to simplify implementation. Request options can be handled within the `getFetch` method.
+
 1.12.1 (December 12, 2023)
  - Updated PluggableStorage, for producer mode, and LocalStorage, for standalone mode, to clear the storage before initiating the synchronization process if it was previously synchronized with a different SDK key (i.e., a different environment) or different Split Filter criteria.
  - Bugfixing - Fixed an issue when tracking telemetry latencies for the new `getTreatmentsByFlagSet(s)` methods in Redis and Pluggable storages, which was causing the SDK to not track those stats.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Split Javascript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -72,7 +72,7 @@
     "jest": "^27.2.3",
     "jest-localstorage-mock": "^2.4.3",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^2.7.0",
     "redis-server": "1.2.2",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.0.5",

package.json

@@ -49,7 +49,6 @@ const fullParamsForSyncSDK = {
   platform: {
     getEventSource: jest.fn(),
     getFetch: jest.fn(),
-    getOptions: jest.fn(),
     EventEmitter
   },
   splitApiFactory: jest.fn(),

src/sdkFactory/__tests__/index.spec.ts

@@ -2,6 +2,7 @@ import { IIntegrationManager, IIntegrationFactoryParams } from '../integrations/
 import { ISignalListener } from '../listeners/types';
 import { IReadinessManager, ISdkReadinessManager } from '../readiness/types';
 import type { sdkManagerFactory } from '../sdkManager';
+import type { splitApiFactory } from '../services/splitApi';
 import { IFetch, ISplitApi, IEventSourceConstructor } from '../services/types';
 import { IStorageAsync, IStorageSync, IStorageFactoryParams } from '../storages/types';
 import { ISyncManager } from '../sync/types';
@@ -17,10 +18,6 @@ export interface IPlatform {
    * If provided, it is used to retrieve the Fetch API for HTTP requests. Otherwise, the global fetch is used.
    */
   getFetch?: () => (IFetch | undefined)
-  /**
-   * If provided, it is used to pass additional options to fetch calls.
-   */
-  getOptions?: () => object
   /**
    * If provided, it is used to retrieve the EventSource constructor for streaming support.
    */
@@ -79,7 +76,7 @@ export interface ISdkFactoryParams {
 
   // Factory of Split Api (HTTP Client Service).
   // It is not required when providing an asynchronous storage or offline SyncManager
-  splitApiFactory?: (settings: ISettings, platform: IPlatform, telemetryTracker: ITelemetryTracker) => ISplitApi,
+  splitApiFactory?: typeof splitApiFactory,
 
   // SyncManager factory.
   // Not required when providing an asynchronous storage (consumer mode), but required in standalone mode to avoid SDK timeout.

src/sdkFactory/types.ts

@@ -17,18 +17,19 @@ function userKeyToQueryParam(userKey: string) {
  * Factory of SplitApi objects, which group the collection of Split HTTP endpoints used by the SDK
  *
  * @param settings validated settings object
- * @param platform object containing environment-specific `getFetch` and `getOptions` dependencies
+ * @param platform object containing environment-specific dependencies
+ * @param telemetryTracker telemetry tracker
  */
 export function splitApiFactory(
-  settings: Pick<ISettings, 'urls' | 'sync' | 'log' | 'version' | 'runtime' | 'core'>,
-  platform: Pick<IPlatform, 'getFetch' | 'getOptions'>,
+  settings: ISettings,
+  platform: Pick<IPlatform, 'getFetch'>,
   telemetryTracker: ITelemetryTracker
 ): ISplitApi {
 
   const urls = settings.urls;
   const filterQueryString = settings.sync.__splitFiltersValidation && settings.sync.__splitFiltersValidation.queryString;
   const SplitSDKImpressionsMode = settings.sync.impressionsMode;
-  const splitHttpClient = splitHttpClientFactory(settings, platform.getFetch, platform.getOptions);
+  const splitHttpClient = splitHttpClientFactory(settings, platform.getFetch);
 
   return {
     // @TODO throw errors if health check requests fail, to log them in the Synchronizer

src/services/splitApi.ts

@@ -1,21 +1,20 @@
-import { IFetch, IRequestOptions, IResponse, ISplitHttpClient, NetworkError } from './types';
+import { IRequestOptions, IResponse, ISplitHttpClient, NetworkError } from './types';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { ERROR_HTTP, ERROR_CLIENT_CANNOT_GET_READY } from '../logger/constants';
 import { ISettings } from '../types';
+import { IPlatform } from '../sdkFactory/types';
 
 const messageNoFetch = 'Global fetch API is not available.';
 
 /**
  * Factory of Split HTTP clients, which are HTTP clients with predefined headers for Split endpoints.
  *
  * @param settings SDK settings, used to access authorizationKey, logger instance and metadata (SDK version, ip and hostname) to set additional headers
- * @param options global request options
- * @param fetch optional http client to use instead of the global Fetch (for environments where Fetch API is not available such as Node)
+ * @param getFetch retrieves the Fetch API for HTTP requests
  */
-export function splitHttpClientFactory(settings: Pick<ISettings, 'log' | 'version' | 'runtime' | 'core'>, getFetch?: () => (IFetch | undefined), getOptions?: () => object): ISplitHttpClient {
+export function splitHttpClientFactory(settings: ISettings, getFetch?: IPlatform['getFetch']): ISplitHttpClient {
 
   const { log, core: { authorizationKey }, version, runtime: { ip, hostname } } = settings;
-  const options = getOptions && getOptions();
   const fetch = getFetch && getFetch();
 
   // if fetch is not available, log Error
@@ -33,11 +32,11 @@ export function splitHttpClientFactory(settings: Pick<ISettings, 'log' | 'versio
 
   return function httpClient(url: string, reqOpts: IRequestOptions = {}, latencyTracker: (error?: NetworkError) => void = () => { }, logErrorsAsInfo: boolean = false): Promise<IResponse> {
 
-    const request = objectAssign({
+    const request = {
       headers: reqOpts.headers ? objectAssign({}, headers, reqOpts.headers) : headers,
       method: reqOpts.method || 'GET',
       body: reqOpts.body
-    }, options);
+    };
 
     // using `fetch(url, options)` signature to work with unfetch, a lightweight ponyfill of fetch API.
     return fetch ? fetch(url, request)

src/services/splitHttpClient.ts

@@ -154,7 +154,7 @@ test('splitChangesUpdater / compute splits mutation with filters', () => {
 describe('splitChangesUpdater', () => {
 
   fetchMock.once('*', { status: 200, body: splitChangesMock1 }); // @ts-ignore
-  const splitApi = splitApiFactory(settingsSplitApi, { getFetch: () => fetchMock, EventEmitter }, telemetryTrackerFactory());
+  const splitApi = splitApiFactory(settingsSplitApi, { getFetch: () => fetchMock }, telemetryTrackerFactory());
   const fetchSplitChanges = jest.spyOn(splitApi, 'fetchSplitChanges');
   const splitChangesFetcher = splitChangesFetcherFactory(splitApi.fetchSplitChanges);
 

src/sync/polling/updaters/__tests__/splitChangesUpdater.spec.ts

@@ -3,15 +3,14 @@ import { splitApiFactory } from '../../../../services/splitApi';
 import { authDataResponseSample, authDataSample, jwtSampleInvalid, jwtSampleNoChannels, jwtSampleNoIat, userKeySample, userKeyBase64HashSample } from '../../__tests__/dataMocks';
 import fetchMock from '../../../../__tests__/testUtils/fetchMock';
 import { settingsSplitApi } from '../../../../utils/settingsValidation/__tests__/settings.mocks';
-import { EventEmitter } from '../../../../utils/MinEvents';
 import { telemetryTrackerFactory } from '../../../../trackers/telemetryTracker';
 
 // module to test
 import { authenticateFactory, hashUserKey } from '../index';
 
 const authorizationKey = settingsSplitApi.core.authorizationKey;
 const authUrl = settingsSplitApi.urls.auth; // @ts-ignore
-const splitApi = splitApiFactory(settingsSplitApi, { getFetch: () => fetchMock, EventEmitter }, telemetryTrackerFactory());
+const splitApi = splitApiFactory(settingsSplitApi, { getFetch: () => fetchMock }, telemetryTrackerFactory());
 const authenticate = authenticateFactory(splitApi.fetchAuth);
 
 test('hashUserKey', () => {