@splitsoftware/splitio 10.17.1-rc.0 → 10.17.3-rc.0

package/lib/{utils/settings → settings}/storage/node.js

@@ -1,12 +1,12 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.validateStorage = validateStorage;
 
-var _constants = require("../../constants");
+var _constants = require("@splitsoftware/splitio-commons/cjs/utils/constants");
 
 /**
-Copyright 2016 Split Software
+Copyright 2022 Split Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,10 +20,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 **/
-var ParseStorageSettings = function ParseStorageSettings(settings) {
+var STORAGE_REDIS = 'REDIS';
+
+function validateStorage(settings) {
   var mode = settings.mode,
-      _settings$storage = settings.storage,
-      type = _settings$storage.type,
+      _settings$storage = settings.storage;
+  _settings$storage = _settings$storage === void 0 ? {
+    type: _constants.STORAGE_MEMORY
+  } : _settings$storage;
+  var type = _settings$storage.type,
       _settings$storage$opt = _settings$storage.options,
       options = _settings$storage$opt === void 0 ? {} : _settings$storage$opt,
       prefix = _settings$storage.prefix;
@@ -41,7 +46,7 @@ var ParseStorageSettings = function ParseStorageSettings(settings) {
   }; // In other cases we can have MEMORY or REDIS
 
   switch (type) {
-    case _constants.STORAGE_REDIS:
+    case STORAGE_REDIS:
       {
         var host = options.host,
             port = options.port,
@@ -86,7 +91,4 @@ var ParseStorageSettings = function ParseStorageSettings(settings) {
         };
       }
   }
-};
-
-var _default = ParseStorageSettings;
-exports.default = _default;
+}

package/lib/umd.js

@@ -5,5 +5,6 @@ exports.default = void 0;
 
 var _index = require("./index");
 
+// eslint-disable-next-line import/no-default-export
 var _default = _index.SplitFactory;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio",
-  "version": "10.17.1-rc.0",
+  "version": "10.17.3-rc.0",
   "description": "Split SDK",
   "files": [
     "README.md",
@@ -33,13 +33,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
+    "@splitsoftware/splitio-commons": "1.2.0",
     "@types/google.analytics": "0.0.40",
     "events": "3.1.0",
     "ioredis": "^4.28.0",
     "ip": "1.1.5",
     "js-yaml": "3.13.1",
-    "node-fetch": "^2.6.1",
-    "object-assign": "^4.1.1",
+    "node-fetch": "^2.6.7",
     "unfetch": "^4.2.0"
   },
   "optionalDependencies": {
@@ -48,8 +48,10 @@
   "devDependencies": {
     "@babel/cli": "^7.15.7",
     "@babel/core": "^7.13.10",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.13.10",
+    "@babel/preset-typescript": "^7.16.7",
     "@babel/register": "^7.13.8",
     "babel-loader": "^8.2.2",
     "copyfiles": "^2.4.1",
@@ -57,6 +59,7 @@
     "csv-streamify": "4.0.0",
     "eslint": "^8.0.1",
     "eslint-plugin-compat": "^3.13.0",
+    "eslint-plugin-import": "^2.25.4",
     "fetch-mock": "^9.11.0",
     "karma": "^6.3.2",
     "karma-chrome-launcher": "^3.1.0",
@@ -80,10 +83,10 @@
   },
   "scripts": {
     "build-es": "rimraf es && cross-env NODE_ENV=es babel ./src -d es --ignore 'src/**/__tests__/*'",
-    "postbuild-es": "cross-env NODE_ENV=es node scripts/copy.packages.json.js",
+    "postbuild-es": "cross-env NODE_ENV=es node scripts/copy.packages.json.js && ./scripts/build_esm_replace_imports.sh",
     "build-umd:stats": "webpack --progress --env production --json > ./stats/stat_results.json",
     "build-cjs": "rimraf lib && cross-env NODE_ENV=cjs babel ./src -d lib --ignore 'src/**/__tests__/*'",
-    "postbuild-cjs": "cross-env NODE_ENV=cjs node scripts/copy.packages.json.js",
+    "postbuild-cjs": "cross-env NODE_ENV=cjs node scripts/copy.packages.json.js && ./scripts/build_cjs_replace_imports.sh",
     "build-umd": "webpack --config webpack.ci.dev.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && webpack --config webpack.ci.prod.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && ./scripts/clean_umd_build.sh",
     "build-umd:local": "webpack --config webpack.dev.js && webpack --config webpack.prod.js && ./scripts/clean_umd_build.sh",
     "build:local": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd:local",
@@ -91,7 +94,7 @@
     "build": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd",
     "check": "npm run check:lint && npm run check:version",
     "check:lint": "eslint src",
-    "check:version": "cross-env NODE_ENV=test tape -r @babel/register src/utils/__tests__/settings/index.spec.js",
+    "check:version": "cross-env NODE_ENV=test tape -r ./babel.register src/settings/__tests__/defaults.spec.js",
     "test-browser-local": "cross-env NODE_ENV=test karma start karma/local.karma.conf.js",
     "test-browser-e2e-local": "cross-env NODE_ENV=test karma start karma/e2e.local.karma.conf.js",
     "test-browser": "npm run test-browser-unit && npm run test-browser-online && npm run test-browser-offline && npm run test-browser-destroy && npm run test-browser-errors && npm run test-browser-push && npm run test-browser-gaintegration",
@@ -103,13 +106,13 @@
     "test-browser-gaintegration": "cross-env NODE_ENV=test karma start karma/gaintegration.ci.karma.conf.js",
     "test-browser-push": "cross-env NODE_ENV=test karma start karma/push.ci.karma.conf.js",
     "test-node": "npm run test-node-unit && npm run test-node-online && npm run test-node-redis && npm run test-node-offline && npm run test-node-destroy && npm run test-node-errors && npm run test-node-push",
-    "test-node-unit": "cross-env NODE_ENV=test tape -r @babel/register \"src/*/**/__tests__/**/!(browser).spec.js\" | tap-min",
-    "test-node-online": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/node.spec.js | tap-min",
-    "test-node-destroy": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/destroy/node.spec.js | tap-min",
-    "test-node-errors": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/errorCatching/node.spec.js | tap-min",
-    "test-node-offline": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/offline/node.spec.js | tap-min",
-    "test-node-redis": "cross-env NODE_ENV=test tape -r @babel/register \"src/__tests__/node_redis.spec.js\" | tap-min",
-    "test-node-push": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/push/node.spec.js | tap-min",
+    "test-node-unit": "cross-env NODE_ENV=test tape -r ./babel.register \"src/*/**/__tests__/**/!(browser).spec.js\" | tap-min",
+    "test-node-online": "cross-env NODE_ENV=test tape -r ./babel.register src/__tests__/node.spec.js | tap-min",
+    "test-node-destroy": "cross-env NODE_ENV=test tape -r ./babel.register src/__tests__/destroy/node.spec.js | tap-min",
+    "test-node-errors": "cross-env NODE_ENV=test tape -r ./babel.register src/__tests__/errorCatching/node.spec.js | tap-min",
+    "test-node-offline": "cross-env NODE_ENV=test tape -r ./babel.register src/__tests__/offline/node.spec.js | tap-min",
+    "test-node-redis": "cross-env NODE_ENV=test tape -r ./babel.register \"src/__tests__/node_redis.spec.js\" | tap-min",
+    "test-node-push": "cross-env NODE_ENV=test tape -r ./babel.register src/__tests__/push/node.spec.js | tap-min",
     "pretest-ts-decls": "npm run build-es && npm run build-cjs && npm link",
     "test-ts-decls": "./scripts/ts-tests.sh",
     "posttest-ts-decls": "npm unlink && npm install",

package/src/factory/clientSide.js

@@ -0,0 +1,58 @@
+import { splitApiFactory } from '@splitsoftware/splitio-commons/src/services/splitApi';
+import { syncManagerOnlineFactory } from '@splitsoftware/splitio-commons/src/sync/syncManagerOnline';
+import { pushManagerFactory } from '@splitsoftware/splitio-commons/src/sync/streaming/pushManager';
+import { pollingManagerCSFactory } from '@splitsoftware/splitio-commons/src/sync/polling/pollingManagerCS';
+import { InLocalStorage } from '@splitsoftware/splitio-commons/src/storages/inLocalStorage';
+import { InMemoryStorageCSFactory } from '@splitsoftware/splitio-commons/src/storages/inMemory/InMemoryStorageCS';
+import { sdkManagerFactory } from '@splitsoftware/splitio-commons/src/sdkManager';
+import { sdkClientMethodCSFactory } from '@splitsoftware/splitio-commons/src/sdkClient/sdkClientMethodCSWithTT';
+import { impressionObserverCSFactory } from '@splitsoftware/splitio-commons/src/trackers/impressionObserver/impressionObserverCS';
+import { integrationsManagerFactory } from '@splitsoftware/splitio-commons/src/integrations/browser';
+import { __InLocalStorageMockFactory } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/storage/storageCS';
+import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
+
+import { settingsFactory } from '../settings/clientSide';
+import { shouldAddPt } from './commons';
+import { platform, signalListener } from '../platform';
+
+const syncManagerOnlineCSFactory = syncManagerOnlineFactory(pollingManagerCSFactory, pushManagerFactory);
+
+/**
+ *
+ * @param {import("@splitsoftware/splitio-commons/types/types").ISettings} settings
+ */
+function getModules(settings) {
+
+  return {
+    settings,
+
+    platform,
+
+    storageFactory: settings.storage.type === 'LOCALSTORAGE' ?
+      InLocalStorage({
+        prefix: settings.storage.prefix,
+      })
+      : settings.storage.__originalType === 'LOCALSTORAGE' ?
+        __InLocalStorageMockFactory
+        : InMemoryStorageCSFactory,
+
+    splitApiFactory: settings.mode === 'localhost' ? undefined : splitApiFactory,
+    syncManagerFactory: settings.mode === 'localhost' ? settings.sync.localhostMode : syncManagerOnlineCSFactory,
+
+    sdkManagerFactory,
+    sdkClientMethodFactory: sdkClientMethodCSFactory,
+    SignalListener: settings.mode === 'localhost' ? undefined : signalListener,
+    impressionListener: settings.impressionListener,
+
+    integrationsManagerFactory: settings.integrations && settings.integrations.length > 0 ? integrationsManagerFactory.bind(null, settings.integrations) : undefined,
+
+    // @TODO consider not including in debug mode?
+    impressionsObserverFactory: shouldAddPt(settings) ? impressionObserverCSFactory : undefined,
+  };
+}
+
+export function SplitFactory(config) {
+  const settings = settingsFactory(config);
+  const modules = getModules(settings);
+  return sdkFactory(modules);
+}

package/src/factory/commons.js

@@ -0,0 +1,16 @@
+import { OPTIMIZED, PRODUCER_MODE, STANDALONE_MODE } from '@splitsoftware/splitio-commons/src/utils/constants';
+
+/**
+ * Checks if impressions previous time should be added or not.
+ */
+export function shouldAddPt(settings) {
+  return [PRODUCER_MODE, STANDALONE_MODE].indexOf(settings.mode) > -1 ? true : false;
+}
+
+/**
+ * Checks if it should dedupe impressions or not.
+ */
+export function shouldBeOptimized(settings) {
+  if (!shouldAddPt(settings)) return false;
+  return settings.sync.impressionsMode === OPTIMIZED ? true : false;
+}

package/src/factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "./serverSide.js",
+  "browser": "./clientSide.js"
+}

package/src/factory/serverSide.js

@@ -0,0 +1,51 @@
+import { splitApiFactory } from '@splitsoftware/splitio-commons/src/services/splitApi';
+import { syncManagerOnlineFactory } from '@splitsoftware/splitio-commons/src/sync/syncManagerOnline';
+import { pushManagerFactory } from '@splitsoftware/splitio-commons/src/sync/streaming/pushManager';
+import { pollingManagerSSFactory } from '@splitsoftware/splitio-commons/src/sync/polling/pollingManagerSS';
+import { InRedisStorage } from '@splitsoftware/splitio-commons/src/storages/inRedis';
+import { InMemoryStorageFactory } from '@splitsoftware/splitio-commons/src/storages/inMemory/InMemoryStorage';
+import { sdkManagerFactory } from '@splitsoftware/splitio-commons/src/sdkManager';
+import { sdkClientMethodFactory } from '@splitsoftware/splitio-commons/src/sdkClient/sdkClientMethod';
+import { impressionObserverSSFactory } from '@splitsoftware/splitio-commons/src/trackers/impressionObserver/impressionObserverSS';
+import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
+
+import { settingsFactory } from '../settings/serverSide';
+import { shouldAddPt } from './commons';
+import { platform, signalListener } from '../platform';
+
+const syncManagerOnlineSSFactory = syncManagerOnlineFactory(pollingManagerSSFactory, pushManagerFactory);
+
+/**
+ *
+ * @param {import("@splitsoftware/splitio-commons/types/types").ISettings} settings
+ */
+function getModules(settings) {
+  return {
+    settings,
+
+    platform,
+
+    storageFactory: settings.storage.type === 'REDIS' ?
+      InRedisStorage({
+        prefix: settings.storage.prefix,
+        options: settings.storage.options
+      }) :
+      InMemoryStorageFactory,
+
+    splitApiFactory: settings.mode === 'localhost' ? undefined : splitApiFactory,
+    syncManagerFactory: settings.storage.type === 'REDIS' ? undefined : settings.mode === 'localhost' ? settings.sync.localhostMode : syncManagerOnlineSSFactory,
+
+    sdkManagerFactory,
+    sdkClientMethodFactory: sdkClientMethodFactory,
+    SignalListener: settings.mode === 'localhost' ? undefined : signalListener,
+    impressionListener: settings.impressionListener,
+
+    impressionsObserverFactory: shouldAddPt(settings) ? impressionObserverSSFactory : undefined,
+  };
+}
+
+export function SplitFactory(config) {
+  const settings = settingsFactory(config);
+  const modules = getModules(settings);
+  return sdkFactory(modules);
+}

package/src/index.js

@@ -1,140 +1 @@
-import ManagerFactory from './manager';
-import StorageFactory from './storage';
-import ReadinessGateFacade from './readiness';
-import SettingsFactory from './utils/settings';
-import Context from './utils/context';
-import keyParser from './utils/key/parser';
-import logFactory, { API } from './utils/logger';
-const log = logFactory('splitio');
-import tracker from './utils/timeTracker';
-import SplitFactoryOnline from './factory/online';
-import SplitFactoryOffline from './factory/offline';
-import sdkStatusManager from './readiness/statusManager';
-import { LOCALHOST_MODE } from './utils/constants';
-import { validateApiKey, validateKey, validateTrafficType } from './utils/inputValidation';
-import IntegrationsManagerFactory from './integrations';
-import ImpressionCounter from './impressions/counter';
-
-const buildInstanceId = (key, trafficType) => `${key.matchingKey ? key.matchingKey : key}-${key.bucketingKey ? key.bucketingKey : key}-${trafficType !== undefined ? trafficType : ''}`;
-
-export function SplitFactory(config) {
-  // Cache instances created per factory.
-  const clientInstances = {};
-
-  // Tracking times. We need to do it here because we need the storage created.
-  const readyLatencyTrackers = {
-    splitsReadyTracker: tracker.start(tracker.TaskNames.SPLITS_READY),
-    segmentsReadyTracker: tracker.start(tracker.TaskNames.SEGMENTS_READY),
-    sdkReadyTracker: tracker.start(tracker.TaskNames.SDK_READY)
-  };
-  const context = new Context();
-
-  // Put settings config within context
-  const settings = SettingsFactory(config);
-  context.put(context.constants.SETTINGS, settings);
-
-  // We will just log and allow for the SDK to end up throwing an SDK_TIMEOUT event for devs to handle.
-  validateApiKey(settings.core.authorizationKey);
-
-  // Put readiness and statusManager within context
-  // Done before adding storage, to let it access readiness gate synchronously
-  const gateFactory = ReadinessGateFacade();
-  const readiness = gateFactory(settings.startup.readyTimeout);
-  context.put(context.constants.READINESS, readiness);
-  const statusManager = sdkStatusManager(context);
-  context.put(context.constants.STATUS_MANAGER, statusManager);
-
-  // Put storage config within context
-  const storage = StorageFactory(context);
-  context.put(context.constants.STORAGE, storage);
-
-  // Put counter
-  const impressionsCounter = new ImpressionCounter(); // Instantiates new counter for Impressions
-  context.put(context.constants.IMPRESSIONS_COUNTER, impressionsCounter);
-
-  // Put integrationsManager within context.
-  // It needs to access the storage, settings and potentially other pieces, so it's registered after them.
-  const integrationsManager = IntegrationsManagerFactory(context);
-  context.put(context.constants.INTEGRATIONS_MANAGER, integrationsManager);
-
-  // Define which type of factory to use
-  const splitFactory = settings.mode === LOCALHOST_MODE ? SplitFactoryOffline : SplitFactoryOnline;
-
-  const {
-    api: mainClientInstance,
-    metricCollectors: mainClientMetricCollectors
-  } = splitFactory(context, readyLatencyTrackers);
-
-  // It makes no sense to have multiple instances of the manager.
-  const managerInstance = ManagerFactory(storage.splits, context);
-
-  const parsedDefaultKey = keyParser(settings.core.key);
-  const defaultInstanceId = buildInstanceId(parsedDefaultKey, settings.core.trafficType);
-  clientInstances[defaultInstanceId] = mainClientInstance;
-
-  log.info('New Split SDK instance created.');
-
-  return {
-    // Split evaluation and event tracking engine
-    client(key, trafficType) {
-      if (key === undefined) {
-        log.debug('Retrieving default SDK client.');
-        return mainClientInstance;
-      }
-
-      if (typeof storage.shared != 'function') {
-        throw new Error('Shared Client not supported by the storage mechanism. Create isolated instances instead.');
-      }
-
-      // Validate the key value
-      const validKey = validateKey(key, 'Shared Client instantiation');
-      if (validKey === false) {
-        throw new Error('Shared Client needs a valid key.');
-      }
-
-      let validTrafficType;
-      if (trafficType !== undefined) {
-        validTrafficType = validateTrafficType(trafficType, 'Shared Client instantiation');
-        if (validTrafficType === false) {
-          throw new Error('Shared Client needs a valid traffic type or no traffic type at all.');
-        }
-      }
-      const instanceId = buildInstanceId(validKey, validTrafficType);
-
-      if (!clientInstances[instanceId]) {
-        const sharedSettings = settings.overrideKeyAndTT(validKey, validTrafficType);
-        const sharedContext = new Context();
-
-        const readiness = gateFactory(sharedSettings.startup.readyTimeout);
-        sharedContext.put(context.constants.READY_FROM_CACHE, context.get(context.constants.READY_FROM_CACHE, true));
-        sharedContext.put(context.constants.READINESS, readiness);
-        // for shared clients, the internal offset of added/removed SDK_READY callbacks is -1
-        sharedContext.put(context.constants.STATUS_MANAGER, sdkStatusManager(sharedContext, -1));
-        sharedContext.put(context.constants.SETTINGS, sharedSettings);
-        sharedContext.put(context.constants.STORAGE, storage.shared(sharedSettings));
-        sharedContext.put(context.constants.IMPRESSIONS_COUNTER, impressionsCounter);
-        // As shared clients reuse all the storage information, we don't need to check here if we
-        // will use offline or online mode. We should stick with the original decision.
-        clientInstances[instanceId] = splitFactory(sharedContext, false, mainClientMetricCollectors).api;
-
-        log.info('New shared client instance created.');
-      } else {
-        log.debug('Retrieving existing SDK client.');
-      }
-
-      return clientInstances[instanceId];
-    },
-
-    // Manager API to explore available information
-    manager() {
-      log.info('Manager instance retrieved.');
-      return managerInstance;
-    },
-
-    // Logger wrapper API
-    Logger: API,
-
-    // Expose SDK settings
-    settings
-  };
-}
+export { SplitFactory } from './factory';

package/src/platform/browser.js

@@ -0,0 +1,13 @@
+// @TODO check 'events': it is a CommonJS module. Can have issues with ESM bundlers.
+import EventEmitter from 'events';
+import { getFetch } from '../platform/getFetch/browser';
+import { getEventSource } from '../platform/getEventSource/browser';
+import { BrowserSignalListener } from '@splitsoftware/splitio-commons/src/listeners/browser';
+
+export const platform = {
+  getFetch,
+  getEventSource,
+  EventEmitter
+};
+
+export const signalListener = BrowserSignalListener;

package/src/{services → platform}/getEventSource/browser.js

@@ -1,3 +1,3 @@
-export default function getEventSource() {
+export function getEventSource() {
   return typeof EventSource === 'function' ? EventSource : undefined;
-}
+}

package/src/{services → platform}/getEventSource/node.js

@@ -10,11 +10,11 @@ export function __restore() {
   __isCustom = false;
 }
 
-export default function getEventSource() {
+export function getEventSource() {
   // returns EventSource at `eventsource` package. If not available, return global EventSource or undefined
   try {
     return __isCustom ? __eventSource : require('eventsource');
   } catch (error) {
     return typeof EventSource === 'function' ? EventSource : undefined;
   }
-}
+}

package/src/{services → platform}/getFetch/browser.js

@@ -1,5 +1,5 @@
 import unfetch from 'unfetch';
 
-export default function getFetch() {
+export function getFetch() {
   return typeof fetch === 'function' ? fetch : unfetch;
-}
+}

package/src/{services → platform}/getFetch/node.js

@@ -16,6 +16,6 @@ export function __setFetch(fetch) {
   nodeFetch = fetch;
 }
 
-export default function getFetch() {
+export function getFetch() {
   return nodeFetch;
 }

package/src/platform/node.js

@@ -0,0 +1,15 @@
+// @TODO check 'events': Node is using events API or the installed dependency?
+import EventEmitter from 'events';
+import { getFetch } from '../platform/getFetch/node';
+import { getEventSource } from '../platform/getEventSource/node';
+import { getOptions } from '../platform/request/options/node';
+import { NodeSignalListener } from '@splitsoftware/splitio-commons/src/listeners/node';
+
+export const platform = {
+  getOptions,
+  getFetch,
+  getEventSource,
+  EventEmitter
+};
+
+export const signalListener = NodeSignalListener;

package/src/{services → platform}/request/options/node.js

@@ -1,5 +1,5 @@
 /**
-Copyright 2016 Split Software
+Copyright 2022 Split Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ const agent = new https.Agent({
   keepAliveMsecs: 1500
 });
 
-export default function getOptions() {
+export function getOptions() {
   return {
     agent
   };

package/src/settings/clientSide.js

@@ -0,0 +1,18 @@
+import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation';
+import { defaults } from './defaults/browser';
+import { validateStorage } from './storage/browser';
+import { validateIntegrations } from './integrations/browser';
+import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger';
+import { LocalhostFromObject } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject';
+
+const params = {
+  defaults,
+  storage: validateStorage,
+  integrations: validateIntegrations,
+  logger: validateLogger,
+  localhost: () => LocalhostFromObject(),
+};
+
+export function settingsFactory(config) {
+  return settingsValidation(config, params);
+}

package/{es/utils → src}/settings/defaults/browser.js

@@ -1,4 +1,6 @@
-export default {
+import { packageVersion } from './version';
+
+export const defaults = {
   startup: {
     // Stress the request time used while starting up the SDK.
     requestTimeoutBeforeReady: 5,
@@ -8,5 +10,8 @@ export default {
     readyTimeout: 10,
     // Amount of time we will wait before the first push of events.
     eventsFirstPushWindow: 10
-  }
-};
+  },
+
+  // Instance version.
+  version: `javascript-${packageVersion}`,
+};

package/{lib/utils → src}/settings/defaults/node.js

@@ -1,8 +1,6 @@
-"use strict";
+import { packageVersion } from './version';
 
-exports.__esModule = true;
-exports.default = void 0;
-var _default = {
+export const defaults = {
   core: {
     // Default is true.
     IPAddressesEnabled: true
@@ -21,6 +19,8 @@ var _default = {
     featuresRefreshRate: 5,
     impressionsRefreshRate: 300
   },
-  features: '.split'
+  features: '.split',
+
+  // Instance version.
+  version: `nodejs-${packageVersion}`,
 };
-exports.default = _default;

package/src/settings/defaults/version.js

@@ -0,0 +1 @@
+export const packageVersion = '10.17.3-rc.0';

package/src/settings/integrations/browser.js

@@ -0,0 +1,6 @@
+import { GOOGLE_ANALYTICS_TO_SPLIT, SPLIT_TO_GOOGLE_ANALYTICS } from '@splitsoftware/splitio-commons/src/utils/constants/browser';
+import { validateConfigurableIntegrations } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/integrations/configurable';
+
+export const validateIntegrations = settings => {
+  return validateConfigurableIntegrations(settings, [GOOGLE_ANALYTICS_TO_SPLIT, SPLIT_TO_GOOGLE_ANALYTICS]);
+};

package/src/{utils/settings → settings}/integrations/node.js

@@ -1,7 +1,5 @@
 // For now, Node SDK does not support integrations,
 // thus any integrations settings is parsed into undefined.
-const validateNodeIntegrationsSettings = () => {
+export const validateIntegrations = () => {
   return [];
 };
-
-export default validateNodeIntegrationsSettings;

package/src/settings/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "./serverSide.js",
+  "browser": "./clientSide.js"
+}

package/src/{utils/settings → settings}/runtime/node.js

@@ -1,5 +1,5 @@
 /**
-Copyright 2016 Split Software
+Copyright 2022 Split Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,18 +17,21 @@ limitations under the License.
 import osFunction from 'os';
 import ipFunction from 'ip';
 
-import { UNKNOWN, NA } from '../../constants';
+import { UNKNOWN, NA, CONSUMER_MODE } from '@splitsoftware/splitio-commons/src/utils/constants';
+
+export function validateRuntime(settings) {
+  const isIPAddressesEnabled = settings.core.IPAddressesEnabled === true;
+  const isConsumerMode = settings.mode === CONSUMER_MODE;
 
-export default function generateRuntimeSettings(isIPAddressesEnabled, isConsumerMode) {
   // If the values are not available, default to false (for standalone) or "unknown" (for consumer mode, to be used on Redis keys)
   let ip = ipFunction.address() || (isConsumerMode ? UNKNOWN : false);
   let hostname = osFunction.hostname() || (isConsumerMode ? UNKNOWN : false);
-  
+
   if (!isIPAddressesEnabled) { // If IPAddresses setting is not enabled, set as false (for standalone) or "NA" (for consumer mode, to  be used on Redis keys)
     ip = hostname = isConsumerMode ? NA : false;
   }
-  
+
   return {
     ip, hostname
   };
-}
+}